Merge pull request #791 from daira/remove-dairaemma-as-zip-editor

ZIP 0: remove Daira-Emma as a ZIP Editor and add Acknowledgements
zcash · Mar 1, 2024 · 146936c · 146936c
2 parents 66881eb + 2442c19
commit 146936c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/zip-0000.html b/zip-0000.html
@@ -8,13 +8,12 @@
     <section>
         <pre>ZIP: 0
 Title: ZIP Process
-Owners: Daira Emma Hopwood &lt;daira@electriccoin.co&gt;
-        teor &lt;teor@zfnd.org&gt;
+Owners: teor &lt;teor@zfnd.org&gt;
         Jack Grigg &lt;str4d@electriccoin.co&gt;
         Conrado Gouvea &lt;conrado@zfnd.org&gt;
         Aditya Bharadwaj &lt;nighthawk24@gmail.com&gt;
         Arya &lt;arya@zfnd.org&gt;
-Original-Authors: Daira Emma Hopwood
+Original-Authors: Daira-Emma Hopwood
                   Josh Cincinnati
                   George Tankersley
                   Deirdre Connolly
@@ -61,7 +60,7 @@
             <section id="zip-editors"><h3><span class="section-heading">ZIP Editors</span><span class="section-anchor"> <a rel="bookmark" href="#zip-editors"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h3>
                 <p>The current ZIP Editors are:</p>
                 <ul>
-                    <li>Daira Emma Hopwood and Jack Grigg, associated with the Electric Coin Company;</li>
+                    <li>Jack Grigg, associated with the Electric Coin Company;</li>
                     <li>teor, Conrado Gouvea, and Arya, associated with the Zcash Foundation.</li>
                     <li>Aditya Bharadwaj, associated with Nighthawk Apps.</li>
                 </ul>
@@ -358,6 +357,9 @@
                 <li><a href="https://electriccoin.co/blog/the-zcash-network-upgrade-pipeline/">Zcash Network Upgrade Pipeline</a></li>
             </ul>
         </section>
+        <section id="acknowledgements"><h2><span class="section-heading">Acknowledgements</span><span class="section-anchor"> <a rel="bookmark" href="#acknowledgements"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
+            <p>We thank George Tankersley, Deirdre Connolly, and Daira-Emma Hopwood for their past contributions as ZIP Editors.</p>
+        </section>
         <section id="references"><h2><span class="section-heading">References</span><span class="section-anchor"> <a rel="bookmark" href="#references"><img width="24" height="24" class="section-anchor" src="assets/images/section-anchor.png" alt=""></a></span></h2>
             <table id="bcp14" class="footnote">
                 <tbody>

diff --git a/zip-0000.rst b/zip-0000.rst
@@ -2,13 +2,12 @@
 
   ZIP: 0
   Title: ZIP Process
-  Owners: Daira Emma Hopwood <daira@electriccoin.co>
-          teor <teor@zfnd.org>
+  Owners: teor <teor@zfnd.org>
           Jack Grigg <str4d@electriccoin.co>
           Conrado Gouvea <conrado@zfnd.org>
           Aditya Bharadwaj <nighthawk24@gmail.com>
           Arya <arya@zfnd.org>
-  Original-Authors: Daira Emma Hopwood
+  Original-Authors: Daira-Emma Hopwood
                     Josh Cincinnati
                     George Tankersley
                     Deirdre Connolly
@@ -172,8 +171,7 @@ ZIP Editors
 
 The current ZIP Editors are:
 
-* Daira Emma Hopwood and Jack Grigg, associated with the Electric Coin
-  Company;
+* Jack Grigg, associated with the Electric Coin Company;
 * teor, Conrado Gouvea, and Arya, associated with the Zcash Foundation.
 * Aditya Bharadwaj, associated with Nighthawk Apps.
 
@@ -798,6 +796,13 @@ See Also
 * `Zcash Network Upgrade Pipeline <https://electriccoin.co/blog/the-zcash-network-upgrade-pipeline/>`__
 
 
+Acknowledgements
+================
+
+We thank George Tankersley, Deirdre Connolly, and Daira-Emma Hopwood
+for their past contributions as ZIP Editors.
+
+
 References
 ==========