Merge pull request #784 from daira/zip-0316-typo

ZIP 316: fix a typo and remove trailing spaces

zip-0316.html

@@ -9,7 +9,7 @@
     <section>
         <pre>ZIP: 316
 Title: Unified Addresses and Unified Viewing Keys
-Owners: Daira Emma Hopwood &lt;[email protected]&gt;
+Owners: Daira-Emma Hopwood &lt;[email protected]&gt;
         Nathan Wilcox &lt;[email protected]&gt;
         Jack Grigg &lt;[email protected]&gt;
         Sean Bowe &lt;[email protected]&gt;
@@ -476,7 +476,7 @@
                      as described in <a id="footnote-reference-34" class="footnote_reference" href="#bip-0032-public-to-public">32</a>.</li>
                 </ul>
                 <p>In each case, the Typecode remains the same as in the FVK.</p>
-                <p>Items (including Metadata Items that are not "MUST-understand") that are unrecognised by a given Consumer, or that are specified in experiments that the user has not opted into (see <a href="#experimental-usage">Experimental Usage</a>), MUST be dropped when when the Consumer derives a UIVK from a UFVK.</p>
+                <p>Items (including Metadata Items that are not "MUST-understand") that are unrecognised by a given Consumer, or that are specified in experiments that the user has not opted into (see <a href="#experimental-usage">Experimental Usage</a>), MUST be dropped when the Consumer derives a UIVK from a UFVK.</p>
             </section>
             <section id="deriving-a-unified-address-from-a-uivk"><h3><span class="section-heading">Deriving a Unified Address from a UIVK</span><span class="section-anchor"> <a rel="bookmark" href="#deriving-a-unified-address-from-a-uivk"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h3>
                 <p>As a consequence of the specification in <a href="#must-understand-typecodes">MUST-understand Typecodes</a>, as of <a href="#revision-1">Revision 1</a> a Consumer of a UIVK MUST understand the meaning of all "MUST-understand" Metadata Item Typecodes present in the UIVK in order to derive a Unified Address from it.</p>

zip-0316.rst

@@ -2,7 +2,7 @@
 
   ZIP: 316
   Title: Unified Addresses and Unified Viewing Keys
-  Owners: Daira Emma Hopwood <[email protected]>
+  Owners: Daira-Emma Hopwood <[email protected]>
           Nathan Wilcox <[email protected]>
           Jack Grigg <[email protected]>
           Sean Bowe <[email protected]>
@@ -799,7 +799,7 @@ Deriving Internal Keys
 ----------------------
 
 In addition to external addresses suitable for giving out to Senders,
-a wallet typically requires addresses for internal operations such as 
+a wallet typically requires addresses for internal operations such as
 change and auto-shielding.
 
 We desire the following properties for viewing authority of both
@@ -851,7 +851,7 @@ all "MUST-understand" Metadata Item Typecodes present in the UFVK in
 order to derive a UIVK from it.
 
 If the source UFVK is Revision 1 then the derived UIVK SHOULD be
-Revision 1; if the source UFVK includes any Metadata Items then 
+Revision 1; if the source UFVK includes any Metadata Items then
 the derived UIVK MUST be Revision 1.
 
 For Metadata Items recognised by the Consumer, the processing of the
@@ -875,7 +875,7 @@ In each case, the Typecode remains the same as in the FVK.
 Items (including Metadata Items that are not "MUST-understand") that
 are unrecognised by a given Consumer, or that are specified in experiments
 that the user has not opted into (see `Experimental Usage`_), MUST be
-dropped when when the Consumer derives a UIVK from a UFVK.
+dropped when the Consumer derives a UIVK from a UFVK.
 
 Deriving a Unified Address from a UIVK
 --------------------------------------
@@ -886,7 +886,7 @@ all "MUST-understand" Metadata Item Typecodes present in the UIVK in
 order to derive a Unified Address from it.
 
 If the source UIVK is Revision 1 then the derived Unified Address
-SHOULD be Revision 1; if the source UIVK includes any Metadata Items 
+SHOULD be Revision 1; if the source UIVK includes any Metadata Items
 then the derived Unified Address MUST be Revision 1.
 
 For Metadata Items recognised by the Consumer, the processing of the