From 10fb2c5cc0ef050258038b6f035bffaf02d85300 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Wed, 17 Jun 2020 22:56:17 -0400
Subject: [PATCH 1/6] Add preferred citation format

---
 _layouts/eip.html | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/_layouts/eip.html b/_layouts/eip.html
index 6448b41825f1c..a8eab327f2590 100644
--- a/_layouts/eip.html
+++ b/_layouts/eip.html
@@ -4,7 +4,7 @@
 
 <div class="home">
   <h1 class="page-heading">
-    EIP {{ page.eip | xml_escape }}: {{ page.title | xml_escape }}
+    EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}
     <a href="{{site.github.repository_url}}/blob/master/{{page.path}}"><svg role="img" aria-label="Source" xmlns="https://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><title>Source</title><path fill-rule="evenodd" d="M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z"/></svg></a>
   </h1>
   <table>
@@ -41,4 +41,31 @@ <h1 class="page-heading">
 
   {{ content }}
 
+  <h2>Citation</h2>
+  <p>Please cite this document as:</p>
+  {% comment %}
+  IEEE specification for reference formatting:
+  https://ieee-dataport.org/sites/default/files/analysis/27/IEEE%20Citation%20Guidelines.pdf
+  {% endcomment %}
+  <p>{% include authorlist.html authors=page.author %}, "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}," <em>Ethereum Improvement Proposals</em>, no. {{ page.eip | xml_escape }}, {{ page.created | date: "%B %Y" }}. [Online serial]. Available: https://eips.ethereum.org/EIPS/eip-{{ page.eip | xml_escape }}.</p>
 </div>
+
+{% comment %}
+Article schema specification:
+https://schema.org/Article
+{% endcomment %}
+<script type="application/ld+json">
+  {
+    "@context": "http://schema.org",
+    "@type": "Article",
+    "author": "{% include authorlist.html authors=page.author %}",
+    "name": "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}",
+    "dateCreated": "{{ page.created | date: "%Y-%m-%d" }}",
+{% if page["discussions-to"] != undefined %}
+    "discussionUrl": "{{ page["discussions-to"] | uri_escape }}",
+{% endif %}    
+    "inLanguage": "en-US",
+    "license": "https://creativecommons.org/publicdomain/zero/1.0/",
+    "copyrightYear": "{{ page.created | date: "%Y" }}"
+  }
+</script>
\ No newline at end of file

From fb1bab4f9f711a289a575ec621203d25f6d46bba Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Wed, 17 Jun 2020 22:59:41 -0400
Subject: [PATCH 2/6] Add [DRAFT]

---
 _layouts/eip.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_layouts/eip.html b/_layouts/eip.html
index a8eab327f2590..e0f44a2952d32 100644
--- a/_layouts/eip.html
+++ b/_layouts/eip.html
@@ -47,7 +47,7 @@ <h2>Citation</h2>
   IEEE specification for reference formatting:
   https://ieee-dataport.org/sites/default/files/analysis/27/IEEE%20Citation%20Guidelines.pdf
   {% endcomment %}
-  <p>{% include authorlist.html authors=page.author %}, "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}," <em>Ethereum Improvement Proposals</em>, no. {{ page.eip | xml_escape }}, {{ page.created | date: "%B %Y" }}. [Online serial]. Available: https://eips.ethereum.org/EIPS/eip-{{ page.eip | xml_escape }}.</p>
+  <p>{% include authorlist.html authors=page.author %}, "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status != "Final" %} [DRAFT]{% endif %}," <em>Ethereum Improvement Proposals</em>, no. {{ page.eip | xml_escape }}, {{ page.created | date: "%B %Y" }}. [Online serial]. Available: https://eips.ethereum.org/EIPS/eip-{{ page.eip | xml_escape }}.</p>
 </div>
 
 {% comment %}
@@ -59,7 +59,7 @@ <h2>Citation</h2>
     "@context": "http://schema.org",
     "@type": "Article",
     "author": "{% include authorlist.html authors=page.author %}",
-    "name": "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}",
+    "name": "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status != "Final" %} [DRAFT]{% endif %}",
     "dateCreated": "{{ page.created | date: "%Y-%m-%d" }}",
 {% if page["discussions-to"] != undefined %}
     "discussionUrl": "{{ page["discussions-to"] | uri_escape }}",

From c99546ec9a00539d5ee07b1366fb5cccf226e964 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Fri, 17 Jul 2020 14:36:39 -0400
Subject: [PATCH 3/6] Fix DRAFT

---
 _layouts/eip.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_layouts/eip.html b/_layouts/eip.html
index e0f44a2952d32..62befad5ceb53 100644
--- a/_layouts/eip.html
+++ b/_layouts/eip.html
@@ -47,7 +47,7 @@ <h2>Citation</h2>
   IEEE specification for reference formatting:
   https://ieee-dataport.org/sites/default/files/analysis/27/IEEE%20Citation%20Guidelines.pdf
   {% endcomment %}
