--- a/contrib/hg-relink	Mon Apr 27 16:29:26 2009 +0200
+++ b/contrib/hg-relink	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright (C) 2007 Brendan Cully <brendan@kublai.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os, sys
 

--- a/contrib/hg-ssh	Mon Apr 27 16:29:26 2009 +0200
+++ b/contrib/hg-ssh	Sun Apr 26 01:08:54 2009 +0200
@@ -4,8 +4,8 @@
 # Author(s):
 # Thomas Arendsen Hein <thomas@intevation.de>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 """
 hg-ssh - a wrapper for ssh access to a limited set of mercurial repos

--- a/hg	Mon Apr 27 16:29:26 2009 +0200
+++ b/hg	Sun Apr 26 01:08:54 2009 +0200
@@ -4,8 +4,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 # enable importing on demand to reduce startup time
 try:

--- a/hgext/acl.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/acl.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 #
 # this hook allows to allow or deny access to parts of a repo when
 # taking incoming changesets.

--- a/hgext/bookmarks.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/bookmarks.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2008 David Soria Parra <dsp@php.net>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''mercurial bookmarks
 

--- a/hgext/bugzilla.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/bugzilla.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''Bugzilla integration
 

--- a/hgext/children.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/children.py	Sun Apr 26 01:08:54 2009 +0200
@@ -4,8 +4,8 @@
 # Author(s):
 # Thomas Arendsen Hein <thomas@intevation.de>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from mercurial import cmdutil
 from mercurial.commands import templateopts

--- a/hgext/churn.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/churn.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2006 Josef "Jeff" Sipek <jeffpc@josefsipek.net>
 # Copyright 2008 Alexander Solovyov <piranha@piranha.org.ua>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 '''command to show certain statistics about revision history'''
 
 from mercurial.i18n import _

--- a/hgext/convert/__init__.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/convert/__init__.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 '''converting foreign VCS repositories to Mercurial'''
 
 import convcmd

--- a/hgext/convert/convcmd.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/convert/convcmd.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from common import NoRepo, MissingTool, SKIPREV, mapfile
 from cvs import convert_cvs

--- a/hgext/convert/cvsps.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/convert/cvsps.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 #
 # Copyright 2008, Frank Kingswood <frank@kingswood-consulting.co.uk>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os
 import re

--- a/hgext/convert/filemap.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/convert/filemap.py	Sun Apr 26 01:08:54 2009 +0200
@@ -1,8 +1,8 @@
 # Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
 # Copyright 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
 #
-# This software may be used and distributed according to the terms of
-# the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import shlex
 from mercurial.i18n import _

--- a/hgext/convert/p4.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/convert/p4.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 #
 # Copyright 2009, Frank Kingswood <frank@kingswood-consulting.co.uk>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 #
 
 from mercurial import util

--- a/hgext/extdiff.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/extdiff.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''
 The `extdiff' Mercurial extension allows you to use external programs

--- a/hgext/fetch.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/fetch.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 '''pulling, updating and merging in one command'''
 
 from mercurial.i18n import _

--- a/hgext/gpg.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/gpg.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os, tempfile, binascii
 from mercurial import util, commands

--- a/hgext/graphlog.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/graphlog.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2007 Joel Rosdahl <joel@rosdahl.net>
 #
-# This software may be used and distributed according to the terms of
-# the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 '''show revision graphs in terminal windows
 
 This extension adds a --graph option to the incoming, outgoing and log

--- a/hgext/hgk.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/hgk.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005, 2006 Chris Mason <mason@suse.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 '''browsing the repository in a graphical way
 
 The hgk extension allows browsing the history of a repository in a

--- a/hgext/inotify/__init__.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/inotify/__init__.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com>
 # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''inotify-based status acceleration for Linux systems
 '''

--- a/hgext/inotify/client.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/inotify/client.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com>
 # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from mercurial.i18n import _
 import common

--- a/hgext/inotify/common.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/inotify/common.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com>
 # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import cStringIO, socket, struct
 

--- a/hgext/inotify/server.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/inotify/server.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com>
 # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from mercurial.i18n import _
 from mercurial import osutil, util

--- a/hgext/interhg.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/interhg.py	Sun Apr 26 01:08:54 2009 +0200
@@ -5,8 +5,8 @@
 # Contributor(s):
 #   Edward Lee <edward.lee@engineering.uiuc.edu>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 #
 # The `interhg' Mercurial extension allows you to change changelog and
 # summary text just like InterWiki way.

