From 3c878ac7281b9c1bb866b739792279e142c7b2b0 Mon Sep 17 00:00:00 2001
From: 0xldr <139177554+0xldr@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:42:17 +0100
Subject: [PATCH 1/6] archive MIP templates

---
 ...Budget Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md | 0
 .../MIPs/Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md  | 0
 .../MIPs/Ratification Poll - $mip_set - $date_MONTH_DD,_YYYY.md   | 0
 .../Short Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename governance/polls/templates/{ => Archived - Not Updated}/MIPs/Budget Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md (100%)
 rename governance/polls/templates/{ => Archived - Not Updated}/MIPs/Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md (100%)
 rename governance/polls/templates/{ => Archived - Not Updated}/MIPs/Ratification Poll - $mip_set - $date_MONTH_DD,_YYYY.md (100%)
 rename governance/polls/templates/{ => Archived - Not Updated}/MIPs/Short Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md (100%)

diff --git a/governance/polls/templates/MIPs/Budget Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Archived - Not Updated/MIPs/Budget Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md
similarity index 100%
rename from governance/polls/templates/MIPs/Budget Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md
rename to governance/polls/templates/Archived - Not Updated/MIPs/Budget Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md
diff --git a/governance/polls/templates/MIPs/Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Archived - Not Updated/MIPs/Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md
similarity index 100%
rename from governance/polls/templates/MIPs/Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md
rename to governance/polls/templates/Archived - Not Updated/MIPs/Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md
diff --git a/governance/polls/templates/MIPs/Ratification Poll - $mip_set - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Archived - Not Updated/MIPs/Ratification Poll - $mip_set - $date_MONTH_DD,_YYYY.md
similarity index 100%
rename from governance/polls/templates/MIPs/Ratification Poll - $mip_set - $date_MONTH_DD,_YYYY.md
rename to governance/polls/templates/Archived - Not Updated/MIPs/Ratification Poll - $mip_set - $date_MONTH_DD,_YYYY.md
diff --git a/governance/polls/templates/MIPs/Short Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Archived - Not Updated/MIPs/Short Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md
similarity index 100%
rename from governance/polls/templates/MIPs/Short Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md
rename to governance/polls/templates/Archived - Not Updated/MIPs/Short Ratification Poll - $mip_code - $date_MONTH_DD,_YYYY.md

From 84a23f63e190297d39ffa50d361afaa236fc0b86 Mon Sep 17 00:00:00 2001
From: 0xldr <139177554+0xldr@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:42:37 +0100
Subject: [PATCH 2/6] Create Atlas Edit Weekly Cycle Proposal -
 $date_MONTH_DD,_YYYY.md

Update Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md
---
 ...y Cycle Proposal - $date_MONTH_DD,_YYYY.md | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md

