Merge remote-tracking branch 'github/develop' into develop

13_wire_protocol.asciidoc

@@ -90,7 +90,6 @@ high-level routine used to encode/decode the type.
 | `short_chan_id` | An unsigned 64-bit integer (`uint64`) | Composed of the block height (24 bits), transaction index (24 bits), and output index (16 bits) packed into 8 bytes.
 | `milli_satoshi` | An unsigned 64-bit integer (`uint64`) | Represents 1000th of a satoshi.
 | `satoshi` | An unsigned 64-bit integer (`uint64`) | The based unit of bitcoin.
-| `satoshi` | An unsigned 64-bit integer (`uint64`) | The based unit of bitcoin.
 | `pubkey`  | An secp256k1 public key encoded in _compressed_ format, occupying 33 bytes. | Occupies a fixed 33-byte length on the wire.
 | `sig`     | An ECDSA signature of the secp256k1 Elliptic Curve. | Encoded as a _fixed_ 64-byte byte slice, packed as `R \|\| S`
 | `uint8`   | An 8-bit integer.  |

glossary.asciidoc

@@ -439,10 +439,10 @@ preimage::
     In particular, when using SHA-256, it should be stated that each element has an infinite number of preimages.
     However, it is still believed to be computationally hard to find such a preimage.
 
-proof of work::
+Proof of Work (PoW)::
     A piece of data that requires significant computation to find.
     In Bitcoin, miners must find a numeric solution to the SHA256 algorithm that meets a network-wide target, called the difficulty target.
-    See _bitcoin mining_.
+    See _Bitcoin mining_ for more information.
 
 PTLC::
     A PTLC is the short form for Point Timelock contract. Similar to an HTLC it is a Bitcoin script that allows a conditional spend either on the presentation of a secret or after a certain blockheight has passed. The secret in PTLCs does not depend on a preimage of a hash function but rather on the private key from an elliptic curve point. The security assumption is thus based on the discret logarithm. PTLCs are not yet used on the Lightning Network.