Update docs for multi wordfile support

diff --git a/README.rst b/README.rst
index 72606f1af7cbd179488c765d679c32067792fff9..36a64fc98cb95b301699fd2ffc974cfdabed68f2 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -79,7 +79,8 @@ A concise overview of the available ``xkcdpass`` options can be accessed via::
                                     show this help message and exit
         -w WORDFILE, --wordfile=WORDFILE
                                     Specify that the file WORDFILE contains the list of
-                                    valid words from which to generate passphrases.
+                                    valid words from which to generate passphrases. Multiple 
+                                    wordfiles can be provided, separated by commas.
                                     Provided wordfiles: eff-long (default), eff-short,
                                     eff-special, legacy, spa-mich (Spanish), fin-kotus (Finnish)
                                     ita-wiki (Italian), ger-anlx / eff_large_de.wordlist (German), nor-nb (Norwegian),
@@ -192,6 +193,7 @@ or setting the appropriate environment variable::
 
 Changelog
 =========
+- **1.19.0** Initial support for multiple wordfiles
 - **1.18.2** fixes for README
 - **1.18.0** Added randomised delimiters
 - **1.17.6** Bugfixes
@@ -208,8 +210,6 @@ Changelog
 - **1.16.1** Fix encoding issue on Windows
 - **1.16.0** Case of words in passphrase can now be set using `--case`
 - **1.15.1** Added more information about supported languages
-- **1.15.0** Added `--separator` argument, German wordlist (GPL 3.0, thanks to @anlx-sw)
-- **1.14.3** Refactor password generator, fixes for hardcoded python version in test
 
 
 License

diff --git a/setup.py b/setup.py
index 997701072474d15692f87e520e0f334ceed8176f..095c2f96226930593e70fafa72fe7c5cea10fd3f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 
 setup(
     name='xkcdpass',
-    version='1.18.2',
+    version='1.19.0',
     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 5d191b446cbe60f6be8db78b1e17eaa34971b7d3..71dda798c147e6624041830b22ea1b1deb9b833e 100755 (executable)
--- a/xkcdpass/xkcd_password.py
+++ b/xkcdpass/xkcd_password.py
@@ -440,6 +440,7 @@ class XkcdPassArgumentParser(argparse.ArgumentParser):
              help=(
                 "Specify that the file WORDFILE contains the list"
                 " of valid words from which to generate passphrases."
+                " Multiple wordfiles can be provided, separated by commas."
                 " Provided wordfiles: eff-long (default), eff-short,"
                 " eff-special, legacy, spa-mich (Spanish), fin-kotus (Finnish),"
                 " fr-freelang (French), fr-corrected.txt (French), pt-ipublicis (Portuguese),"