updated license to be explicit about GPL version 2

contrib/hg-relink

@@ -2,8 +2,8 b''
 #
 # Copyright (C) 2007 Brendan Cully <[e-mail]>
 #
-# 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
 

contrib/hg-ssh

@@ -4,8 +4,8 b''
 # Author(s):
 # Thomas Arendsen Hein <[e-mail]>
 #
-# 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

hg

@@ -4,8 +4,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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:

hgext/acl.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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.

hgext/bookmarks.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2008 David Soria Parra <[e-mail]>
 #
-# 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
 

hgext/bugzilla.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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
 

hgext/children.py

@@ -4,8 +4,8 b''
 # Author(s):
 # Thomas Arendsen Hein <[e-mail]>
 #
-# 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

hgext/churn.py

@@ -3,8 +3,8 b''
 # Copyright 2006 Josef "Jeff" Sipek <[e-mail]>
 # Copyright 2008 Alexander Solovyov <[e-mail]>
 #
-# 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 _

hgext/convert/__init__.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

hgext/convert/convcmd.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

hgext/convert/cvsps.py

@@ -3,8 +3,8 b''
 #
 # Copyright 2008, Frank Kingswood <[e-mail]>
 #
-# 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

hgext/convert/filemap.py

@@ -1,8 +1,8 b''
 # Copyright 2007 Bryan O'Sullivan <[e-mail]>
 # Copyright 2007 Alexis S. L. Carvalho <[e-mail]>
 #
-# 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 _

hgext/convert/p4.py

@@ -3,8 +3,8 b''
 #
 # Copyright 2009, Frank Kingswood <[e-mail]>
 #
-# 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

hgext/extdiff.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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

hgext/fetch.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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 _

hgext/gpg.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005, 2006 Benoit Boissinot <[e-mail]>
 #
-# 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

hgext/graphlog.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2007 Joel Rosdahl <[e-mail]>
 #
-# 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

hgext/hgk.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005, 2006 Chris Mason <[e-mail]>
 #
-# 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

hgext/inotify/__init__.py

@@ -3,8 +3,8 b''
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <[e-mail]>
 # Copyright 2007, 2008 Brendan Cully <[e-mail]>
 #
-# 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
 '''

hgext/inotify/client.py

@@ -3,8 +3,8 b''
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <[e-mail]>
 # Copyright 2007, 2008 Brendan Cully <[e-mail]>
 #
-# 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

hgext/inotify/common.py

@@ -3,8 +3,8 b''
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <[e-mail]>
 # Copyright 2007, 2008 Brendan Cully <[e-mail]>
 #
-# 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
 

hgext/inotify/server.py

@@ -3,8 +3,8 b''
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <[e-mail]>
 # Copyright 2007, 2008 Brendan Cully <[e-mail]>
 #
-# 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

hgext/interhg.py

@@ -5,8 +5,8 b''
 # Contributor(s):
 #   Edward Lee <[e-mail]>
 #
-# 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.

hgext/keyword.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2007, 2008 Christian Ebert <[e-mail]>
 #
-# 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$
 #

hgext/mq.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005, 2006 Chris Mason <[e-mail]>
 #
-# 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
 

hgext/notify.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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
 

hgext/pager.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2008 David Soria Parra <[e-mail]>
 #
-# 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:
 #

hgext/parentrevspec.py

@@ -2,8 +2,8 b''
 #
 # Copyright (C) 2007 Alexis S. L. Carvalho <[e-mail]>
 #
-# 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
 

hgext/rebase.py

@@ -2,8 +2,8 b''
 #
 # 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
 

hgext/record.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2007 Bryan O'Sullivan <[e-mail]>
 #
-# 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'''
 

hgext/transplant.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006, 2007 Brendan Cully <[e-mail]>
 #
-# 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
 

hgext/win32mbcs.py

@@ -5,8 +5,8 b''
 # Version: 0.2
 # Author:  Shun-ichi Goto <[e-mail]>
 #
-# 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.
 

hgext/zeroconf/__init__.py

@@ -2,9 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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
 

mercurial/ancestor.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
-# 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
 

mercurial/archival.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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

mercurial/bundlerepo.py

@@ -6,8 +6,8 b' they were part of the actual repository.'
 
 Copyright 2006, 2007 Benoit Boissinot <[e-mail]>
 
-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

mercurial/changegroup.py

@@ -3,8 +3,8 b' changegroup.py - Mercurial changegroup m'
 
  Copyright 2006 Matt Mackall <[e-mail]>
 
-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 _

mercurial/changelog.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/cmdutil.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/commands.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/context.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006, 2007 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/copies.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2008 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/demandimport.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006, 2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/dirstate.py

@@ -3,8 +3,8 b' dirstate.py - working directory tracking'
 
 Copyright 2005-2007 Matt Mackall <[e-mail]>
 
-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

mercurial/dispatch.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/encoding.py

@@ -3,9 +3,8 b' encoding.py - character transcoding supp'
 
  Copyright 2005-2009 Matt Mackall <[e-mail]> 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

