From f368d38e04e26bfa116339310e6e0d53a1680a07 Mon Sep 17 00:00:00 2001
From: "David A. Harding" <dave@dtrt.org>
Date: Sat, 13 Dec 2014 17:35:21 -0500
Subject: [PATCH 1/4] Dev Docs: Add "Edit|History|Report Issue|Discuss" Links
 To Subheads

---
 Makefile                                | 20 +++++++++--
 _includes/example_intro.md              |  1 +
 _includes/example_p2p_networking.md     |  6 ++++
 _includes/example_payment_processing.md |  9 +++++
 _includes/example_testing.md            |  4 +++
 _includes/example_transactions.md       |  8 +++++
 _includes/guide_block_chain.md          |  8 +++++
 _includes/guide_contracts.md            |  5 +++
 _includes/guide_mining.md               |  8 +++++
 _includes/guide_operating_modes.md      |  8 +++++
 _includes/guide_p2p_network.md          |  9 +++++
 _includes/guide_payment_processing.md   | 15 +++++++++
 _includes/guide_transactions.md         | 16 +++++++++
 _includes/guide_wallets.md              | 17 ++++++++++
 _includes/helpers/subhead-links.md      |  8 +++++
 _includes/ref_block_chain.md            |  7 ++++
 _includes/ref_core_rpc_intro.md         | 17 ++++++++++
 _includes/ref_core_rpcs-abcdefg.md      | 44 +++++++++++++++++++++++++
 _includes/ref_core_rpcs-hijklmn.md      | 15 +++++++++
 _includes/ref_core_rpcs-opqrst.md       | 13 ++++++++
 _includes/ref_core_rpcs-uvwxyz.md       |  7 ++++
 _includes/ref_p2p_networking.md         | 30 +++++++++++++++++
 _includes/ref_transactions.md           | 10 ++++++
 _includes/ref_wallets.md                |  5 +++
 _less/screen.less                       | 14 ++++++++
 _plugins/liquid-die.rb                  | 29 ++++++++++++++++
 en/developer-reference.md               | 18 ----------
 27 files changed, 331 insertions(+), 20 deletions(-)
 create mode 100644 _includes/helpers/subhead-links.md
 create mode 100644 _plugins/liquid-die.rb

diff --git a/Makefile b/Makefile
index ff8bf1c3..8dc16b5b 100644
--- a/Makefile
+++ b/Makefile
@@ -33,13 +33,13 @@ all: pre-build-tests build post-build-tests
 
 
 ## Pre-build tests which, aggregated together, take less than 5 seconds to run on a typical PC
-pre-build-tests-fast: check-for-non-ascii-urls
+pre-build-tests-fast: check-for-non-ascii-urls check-for-wrong-filename-assignments
 
 ## Post-build tests which, aggregated together, take less than 5 seconds to run on a typical PC
 post-build-tests-fast: check-for-build-errors ensure-each-svg-has-a-png check-for-liquid-errors \
     check-for-missing-anchors check-for-broken-markdown-reference-links \
     check-for-broken-kramdown-tables check-for-duplicate-header-ids \
-    check-for-headers-containing-auto-link
+    check-for-headers-containing-auto-link check-for-missing-subhead-links
 
 ## All pre-build tests, including those which might take multiple minutes
 pre-build-tests: pre-build-tests-fast
@@ -134,3 +134,19 @@ check-for-headers-containing-auto-link:
 ## none of the generated subheadings contain the string
 ## 'class="auto-link"' produced by autocrossref
 	$S grep '<\(h[2-6]\).*\?>[^>]\+class="auto-link".*</\1>' _site/en/developer-* | eval $(ERROR_ON_OUTPUT)
+
+check-for-missing-subhead-links:
+## Make sure each subhead (h2-h6) either has the subhead links
+## (edit,issue,etc) or something like <!-- no subhead-links here -->
+	$S egrep -n -A1 '<h[2-6]' _site/en/developer-* \
+	   | egrep -v 'developer-documentation|<h[2-6]|^--|subhead-links' \
+	   | eval $(ERROR_ON_OUTPUT)
+
+check-for-wrong-filename-assignments:
+## Make sure whenever we use {% assign filename="some-file" %} that the
+## filename assignment matches the actual filename. This will, in
+## particular, help catch mistakes when we move files
+	$S find . -name '*.md' \
+	   | xargs grep 'assign *filename' \
+	   | grep -v '^\./\(.*\):{.*filename=.\1"' \
+	   | eval $(ERROR_ON_OUTPUT)
diff --git a/_includes/example_intro.md b/_includes/example_intro.md
index 028db219..93482d23 100644
--- a/_includes/example_intro.md
+++ b/_includes/example_intro.md
@@ -2,6 +2,7 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/example_intro.md" %}
 
 {% autocrossref %}
 
diff --git a/_includes/example_p2p_networking.md b/_includes/example_p2p_networking.md
index 3686e563..dc7b1014 100644
--- a/_includes/example_p2p_networking.md
+++ b/_includes/example_p2p_networking.md
@@ -2,10 +2,13 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/example_p2p_networking.md" %}
 
 ## P2P Network
+{% include helpers/subhead-links.md %}
 
 ### Creating A Bloom Filter
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -160,6 +163,7 @@ b50f ....... Filter: 1010 1101 1111 0000
 {% endautocrossref %}
 
 ### Evaluating A Bloom Filter
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -234,6 +238,7 @@ MATCH FAILURE: Index 0x6 not set in 1010110111110000
 {% endautocrossref %}
 
 ### Retrieving A MerkleBlock
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -349,6 +354,7 @@ Part of the response is shown in the section below.
 {% endautocrossref %}
 
 ### Parsing A MerkleBlock
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/example_payment_processing.md b/_includes/example_payment_processing.md
index 80c1ce1d..f1494c21 100644
--- a/_includes/example_payment_processing.md
+++ b/_includes/example_payment_processing.md
@@ -2,10 +2,13 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/example_payment_processing.md" %}
 
 ## Payment Processing
+{% include helpers/subhead-links.md %}
 
 ### Payment Protocol
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -36,6 +39,7 @@ custom example URIs and payment requests for use with testnet.
 {% endautocrossref %}
 
 #### PaymentRequest & PaymentDetails
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -62,6 +66,7 @@ programming languages. You will also need a copy of the PaymentRequest
 {% endautocrossref %}
 
 ##### Initialization Code
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -93,6 +98,7 @@ functions created by `protoc`.
 {% endautocrossref %}
 
 ##### Configuration Code
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -243,6 +249,7 @@ later.
 {% endautocrossref %}
 
 ##### Code Variables
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -346,6 +353,7 @@ payment as part of a cryptographically-proven receipt.
 {% endautocrossref %}
 
 ##### Derivable Data
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -432,6 +440,7 @@ same hashing formula we specified in `pki_type` (sha256 in this case)
 {% endautocrossref %}
 
 ##### Output Code
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/example_testing.md b/_includes/example_testing.md
index c58863c0..8ae691c1 100644
--- a/_includes/example_testing.md
+++ b/_includes/example_testing.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/example_testing.md" %}
 
 ## Testing Applications
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -13,6 +15,7 @@ test their applications with reduced risks and limitations.
 {% endautocrossref %}
 
 ### Testnet
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -32,6 +35,7 @@ community, so please don't abuse it.
 {% endautocrossref %}
 
 ### Regtest Mode
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/example_transactions.md b/_includes/example_transactions.md
index db303a65..0b8f1162 100644
--- a/_includes/example_transactions.md
+++ b/_includes/example_transactions.md
@@ -2,10 +2,13 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/example_transactions.md" %}
 
 ## Transactions
