From: Steven Tobin <steventtobin (at) gmail.com>
Date: Tue, 11 Nov 2014 08:09:35 +0000 (+1100)
Subject: Included explicit BSD license
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=812d840ee4671d90e95e97f097bb951591f7fbba;p=redacted-XKCD-password-generator.git

Included explicit BSD license
---

diff --git a/LICENSE.BSD b/LICENSE.BSD
new file mode 100644
index 0000000..37adedc
--- /dev/null
+++ b/LICENSE.BSD
@@ -0,0 +1,33 @@
+Copyright (c) 2011 - 2014, Steven Tobin and Contributors.
+All rights reserved.
+
+Contributors: Steven Tobin,
+              Rob Lanphier <robla@robla.net>,
+              Mithrandir <mithrandiragain@lavabit.com>,
+              Daniel Beecham <daniel@lunix.se>,
+              Kim Slawson <kimslawson@gmail.com>,
+              Stanislav Bytsko <zbstof@gmail.com>,
+              Lowe Thiderman <lowe.thiderman@gmail.com>,
+              Daniil Baturin <daniil@baturin.org>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.rst b/README.rst
index 7fe4ffc..54a6b0c 100644
--- a/README.rst
+++ b/README.rst
@@ -121,4 +121,5 @@ A simple use of import::
 
 License
 =======
-The BSD License (BSD)
+This is free software: you may copy, modify, and/or distribute this work under the terms of the BSD 3-Clause license. 
+See the file ``LICENSE.BSD`` for details. 
diff --git a/setup.py b/setup.py
index d6af640..92a31ac 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='xkcdpass',
-    version='1.2.2',
+    version='1.2.3',
     author='Steven Tobin',
     author_email='steventtobin@gmail.com',
     url='https://github.com/redacted/XKCD-password-generator',
diff --git a/xkcdpass/xkcd_password.py b/xkcdpass/xkcd_password.py
index 96530fc..5194a19 100755
--- a/xkcdpass/xkcd_password.py
+++ b/xkcdpass/xkcd_password.py
@@ -94,7 +94,6 @@ def validate_options(parser, options, args):
                              "not exist.\n")
             sys.exit(1)
 
-
 def locate_wordfile():
     static_default = os.path.join(
         os.path.dirname(os.path.abspath(__file__)),