mercurial/error.py

@@ -5,8 +5,8 b' This allows us to catch exceptions at hi'
 
 Copyright 2005-2008 Matt Mackall <[e-mail]>
 
-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

mercurial/extensions.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/filelog.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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
 

mercurial/filemerge.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006, 2007, 2008 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/graphmod.py

@@ -3,8 +3,8 b''
 # Copyright 2008 Dirkjan Ochtman <[e-mail]>
 # Copyright 2007 Joel Rosdahl <[e-mail]>
 #
-# 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
 

mercurial/hbisect.py

@@ -4,8 +4,8 b''
 # Copyright 2005, 2006 Benoit Boissinot <[e-mail]>
 # 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 _

mercurial/help.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
-# 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 _
 

mercurial/hg.py

@@ -3,8 +3,8 b''
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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

mercurial/hgweb/__init__.py

@@ -3,8 +3,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005 Matt Mackall <[e-mail]>
 #
-# 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
 

mercurial/hgweb/common.py

@@ -3,8 +3,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
-# 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
 

mercurial/hgweb/hgweb_mod.py

@@ -3,8 +3,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/hgweb/hgwebdir_mod.py

@@ -3,8 +3,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/hgweb/protocol.py

@@ -2,8 +2,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/hgweb/request.py

@@ -3,8 +3,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/hgweb/server.py

@@ -3,8 +3,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/hgweb/webcommands.py

@@ -2,8 +2,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/hgweb/webutil.py

@@ -3,8 +3,8 b''
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/hgweb/wsgicgi.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Eric Hopper <[e-mail]>
 #
-# 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

mercurial/hook.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/httprepo.py

@@ -3,8 +3,8 b''
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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 _

mercurial/i18n.py

@@ -3,8 +3,8 b' i18n.py - internationalization support f'
 
 Copyright 2005, 2006 Matt Mackall <[e-mail]>
 
-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

mercurial/ignore.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/localrepo.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/lock.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/mail.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/manifest.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/mdiff.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/merge.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006, 2007 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/node.py

@@ -3,8 +3,8 b' node.py - basic nodeid manipulation for '
 
 Copyright 2005, 2006 Matt Mackall <[e-mail]>
 
-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

mercurial/patch.py

@@ -3,8 +3,8 b''
 # Copyright 2006 Brendan Cully <[e-mail]>
 # Copyright 2007 Chris Mason <[e-mail]>
 #
-# 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

mercurial/posix.py

@@ -3,9 +3,8 b' posix.py - Posix utility function implem'
 
  Copyright 2005-2009 Matt Mackall <[e-mail]> 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 _

mercurial/pure/base85.py

@@ -2,8 +2,8 b''
 #
 # Copyright (C) 2009 Brendan Cully <[e-mail]>
 #
-# 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
 

mercurial/pure/bdiff.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2009 Matt Mackall <[e-mail]> 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
 

mercurial/pure/diffhelpers.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2009 Matt Mackall <[e-mail]> 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:

mercurial/pure/mpatch.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2009 Matt Mackall <[e-mail]> 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:

mercurial/pure/parsers.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2009 Matt Mackall <[e-mail]> 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

mercurial/repair.py

@@ -3,8 +3,8 b''
 # Copyright 2005, 2006 Chris Mason <[e-mail]>
 # 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

mercurial/repo.py

@@ -3,8 +3,8 b''
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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

mercurial/revlog.py

@@ -6,8 +6,8 b' and O(changes) merge between branches'
 
 Copyright 2005-2007 Matt Mackall <[e-mail]>
 
-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

mercurial/sshrepo.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/sshserver.py

@@ -3,8 +3,8 b''
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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

mercurial/statichttprepo.py

@@ -4,8 +4,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/store.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2008 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/streamclone.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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 _

mercurial/strutil.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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:

mercurial/templatefilters.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2008 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/templater.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/transaction.py

@@ -8,8 +8,8 b''
 #
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/ui.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
-# 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

mercurial/url.py

@@ -4,8 +4,8 b''
 # Copyright 2006, 2007 Alexis S. L. Carvalho <[e-mail]>
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
-# 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 _

mercurial/util.py

@@ -5,8 +5,8 b' util.py - Mercurial utility functions an'
  Copyright 2005-2007 Matt Mackall <[e-mail]>
  Copyright 2006 Vadim Gelfer <[e-mail]>
 
-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.

mercurial/verify.py

@@ -2,8 +2,8 b''
 #
 # Copyright 2006, 2007 Matt Mackall <[e-mail]>
 #
-# 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 _

mercurial/win32.py

@@ -3,8 +3,8 b' win32.py - utility functions that use wi'
 
 Copyright 2005-2009 Matt Mackall <[e-mail]> 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

mercurial/windows.py

@@ -3,9 +3,8 b' windows.py - Windows utility function im'
 
  Copyright 2005-2009 Matt Mackall <[e-mail]> 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 _

tests/run-tests.py

@@ -4,8 +4,8 b''
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
-# 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