Merge pull request bitcoin#429 from OpenBitcoinPrivacyProject/master

BIP126: Clarify interaction with BIP69

Author: luke-jr

bip-0126.mediawiki

@@ -37,6 +37,10 @@ In order to achieve these goals, this specification proposes a set of best pract
 
 In order to achieve this, two forms of HIT are proposed: Standard form and alternate form.
 
+==Interaction with Other Procedures==
+
+Applications which wish to comply both with this procedure and BIP69 should apply this procedure prior to applying BIP69.
+
 ==Standard form heterogenous input script transaction==
 
 ===Rules===
@@ -96,3 +100,7 @@ An HIT formed via the preceding procedure will adhere to the following condition
 ==Non-compliant heterogenous input script transactions==
 
 If a user wishes to create an output that is larger than half the total size of their spendable outputs, or if their inputs are not distributed in a manner in which the alternate form procedure can be completed, then the user can not create a transaction which is compliant with this procedure.
+
+==Reference==
+
+* [[bip-0069.mediawiki|BIP69 - Lexicographical Indexing of Transaction Inputs and Outputs]]