From 0cf16140547626be653428323ade8e456877a127 Mon Sep 17 00:00:00 2001
From: Justin W. Flory <git@jwf.io>
Date: Feb 26 2020 12:23:07 +0000
Subject: decision-process: Use headers, fix some links, some rearranging


This commit is a follow-up to PR #105. My changes are summarized below:

* Move decision-making page to `policy/` subfolder
  * Easier to determine docs that require full consensus for changes
* Fix link to D&I team members by linking out to FAS group members
* Change formatting of some sections to headers
* Add "Choosing a process" section from previous section
  * Made some edits for clarity / improved readability

Signed-off-by: Justin W. Flory <git@jwf.io>

---

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index ed5129c..5df6810 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -1,5 +1,4 @@
 * xref:team.adoc[About Diversity and Inclusion Team]
-* xref:decision-process.adoc[D&I Team's Decision Making Process]
 * xref:events.adoc[D&I events]
 * xref:demographic-survey.adoc[Demographic survey]
 * Fedora Women's Day (FWD)
@@ -7,3 +6,5 @@
 ** xref:fedora-womens-day/resource-pack.adoc[Resource pack]
 * xref:get-involved.adoc[Get involved]
 * xref:meetings.adoc[Meetings]
+* Policy
+** xref:policy/decision-process.adoc[Decision-making process]
diff --git a/modules/ROOT/pages/decision-process.adoc b/modules/ROOT/pages/decision-process.adoc
deleted file mode 100644
index c2d7c06..0000000
--- a/modules/ROOT/pages/decision-process.adoc
+++ /dev/null
@@ -1,33 +0,0 @@
-= D&I Team Decision Making Process
-
-This page describes the decision process followed within the Fedora D&I team.
-
-[[process]]
-== Process
-
-**Lazy Approval**::
-This means general consent is assumed unless valid objections are raised within a specific period of time i.e. 5 days along with minimum two positive vote (+1) and no -1's.
-Votes can be cast by any approved member of diversity team.
-This process is used for decisions with short-term consequences and which can be easily reversed.
-Any team member can ask for the deadline to be extended or the decision escalated to require full consensus.
-
-**Full Consensus**::
-More significant decisions are made through a process of full consensus.
-In order to pass, these decisions need three positive votes (+3) and no negative votes (-1) within a specific period of time i.e. 14 days.
-The votes can be cast by any of the approved members in the FAS group for the Diversity and Inclusion Team.
-A negative vote immediately halts the process and requires discussion.
-Therefore, in order to remain valid, negative votes must be supported with a specific concern about the proposal, and suggestions for what could be changed in order to make the proposal acceptable.
-
-**Who are the eligible Members to vote?**
-Fedora link:Diversity#Team_Members[Diversity and Inclusion Team member] are eligible to vote.
-
-**Which approval process should be followed and when?**
-Lazy approval will be followed for tasks which already have a defined process in D&I Team and when all prior steps for this task have been completed with just the ticket-based approval remaining.
-For example, translation of an article,  sponsoring a new membership etc.
-
-Full consensus is needed for approving new processes, additional improvements to an existing process and tasks requiring D&I funding.
-For example - proposal for event guidelines for Fedora event organizers, for the decisions related to D&I team presence at Flock, full consensus process will be followed.
-
-[[links]]
-== Links
-1.  Pagure Ticket - https://pagure.io/fedora-diversity/issue/98
diff --git a/modules/ROOT/pages/policy/decision-process.adoc b/modules/ROOT/pages/policy/decision-process.adoc
new file mode 100644
index 0000000..c46fd86
--- /dev/null
+++ b/modules/ROOT/pages/policy/decision-process.adoc
@@ -0,0 +1,42 @@
+include::{partialsdir}/attributes.adoc[]
+
+= Decision-making process
+
+This page describes how the Fedora D&I team makes decisions.
+
+
+[[process]]
+== Process
+
+Members of the https://admin.fedoraproject.org/accounts/group/members/diversity-team/*[Fedora Diversity and Inclusion Team FAS group] are eligible to vote.
+
+=== Lazy Approval
+
+This means general consent is assumed unless valid objections are raised within a specific period of time i.e. 5 days along with minimum two positive vote (+1) and no -1's.
+Votes can be cast by any approved member of diversity team.
+This process is used for decisions with short-term consequences and which can be easily reversed.
+Any team member can ask for the deadline to be extended or the decision escalated to require full consensus.
+
+=== Full Consensus
+
+More significant decisions are made through a process of full consensus.
+In order to pass, these decisions need three positive votes (+3) and no negative votes (-1) within a specific period of time i.e. 14 days.
+The votes can be cast by any of the approved members in the FAS group for the Diversity and Inclusion Team.
+A negative vote immediately halts the process and requires discussion.
+Therefore, in order to remain valid, negative votes must be supported with a specific concern about the proposal, and suggestions for what could be changed in order to make the proposal acceptable.
+
+
+== Choosing a process
+
+*Lazy approval* is followed for tasks with a defined process in D&I Team.
+When all prior steps for a task are completed with just the ticket-based approval remaining.
+For example, translating an article or proposing a Flock session fit in this model.
+
+*Full consensus* is required to approve new processes, make changes to existing team policies, and tickets requiring https://budget.fedoraproject.org/budget/{FISCALYEAR}/d-i.html[D&I budget].
+For example, proposing new event guidelines for events, changing the decision-making process, and voting on Outreachy budget allocation requires full consensus.
+
+
+[[references]]
+== References
+
+* https://pagure.io/fedora-diversity/issue/98[fedora-diversity#98]