diff --git a/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md
new file mode 100644
index 000000000..5fabe3b11
--- /dev/null
+++ b/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
@@ -0,0 +1,62 @@
+---
+title: Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY
+summary: $sentence_summary
+discussion_link: $discussion_link
+parameters:
+    input_format:
+        type: single-choice
+        abstain: [0]
+    victory_conditions:
+        - {
+            type: 'and',
+            conditions: [
+                { type : plurality },
+                { type : comparison, comparator : '>=', value: 20000 }
+            ]
+        }
+        - {type : default, value : 2 }
+    result_display: single-vote-breakdown
+version: v2.0.0
+options:
+   0: Abstain
+   1: Yes
+   2: No
+start_date: $YYYY-MM-DDT16:00:00
+end_date: $YYYY-MM-DDT16:00:00
+---
+# Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY
+
+The $poll_deployers have placed an [Atlas Edit Weekly Cycle Proposal](https://sky-atlas.powerhouse.io/#A.1.9.2_Atlas_Edit_Weekly_Cycle-4a8ad9ad-5c5d-4994-9b46-f04c0e61ce59|0db30308) into the [voting system](https://vote.makerdao.com/polling) [on behalf of Prime Delegate $Delegate_Name]($link). This Governance [Poll](https://sky-atlas.powerhouse.io/#A.1.9.2_Atlas_Edit_Weekly_Cycle-4a8ad9ad-5c5d-4994-9b46-f04c0e61ce59%7C0db30308) will be active for three days beginning on $date_DAY,_MONTH_DD at 16:00 UTC.
+
+**This is a binary vote.**
+- **You may vote for a single option.**
+- **You should vote for the option which you prefer.**
+- **If you would accept either option, you should vote 'Abstain'.**
+
+## Review
+
+The community may vote in this poll to express support or opposition to the following Atlas Edit Weekly Cycle Proposal:
+
+- [Atlas Edit Pull Request]($Pull_Request_link)
+- [Proposal Discussion Thread]($discussion_link)
+
+A brief summary of this Atlas Edit has been provided by the Author and is shown below:
+
+*$paragraph_summary*
+
+## Outcomes
+
+This poll implements a **Minimum Positive Participation** value. The Minimum Positive Participation for Atlas Edit Weekly Cycle Proposals is currently set to **20,000 MKR**.
+
+**If the votes for the 'Yes' option exceed the votes for the 'No' option AND the votes for the 'Yes' option exceed 20,000 MKR, then the following actions will be taken:**
+- The associated Pull Request will be merged into The Atlas.
+
+---
+
+## Resources
+
+If you are new to voting in the Sky Protocol, please see the [voting guide](https://manual.makerdao.com/governance/voting-in-makerdao/on-chain-governance) to learn how voting works.
+
+Additional information about the Governance process can be found in the [Operational Manual](https://manual.makerdao.com).
+
+To add current and upcoming votes to your calendar, please see the [Sky Governance Calendar](https://manual.makerdao.com/makerdao/calendars/governance-calendar).

From 244df20b7dd527fcb34233f5206098cf4f975b0d Mon Sep 17 00:00:00 2001
From: 0xldr <139177554+0xldr@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:49:37 +0100
Subject: [PATCH 3/6] Create Atlas Edit Monthly Cycle Proposal -
 $date_MONTH_DD,_YYYY.md

---
 ...y Cycle Proposal - $date_MONTH_DD,_YYYY.md | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md

diff --git a/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md
new file mode 100644
index 000000000..121abbbce
--- /dev/null
+++ b/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
@@ -0,0 +1,62 @@
+---
+title: Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY
+summary: $sentence_summary
+discussion_link: $discussion_link
+parameters:
+    input_format:
+        type: single-choice
+        abstain: [0]
+    victory_conditions:
+        - {
+            type: 'and',
+            conditions: [
+                { type : plurality },
+                { type : comparison, comparator : '>=', value: 10000 }
+            ]
+        }
+        - {type : default, value : 2 }
+    result_display: single-vote-breakdown
+version: v2.0.0
+options:
+   0: Abstain
+   1: Yes
+   2: No
+start_date: $YYYY-MM-DDT16:00:00
+end_date: $YYYY-MM-DDT16:00:00
+---
+# Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY
+
+The $poll_deployers have placed an [Atlas Edit Monthly Cycle Proposal](https://sky-atlas.powerhouse.io/#A.1.10.2_Atlas_Edit_Monthly_Cycle-430185a5-fa5d-4664-89cf-21c9e6cfc109|0db3326e) into the [voting system](https://vote.makerdao.com/polling). This Governance [Poll](https://sky-atlas.powerhouse.io/#A.1.9.2_Atlas_Edit_Weekly_Cycle-4a8ad9ad-5c5d-4994-9b46-f04c0e61ce59%7C0db30308) will be active for fourteen days beginning on $date_DAY,_MONTH_DD at 16:00 UTC.
+
+**This is a binary vote.**
+- **You may vote for a single option.**
+- **You should vote for the option which you prefer.**
+- **If you would accept either option, you should vote 'Abstain'.**
+
+## Review
+
+The community may vote in this poll to express support or opposition to the following Atlas Edit Weekly Cycle Proposal:
+
+- [Atlas Edit Pull Request]($Pull_Request_link)
+- [Proposal Discussion Thread]($discussion_link)
+
+A brief summary of this Atlas Edit has been provided by the Author and is shown below:
+
+*$paragraph_summary*
+
+## Outcomes
+
+This poll implements a **Minimum Positive Participation** value. The Minimum Positive Participation for Atlas Edit Weekly Cycle Proposals is currently set to **10,000 MKR**.
+
+**If the votes for the 'Yes' option exceed the votes for the 'No' option AND the votes for the 'Yes' option exceed 10,000 MKR, then the following actions will be taken:**
+- The associated Pull Request will be merged into The Atlas.
+
+---
+
+## Resources
+
+If you are new to voting in the Sky Protocol, please see the [voting guide](https://manual.makerdao.com/governance/voting-in-makerdao/on-chain-governance) to learn how voting works.
+
+Additional information about the Governance process can be found in the [Operational Manual](https://manual.makerdao.com).
+
+To add current and upcoming votes to your calendar, please see the [Sky Governance Calendar](https://manual.makerdao.com/makerdao/calendars/governance-calendar).

From de290691a83207db3356b7c14a70faf04f5d9cac Mon Sep 17 00:00:00 2001
From: 0xldr <139177554+0xldr@users.noreply.github.com>
Date: Mon, 23 Sep 2024 20:11:26 +0100
Subject: [PATCH 4/6] Apply suggestions from code review

Co-authored-by: blimpa <72349134+blimpa@users.noreply.github.com>
---
 .../Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md | 2 ++
 .../Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md
index 121abbbce..ba0308a62 100644
--- a/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
+++ b/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
@@ -29,6 +29,7 @@ end_date: $YYYY-MM-DDT16:00:00
 The $poll_deployers have placed an [Atlas Edit Monthly Cycle Proposal](https://sky-atlas.powerhouse.io/#A.1.10.2_Atlas_Edit_Monthly_Cycle-430185a5-fa5d-4664-89cf-21c9e6cfc109|0db3326e) into the [voting system](https://vote.makerdao.com/polling). This Governance [Poll](https://sky-atlas.powerhouse.io/#A.1.9.2_Atlas_Edit_Weekly_Cycle-4a8ad9ad-5c5d-4994-9b46-f04c0e61ce59%7C0db30308) will be active for fourteen days beginning on $date_DAY,_MONTH_DD at 16:00 UTC.
 
 **This is a binary vote.**
+
 - **You may vote for a single option.**
 - **You should vote for the option which you prefer.**
 - **If you would accept either option, you should vote 'Abstain'.**
@@ -49,6 +50,7 @@ A brief summary of this Atlas Edit has been provided by the Author and is shown
 This poll implements a **Minimum Positive Participation** value. The Minimum Positive Participation for Atlas Edit Weekly Cycle Proposals is currently set to **10,000 MKR**.
 
 **If the votes for the 'Yes' option exceed the votes for the 'No' option AND the votes for the 'Yes' option exceed 10,000 MKR, then the following actions will be taken:**
+
 - The associated Pull Request will be merged into The Atlas.
 
 ---
diff --git a/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md
index 5fabe3b11..0c4f5e672 100644
--- a/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
+++ b/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
@@ -29,6 +29,7 @@ end_date: $YYYY-MM-DDT16:00:00
 The $poll_deployers have placed an [Atlas Edit Weekly Cycle Proposal](https://sky-atlas.powerhouse.io/#A.1.9.2_Atlas_Edit_Weekly_Cycle-4a8ad9ad-5c5d-4994-9b46-f04c0e61ce59|0db30308) into the [voting system](https://vote.makerdao.com/polling) [on behalf of Prime Delegate $Delegate_Name]($link). This Governance [Poll](https://sky-atlas.powerhouse.io/#A.1.9.2_Atlas_Edit_Weekly_Cycle-4a8ad9ad-5c5d-4994-9b46-f04c0e61ce59%7C0db30308) will be active for three days beginning on $date_DAY,_MONTH_DD at 16:00 UTC.
 
 **This is a binary vote.**
+
 - **You may vote for a single option.**
 - **You should vote for the option which you prefer.**
 - **If you would accept either option, you should vote 'Abstain'.**
@@ -49,6 +50,7 @@ A brief summary of this Atlas Edit has been provided by the Author and is shown
 This poll implements a **Minimum Positive Participation** value. The Minimum Positive Participation for Atlas Edit Weekly Cycle Proposals is currently set to **20,000 MKR**.
 
 **If the votes for the 'Yes' option exceed the votes for the 'No' option AND the votes for the 'Yes' option exceed 20,000 MKR, then the following actions will be taken:**
+
 - The associated Pull Request will be merged into The Atlas.
 
 ---

From 60cf78dfa15eec66328fadda915bf877a158e027 Mon Sep 17 00:00:00 2001
From: 0xldr <139177554+0xldr@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:55:03 +0100
Subject: [PATCH 5/6] change qualifier

---
 .../Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md
index 0c4f5e672..2b31ad467 100644
--- a/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
+++ b/governance/polls/templates/Atlas/Atlas Edit Weekly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
@@ -49,7 +49,7 @@ A brief summary of this Atlas Edit has been provided by the Author and is shown
 
 This poll implements a **Minimum Positive Participation** value. The Minimum Positive Participation for Atlas Edit Weekly Cycle Proposals is currently set to **20,000 MKR**.
 
-**If the votes for the 'Yes' option exceed the votes for the 'No' option AND the votes for the 'Yes' option exceed 20,000 MKR, then the following actions will be taken:**
+**If the votes for the 'Yes' option exceed the votes for the 'No' option AND the votes for the 'Yes' option equal or exceed 20,000 MKR, then the following actions will be taken:**
 
 - The associated Pull Request will be merged into The Atlas.
 

From f173b8e84185aeec30d18276c5b4d09de977896b Mon Sep 17 00:00:00 2001
From: 0xldr <139177554+0xldr@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:58:09 +0100
Subject: [PATCH 6/6] add AEP numbers and clarify qualifiers

---
 ...as Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md b/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md
index ba0308a62..253438bb6 100644
--- a/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
+++ b/governance/polls/templates/Atlas/Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY.md	
@@ -1,5 +1,5 @@
 ---
-title: Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY
+title: Atlas Edit Monthly Cycle Proposal (AEP-$AEP_Number) - $date_MONTH_DD,_YYYY
 summary: $sentence_summary
 discussion_link: $discussion_link
 parameters:
@@ -24,7 +24,7 @@ options:
 start_date: $YYYY-MM-DDT16:00:00
 end_date: $YYYY-MM-DDT16:00:00
 ---
-# Atlas Edit Monthly Cycle Proposal - $date_MONTH_DD,_YYYY
+# Atlas Edit Monthly Cycle Proposal (AEP-$AEP_Number) - $date_MONTH_DD,_YYYY
 
 The $poll_deployers have placed an [Atlas Edit Monthly Cycle Proposal](https://sky-atlas.powerhouse.io/#A.1.10.2_Atlas_Edit_Monthly_Cycle-430185a5-fa5d-4664-89cf-21c9e6cfc109|0db3326e) into the [voting system](https://vote.makerdao.com/polling). This Governance [Poll](https://sky-atlas.powerhouse.io/#A.1.9.2_Atlas_Edit_Weekly_Cycle-4a8ad9ad-5c5d-4994-9b46-f04c0e61ce59%7C0db30308) will be active for fourteen days beginning on $date_DAY,_MONTH_DD at 16:00 UTC.
 
@@ -49,7 +49,7 @@ A brief summary of this Atlas Edit has been provided by the Author and is shown
 
 This poll implements a **Minimum Positive Participation** value. The Minimum Positive Participation for Atlas Edit Weekly Cycle Proposals is currently set to **10,000 MKR**.
 
-**If the votes for the 'Yes' option exceed the votes for the 'No' option AND the votes for the 'Yes' option exceed 10,000 MKR, then the following actions will be taken:**
+**If the votes for the 'Yes' option exceed the votes for the 'No' option AND the votes for the 'Yes' option equal or exceed 10,000 MKR, then the following actions will be taken:**
 
 - The associated Pull Request will be merged into The Atlas.