Fix copyright year and reorder argument order

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011-2013 Kristian Larsson, Lukas Garberg
+Copyright (C) 2011-2014 Kristian Larsson, Lukas Garberg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

nipap-cli/nipap.man.rst

@@ -84,4 +84,4 @@ Kristian Larsson, Lukas Garberg
 
 Copyright
 =========
-Kristian Larsson, Lukas Garberg 2011-2013
+Kristian Larsson, Lukas Garberg 2011-2014

nipap/nipap-passwd

@@ -16,22 +16,22 @@ if __name__ == '__main__':
     # parse options
     parser = optparse.OptionParser()
     parser.add_option('-a', '--add', dest='add_user', type='string', help='add user ADD_USER')
+    parser.add_option('-c', '--config', dest='config', default='/etc/nipap/nipap.conf', type='string',
+            help='read configuration from CONFIG [default:/etc/nipap/nipap.conf]')
+    parser.add_option('--create-database', action='store_true',
+            help='create SqliteAuth database')
     parser.add_option('-d', '--delete', dest='delete_user', type='string', help="delete user DELETE_USER")
     parser.add_option('-f', '--file', dest='db_file', type='string', help="database file [default: read from config]")
 #    parser.add_option('-m', '--modify', dest='modify_user', type='string')
-    parser.add_option('-p', '--password', dest='password', type='string', help='set user\'s password to PASSWORD')
+    parser.add_option('-n', '--name', dest='name', type='string', help='set user\'s name to NAME')
     parser.add_option('--latest-version', action='store_true',
-            help='check that the sqlite database is of latest version')
-    parser.add_option('--create-database', action='store_true',
-            help='create SqliteAuth database')
-    parser.add_option('--upgrade-database', action='store_true',
-            help='upgrade sqlite database to latest version')
+            help='check if the sqlite database is of latest version')
     parser.add_option('-l', '--list', action='store_true', dest='list', help='list users')
-    parser.add_option('-t', '--trusted', action='store_true', dest='trusted', default=False, help='mark user as trusted')
+    parser.add_option('-p', '--password', dest='password', type='string', help='set user\'s password to PASSWORD')
     parser.add_option('-r', '--readonly', action='store_true', dest='readonly', default=False, help='set user to read only')
-    parser.add_option('-n', '--name', dest='name', type='string', help='set user\'s name to NAME')
-    parser.add_option('-c', '--config', dest='config', default='/etc/nipap/nipap.conf', type='string',
-            help='read configuration from CONFIG [default:/etc/nipap/nipap.conf]')
+    parser.add_option('-t', '--trusted', action='store_true', dest='trusted', default=False, help='mark user as trusted')
+    parser.add_option('--upgrade-database', action='store_true',
+            help='upgrade sqlite database to latest version')
     options, args = parser.parse_args()
 
     logger = logging.getLogger()

nipap/nipap-passwd.man.rst

@@ -21,14 +21,18 @@ Options
 
     -h, --help                      show a help message
     -a ADD_USER, --add=ADD_USER     add user with username ADD_USER
+    -c CONFIG, --config=CONFIG      read configuration from configuration file CONFIG [default: /etc/nipap/nipap.conf]
+    --create-database               create SqliteAuth database
     -d DELETE_USER, --delete=DELETE_USER    delete user with username DELETE_USER
     -f DB_FILE, --file=DB_FILE      database file [default: read from config]
-    -p PASSWORD, --password=PASSWORD    set user's password to PASSWORD
+    -n NAME, --name=NAME            set user's name to NAME
+    --latest-version                check if the sqlite database is of the latest version
     -l, --list                      list all users
+    -p PASSWORD, --password=PASSWORD    set user's password to PASSWORD
+    -r, --readonly                  set usr to read only
     -t, --trusted                   mark user as trusted
-    -n NAME, --name=NAME            set user's name to NAME
-    -c CONFIG, --config=CONFIG      read configuration from configuration file CONFIG [default: /etc/nipap/nipap.conf]
+    --upgrade-database              upgrade Sqlite database to latest version
 
 Copyright
 ---------
-Kristian Larsson, Lukas Garberg 2011-2013
+Kristian Larsson, Lukas Garberg 2011-2014

nipap/nipap/__init__.py

@@ -1,7 +1,7 @@
 __version__		= "0.23.0"
 __author__		= "Kristian Larsson, Lukas Garberg"
 __author_email__ = "[email protected], [email protected]"
-__copyright__	= "Copyright 2011, Kristian Larsson, Lukas Garberg"
+__copyright__	= "Copyright 2011-2014, Kristian Larsson, Lukas Garberg"
 __license__		= "MIT"
 __status__		= "Development"
 __url__			= "http://SpriteLink.github.com/NIPAP"

nipap/nipapd.man.rst

@@ -42,4 +42,4 @@ To start nipapd in the foreground with debug logging, running on a specific port
 
 Copyright
 ---------
-Kristian Larsson, Lukas Garberg 2011-2013
+Kristian Larsson, Lukas Garberg 2011-2014