Update man page.

Show new option (multiple wordlists) and add infos about the new lists.

diceware.1

@@ -80,9 +80,9 @@ Separate words by DELIMITER. Empty string by default.
 Get randomness from this source. Possible values:
 \fBrealdice\fP, \fBsystem\fP\&. Default: \fBsystem\fP
 .TP
-.B \fB\-w\fP \fINAME\fP, \fB\-\-wordlist\fP \fINAME\fP
-Use words from this wordlist. Possible values: \fIen\fP, \fIen_eff\fP, \fIen_orig\fP,
-\fIen_securedrop\fP\&.  Wordlists are stored in the folder displayed below.
+.B \fB\-w\fP [\fINAME\fP [\fINAME\fP ...]], \fB\-\-wordlist\fP [\fINAME\fP [\fINAME\fP ...]]
+Use words from this wordlist. Possible values: \fIde\fP, \fIde_8k\fP,
+\fIen_adjectives\fP, \fIen_eff\fP, \fIen_nouns\fP, \fIen_orig\fP, \fIen_securedrop\fP\&. \fIpt\-br\fP\&.
 Default: \fBen_eff\fP
 .TP
 .B \fB\-v\fP, \fB\-\-verbose\fP
@@ -146,6 +146,11 @@ Create a passphrase with two special chars spread over the generated
 passphrase and containing words from wordlist "\fBen_orig\fP". This is one of
 the wordlists that come included with \fIdiceware\fP\&. Creates something like:
 "\fBRutt[FanScoldLouiseT*nyThrob\fP".
+.TP
+.B \fBdiceware \-w en_adjectives en_nouns \-n 2\fP
+Create two syntactically meaningful phrases, each one consisting of an
+adjective and a noun. Results in something like:
+"\fBCruelAttendeesCleanCoffee\fP".
 .UNINDENT
 .SH COPYRIGHT
 .sp
@@ -178,6 +183,12 @@ The EFF wordlist (file \fBwordlsts/wordlist_en_eff.txt\fP) is licensed by the
 Electronic Frontier Foundation under the \fICreative Commons CC\-BY 3.0 US\fP
 license (see \fI\%https://creativecommons.org/licenses/by/3.0/us/\fP).
 .sp
+The copyright for the \fIDiceware8k\fP list is owned by Arnold G Reinhold.  The
+copyright for the the \fIDiceware SecureDrop\fP list is owned by \fI@heartsucker\fP\&.
+Copyright for the \fIEFF large\fP list by \fIJoseph Bonneau\fP and \fIEFF\fP\&. Copyright for
+the brazilian portuguese list by \fI@drebs\fP\&. Copyright for the english adjective
+and noun lists by \fINaturalLanguagePasswords\fP\&.
+.sp
 "Diceware" is a trademark of Arnold G Reinhold, used with permission.
 .SH AUTHOR
 Written by Uli Fouquet and contributors

docs/manpage.rst

@@ -56,9 +56,9 @@ options
     Get randomness from this source. Possible values:
     ``realdice``, ``system``. Default: ``system``
 
-  ``-w`` `NAME`, ``--wordlist`` `NAME`
-    Use words from this wordlist. Possible values: `en`, `en_eff`, `en_orig`,
-    `en_securedrop`.  Wordlists are stored in the folder displayed below.
+  ``-w`` [`NAME` [`NAME` ...]], ``--wordlist`` [`NAME` [`NAME` ...]]
+    Use words from this wordlist. Possible values: `de`, `de_8k`,
+    `en_adjectives`, `en_eff`, `en_nouns`, `en_orig`, `en_securedrop`. `pt-br`.
     Default: ``en_eff``
 
   ``-v``, ``--verbose``
@@ -117,6 +117,10 @@ examples
     the wordlists that come included with `diceware`. Creates something like:
     "``Rutt[FanScoldLouiseT*nyThrob``".
 
+``diceware -w en_adjectives en_nouns -n 2``
+    Create two syntactically meaningful phrases, each one consisting of an
+    adjective and a noun. Results in something like:
+    "``CruelAttendeesCleanCoffee``".
 
 copyright
 ---------
@@ -150,4 +154,11 @@ The EFF wordlist (file ``wordlsts/wordlist_en_eff.txt``) is licensed by the
 Electronic Frontier Foundation under the `Creative Commons CC-BY 3.0 US`
 license (see https://creativecommons.org/licenses/by/3.0/us/).
 
+
+The copyright for the `Diceware8k` list is owned by Arnold G Reinhold.  The
+copyright for the the `Diceware SecureDrop` list is owned by `@heartsucker`.
+Copyright for the `EFF large` list by `Joseph Bonneau` and `EFF`. Copyright for
+the brazilian portuguese list by `@drebs`. Copyright for the english adjective
+and noun lists by `NaturalLanguagePasswords`.
+
 "Diceware" is a trademark of Arnold G Reinhold, used with permission.