From c397e4870f7037e46efc085673aa68f4168b771f Mon Sep 17 00:00:00 2001 From: ulif <uli@gnufix.de> Date: Sun, 26 Jul 2015 15:48:24 +0200 Subject: [PATCH] Add links in wordlists docs. --- docs/wordlists.rst | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/docs/wordlists.rst b/docs/wordlists.rst index 3148c01..833bcf6 100644 --- a/docs/wordlists.rst +++ b/docs/wordlists.rst @@ -2,23 +2,31 @@ Wordlists ========= The passphrases generated by `diceware` naturally depend on the set of -words used, the wordlists. `diceware` comes with some wordlists -out-of-the-box, that are a good choice for usual private use. +words used, the wordlists. -By default we use the so-called ``8k`` list from http://diceware.com/ -with 8,192 english words. +`diceware` comes with some wordlists out-of-the-box, that might be a +good choice for usual private use. -.. warn:: We do *not* use the list for use with dice (which contains - 7,776 words) by default, because the computer is better at - binary math and we use the Python standard lib random source - by default. +By default we use the so-called `8k wordlist`_ from Mr. Reinhold as +published on http://diceware.com/. It contains 8,192 english words +and phrases. - But the "original" list from http://diceware.com/ is - included in diceware as well. You can pick it with the ``-w - en_orig`` option. +.. warning:: We do *not* use the `diceware standard wordlist`_ (which + contains 7,776 words) by default, because computers + prefer powers of two and we use the Python standard lib + random source by default. + + But this "original" list is included in diceware as + well. You can pick it with the ``-w en_orig`` option and + you *should* pick it when you use real dice as source of + randomness. You can pick another list with the ``-w`` or ``--wordlist`` option. You can add own wordlists. You can add PGP-signed wordlists. + +.. _`8k wordlist`: http://world.std.com/~reinhold/diceware8k.txt + +.. _`diceware standard wordlist`: http://world.std.com/~reinhold/diceware.wordlist.asc -- GitLab