Merge pulls #839 and #840

* 839: Dev Docs Glossary: Add Denominations Entry
* 840: Bitcoin.pdf: Add A Page That Lists Translations

_autocrossref.yaml

@@ -13,8 +13,6 @@
 '`alert` message': alert message
 '`alert` messages': alert message
 '`amount`': pp amount
-## bitcoin -- Recommend against bitcoin (singular) because of confusion between protocol, software, denomination
-bitcoins: 
 bitcoin QR code: URI QR code
 bitcoin QR codes: URI QR code
 '`bitcoin:` URI': bitcoin uri
@@ -23,8 +21,6 @@ bitcoinj:
 '`block` message': block message
 '`block` messages': block message
 certificate chain:
-denomination:
-denominations: denomination
 DER:
 DER format: der
 DER-formatted: der
@@ -77,8 +73,6 @@ merge:
 Merge avoidance:
 micropayment channel:
 micropayment channels: micropayment channel
-millibitcoin: millibitcoins
-millibitcoins:
 '`MSG_BLOCK`': msg_block
 '`MSG_FILTERED_BLOCK`': msg_filtered_block
 '`MSG_TX`': msg_tx
@@ -134,8 +128,6 @@ refunds: refund
 root certificate:
 RPC:
 RPCs: rpc
-satoshi:
-satoshis: satoshi
 '`script`': pp script
 secp256k1:
 standard block relay:

_data/glossary/en/denominations.yaml

@@ -0,0 +1,40 @@
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
+required:
+                                           #-------------40 characters-------------#
+    title_max_40_characters_no_formatting: Denominations
+
+    summary_max_255_characters_no_formatting: >
+        Denominations of Bitcoin value, usually measured in fractions of
+        a bitcoin but sometimes measured in multiples of a satoshi.  One
+        bitcoin equals 100,000,000 satoshis.
+
+    synonyms_shown_in_glossary_capitalize_first_letter:
+        - Denomination
+        - Bitcoins
+        - Satoshis
+
+optional:
+    synonyms_and_pluralizations_not_shown_in_glossary:
+        - denominations
+        - millibitcoin
+        - millibitcoins
+        - millibit
+        - millibits
+        - microbitcoin
+        - microbitcoins
+        - microbit
+        - microbits
+        - satoshi
+        ## Don't add bitcoin singular, we use bare "Bitcoin" massively often
+        ## Don't add bits; the dev docs use [binary] "bits" often
+
+    not_to_be_confused_with_capitalize_first_letter:
+        - Binary bits, a unit of data with two possible values
+
+    links_html_or_markdown_style_capitalize_first_letter:
+        - "[Bitcoin Units](https://en.bitcoin.it/wiki/Units) --- Bitcoin Wiki"
+
+---

_includes/guide_payment_processing.md

@@ -155,9 +155,9 @@ You must pay by: 2014-04-01 at 23:00 UTC
 
 {% autocrossref %}
 