--- a/hgext/keyword.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/keyword.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2007, 2008 Christian Ebert <blacktrash@gmx.net>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 #
 # $Id$
 #

--- a/hgext/mq.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/mq.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005, 2006 Chris Mason <mason@suse.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''patch management and development
 

--- a/hgext/notify.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/notify.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''hook extension to email notifications on commits/pushes
 

--- a/hgext/pager.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/pager.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2008 David Soria Parra <dsp@php.net>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 #
 # To load the extension, add it to your .hgrc file:
 #

--- a/hgext/parentrevspec.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/parentrevspec.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright (C) 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 '''\
 use suffixes to refer to ancestor revisions
 

--- a/hgext/rebase.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/rebase.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2008 Stefano Tortarolo <stefano.tortarolo at gmail dot com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''move sets of revisions to a different ancestor
 

--- a/hgext/record.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/record.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
 #
-# This software may be used and distributed according to the terms of
-# the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''interactive change selection during commit or qrefresh'''
 

--- a/hgext/transplant.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/transplant.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006, 2007 Brendan Cully <brendan@kublai.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''patch transplanting tool
 

--- a/hgext/win32mbcs.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/win32mbcs.py	Sun Apr 26 01:08:54 2009 +0200
@@ -5,8 +5,8 @@
 # Version: 0.2
 # Author:  Shun-ichi Goto <shunichi.goto@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 #
 """allow to use MBCS path with problematic encoding.
 

--- a/hgext/zeroconf/__init__.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/hgext/zeroconf/__init__.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,9 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms of
-# the GNU General Public License (version 2), incorporated herein by
-# reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''zeroconf support for mercurial repositories
 

--- a/mercurial/ancestor.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/ancestor.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import heapq
 

--- a/mercurial/archival.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/archival.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms of
-# the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 from node import hex

--- a/mercurial/bundlerepo.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/bundlerepo.py	Sun Apr 26 01:08:54 2009 +0200
@@ -6,8 +6,8 @@
 
 Copyright 2006, 2007 Benoit Boissinot <bboissin@gmail.com>
 
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 from node import nullid

--- a/mercurial/changegroup.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/changegroup.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 
  Copyright 2006 Matt Mackall <mpm@selenic.com>
 
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 from i18n import _

--- a/mercurial/changelog.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/changelog.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import bin, hex, nullid
 from i18n import _

--- a/mercurial/cmdutil.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/cmdutil.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import hex, nullid, nullrev, short
 from i18n import _

--- a/mercurial/commands.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/commands.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import hex, nullid, nullrev, short
 from lock import release

--- a/mercurial/context.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/context.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import nullid, nullrev, short, hex
 from i18n import _

--- a/mercurial/copies.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/copies.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2008 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import util, heapq

--- a/mercurial/demandimport.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/demandimport.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 '''
 demandimport - automatic demandloading of modules

--- a/mercurial/dirstate.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/dirstate.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 
 Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 from node import nullid

--- a/mercurial/dispatch.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/dispatch.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import os, sys, atexit, signal, pdb, socket, errno, shlex, time

--- a/mercurial/encoding.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/encoding.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,9 +3,8 @@
 
  Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
 
-This software may be used and distributed according to the terms of
-the GNU General Public License version 2, incorporated herein by
-reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 import sys, unicodedata, locale, os, error

--- a/mercurial/error.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/error.py	Sun Apr 26 01:08:54 2009 +0200
@@ -5,8 +5,8 @@
 
 Copyright 2005-2008 Matt Mackall <mpm@selenic.com>
 
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 # Do not import anything here, please

--- a/mercurial/extensions.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/extensions.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import imp, os
 import util, cmdutil

--- a/mercurial/filelog.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/filelog.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import revlog
 

--- a/mercurial/filemerge.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/filemerge.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import short
 from i18n import _

--- a/mercurial/graphmod.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/graphmod.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2008 Dirkjan Ochtman <dirkjan@ochtman.nl>
 # Copyright 2007 Joel Rosdahl <joel@rosdahl.net>
 #
-# This software may be used and distributed according to the terms of
-# the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import nullrev
 

--- a/mercurial/hbisect.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hbisect.py	Sun Apr 26 01:08:54 2009 +0200
@@ -4,8 +4,8 @@
 # Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
 # Inspired by git bisect, extension skeleton taken from mq.py.
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os
 from i18n import _

--- a/mercurial/help.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/help.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 

--- a/mercurial/hg.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hg.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 from lock import release

--- a/mercurial/hgweb/__init__.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/__init__.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import hgweb_mod, hgwebdir_mod
 

--- a/mercurial/hgweb/common.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/common.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import errno, mimetypes, os
 

--- a/mercurial/hgweb/hgweb_mod.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/hgweb_mod.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os
 from mercurial import ui, hg, util, hook, error, encoding

--- a/mercurial/hgweb/hgwebdir_mod.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os
 from mercurial.i18n import _

--- a/mercurial/hgweb/protocol.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/protocol.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import cStringIO, zlib, tempfile, errno, os, sys
 from mercurial import util, streamclone

--- a/mercurial/hgweb/request.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/request.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import socket, cgi, errno
 from mercurial import util

--- a/mercurial/hgweb/server.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/server.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os, sys, errno, urllib, BaseHTTPServer, socket, SocketServer, traceback
 from mercurial import hg, util, error

--- a/mercurial/hgweb/webcommands.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/webcommands.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os, mimetypes, re, cgi, copy
 import webutil

--- a/mercurial/hgweb/webutil.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/webutil.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import os, copy
 from mercurial import match, patch, util, error

--- a/mercurial/hgweb/wsgicgi.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hgweb/wsgicgi.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Eric Hopper <hopper@omnifarious.org>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 #
 # This was originally copied from the public domain code at
 # http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side

--- a/mercurial/hook.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/hook.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import util, os, sys

--- a/mercurial/httprepo.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/httprepo.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import bin, hex, nullid
 from i18n import _

--- a/mercurial/i18n.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/i18n.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 
 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 import gettext, sys, os, encoding

--- a/mercurial/ignore.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/ignore.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import util, re

--- a/mercurial/localrepo.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/localrepo.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import bin, hex, nullid, nullrev, short
 from i18n import _

--- a/mercurial/lock.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/lock.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import errno, os, socket, time, util, error
 import warnings

--- a/mercurial/mail.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/mail.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import os, smtplib, socket

--- a/mercurial/manifest.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/manifest.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import array, struct, mdiff, parsers, util, error, revlog

--- a/mercurial/mdiff.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/mdiff.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import bdiff, mpatch, re, struct, util

--- a/mercurial/merge.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/merge.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import nullid, nullrev, hex, bin
 from i18n import _

--- a/mercurial/node.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/node.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 
 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 import binascii

--- a/mercurial/patch.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/patch.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2006 Brendan Cully <brendan@kublai.com>
 # Copyright 2007 Chris Mason <chris.mason@oracle.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 from node import hex, nullid, short

--- a/mercurial/posix.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/posix.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,9 +3,8 @@
 
  Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
 
-This software may be used and distributed according to the terms of
-the GNU General Public License version 2, incorporated herein by
-reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 from i18n import _

--- a/mercurial/pure/base85.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/pure/base85.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright (C) 2009 Brendan Cully <brendan@kublai.com>
 #
-# This software may be used and distributed according to the terms of
-# the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import struct
 

--- a/mercurial/pure/bdiff.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/pure/bdiff.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2009 Matt Mackall <mpm@selenic.com> and others
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import struct, difflib
 

--- a/mercurial/pure/diffhelpers.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/pure/diffhelpers.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2009 Matt Mackall <mpm@selenic.com> and others
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 def addlines(fp, hunk, lena, lenb, a, b):
     while True:

--- a/mercurial/pure/mpatch.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/pure/mpatch.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2009 Matt Mackall <mpm@selenic.com> and others
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import struct
 try:

--- a/mercurial/pure/parsers.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/pure/parsers.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2009 Matt Mackall <mpm@selenic.com> and others
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from mercurial.node import bin, nullid, nullrev
 from mercurial import util

--- a/mercurial/repair.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/repair.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2005, 2006 Chris Mason <mason@suse.com>
 # Copyright 2007 Matt Mackall
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import changegroup, os
 from node import nullrev, short

--- a/mercurial/repo.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/repo.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import error

--- a/mercurial/revlog.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/revlog.py	Sun Apr 26 01:08:54 2009 +0200
@@ -6,8 +6,8 @@
 
 Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 # import stuff from node for others to import from revlog

--- a/mercurial/sshrepo.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/sshrepo.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import bin, hex
 from i18n import _

--- a/mercurial/sshserver.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/sshserver.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 from node import bin, hex

--- a/mercurial/statichttprepo.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/statichttprepo.py	Sun Apr 26 01:08:54 2009 +0200
@@ -4,8 +4,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import changelog, byterange, url, error

--- a/mercurial/store.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/store.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2008 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import os, stat, osutil, util

--- a/mercurial/streamclone.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/streamclone.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import util, error
 from i18n import _

--- a/mercurial/strutil.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/strutil.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 def findall(haystack, needle, start=0, end=None):
     if end is None:

--- a/mercurial/templatefilters.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/templatefilters.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2008 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import cgi, re, os, time, urllib, textwrap
 import util, templater, encoding

--- a/mercurial/templater.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/templater.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import re, sys, os

--- a/mercurial/transaction.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/transaction.py	Sun Apr 26 01:08:54 2009 +0200
@@ -8,8 +8,8 @@
 #
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import os, errno

--- a/mercurial/ui.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/ui.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import errno, getpass, os, re, socket, sys, tempfile

--- a/mercurial/url.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/url.py	Sun Apr 26 01:08:54 2009 +0200
@@ -4,8 +4,8 @@
 # Copyright 2006, 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import urllib, urllib2, urlparse, httplib, os, re
 from i18n import _

--- a/mercurial/util.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/util.py	Sun Apr 26 01:08:54 2009 +0200
@@ -5,8 +5,8 @@
  Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
  Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 
 This contains helper routines that are independent of the SCM core and hide
 platform-specific details from the core.

--- a/mercurial/verify.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/verify.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import nullid, short
 from i18n import _

--- a/mercurial/win32.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/win32.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,8 +3,8 @@
 
 Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
 
-This software may be used and distributed according to the terms of
-the GNU General Public License, incorporated herein by reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 
 Mark Hammond's win32all package allows better functionality on
 Windows.  this module overrides definitions in util.py.  if not

--- a/mercurial/windows.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/windows.py	Sun Apr 26 01:08:54 2009 +0200
@@ -3,9 +3,8 @@
 
  Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
 
-This software may be used and distributed according to the terms of
-the GNU General Public License version 2, incorporated herein by
-reference.
+This software may be used and distributed according to the terms of the
+GNU General Public License version 2, incorporated herein by reference.
 """
 
 from i18n import _

--- a/tests/run-tests.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/tests/run-tests.py	Sun Apr 26 01:08:54 2009 +0200
@@ -4,8 +4,8 @@
 #
 # Copyright 2006 Matt Mackall <mpm@selenic.com>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 import difflib
 import errno