Added user aliases to update_copyright.py and print comment chars in help.

diff --git a/update_copyright.py b/update_copyright.py
index 22f1b9a172a8281894f2d95c2817bceecf5f420d..b28d00cca80778067aa90ca8a7e56e2652f29af4 100755 (executable)
--- a/update_copyright.py
+++ b/update_copyright.py
@@ -69,11 +69,15 @@ COMMENT_CHARS=['#', '%'] # allowed comment characters
 #     }
 # Git-based projects are encouraged to use .mailmap instead of
 # ALIASES.  See git-shortlog(1) for details.
-ALIASES = {}
+ALIASES = {
+    'W. Trevor King <wking@drexel.edu>':
+        ['William Trevor King <wking@thor.yang.physics.drexel.edu>',
+         'wking <wking@loki.(none)>'],
+}
 
 # List of paths that should not be scanned for copyright updates.
 # IGNORED_PATHS = ['./.git/']
-IGNORED_PATHS = ['./.git/', './template/']
+IGNORED_PATHS = ['./.git/', './template/web/']
 # List of files that should not be scanned for copyright updates.
 # IGNORED_FILES = ['COPYING']
 IGNORED_FILES = ['COPYING', 'certgen.py', 'mk_simple_certs.py',
@@ -626,6 +630,7 @@ if __name__ == '__main__':
     import optparse
     import sys
 
+    PROJECT_INFO['comment_chars'] = COMMENT_CHARS
     usage = """%%prog [options] [file ...]
 
 Update copyright information in source code with information from
@@ -635,7 +640,8 @@ Replaces every line starting with '^# Copyright' and continuing with
 '^#' with an auto-generated copyright blurb.  If you want to add
 #-commented material after a copyright blurb, please insert a blank
 line between the blurb and your comment, so the next run of
-``update_copyright.py`` doesn't clobber your comment.
+``update_copyright.py`` doesn't clobber your comment.  The comment
+character ('#' above) can be any of %(comment_chars)s.'
 
 If no files are given, a list of files to update is generated
 automatically.