nanocurrency · zhyatt · Jun 10, 2020 · Apr 15, 2020 · Apr 16, 2020 · Apr 16, 2020
diff --git a/docs/commands/command-line-interface.md b/docs/commands/command-line-interface.md
@@ -112,7 +112,10 @@ Changes seed for `<wallet>` to `<seed>`.  Note the legacy `--key` option can sti
 
 ### --wallet_decrypt_unsafe --wallet=`<wallet>` --password=`<password>`
 Decrypts `<wallet>` using `<password>`  
-**!!THIS WILL PRINT YOUR PRIVATE KEY AND SEED TO STDOUT!!**  
+
+!!! danger
+	**USE WITH CAUTION: THIS WILL PRINT YOUR PRIVATE KEY AND SEED TO STDOUT**
+
 If you didn't set password yet, use --wallet_decrypt_unsafe --wallet=`<wallet>`
 
 ### --wallet_destroy --wallet=`<wallet>`
@@ -137,7 +140,12 @@ Set `<account>` as default representative for `<wallet>`
 ## Launch options
 When initially starting the nano_node or nano_wallet as a service the following launch options are available.
 
-NOTE: These options are only for developer use so please understand the impacts before use.
+!!! note "Intended for developer use"
+	These options are only for developer use so please understand the impacts before use.
+
+### --allow_bootstrap_peers_duplicates
+_version 21.0+_  
+Allow multiple connections to the same peer in bootstrap attempts
 
 ### --block_processor_batch_size
 Increase block processor transaction batch write size, default 0 (limited by config block_processor_batch_max_time), 256k for fast_bootstrap
@@ -148,14 +156,6 @@ Increase block processor allowed blocks queue size before dropping live network
 ### --block_processor_verification_size
 Increase batch signature verification size in block processor, default 0 (limited by config signature_checker_threads), unlimited for fast_bootstrap
 
-### --inactive_votes_cache_size
-_version 21.0+_  
-Increase cached votes without active elections size, default 16384
-
-### --vote_processor_capacity
-_version 21.0+_  
-Vote processor queue size before dropping votes, default 144k
-
 ### --disable_backup
 Turn off automatic wallet backup process
 
@@ -175,13 +175,6 @@ Turn off listener on the bootstrap network so incoming TCP (bootstrap) connectio
 _version 19.0+_  
 Turn off use of TCP live network (TCP for bootstrap will remain available)
 
-### --disable_udp (Deprecated)
-_version 21.0+_  
-This option has been deprecated and will be removed in future versions. It has no effect because it is now the default.
-
-_version 19.0+_  
-Turn off use of UDP live network
-
 ### --disable_unchecked_cleanup
 Prevent periodic cleaning of unchecked table
 
@@ -200,16 +193,16 @@ Disable deletion of unchecked blocks after processing.
 _version 21.0+_  
 Turn on use of the UDP live network.
 
-### --allow_bootstrap_peers_duplicates
-_version 21.0+_  
-Allow multiple connections to the same peer in bootstrap attempts
-
 ### --fast_bootstrap
 Increase bootstrap processor limits to allow more blocks before hitting full state and verify/write more per database call. Also disable deletion of processed unchecked blocks.
 
-### --batch_size (Deprecated)
-_version 18.0+_  
-Increase sideband upgrade batch size (default 512). Deprecated in _v21_ and will be removed in _v22_ as it will not support upgrades from v18 nodes and earlier.
+### --inactive_votes_cache_size
+_version 21.0+_  
+Increase cached votes without active elections size, default 16384
+
+### --vote_processor_capacity
+_version 21.0+_  
+Vote processor queue size before dropping votes, default 144k
 
 ## Debug commands
 
@@ -240,19 +233,17 @@ List online weights table and current online_weights value
 ### --debug_dump_representatives
 List representatives and weights
 
