1
0
mirror of https://github.com/lightning/bolts.git synced 2024-11-19 01:50:03 +01:00

Merge branch 'master' into copy-edit-bolts

This commit is contained in:
Landon Mutch 2017-11-10 14:09:05 -08:00
commit 441da24462
2 changed files with 16 additions and 13 deletions

View File

@ -1,5 +1,5 @@
Basic checklist/stylesheet used for copy editing BOLTs. Basic checklist/stylesheet used for copy editing BOLTs,
Temporarily included here for reference purposes. temporarily included here for reference purposes.
- spelling - spelling
- typos - typos
@ -7,6 +7,8 @@ Temporarily included here for reference purposes.
- sentence fragments - sentence fragments
- run-on sentences - run-on sentences
- dangling, misplaced modifiers - dangling, misplaced modifiers
- consistent paragraph tense (e.g. past, present, future)
- passive voice (e.g. avoid 'we')
- capitalization - capitalization
- table of contents - table of contents
- headers - headers
@ -27,19 +29,20 @@ Temporarily included here for reference purposes.
- comma before 'and' item - comma before 'and' item
- period at branch ends - period at branch ends
- example: - example:
>A sending node: ```
- MAY do this. A sending node:
- if this: - MAY do this.
- SHOULD do this. - if this:
- else: - SHOULD do this.
- MUST do this, - else:
- and MUST NOT do this. - MUST do this,
- and MUST NOT do this.
```
- links - links
- broken links - broken links
- link text - link text
- correct anchors/urls - correct anchors/urls
- references - references
- e.g. <sup>[1](#reference-1)</sup> - format e.g. <sup>[1](#reference-1)</sup>
- tags - tags
- consistent usage, e.g. [TODO:], [FIXME:] - consistent usage, e.g. [TODO:], [FIXME:]

View File

@ -240,8 +240,8 @@ Connections between nodes within the network may be very long lived, as payment
channels have an indefinite lifetime. However, it's likely that for a channels have an indefinite lifetime. However, it's likely that for a
significant portion of the lifetime of a connection, no new data will be significant portion of the lifetime of a connection, no new data will be
exchanged. Also, on several platforms it's possible that Lightning exchanged. Also, on several platforms it's possible that Lightning
clients will be put to sleep without prior warning. Hence, we use a clients will be put to sleep without prior warning. Hence, a
distinct `ping` message, in order to probe for the liveness of the connection on distinct `ping` message is used, in order to probe for the liveness of the connection on
the other side, as well as to keep the established connection active. the other side, as well as to keep the established connection active.
Additionally, the ability for a sender to request that the receiver send a Additionally, the ability for a sender to request that the receiver send a