add support for randomised delimiters; fix issue with manpage

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fc9f38e62c8dfb81f582a8608d6fda075a6029ac..a2eec63878ba4fa281f83aa5b69b7b752c3c7473 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -38,4 +38,5 @@ Lopo <dev@ipublicis.com>
 Andres Weber <andresmweber@gmail.com>
 Francoisa <francois@webaf.net>
 Tobias Bora <tobias.bora@gmail.com>
-Andrew Parker <aparker127@gmail.com>
\ No newline at end of file
+Andrew Parker <aparker127@gmail.com>
+Sean Abbott <sabbott@cargurus.com>
\ No newline at end of file

diff --git a/README.rst b/README.rst
index 1eb941545853bd330a4a443e1606712b22cfaa3a..6384ea4fda7412cebf9bdd3f864279057a72d826 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -188,6 +188,7 @@ or setting the appropriate environment variable::
 
 Changelog
 =========
+- **1,18.0** Added randomised delimiters
 - **1.17.6** Bugfixes
 - **1.17.5** Bugfixes
 - **1.17.4** Improvements to French dictionary
@@ -204,7 +205,6 @@ Changelog
 - **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
-- **1.14.2** Improve unit test discovery, remove deprecation warnings
 
 
 License

diff --git a/setup.py b/setup.py
index 668f8364a7b11f431f51963b20ff581d7e44cab6..dc1d680d0bb37705bc412e7d8ea7f090c71f9e7e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 
 setup(
     name='xkcdpass',
-    version='1.17.6',
+    version='1.18.0',
     author='Steven Tobin',
     author_email='steventtobin@gmail.com',
     url='https://github.com/redacted/XKCD-password-generator',