fixes to docs for wordlists

diff --git a/README.rst b/README.rst
index 8d260a129065cbc6dceca5992ca8c5a2890b8b09..5c9d4e960fefdceff8383e4f8b8dc90a69eb65a9 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -82,7 +82,7 @@ A concise overview of the available ``xkcdpass`` options can be accessed via::
                                     valid words from which to generate passphrases.
                                     Provided wordfiles: eff-long (default), eff-short,
                                     eff-special, legacy, spa-mich (Spanish), fin-kotus (Finnish)
-                                    ita-wiki (Italian)
+                                    ita-wiki (Italian), ger-anlx (German)
         --min=MIN_LENGTH
                                     Minimum length of words to make password
         --max=MAX_LENGTH
@@ -133,7 +133,7 @@ Additional languages
 - Spanish: a modifed version of archive.umich.edu in the `/linguistics` directory. It includes ~80k words. Less than 5 char. and latin-like words were deleted using regex. This list is public domain, see `here <http://www.umich.edu/~archive/linguistics/00readme.txt>`_.
 - Finnish: a modified version of the Institute for the Languages of Finland `XML word list <http://kaino.kotus.fi/sanat/nykysuomi/>`_. Profanities and expressions containing spaces were removed using regex. The resulting list contains ~93k words. The list is published under GNU LGPL, EUPL 1.1 and CC-BY 3.0 licenses.
 - Italian: generated from dumps of the Italian-language Wikipedia, which is released under the Creative Commons Attribution-Share-Alike 3.0 licence.
-- German: based on `this GPL v3 list <https://github.com/dassencio/langcmp/blob/master/wordlists/top1000de.txt>`_. Single and double character words have been removed.
+- German: based on `this GPL v3 list <https://github.com/dassencio/langcmp/blob/master/wordlists/top10000de.txt>`_. Single and double character words have been removed.
 
 Additional language word lists are always welcome!
 
@@ -183,6 +183,7 @@ or setting the appropriate environment variable::
 
 Changelog
 =========
+- **1.16.3** Correct links for German worldist, updated docs to include the list
 - **1.16.2** Fix exception on UTF8 open with python 2.x
 - **1.16.1** Fix encoding issue on Windows
 - **1.16.0** Case of words in passphrase can now be set using `--case`
@@ -197,9 +198,7 @@ Changelog
 - **1.11.1** Fix bug in entropy calc
 - **1.11.0** Rewrite verbose report to take acrostics etc into account
 - **1.10.0** Switch to EFF wordlist as default (note: decrease in entropy of default length passwords to 77 bits, still at EFF recommendations)
-- **1.9.5** Fix broken test
-- **1.9.4** Improve office-safe wordlist contents
-- **1.9.3** Link EFF wordlist information, fix typos, update copyright
+
 
 License
 =======

diff --git a/setup.py b/setup.py
index 12b001e57424d78731ef4d3a9d52814aa334f9f4..1c8162727efe7d73f564c7a92867ee7affe8ce61 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='xkcdpass',
-    version='1.16.2',
+    version='1.16.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 aee83194280a586cc0c0d6e31d69c1263106c5f7..78b0b69e83062b3d7f0fbbf1db674acf894f48ad 100755 (executable)
--- a/xkcdpass/xkcd_password.py
+++ b/xkcdpass/xkcd_password.py
@@ -396,8 +396,8 @@ class XkcdPassArgumentParser(argparse.ArgumentParser):
                 "Specify that the file WORDFILE contains the list"
                 " of valid words from which to generate passphrases."
                 " Provided wordfiles: eff-long (default), eff-short,"
-                " eff-special, legacy, spa-mich (Spanish),"
-                " fin-kotus (Finnish)"))
+                " eff-special, legacy, spa-mich (Spanish), fin-kotus (Finnish)"
+                " ita-wiki (Italian), ger-anlx (German)"))
         self.add_argument(
             "--min",
             dest="min_length", type=int, default=5, metavar="MIN_LENGTH",