+{% include helpers/subhead-links.md %}
 
 ### Transaction Tutorial
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -30,6 +33,7 @@ wallet.
 
 
 #### Simple Spending
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -127,6 +131,7 @@ second) and clear the shell variable.
 
 
 #### Simple Raw Transaction
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -342,6 +347,7 @@ variables.
 
 
 #### Complex Raw Transaction
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -578,6 +584,7 @@ the block chain or memory pool.
 
 
 #### Offline Signing
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -874,6 +881,7 @@ Remove old shell variables.
 
 
 #### P2SH Multisig
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/guide_block_chain.md b/_includes/guide_block_chain.md
index a5036542..ca274574 100644
--- a/_includes/guide_block_chain.md
+++ b/_includes/guide_block_chain.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/guide_block_chain.md" %}
 
 ## Block Chain
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -22,6 +24,7 @@ the consensus rules used by Bitcoin Core.
 {% endautocrossref %}
 
 ### Block Chain Overview
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -73,6 +76,7 @@ satoshi transaction fee.
 {% endautocrossref %}
 
 ### Proof Of Work
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -147,6 +151,7 @@ the merkle tree.
 {% endautocrossref %}
 
 ### Block Height And Forking
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -191,6 +196,7 @@ are usually referenced by the hash of their header (often with the byte order re
 {% endautocrossref %}
 
 ### Transaction Data
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -260,6 +266,7 @@ otherwise, a valid block with the duplicates eliminated could have the same merk
 {% endautocrossref %}
 
 ### Consensus Rule Changes
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -318,6 +325,7 @@ implemented](https://gist.github.com/gavinandresen/2355445).
 {% endautocrossref %}
 
 #### Detecting Forks
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/guide_contracts.md b/_includes/guide_contracts.md
index 95afdceb..de8830aa 100644
--- a/_includes/guide_contracts.md
+++ b/_includes/guide_contracts.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/guide_contracts.md" %}
 
 ## Contracts
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -25,6 +27,7 @@ page](https://en.bitcoin.it/wiki/Contracts) of the Bitcoin Wiki.
 {% endautocrossref %}
 
 ### Escrow And Arbitration
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -125,6 +128,7 @@ service interface using HTML/JavaScript on a GNU AGPL-licensed website.
 {% endautocrossref %}
 
 ### Micropayment Channel
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -202,6 +206,7 @@ all under an Apache license.
 {% endautocrossref %}
 
 ### CoinJoin
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/guide_mining.md b/_includes/guide_mining.md
index 15f8bb5a..a20760ee 100644
--- a/_includes/guide_mining.md
+++ b/_includes/guide_mining.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/guide_mining.md" %}
 
 ## Mining
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -24,6 +26,7 @@ hard to modify.  Mining today takes on two forms:
 {% endautocrossref %}
 
 ### Solo Mining
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -55,6 +58,7 @@ block chain.
 {% endautocrossref %}
 
 ### Pool Mining
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -97,6 +101,7 @@ different reward distribution systems based on this basic share system.
 {% endautocrossref %}
 
 ### Block Prototypes
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -109,6 +114,7 @@ are used to keep ASIC hashers working at maximum capacity,
 {% endautocrossref %}
 
 #### getwork RPC
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -122,6 +128,7 @@ discourage or disallow its use.
 {% endautocrossref %}
 
 #### getblocktemplate RPC
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -159,6 +166,7 @@ wants to send more transactions to the mining software.
 {% endautocrossref %}
 
 #### Stratum
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/guide_operating_modes.md b/_includes/guide_operating_modes.md
index a69e78e4..673b1f56 100644
--- a/_includes/guide_operating_modes.md
+++ b/_includes/guide_operating_modes.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/guide_operating_modes.md" %}
 
 ## Operating Modes
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -12,6 +14,7 @@ Currently there are two primary methods of validating the block chain as a clien
 {% endautocrossref %}
 
 ### Full Node
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -24,6 +27,7 @@ For a client to be fooled, an adversary would need to give a complete alternativ
 {% endautocrossref %}
 
 ### Simplified Payment Verification (SPV)
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -36,6 +40,7 @@ The block's depth in the block chain corresponds to the cumulative difficulty th
 {% endautocrossref %}
 
 #### Potential SPV Weaknesses
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -50,6 +55,7 @@ To mitigate the latter issue, Bloom filters have been implemented as a method of
 {% endautocrossref %}
 
 #### Bloom Filters
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -68,6 +74,7 @@ Removal of elements can only be done by scrapping the bloom filter and re-creati
 {% endautocrossref %}
 
 #### Application Of Bloom Filters 
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -85,6 +92,7 @@ Bloom filters were standardized for use via [BIP37](https://github.com/bitcoin/b
 {% endautocrossref %}
 
 ### Future Proposals 
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/guide_p2p_network.md b/_includes/guide_p2p_network.md
index 13be9187..62f04841 100644
--- a/_includes/guide_p2p_network.md
+++ b/_includes/guide_p2p_network.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/guide_p2p_network.md" %}
 
 ## P2P Network
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -29,6 +31,7 @@ IP addresses.
 {% endautocrossref %}
 
 ### Peer Discovery
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -121,6 +124,7 @@ BitcoinJ is generated using the [makeseeds script][].
 {% endautocrossref %}
 
 ### Connecting To Peers
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -137,6 +141,7 @@ In order to maintain a connection with a peer, nodes by default will send a mess
 {% endautocrossref %}
 
 ### Block Broadcasting
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -147,6 +152,7 @@ New blocks are also discovered as miners publish their found blocks, and these m
 {% endautocrossref %}
 
 ### Transaction Broadcasting
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -155,6 +161,7 @@ In order to send a transaction to a peer, an `inv` message is sent. If a `getdat
 {% endautocrossref %}
 
 #### Memory Pool
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -195,6 +202,7 @@ next block.
 
 
 ### Misbehaving Nodes
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -203,6 +211,7 @@ Take note that for both types of broadcasting, mechanisms are in place to punish
 {% endautocrossref %}
 
 ### Alerts
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/guide_payment_processing.md b/_includes/guide_payment_processing.md
index e2212138..a4f2158a 100644
--- a/_includes/guide_payment_processing.md
+++ b/_includes/guide_payment_processing.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/guide_payment_processing.md" %}
 
 ## Payment Processing
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -32,6 +34,7 @@ using third party APIs and services.
 {% endautocrossref %}
 
 ### Pricing Orders
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -80,6 +83,7 @@ fluctuate a significant amount before payment is received.
 {% endautocrossref %}
 
 ### Requesting Payments
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -131,6 +135,7 @@ with the attacker's address.
 {% endautocrossref %}
 
 #### Plain Text
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -167,6 +172,7 @@ some or all of the following options:
 {% endautocrossref %}
 
 #### bitcoin: URI
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -219,6 +225,7 @@ might be the case for micropayments).
 {% endautocrossref %}
 
 #### QR Codes
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -246,6 +253,7 @@ displayed on high-resolution screens.
 {% endautocrossref %}
 
 #### Payment Protocol
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -411,6 +419,7 @@ for more details.
 {% endautocrossref %}
 
 ### Verifying Payment
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -505,6 +514,7 @@ basis.
 {% endautocrossref %}
 
 ### Issuing Refunds
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -547,6 +557,7 @@ original payment was made.
 {% endautocrossref %}
 
 ### Disbursing Income (Limiting Forex Risk)
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -575,6 +586,7 @@ which can lead to different results.
 {% endautocrossref %}
 
 #### Merge Avoidance
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -609,6 +621,7 @@ provided by the receiver.
 {% endautocrossref %}
 
 #### Last In, First Out (LIFO)
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -646,6 +659,7 @@ the [Verification subsection][] above) before using them to make payments.
 {% endautocrossref %}
 
 #### First In, First Out (FIFO)
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -685,6 +699,7 @@ a bi-hourly schedule.
 {% endautocrossref %}
 
 ### Rebilling Recurring Payments
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/guide_transactions.md b/_includes/guide_transactions.md
index 6208efc4..eeeb434e 100644
--- a/_includes/guide_transactions.md
+++ b/_includes/guide_transactions.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/guide_transactions.md" %}
 
 ## Transactions
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -156,6 +158,7 @@ transactions.
 {% endautocrossref %}
 
 ### P2PKH Script Validation
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -248,6 +251,7 @@ problems with it).
 {% endautocrossref %}
 
 ### P2SH Scripts
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -292,6 +296,7 @@ redeem script, so P2SH scripts are as secure as P2PKH pubkey hashes.
 {% endautocrossref %}
 
 ### Standard Transactions
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -324,6 +329,7 @@ As of Bitcoin Core 0.9, the standard pubkey script types are:
 
 #### Pay To Public Key Hash (P2PKH)
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -339,6 +345,7 @@ Signature script: <sig> <pubkey>
 
 #### Pay To Script Hash (P2SH)
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -355,6 +362,7 @@ Signature script: <sig> [sig] [sig...] <redeemScript>
 
 #### Multisig
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -398,6 +406,7 @@ Signature script: OP_0 <A sig> <C sig> <redeemScript>
 
 #### Pubkey
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -415,6 +424,7 @@ Signature script: <sig>
 
 #### Null Data
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -431,6 +441,7 @@ Pubkey Script: OP_RETURN <0 to 40 bytes of data>
 ~~~
 
 #### Non-Standard Transactions
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -483,6 +494,7 @@ conditions:
 {% endautocrossref %}
 
 ### Signature Hash Types
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -545,6 +557,7 @@ hash types sign, including the procedure for inserting the subscript -->
 {% endautocrossref %}
 
 ### Locktime And Sequence Number
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -603,6 +616,7 @@ enable locktime.
 {% endautocrossref %}
 
 ### Transaction Fees And Change
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -642,6 +656,7 @@ outputs be sent to a new P2PKH or P2SH address.
 {% endautocrossref %}
 
 ### Avoiding Key Reuse
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -695,6 +710,7 @@ fixed URI to which payments should be sent, please see the
 {% endautocrossref %}
 
 ### Transaction Malleability
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/guide_wallets.md b/_includes/guide_wallets.md
index e9e37baf..bb2ceec9 100644
--- a/_includes/guide_wallets.md
+++ b/_includes/guide_wallets.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/guide_wallets.md" %}
 
 ## Wallets
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -20,6 +22,7 @@ we're talking about wallet programs or wallet files.
 {% endautocrossref %}
 
 ### Wallet Programs
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -47,6 +50,7 @@ they control are spent.
 {% endautocrossref %}
 
 #### Full-Service Wallets
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -80,6 +84,7 @@ key or to read the decrypted keys from memory.
 
 
 #### Signing-Only Wallets
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -118,6 +123,7 @@ signing-only wallets: offline wallets and hardware wallets.
 {% endautocrossref %}
 
 ##### Offline Wallets
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -171,6 +177,7 @@ device and back.
 
 
 ##### Hardware Wallets
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -217,6 +224,7 @@ their intention to support at least one model of hardware wallet.
 
 
 #### Distributing-Only Wallets
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -250,6 +258,7 @@ Processing][devguide payment processing] section for details.
 
 
 ### Wallet Files
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -260,6 +269,7 @@ stored on pieces of paper.
 {% endautocrossref %}
 
 #### Private Key Formats
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -270,6 +280,7 @@ Private keys are what are used to unlock satoshis from a particular address. In
 {% endautocrossref %}
 
 ##### Wallet Import Format (WIF)
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -298,6 +309,7 @@ The process is easily reversible, using the Base58 decoding function, and removi
 {% endautocrossref %}
 
 ##### Mini Private Key Format
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -322,6 +334,7 @@ address utility].
 
 
 #### Public Key Formats
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -380,6 +393,7 @@ help programs identify how keys should be used:
 
 
 #### Hierarchical Deterministic Key Creation
+{% include helpers/subhead-links.md %}
 
 <!-- 
 For consistent word ordering:
@@ -530,6 +544,7 @@ which makes them special.
 {% endautocrossref %}
 
 ##### Hardened Keys
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -619,6 +634,7 @@ for the full HD protocol specification.
 {% endautocrossref %}
 
 ##### Storing Root Seeds
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -654,6 +670,7 @@ For implementation details, please see BIP39.
 
 
 #### Loose-Key Wallets
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/helpers/subhead-links.md b/_includes/helpers/subhead-links.md
new file mode 100644
index 00000000..4a579199
--- /dev/null
+++ b/_includes/helpers/subhead-links.md
@@ -0,0 +1,8 @@
+{% if filename %}<div class="subhead-links"
+><a href="https://github.com/bitcoin/bitcoin.org/edit/master/{{filename|uri_escape}}">Edit</a>
+| <a href="https://github.com/bitcoin/bitcoin.org/commits/master/{{filename|uri_escape}}">History</a>
+| <a href="https://github.com/bitcoin/bitcoin.org/issues/new?body=Source%20File%3A%20{{filename|uri_escape}}%0A%0A">Report Issue</a>
+| <a href="/en/development#devcommunities">Discuss</a></div>
+{% else %}
+{% die %}
+{% endif %}
diff --git a/_includes/ref_block_chain.md b/_includes/ref_block_chain.md
index 89b39a8e..d5ecd548 100644
--- a/_includes/ref_block_chain.md
+++ b/_includes/ref_block_chain.md
@@ -2,12 +2,15 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_block_chain.md" %}
 
 ## Block Chain
+{% include helpers/subhead-links.md %}
 
 The following subsections briefly document core block details.
 
 ### Block Headers
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -45,6 +48,7 @@ fe9f0864 ........................... Nonce
 {% endautocrossref %}
 
 #### Block Versions
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -76,6 +80,7 @@ fe9f0864 ........................... Nonce
 {% endautocrossref %}
 
 #### Merkle Trees
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -128,6 +133,7 @@ order when it's placed in the block header.
 {% endautocrossref %}
 
 #### Target nBits
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -190,6 +196,7 @@ of blocks in regtest mode.
 
 
 ### Serialized Blocks
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/ref_core_rpc_intro.md b/_includes/ref_core_rpc_intro.md
index 5273df19..3a44db07 100644
--- a/_includes/ref_core_rpc_intro.md
+++ b/_includes/ref_core_rpc_intro.md
@@ -2,8 +2,13 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_core_rpc_intro.md" %}
+
+## Bitcoin Core APIs
+{% include helpers/subhead-links.md %}
 
 ### Hash Byte Order
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -91,3 +96,15 @@ print "System byte order:", byteorder
 print "Internal-Byte-Order Hash: ", hash.encode('hex_codec')
 print "RPC-Byte-Order Hash:      ", hash[::-1].encode('hex_codec')
 {% endhighlight %}
+
+### Remote Procedure Calls (RPCs)
+{% include helpers/subhead-links.md %}
+
+**Warning:** the block chain and memory pool can include arbitrary data
+which several of the commands below will return in hex format. If you
+convert this data to another format in an executable context, it could
+be used in an exploit. For example, displaying an output script as
+ASCII text in a webpage could add arbitrary Javascript to that page and
+create a cross-site scripting (XSS) exploit. To avoid problems, please
+treat block chain and memory pool data as an arbitrary input from an
+untrusted source.
diff --git a/_includes/ref_core_rpcs-abcdefg.md b/_includes/ref_core_rpcs-abcdefg.md
index d0be0b97..5253e0c7 100644
--- a/_includes/ref_core_rpcs-abcdefg.md
+++ b/_includes/ref_core_rpcs-abcdefg.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_core_rpcs-abcdefg.md" %}
 
 #### addmultisigaddress
+{% include helpers/subhead-links.md %}
 
 ~~~
 addmultisigaddress <num required> <addresses|pubkeys> [account]
@@ -113,6 +115,7 @@ Result:
 
 
 #### addnode
+{% include helpers/subhead-links.md %}
 
 ~~~
 addnode <ip address>:<port> <add|remove|onetry>
@@ -169,6 +172,7 @@ Try connecting to the following node.
 
 
 #### backupwallet
+{% include helpers/subhead-links.md %}
 
 ~~~
 backupwallet <filename|directory>
@@ -208,6 +212,7 @@ written, an error will be returned.
 
 
 #### createmultisig
+{% include helpers/subhead-links.md %}
 
 ~~~
 createmultisig <num required> <addresses|pubkeys>
@@ -307,6 +312,7 @@ Result (redeemScript wrapped):
 
 
 #### createrawtransaction
+{% include helpers/subhead-links.md %}
 
 ~~~
 createrawtransaction <previous output(s)> <new output(s)>
@@ -391,6 +397,7 @@ Result:
 
 
 #### decoderawtransaction
+{% include helpers/subhead-links.md %}
 
 ~~~
 decoderawtransaction <hexstring>
@@ -593,6 +600,7 @@ Result:
 ~~~
 
 #### decodescript
+{% include helpers/subhead-links.md %}
 
 ~~~
 decodescript <redeemScript>
@@ -676,6 +684,7 @@ Result:
 ~~~
 
 #### dumpprivkey
+{% include helpers/subhead-links.md %}
 
 ~~~
 dumpprivkey <address>
@@ -721,6 +730,7 @@ cTVNtBK7mBi2yc9syEnwbiUpnpGJKohDWzXMeF4tGKAQ7wvomr95
 
 
 #### dumpwallet
+{% include helpers/subhead-links.md %}
 
 ~~~
 dumpwallet <filename>
@@ -782,6 +792,7 @@ cNCD679B4xi17jb4XeLpbRbZCbYUugptD7dCtUTfSU4KPuK2DyKT 2014-02-05T16:58:41Z reserv
 
 
 #### encryptwallet
+{% include helpers/subhead-links.md %}
 
 ~~~
 encryptwallet <passphrase>
@@ -837,6 +848,7 @@ wallet. The keypool has been flushed, you need to make a new backup.
 
 
 #### getaccount
+{% include helpers/subhead-links.md %}
 
 ~~~
 getaccount <address>
@@ -881,6 +893,7 @@ doc test
 
 
 #### getaccountaddress
+{% include helpers/subhead-links.md %}
 
 ~~~
 getaccountaddress "account"
@@ -935,6 +948,7 @@ msQyFNYHkFUo4PG3puJBbpesvRCyRQax7r
 ~~~
 
 #### getaddednodeinfo
+{% include helpers/subhead-links.md %}
 
 ~~~
 getaddednodeinfo <true|false> [node]
@@ -1017,6 +1031,7 @@ Result:
 ~~~
 
 #### getaddressesbyaccount
+{% include helpers/subhead-links.md %}
 
 ~~~
 getaddressesbyaccount <account>
@@ -1073,6 +1088,7 @@ Result:
 
 
 #### getbalance
+{% include helpers/subhead-links.md %}
 
 ~~~
 getbalance [account] [confirmations]
@@ -1153,6 +1169,7 @@ for the default account and a balance for all accounts.
 
 
 #### getbestblockhash
+{% include helpers/subhead-links.md %}
 
 ~~~
 getbestblockhash
@@ -1186,6 +1203,7 @@ Result:
 
 
 #### getblock
+{% include helpers/subhead-links.md %}
 
 ~~~
 getblock <hash> [true|false]
@@ -1336,6 +1354,7 @@ Result:
 
 
 #### getblockchaininfo
+{% include helpers/subhead-links.md %}
 
 ~~~
 getblockchaininfo
@@ -1396,6 +1415,7 @@ Result:
 
 
 #### getblockcount
+{% include helpers/subhead-links.md %}
 
 ~~~
 getblockcount
@@ -1425,6 +1445,7 @@ Result:
 
 
 #### getblockhash
+{% include helpers/subhead-links.md %}
 
 ~~~
 getblockhash <height>
@@ -1470,6 +1491,7 @@ Return:
 
 
 #### getblocktemplate
+{% include helpers/subhead-links.md %}
 
 ~~~
 getblocktemplate [client capabilities]
@@ -1784,6 +1806,7 @@ Result (long lines have been wrapped (\\) and some data has been omitted
 
 
 #### getconnectioncount
+{% include helpers/subhead-links.md %}
 
 ~~~
 getconnectioncount
@@ -1819,6 +1842,7 @@ Result:
 
 
 #### getdifficulty
+{% include helpers/subhead-links.md %}
 
 ~~~
 getdifficulty
@@ -1849,6 +1873,7 @@ Result:
 
 
 #### getgenerate
+{% include helpers/subhead-links.md %}
 
 ~~~
 getgenerate
@@ -1884,6 +1909,7 @@ false
 
 
 #### gethashespersec
+{% include helpers/subhead-links.md %}
 
 ~~~
 gethashespersec
@@ -1921,6 +1947,7 @@ Result:
 
 
 #### getinfo
+{% include helpers/subhead-links.md %}
 
 ~~~
 getinfo
@@ -2001,6 +2028,7 @@ Result:
 
 
 #### getmininginfo
+{% include helpers/subhead-links.md %}
 
 ~~~
 getmininginfo
@@ -2067,6 +2095,7 @@ Result:
 
 
 #### getnettotals
+{% include helpers/subhead-links.md %}
 
 ~~~
 getnettotals
@@ -2116,6 +2145,7 @@ Result:
 
 
 #### getnetworkhashps
+{% include helpers/subhead-links.md %}
 
 ~~~
 getnetworkhashps [blocks] [height]
@@ -2176,6 +2206,7 @@ Result:
 
 
 #### getnetworkinfo
+{% include helpers/subhead-links.md %}
 
 ~~~
 getnetworkinfo
@@ -2245,6 +2276,7 @@ Result:
 
 
 #### getnewaddress
+{% include helpers/subhead-links.md %}
 
 ~~~
 getnewaddress [account]
@@ -2298,6 +2330,7 @@ mft61jjkmiEJwJ7Zw3r1h344D6aL1xwhma
 
 
 #### getpeerinfo
+{% include helpers/subhead-links.md %}
 
 ~~~
 getpeerinfo
@@ -2387,6 +2420,7 @@ Result (only first object shown):
 
 
 #### getrawchangeaddress
+{% include helpers/subhead-links.md %}
 
 ~~~
 getrawchangeaddress
@@ -2425,6 +2459,7 @@ mnycUc8FRjJodfKhaj9QBZs2PwxxYoWqaK
 
 
 #### getrawmempool
+{% include helpers/subhead-links.md %}
 
 ~~~
 getrawmempool [true|false]
@@ -2541,6 +2576,7 @@ Verbose output (*true*):
 ~~~
 
 #### getrawtransaction
+{% include helpers/subhead-links.md %}
 
 ~~~
 getrawtransaction <txid> [true|false]
@@ -2720,6 +2756,7 @@ Result:
 
 
 #### getreceivedbyaccount
+{% include helpers/subhead-links.md %}
 
 ~~~
 getreceivedbyaccount <account> <confirmations>
@@ -2779,6 +2816,7 @@ Result:
 
 
 #### getreceivedbyaddress
+{% include helpers/subhead-links.md %}
 
 ~~~
 getreceivedbyaddress <address> [confirmations]
@@ -2840,6 +2878,7 @@ Result:
 
 
 #### gettransaction
+{% include helpers/subhead-links.md %}
 
 ~~~
 gettransaction <txid>
@@ -2955,6 +2994,7 @@ Result:
 
 
 #### gettxout
+{% include helpers/subhead-links.md %}
 
 ~~~
 gettxout <txid> <output index number> [true|false]
@@ -3068,6 +3108,7 @@ Result:
 
 
 #### gettxoutsetinfo
+{% include helpers/subhead-links.md %}
 
 ~~~
 gettxoutsetinfo
@@ -3129,6 +3170,7 @@ Result:
 
 
 #### getunconfirmedbalance
+{% include helpers/subhead-links.md %}
 
 ~~~
 getunconfirmedbalance
@@ -3162,6 +3204,7 @@ Result (no satoshis unconfirmed):
 
 
 #### getwalletinfo
+{% include helpers/subhead-links.md %}
 
 ~~~
 getwalletinfo
@@ -3217,6 +3260,7 @@ Result:
 
 
 #### getwork
+{% include helpers/subhead-links.md %}
 
 ~~~
 getwork [data]
diff --git a/_includes/ref_core_rpcs-hijklmn.md b/_includes/ref_core_rpcs-hijklmn.md
index 6243811b..b980f24a 100644
--- a/_includes/ref_core_rpcs-hijklmn.md
+++ b/_includes/ref_core_rpcs-hijklmn.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_core_rpcs-hijklmn.md" %}
 
 #### help
+{% include helpers/subhead-links.md %}
 
 ~~~
 help [RPC]
@@ -45,6 +47,7 @@ Command to get a description similar to this subsection:
 ~~~
 
 #### importprivkey
+{% include helpers/subhead-links.md %}
 
 ~~~
 importprivkey <private key> [label] [rescan]
@@ -113,6 +116,7 @@ entire block chain:
 (Success: no result generated.)
 
 #### importwallet
+{% include helpers/subhead-links.md %}
 
 ~~~
 importwallet <filename>
@@ -162,6 +166,7 @@ Import the file shown in the example subsection of `dumpwallet`.
 
 
 #### keypoolrefill
+{% include helpers/subhead-links.md %}
 
 ~~~
 keypoolrefill [size]
@@ -205,6 +210,7 @@ Generate one extra key than the default:
 
 
 #### listaccounts
+{% include helpers/subhead-links.md %}
 
 ~~~
 listaccounts [minconf]
@@ -268,6 +274,7 @@ Result:
 
 
 #### listaddressgroupings
+{% include helpers/subhead-links.md %}
 
 ~~~
 listaddressgroupings
@@ -344,6 +351,7 @@ Result (truncated):
 
 
 #### listlockunspent
+{% include helpers/subhead-links.md %}
 
 ~~~
 listlockunspent
@@ -397,6 +405,7 @@ Result:
 
 
 #### listreceivedbyaccount
+{% include helpers/subhead-links.md %}
 
 ~~~
 listreceivedbyaccount [confirmations] [true|false]
@@ -481,6 +490,7 @@ Result:
 ~~~
 
 #### listreceivedbyaddress
+{% include helpers/subhead-links.md %}
 
 ~~~
 listreceivedbyaddress [confirmations] [true|false]
@@ -568,6 +578,7 @@ Result (truncated after first entry):
 ~~~
 
 #### listsinceblock
+{% include helpers/subhead-links.md %}
 
 ~~~
 listsinceblock [block hash] [block depth]
@@ -692,6 +703,7 @@ Result (some array objects removed):
 ~~~
 
 #### listtransactions
+{% include helpers/subhead-links.md %}
 
 ~~~
 listtransactions [account] [count] [from]
@@ -779,6 +791,7 @@ Result:
 
 
 #### listunspent
+{% include helpers/subhead-links.md %}
 
 ~~~
 listunspent [minconf] [maxconf] [addresses]
@@ -900,6 +913,7 @@ Result:
 
 
 #### lockunspent
+{% include helpers/subhead-links.md %}
 
 ~~~
 lockunspent <true|false> <outputs>
@@ -1011,6 +1025,7 @@ true
 
 
 #### move
+{% include helpers/subhead-links.md %}
 
 ~~~
 move <account> <account> <amount> [minconf] [comment]
diff --git a/_includes/ref_core_rpcs-opqrst.md b/_includes/ref_core_rpcs-opqrst.md
index fd10cb09..e48fe498 100644
--- a/_includes/ref_core_rpcs-opqrst.md
+++ b/_includes/ref_core_rpcs-opqrst.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_core_rpcs-opqrst.md" %}
 
 #### ping {#ping-rpc}
+{% include helpers/subhead-links.md %}
 
 ~~~
 ping
@@ -28,6 +30,7 @@ bitcoin-cli -testnet ping
 
 
 #### sendfrom
+{% include helpers/subhead-links.md %}
 
 ~~~
 sendfrom <account> <address> <amount> [confirmations] [comment] [label]
@@ -131,6 +134,7 @@ ca7cb6a5ffcc2f21036879493db4530c0ce9b5bff9648f9a3be46e2dfc8e0166
 
 
 #### sendmany
+{% include helpers/subhead-links.md %}
 
 ~~~
 sendmany <account> <addresses & amounts> [confirmations] [memo]
@@ -223,6 +227,7 @@ ef7c0cbf6ba5af68d2ea239bba709b26ff7b0b669839a63bb01c2cb8e8de481e
 
 
 #### sendrawtransaction
+{% include helpers/subhead-links.md %}
 
 ~~~
 sendrawtransaction <hex> [true|false]
@@ -348,6 +353,7 @@ Result (success):
 
 
 #### sendtoaddress
+{% include helpers/subhead-links.md %}
 
 ~~~
 sendtoaddress <address> <amount> <memo> <label>
@@ -422,6 +428,7 @@ example" and the label "Nemo From Example.com":
 
 
 #### setaccount
+{% include helpers/subhead-links.md %}
 
 ~~~
 setaccount <address> <account>
@@ -476,6 +483,7 @@ Put the address indicated below in the "doc test" account.
 
 
 #### setgenerate
+{% include helpers/subhead-links.md %}
 
 ~~~
 setgenerate <true|false> [processors]
@@ -549,6 +557,7 @@ coinbase transaction of the first block generated):
 
 
 #### settxfee
+{% include helpers/subhead-links.md %}
 
 ~~~
 settxfee amount
@@ -598,6 +607,7 @@ true
 
 
 #### signmessage
+{% include helpers/subhead-links.md %}
 
 ~~~
 signmessage <address> <message>
@@ -657,6 +667,7 @@ IOGreqb/7UgD1ifcojESd32ZJgH5RGzUXitmbl6ZbdenSmitipWoLSi73TskmLY7zhcD662bTw3RHoYQ
 
 
 #### signrawtransaction
+{% include helpers/subhead-links.md %}
 
 ~~~
 signrawtransaction <raw transaction hex> [previous transactions] [private keys] [sighashtype]
@@ -794,6 +805,7 @@ Result:
 
 
 #### stop
+{% include helpers/subhead-links.md %}
 
 ~~~
 stop
@@ -814,6 +826,7 @@ bitcoin-cli -testnet stop
 
 
 #### submitblock
+{% include helpers/subhead-links.md %}
 
 ~~~
 submitblock <new block>  [extra parameters]
diff --git a/_includes/ref_core_rpcs-uvwxyz.md b/_includes/ref_core_rpcs-uvwxyz.md
index dadcc45e..a5781c11 100644
--- a/_includes/ref_core_rpcs-uvwxyz.md
+++ b/_includes/ref_core_rpcs-uvwxyz.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_core_rpcs-uvwxyz.md" %}
 
 #### validateaddress
+{% include helpers/subhead-links.md %}
 
 ~~~
 validateaddress <address>
@@ -78,6 +80,7 @@ Result:
 
 
 #### verifychain
+{% include helpers/subhead-links.md %}
 
 ~~~
 verifychain [throughness] [blocks]
@@ -134,6 +137,7 @@ true
 
 
 #### verifymessage
+{% include helpers/subhead-links.md %}
 
 ~~~
 verifymessage <address> <signature> <message>
@@ -204,6 +208,7 @@ true
 
 
 #### walletlock
+{% include helpers/subhead-links.md %}
 
 ~~~
 walletlock
@@ -230,6 +235,7 @@ No return printed on success.
 
 
 #### walletpassphrase
+{% include helpers/subhead-links.md %}
 
 walletpassphrase <passphrase> <seconds>
 
@@ -271,6 +277,7 @@ Unlock the wallet for 10 minutes (the passphrase is "test"):
 
 
 #### walletpassphrasechange
+{% include helpers/subhead-links.md %}
 
 ~~~
 walletpassphrasechange <old passphrase> <new passphrase>
diff --git a/_includes/ref_p2p_networking.md b/_includes/ref_p2p_networking.md
index 7bef004d..27c688b9 100644
--- a/_includes/ref_p2p_networking.md
+++ b/_includes/ref_p2p_networking.md
@@ -2,8 +2,10 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_p2p_networking.md" %}
 
 ## P2P Network
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -21,6 +23,7 @@ integers mentioned in this section are transmitted in little-endian order.
 {% endautocrossref %}
 
 ### Constants And Defaults
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -52,6 +55,7 @@ and testnet.
 {% endautocrossref %}
 
 ### Protocol Versions
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -75,6 +79,7 @@ please [open an issue][docs issue].)
 {% endautocrossref %}
 
 ### Message Headers
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -102,6 +107,7 @@ f9beb4d9 ................... Start string: Mainnet
 {% endautocrossref %}
 
 ### Data Messages
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -135,6 +141,7 @@ one of these unknown types.
 {% endautocrossref %}
 
 #### Block
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -148,6 +155,7 @@ It is sent in reply to a `getdata` message which had an inventory type of
 {% endautocrossref %}
 
 #### GetBlocks
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -199,6 +207,7 @@ d39f608a7775b537729884d4e6633bb2
 {% endautocrossref %}
 
 #### GetData
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -222,6 +231,7 @@ identical to the `inv` message; only the message header differs.
 {% endautocrossref %}
 
 #### GetHeaders
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -236,6 +246,7 @@ will include no more than 500 block header hashes; the `headers` reply
 to the `getheaders` message will include as many as 2,000 block headers.
 
 #### Headers
+{% include helpers/subhead-links.md %}
 
 The `headers` message sends one or more block headers to a node which
 previously requested certain headers with a `getheaders` message.
@@ -266,6 +277,7 @@ fe9f0864 ........................... Nonce
 {% endautocrossref %}
 
 #### Inv
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -301,6 +313,7 @@ a055aaf1d872e94ae85e9817b2c68dc7 ... Hash (TXID)
 {% endautocrossref %}
 
 #### MemPool
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -349,6 +362,7 @@ section][message header] for an example of a message without a payload.
 {% endautocrossref %}
 
 #### MerkleBlock
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -414,6 +428,7 @@ a `tx` message.
 
 ##### Parsing A MerkleBlock Message
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 As seen in the annotated hexdump above, the `merkleblock` message
 provides three special data types: a transaction count, a list of
@@ -486,6 +501,7 @@ example].
 
 ##### Creating A MerkleBlock Message
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 It's easier to understand how to create a `merkleblock` message after
 you understand how to parse an already-created message, so we recommend
@@ -532,6 +548,7 @@ template near the beginning of this subsection.
 {% endautocrossref %}
 
 #### NotFound
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -550,6 +567,7 @@ identical to the `inv` message; only the message header differs.
 {% endautocrossref %}
 
 #### Tx
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -579,6 +597,7 @@ transaction section][raw format].
 
 
 ### Control Messages
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -597,6 +616,7 @@ information about Tor, please [open an issue][docs issue].
 {% endautocrossref %}
 
 #### Addr
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -645,6 +665,7 @@ d91f4854 ........................... Epoch time: 1414012889
 
 
 #### Alert
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -750,6 +771,7 @@ alert.cpp] source code for the parameters of this message.
 
 
 #### FilterAdd
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -789,6 +811,7 @@ fdacf9b3eb077412e7a968d2e4f11b9a
 {% endautocrossref %}
 
 #### FilterClear
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -810,6 +833,7 @@ section][message header] for an example of a message without a payload.
 
 
 #### FilterLoad
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -1047,6 +1071,7 @@ filter when the rate gets too high.
 {% endautocrossref %}
 
 #### GetAddr
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -1063,6 +1088,7 @@ section][message header] for an example of a message without a payload.
 
 
 #### Ping
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -1090,6 +1116,7 @@ header has been omitted.)
 {% endautocrossref %}
 
 #### Pong
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -1109,6 +1136,7 @@ only the message header differs.
 {% endautocrossref %}
 
 #### Reject
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -1164,6 +1192,7 @@ header has been omitted.)
 {% endautocrossref %}
 
 #### VerAck
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -1177,6 +1206,7 @@ section][message header].
 
 
 #### Version
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/ref_transactions.md b/_includes/ref_transactions.md
index 13933c43..fd10aa2e 100644
--- a/_includes/ref_transactions.md
+++ b/_includes/ref_transactions.md
@@ -2,12 +2,15 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_transactions.md" %}
 
 ## Transactions
+{% include helpers/subhead-links.md %}
 
 The following subsections briefly document core transaction details.
 
 #### OP Codes
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -124,6 +127,7 @@ Failure, aborted: two signature matches required but none found so
 {% endautocrossref %}
 
 #### Address Conversion
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -193,6 +197,7 @@ against the extracted checksum, and then remove the version byte.
 {% endautocrossref %}
 
 #### Raw Transaction Format
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -230,6 +235,7 @@ the [CompactSize section][CompactSize unsigned integer].
 
 ##### TxIn: A Transaction Input (Non-Coinbase) {#txin}
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -247,6 +253,7 @@ Each non-coinbase input spends an outpoint from a previous transaction.
 
 ##### Outpoint: The Specific Part Of A Specific Output {#outpoint}
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -263,6 +270,7 @@ specific output.
 
 ##### TxOut: A Transaction Output {#txout}
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -320,6 +328,7 @@ to a new pay-to-pubkey-hash (P2PKH) output.
 
 ##### Coinbase Input: The Input Of The First Transaction In A Block {#coinbase}
 {:.no_toc}
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
@@ -376,6 +385,7 @@ An itemized coinbase transaction:
 {% endautocrossref %}
 
 ### CompactSize Unsigned Integers
+{% include helpers/subhead-links.md %}
 
 {% autocrossref %}
 
diff --git a/_includes/ref_wallets.md b/_includes/ref_wallets.md
index 7f22b096..e6bd9ef3 100644
--- a/_includes/ref_wallets.md
+++ b/_includes/ref_wallets.md
@@ -2,12 +2,16 @@
 This file is licensed under the MIT License (MIT) available on
 http://opensource.org/licenses/MIT.
 {% endcomment %}
+{% assign filename="_includes/ref_wallets.md" %}
 
 ## Wallets 
+{% include helpers/subhead-links.md %}
 
 ### Deterministic Wallet Formats
+<!-- no subhead-links here -->
 
 #### Type 1: Single Chain Wallets
+<!-- no subhead-links here -->
 
 {% autocrossref %}
 
@@ -19,6 +23,7 @@ sharing is extremely limited.
 {% endautocrossref %}
 
 #### Type 2: Hierarchical Deterministic (HD) Wallets
+<!-- no subhead-links here -->
 
 {% autocrossref %}
 
diff --git a/_less/screen.less b/_less/screen.less
index 6f015877..c3d1d344 100644
--- a/_less/screen.less
+++ b/_less/screen.less
@@ -766,18 +766,26 @@ table td,table th{
 .toccontent h2{
 	font-size:150%;
 	color:#383838;
+	margin-top: 30px;
+	margin-bottom: 0;
 }
 .toccontent h3{
 	font-size:130%;
 	color:#383838;
+	margin-top: 30px;
+	margin-bottom: 0;
 }
 .toccontent h4{
 	font-size:110%;
 	color:#383838;
+	margin-top: 30px;
+	margin-bottom: 0;
 }
 .toccontent h5,.toccontent h6{
 	font-size:100%;
 	color:#383838;
+	margin-top: 30px;
+	margin-bottom: 0;
 }
 .toccontent img{
 	max-width:100%;
@@ -797,6 +805,12 @@ table td,table th{
 .toccontent:hover a.auto-link:visited:hover{
 	color:#63a4e1;
 }
+.toccontent .subhead-links{
+	visibility: hidden;
+}
+.toccontent:hover .subhead-links{
+	visibility: visible;
+}
 .toccontent a:link.term,
 .toccontent a:visited.term,
 .toccontent:hover a.auto-link.term:link,
diff --git a/_plugins/liquid-die.rb b/_plugins/liquid-die.rb
new file mode 100644
index 00000000..7e9f3012
--- /dev/null
+++ b/_plugins/liquid-die.rb
@@ -0,0 +1,29 @@
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
+## liquid-die.rb terminates site compilation in failure. This can allow
+## us to avoid updating the site HTML with a broken layout
+
+## Example:
+## {% if some_variable_is_set %}
+##     ...content...
+## {% else %}
+##     {% die %}
+## {% endif %}
+
+module Jekyll
+
+  class LiquidDie < Liquid::Tag
+
+    def initialize(tag_name, text, tokens)
+      super
+    end
+
+    def render(context)
+        abort("Liquid die tag called.  Dying...")
+    end
+  end
+end
+
+
+Liquid::Template.register_tag('die', Jekyll::LiquidDie)
diff --git a/en/developer-reference.md b/en/developer-reference.md
index 8dd8d46a..d9c1237e 100644
--- a/en/developer-reference.md
+++ b/en/developer-reference.md
@@ -44,28 +44,10 @@ title: "Developer Reference - Bitcoin"
 
 {% include ref_p2p_networking.md %}
 
-## Bitcoin Core APIs
-
-<!-- TODO, Relevant links:
--- * https://en.bitcoin.it/wiki/Original_Bitcoin_client/API_Calls_list
--- * https://en.bitcoin.it/wiki/API_reference_(JSON-RPC)
--->
-
 <div class="sourcefile" data-sourcefile="ref_core_rpc_intro.md"></div>
 
 {% include ref_core_rpc_intro.md %}
 
-### Remote Procedure Calls (RPCs)
-
-**Warning:** the block chain and memory pool can include arbitrary data
-which several of the commands below will return in hex format. If you
-convert this data to another format in an executable context, it could
-be used in an exploit. For example, displaying an output script as
-ASCII text in a webpage could add arbitrary Javascript to that page and
-create a cross-site scripting (XSS) exploit. To avoid problems, please
-treat block chain and memory pool data as an arbitrary input from an
-untrusted source.
-
 <div class="sourcefile" data-sourcefile="ref_core_rpcs-abcdefg.md"></div>
 
 {% include ref_core_rpcs-abcdefg.md %}

From 9718c474fb3b649de7f9e9f7b47d15ef088faa76 Mon Sep 17 00:00:00 2001
From: Saivann <saivann@gmail.com>
Date: Sat, 13 Dec 2014 20:06:30 -0500
Subject: [PATCH 2/4] Improve styles for actions in devel-docs Apply consistent
 title and paragraph margins Increase space between titles and actions for
 better readability Use a different font-size for actions to separate them
 from the content

---
 _less/screen.less | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/_less/screen.less b/_less/screen.less
index c3d1d344..50dbfad1 100644
--- a/_less/screen.less
+++ b/_less/screen.less
@@ -763,29 +763,26 @@ table td,table th{
 	position:relative;
 	text-align: left;
 }
+.toccontent h2,
+.toccontent h3,
+.toccontent h4,
+.toccontent h5,
+.toccontent h6{
+	color:#383838;
+	margin-top: 40px;
+	margin-bottom: 0;
+}
 .toccontent h2{
 	font-size:150%;
-	color:#383838;
-	margin-top: 30px;
-	margin-bottom: 0;
 }
 .toccontent h3{
 	font-size:130%;
-	color:#383838;
-	margin-top: 30px;
-	margin-bottom: 0;
 }
 .toccontent h4{
 	font-size:110%;
-	color:#383838;
-	margin-top: 30px;
-	margin-bottom: 0;
 }
 .toccontent h5,.toccontent h6{
 	font-size:100%;
-	color:#383838;
-	margin-top: 30px;
-	margin-bottom: 0;
 }
 .toccontent img{
 	max-width:100%;
@@ -807,6 +804,9 @@ table td,table th{
 }
 .toccontent .subhead-links{
 	visibility: hidden;
+	font-size: 85%;
+	height: 18px;
+	padding-top: 7px;
 }
 .toccontent:hover .subhead-links{
 	visibility: visible;

From 53d4a6eebeaadd4b1be8322b229d7f118c6fa17d Mon Sep 17 00:00:00 2001
From: "David A. Harding" <dave@dtrt.org>
Date: Sun, 14 Dec 2014 07:44:35 -0500
Subject: [PATCH 3/4] Dev Docs: Move Manual Sourcefile Lines To Auto Helper
 (thanks saivann!)

---
 _includes/helpers/subhead-links.md |  2 +-
 _less/screen.less                  |  5 -----
 en/developer-examples.md           |  8 --------
 en/developer-guide.md              | 16 ----------------
 en/developer-reference.md          | 18 ------------------
 js/main.js                         |  2 +-
 6 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/_includes/helpers/subhead-links.md b/_includes/helpers/subhead-links.md
index 4a579199..973e670d 100644
--- a/_includes/helpers/subhead-links.md
+++ b/_includes/helpers/subhead-links.md
@@ -1,4 +1,4 @@
-{% if filename %}<div class="subhead-links"
+{% if filename %}<div class="subhead-links sourcefile" data-sourcefile="{{filename|uri_escape}}"
 ><a href="https://github.com/bitcoin/bitcoin.org/edit/master/{{filename|uri_escape}}">Edit</a>
 | <a href="https://github.com/bitcoin/bitcoin.org/commits/master/{{filename|uri_escape}}">History</a>
 | <a href="https://github.com/bitcoin/bitcoin.org/issues/new?body=Source%20File%3A%20{{filename|uri_escape}}%0A%0A">Report Issue</a>
diff --git a/_less/screen.less b/_less/screen.less
index 50dbfad1..bccae689 100644
--- a/_less/screen.less
+++ b/_less/screen.less
@@ -838,11 +838,6 @@ table td,table th{
 	margin:0;
 	overflow-y:visible;
 }
-.toccontent .sourcefile{
-	width:0;
-	height:0;
-	position:absolute;
-}
 
 .anchorAf{
 	position:relative;
diff --git a/en/developer-examples.md b/en/developer-examples.md
index 27a26673..12a0304f 100644
--- a/en/developer-examples.md
+++ b/en/developer-examples.md
@@ -28,20 +28,12 @@ title: "Developer Examples - Bitcoin"
 
 {% include example_intro.md %}
 
-<div class="sourcefile" data-sourcefile="example_testing.md"></div>
-
 {% include example_testing.md %}
 
-<div class="sourcefile" data-sourcefile="example_transactions.md"></div>
-
 {% include example_transactions.md %}
 
-<div class="sourcefile" data-sourcefile="example_payment_processing.md"></div>
-
 {% include example_payment_processing.md %}
 
-<div class="sourcefile" data-sourcefile="example_p2p_networking.md"></div>
-
 {% include example_p2p_networking.md %}
 
 {% include references.md %}
diff --git a/en/developer-guide.md b/en/developer-guide.md
index 223a426a..d2563e2e 100644
--- a/en/developer-guide.md
+++ b/en/developer-guide.md
@@ -33,36 +33,20 @@ of the following file. -->
 
 {% include guide_intro.md %}
 
-<div class="sourcefile" data-sourcefile="guide_block_chain.md"></div>
-
 {% include guide_block_chain.md %}
 
-<div class="sourcefile" data-sourcefile="guide_transactions.md"></div>
-
 {% include guide_transactions.md %}
 
-<div class="sourcefile" data-sourcefile="guide_contracts.md"></div>
-
 {% include guide_contracts.md %}
 
-<div class="sourcefile" data-sourcefile="guide_wallets.md"></div>
-
 {% include guide_wallets.md %}
 
-<div class="sourcefile" data-sourcefile="guide_payment_processing.md"></div>
-
 {% include guide_payment_processing.md %}
 
-<div class="sourcefile" data-sourcefile="guide_operating_modes.md"></div>
-
 {% include guide_operating_modes.md %}
 
-<div class="sourcefile" data-sourcefile="guide_p2p_network.md"></div>
-
 {% include guide_p2p_network.md %}
 
-<div class="sourcefile" data-sourcefile="guide_mining.md"></div>
-
 {% include guide_mining.md %}
 
 {% include references.md %}
diff --git a/en/developer-reference.md b/en/developer-reference.md
index d9c1237e..148d0dea 100644
--- a/en/developer-reference.md
+++ b/en/developer-reference.md
@@ -28,40 +28,22 @@ title: "Developer Reference - Bitcoin"
 
 {% include ref_intro.md %}
 
-<div class="sourcefile" data-sourcefile="ref_block_chain.md"></div>
-
 {% include ref_block_chain.md %}
 
-<div class="sourcefile" data-sourcefile="ref_transactions.md"></div>
-
 {% include ref_transactions.md %}
 
-<div class="sourcefile" data-sourcefile="ref_wallets.md"></div>
-
 {% include ref_wallets.md %}
 
-<div class="sourcefile" data-sourcefile="ref_p2p_networking.md"></div>
-
 {% include ref_p2p_networking.md %}
 
-<div class="sourcefile" data-sourcefile="ref_core_rpc_intro.md"></div>
-
 {% include ref_core_rpc_intro.md %}
 
-<div class="sourcefile" data-sourcefile="ref_core_rpcs-abcdefg.md"></div>
-
 {% include ref_core_rpcs-abcdefg.md %}
 
-<div class="sourcefile" data-sourcefile="ref_core_rpcs-hijklmn.md"></div>
-
 {% include ref_core_rpcs-hijklmn.md %}
 
-<div class="sourcefile" data-sourcefile="ref_core_rpcs-opqrst.md"></div>
-
 {% include ref_core_rpcs-opqrst.md %}
 
-<div class="sourcefile" data-sourcefile="ref_core_rpcs-uvwxyz.md"></div>
-
 {% include ref_core_rpcs-uvwxyz.md %}
 
 {% include references.md %}
diff --git a/js/main.js b/js/main.js
index fd0404a5..5d9406c6 100644
--- a/js/main.js
+++ b/js/main.js
@@ -447,7 +447,7 @@ for (var i = 0, n = nodes.length; i < n; i++) {
 if (pageoffset < first[1]) closer = [first[0], first[1]];
 if (windowy + pageoffset >= getHeight(document.body)) closer = [last[0], last[1]];
 // Set updated url to source file.
-t.href = 'https://github.com/bitcoin/bitcoin.org/edit/master/_includes/' + closer[0].getAttribute('data-sourcefile');
+t.href = 'https://github.com/bitcoin/bitcoin.org/edit/master/' + closer[0].getAttribute('data-sourcefile');
 }
 
 function disclaimerClose(e) {

From b3b545c28940bbaa90d74d338bb78d61c2a7d74d Mon Sep 17 00:00:00 2001
From: Saivann <saivann@gmail.com>
Date: Sun, 14 Dec 2014 13:18:31 -0500
Subject: [PATCH 4/4] Adjust pageoffset to update the "Edit On GitHub" link
 slightly before the user scrolls the relevant subsection

---
 js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/main.js b/js/main.js
index 5d9406c6..baf62473 100644
--- a/js/main.js
+++ b/js/main.js
@@ -430,7 +430,7 @@ function updateSource(e){
 if (!document.getElementsByClassName) return;
 var t = getEventTarget(e),
     nodes = document.getElementsByClassName('sourcefile'),
-    pageoffset = getPageYOffset(),
+    pageoffset = Math.max(0, getPageYOffset() + 100),
     windowy = getWindowY(),
     fallback = nodes[0],
     first = [fallback, getTop(fallback)],