-  <p>{% include authorlist.html authors=page.author %}, "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status != "Final" %} [DRAFT]{% endif %}," <em>Ethereum Improvement Proposals</em>, no. {{ page.eip | xml_escape }}, {{ page.created | date: "%B %Y" }}. [Online serial]. Available: https://eips.ethereum.org/EIPS/eip-{{ page.eip | xml_escape }}.</p>
+  <p>{% include authorlist.html authors=page.author %}, "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status == "Draft" or page.status = "Last Call" %} [DRAFT]{% endif %}," <em>Ethereum Improvement Proposals</em>, no. {{ page.eip | xml_escape }}, {{ page.created | date: "%B %Y" }}. [Online serial]. Available: https://eips.ethereum.org/EIPS/eip-{{ page.eip | xml_escape }}.</p>
 </div>
 
 {% comment %}
@@ -59,7 +59,7 @@ <h2>Citation</h2>
     "@context": "http://schema.org",
     "@type": "Article",
     "author": "{% include authorlist.html authors=page.author %}",
-    "name": "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status != "Final" %} [DRAFT]{% endif %}",
+    "name": "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status == "Draft" or page.status = "Last Call" %} [DRAFT]{% endif %}",
     "dateCreated": "{{ page.created | date: "%Y-%m-%d" }}",
 {% if page["discussions-to"] != undefined %}
     "discussionUrl": "{{ page["discussions-to"] | uri_escape }}",
@@ -68,4 +68,4 @@ <h2>Citation</h2>
     "license": "https://creativecommons.org/publicdomain/zero/1.0/",
     "copyrightYear": "{{ page.created | date: "%Y" }}"
   }
-</script>
\ No newline at end of file
+</script>

From 0f70b6b0fed62c8c350899b13235cdabc74463d3 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Fri, 17 Jul 2020 14:59:13 -0400
Subject: [PATCH 4/6] Update license to a link inside the article

---
 _layouts/eip.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_layouts/eip.html b/_layouts/eip.html
index 62befad5ceb53..6b7092b45e427 100644
--- a/_layouts/eip.html
+++ b/_layouts/eip.html
@@ -65,7 +65,7 @@ <h2>Citation</h2>
     "discussionUrl": "{{ page["discussions-to"] | uri_escape }}",
 {% endif %}    
     "inLanguage": "en-US",
-    "license": "https://creativecommons.org/publicdomain/zero/1.0/",
+    "license": "#copyright",
     "copyrightYear": "{{ page.created | date: "%Y" }}"
   }
 </script>

From fc1ecca9749028a8f11b16c8857083a926bff97b Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Fri, 17 Jul 2020 17:54:35 -0400
Subject: [PATCH 5/6] remove json-id

---
 _layouts/eip.html | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/_layouts/eip.html b/_layouts/eip.html
index 6b7092b45e427..f58282f7552ca 100644
--- a/_layouts/eip.html
+++ b/_layouts/eip.html
@@ -49,23 +49,3 @@ <h2>Citation</h2>
   {% endcomment %}
   <p>{% include authorlist.html authors=page.author %}, "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status == "Draft" or page.status = "Last Call" %} [DRAFT]{% endif %}," <em>Ethereum Improvement Proposals</em>, no. {{ page.eip | xml_escape }}, {{ page.created | date: "%B %Y" }}. [Online serial]. Available: https://eips.ethereum.org/EIPS/eip-{{ page.eip | xml_escape }}.</p>
 </div>
-
-{% comment %}
-Article schema specification:
-https://schema.org/Article
-{% endcomment %}
-<script type="application/ld+json">
-  {
-    "@context": "http://schema.org",
-    "@type": "Article",
-    "author": "{% include authorlist.html authors=page.author %}",
-    "name": "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status == "Draft" or page.status = "Last Call" %} [DRAFT]{% endif %}",
-    "dateCreated": "{{ page.created | date: "%Y-%m-%d" }}",
-{% if page["discussions-to"] != undefined %}
-    "discussionUrl": "{{ page["discussions-to"] | uri_escape }}",
-{% endif %}    
-    "inLanguage": "en-US",
-    "license": "#copyright",
-    "copyrightYear": "{{ page.created | date: "%Y" }}"
-  }
-</script>

From 34d4dd60e0a9891708f65f26951ff005382054cd Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Sat, 18 Jul 2020 14:55:15 -0400
Subject: [PATCH 6/6] Update eip.html

---
 _layouts/eip.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_layouts/eip.html b/_layouts/eip.html
index f58282f7552ca..8cf913d2b405d 100644
--- a/_layouts/eip.html
+++ b/_layouts/eip.html
@@ -47,5 +47,5 @@ <h2>Citation</h2>
   IEEE specification for reference formatting:
   https://ieee-dataport.org/sites/default/files/analysis/27/IEEE%20Citation%20Guidelines.pdf
   {% endcomment %}
-  <p>{% include authorlist.html authors=page.author %}, "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status == "Draft" or page.status = "Last Call" %} [DRAFT]{% endif %}," <em>Ethereum Improvement Proposals</em>, no. {{ page.eip | xml_escape }}, {{ page.created | date: "%B %Y" }}. [Online serial]. Available: https://eips.ethereum.org/EIPS/eip-{{ page.eip | xml_escape }}.</p>
+  <p>{% include authorlist.html authors=page.author %}, "EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}{% if page.status == "Draft" or page.status == "Last Call" %} [DRAFT]{% endif %}," <em>Ethereum Improvement Proposals</em>, no. {{ page.eip | xml_escape }}, {{ page.created | date: "%B %Y" }}. [Online serial]. Available: https://eips.ethereum.org/EIPS/eip-{{ page.eip | xml_escape }}.</p>
 </div>