-Indicating the [denomination][]{:#term-denomination}{:.term} is critical. As of this writing, popular
-Bitcoin wallet software defaults to denominating amounts in either [bitcoins][]{:#term-bitcoins}{:.term} (BTC)
-, [millibitcoins][]{:#term-millibitcoins}{:.term} (mBTC) or microbitcoins (uBTC, "[bits][]{:#term-bits}{:.term}"). Choosing between each unit is widely supported,
+Indicating the denomination is critical. As of this writing, popular
+Bitcoin wallet software defaults to denominating amounts in either bitcoins (BTC)
+, millibitcoins (mBTC) or microbitcoins (uBTC, "bits"). Choosing between each unit is widely supported,
 but other software also lets its users select denomination amounts from
 some or all of the following options:
 
@@ -167,7 +167,7 @@ some or all of the following options:
 | 0.01        | bitcent (cBTC)      |
 | 0.001       | millibitcoin (mBTC) |
 | 0.000001    | microbitcoin (uBTC, "bits") |
-| 0.00000001  | [satoshi][]{:#term-satoshi}{:.term}             |
+| 0.00000001  | satoshi             |
 
 {% endautocrossref %}
 

_includes/references.md

@@ -5,12 +5,9 @@ http://opensource.org/licenses/MIT.
 
 <!-- Terms; must have tooltip description in "quotes"; alphabetical order -->
 [bitcoin URI]: /en/developer-guide#term-bitcoin-uri "A URI which allows receivers to encode payment details so spenders don't have to manually enter addresses and other details"
-[bitcoins]: /en/developer-guide#term-bitcoins "A primary accounting unit used in Bitcoin; 100 million satoshis"
-[bits]: /en/developer-guide#term-bits "0.000001 bitcoins (100 satoshis)"
 [certificate chain]: /en/developer-examples#term-certificate-chain "A chain of certificates connecting a individual's leaf certificate to the certificate authority's root certificate"
 [coinbase block height]: /en/developer-reference#term-coinbase-block-height "The current block's height encoded into the first bytes of the coinbase field"
 [data-pushing op code]: https://en.bitcoin.it/wiki/Script#Constants "Any op code from 0x01 to 0x4e which pushes data on to the script evaluation stack"
-[denomination]: /en/developer-guide#term-denomination "bitcoins (BTC), bitcents (cBTC), millibitcoins (mBTC), bits (uBTC, microbitcoins), or satoshis"
 [fiat]: /en/developer-guide#term-fiat "National currencies such as the dollar or euro"
 [intermediate certificate]: /en/developer-examples#term-intermediate-certificate "A intermediate certificate authority certificate which helps connect a leaf (receiver) certificate to a root certificate authority"
 [key index]: /en/developer-guide#term-key-index "An index number used in the HD wallet formula to generate child keys from a parent key"
@@ -20,7 +17,6 @@ http://opensource.org/licenses/MIT.
 [merge]: /en/developer-guide#term-merge "Spending, in the same transaction, multiple outputs which can be traced back to different previous spenders, leaking information about how many satoshis you control"
 [merge avoidance]: /en/developer-guide#term-merge-avoidance "A strategy for selecting which outputs to spend that avoids merging outputs with different histories that could leak private information"
 [message]: /en/developer-guide#term-message "A parameter of bitcoin: URIs which allows the receiver to optionally specify a message to the spender"
-[millibitcoins]: /en/developer-guide#term-millibitcoins "0.001 bitcoins (100,000 satoshis)"
 [msg_tx]: /en/developer-reference#term-msg_tx "The TXID data type identifier of an inventory on the P2P network"
 [msg_block]: /en/developer-reference#term-msg_block "The block header hash data type identifier of an inventory on the P2P network"
 [msg_filtered_block]: /en/developer-reference#term-msg_block "An alternative to the block header hash data type identifier of an inventory on the P2P network used to request a merkle block"
@@ -55,8 +51,6 @@ http://opensource.org/licenses/MIT.
 [recurrent rebilling]: /en/developer-guide#rebilling-recurring-payments "Billing a spender on a regular schedule"
 [refund]: /en/developer-guide#issuing-refunds "A transaction which refunds some or all satoshis received in a previous transaction"
 [root certificate]: /en/developer-examples#term-root-certificate "A certificate belonging to a certificate authority (CA)"
-[satoshi]: /en/developer-guide#term-satoshi "The smallest unit of Bitcoin value; 0.00000001 bitcoins.  Also used generically for any value of bitcoins"
-[satoshis]: /en/developer-guide#term-satoshi "The smallest unit of Bitcoin value; 0.00000001 bitcoins.  Also used generically for any value of bitcoins"
 [ssl signature]: /en/developer-examples#term-ssl-signature "Signatures created and recognized by major SSL implementations such as OpenSSL"
 [standard block relay]: /en/developer-guide#term-standard-block-relay "The regular block relay method: announcing a block with an inv message and waiting for a response"
 [transaction]: /en/developer-guide#transactions "A transaction spending satoshis"