-### --debug_mass_activity (Deprecated)
-Generates fake debug activity. Deprecated in _v21+_, can use `slow_test --gtest_filter=system.generate_mass_activity` instead.
-
-### --debug_output_last_backtrace_dump
-_version 19.0+_  
-Output the stacktrace stored after a node crash.
-
 ### --debug_generate_crash_report
 _version 21.0+_
 After a node crash on linux, this command consumes the dump files generated from that crash and produces a "nano_node_crash_report.txt" file. Requires `addr2line` to be installed on the system. See the [troubleshooting guide](/running-a-node/troubleshooting/#what-to-do-if-the-node-crashes-linux) for more information.
 
 ### --debug_opencl
-Profile OpenCL work generation for (optional) `--device=<device>` on `--device=<platform>` using `--threads=<threads>` count. To retrieve available platforms & devices run [--diagnostics](#-diagnostics).  
+Profile OpenCL work generation for (optional) `--device=<device>` on `--device=<platform>` using `--threads=<threads>` count. To retrieve available platforms & devices run [--diagnostics](#-diagnostics). 
+
+### --debug_output_last_backtrace_dump
+_version 19.0+_  
+Output the stacktrace stored after a node crash. 
+
 Optionals `--difficulty` and `--multiplier` (only the latter is used if both given) in version 21.0+ to set the work generation threshold.
 
 ### --debug_profile_bootstrap
@@ -291,3 +282,23 @@ Profile signature verification
 
 ### --debug_xorshift_profile
 [Disabled] Profile xorshift algorithms
+
+## Deprecated commands
+
+### Debug
+
+##### --debug_mass_activity (Deprecated)
+Generates fake debug activity. Deprecated in _v21+_, can use `slow_test --gtest_filter=system.generate_mass_activity` instead.
+
+### Launch options
+
+##### --batch_size (Deprecated)
+_version 18.0+_  
+Increase sideband upgrade batch size (default 512). Deprecated in _v21_ and will be removed in _v22_ as it will not support upgrades from v18 nodes and earlier.
+
+##### --disable_udp (Deprecated)
+_version 21.0+_  
+This option has been deprecated and will be removed in future versions. It has no effect because it is now the default.
+
+_version 19.0+_  
+Turn off use of UDP live network
diff --git a/docs/commands/rpc-protocol.md b/docs/commands/rpc-protocol.md
@@ -640,8 +640,10 @@ _version 21.0+_
 Work version string. Currently "work_1" is the default and only valid option. Only used if optional **work** is not given.
 
 **Optional "difficulty"**
-_version 21.0+_
+
+_version 21.0+_  
 Difficulty value (16 hexadecimal digits string, 64 bit). Uses **difficulty** value to generate work. Only used if optional **work** is not given.  
+
 If difficulty and work values are both not given, RPC processor tries to calculate difficulty for work generation based on ledger data: epoch from previous block or from link for receive subtype; block subtype from previous block balance.  
 
 ---
@@ -2795,7 +2797,8 @@ Work version string. Currently "work_1" is the default and only valid option.
 **Optional "block"**
 
 _version 21.0+_  
-A valid Nano block (string or JSON). Using the optional `json_block` is recommended. If provided and `difficulty` or `multiplier` are both not given, RPC processor tries to calculate the appropriate difficulty threshold based on ledger data.
+A valid Nano block (string or JSON). Using the optional `json_block` is recommended. If provided and `difficulty` or `multiplier` are both not given, RPC processor tries to calculate the appropriate difficulty threshold based on ledger data.  
+***Note:*** block should be the one where the resulting work value will be used, not the previous block.
 
 **Optional "json_block"**
 

diff --git a/docs/glossary.md b/docs/glossary.md
@@ -65,7 +65,7 @@ A block with funds being transferred to an [account](#account) owned by a [walle
 Blocks on an account chain before the first v1 block (which is often the v1 epoch block but can be other types). The first v1 block and all subsequent blocks are stateful blocks.
 
 #### live network
-A sub-network established between peers via User Datagram Protocol (UDP) for communicating newly published blocks, votes and other non-bootstrap related traffic. This is available within all Nano networks (main, beta and test networks).
+A sub-network established between peers via Transmission Control Protocol (TCP) for communicating newly published blocks, votes and other non-bootstrap related traffic. This is available within all Nano networks (main, beta and test networks). In versions prior to V19, this was done via User Datagram Protocol (UDP). UDP was retained as a fallback for peer connection for versions 19 and 20. As of V21, use of UDP is deprecated.
 
 #### online voting weight
 Also called online stake, it is a trended value. The node samples online representative weights every 5 minutes across a rolling 2 week period. The online voting weight value is the median of those samples.

diff --git a/docs/images/mailing-list.svg b/docs/images/mailing-list.svg
diff --git a/docs/integration-guides/the-basics.md b/docs/integration-guides/the-basics.md
@@ -145,7 +145,7 @@ Because each block contains the current state of the account, the `"type"` of th
 | balance        | decimal string      | 16 bytes   | Resulting balance (in [raw](#units)) |
 | link           | -                   | 32 bytes   | Multipurpose field - see link table below |
 | signature      | 128 hex-char string | 64 bytes   | ED25519+Blake2b 512-bit signature |
-| work           | 16 hex-char string  | 8 bytes    | [Proof of Work](#proof-of-work) Nonce |
+| work           | 16 hex-char string  | 8 bytes    | [Proof of Work](../glossary.md#proof-of-work-pow) Nonce |
 
 Depending on the action each transaction intends to perform, the `"link"` field will have a different value for [block_create](/commands/rpc-protocol#block_create) RPC command: