From 1ce6cea9e2fb06a1341d29c0348b7051e115a7da Mon Sep 17 00:00:00 2001
From: Karl Stevens <karlosfandango64@gmail.com>
Date: Feb 23 2023 13:43:58 +0000
Subject: [PATCH 1/4] Updates to Initiatives page.

Removal of failing ref to attributes.adoc file.
Change side menu to "Initiatives"
Change reference "Objectives" to "Community Initiatives" on "Get Involved" page

Signed-off-by: Karl Stevens <karlosfandango64@gmail.com>

---

diff --git a/project/modules/ROOT/nav.adoc b/project/modules/ROOT/nav.adoc
index 30f193e..fb9ab5b 100644
--- a/project/modules/ROOT/nav.adoc
+++ b/project/modules/ROOT/nav.adoc
@@ -1,6 +1,6 @@
 * xref:index.adoc[Mission and Foundations]
 * xref:leadership.adoc[Leadership]
-* xref:objectives.adoc[Current Objectives]
+* xref:objectives.adoc[Current Initiatives]
 * xref:orgchart.adoc[High-Level Organization]
 * xref:brand.adoc[Brand]
 * xref:code-of-conduct.adoc[Code of Conduct]
diff --git a/project/modules/ROOT/pages/initiatives.adoc b/project/modules/ROOT/pages/initiatives.adoc
index 99b68c0..6137562 100644
--- a/project/modules/ROOT/pages/initiatives.adoc
+++ b/project/modules/ROOT/pages/initiatives.adoc
@@ -1,46 +1,71 @@
-include::ROOT:partial$attributes.adoc[]
+= What are Community Initiatives?
 
-= Current 12-18 Month Community Initiatives
 :page-aliases: objectives.adoc
-
-The primary role of the xref:council::index.adoc[Fedora Council] is to identify the short-, medium-, and long-term goals of the Fedora community and to organize and enable the project to best achieve them.
-This section documents the **medium-term** targets we've highlighted (as explained in the Council charter).
-Each Community Initiative has a designated Community Initiative Lead who is responsible for coordinating efforts to reach the Community Initiative's goals, for evaluating and reporting on progress, and for working regularly with all relevant groups in Fedora to ensure that progress is made.
-
-
+ 
+Fedora Community Intitiatives (formerly "Objectives") contain projects which do not fall neatly into the 6 monthly Fedora release-cycle. 
+Typically they require longer to complete; 12-18 or even up to 24 months, and they are not limited to engineering projects.
+The Council looks to achieve a balance between engineering projects and those from the wider Fedora community.
+ 
+The primary role of the xref:council::index.adoc[Fedora Council] is to identify the short-, medium-, 
+and long-term goals of the Fedora community and to organize and enable the project to best achieve them. 
+Anyone can propose a Community Initiative to the Council. 
+To be accepted it should to align with Fedora's https://docs.fedoraproject.org/en-US/project/#_our_mission[mission statement] and long-term goals. 
+ 
+Each Community Initiative has a designated Community Initiative Lead.
+This Lead sits on the council for the duration of the Initiative and is responsible for coordinating efforts
+to reach the Community Initiative's goals, as well as evaluating and reporting on progress. 
+The Initiative Lead works regularly with all relevant groups in Fedora to ensure that progress is made.
+ 
 [[proposing]]
 == Proposing a Community Initiative
-
-Any community member can propose a Community Initiative to the Council.
-First, discuss on the https://discussion.fedoraproject.org/tag/council[#council tag on Fedora Discussion].
+ 
+To propose a Community Initiative to the Council, the Lead should first discuss on the https://discussion.fedoraproject.org/tag/council[#council tag on Fedora Discussion]. 
 Next, if well-received, file a https://pagure.io/Fedora-Council/tickets/[ticket].
 Of course, people need to be ready to do the actual work required — a Community Initiative with no passionate bottom-liners won't get far.
-
-
+ 
+To succeed, Community Initiatives ideally require a leadership team with division of responsibility.
+For example separating roles of project leadership, engineering, marketing and documentation, depending on the size and scope of the Initiative.
+The Council can assist a proposer in finding the right people to work on the project if required.
+ 
+Community Initiatives will be assigned an Executive Sponsor from amongst the existing Council members, 
+to assist with raising and maintaining the visibility of the Initiative in the community.
+ 
+[[completing]]
+== How are Community Initiatives Finalized?
+ 
+At the end of the expected duration of the Initiative (as specified at the proposal / acceptance stage), 
+the Council will assess the progress of the Initiative. 
+If the all of the aims, or all of the most significant of them have been achieved the Initiative will be terminated.
+If the aims are close to complete and further work will substantially increase the impact it may be allowed to continue for a further agreed period, after which it will be terminated. 
+Initiatives will not be allowed to run indefinitely.
+ 
 [[current]]
-== Current Community Initiatives
+== Current 12-18 Month Community Initiatives
+ 
+This section documents the current Initiatives we, the Council, have accepted for implementation in alignment with the **medium-term** goals of the Project, (as explained in the https://docs.fedoraproject.org/en-US/council/[Council Charter]). 
 
 [[websites-apps]]
 === Websites & Apps Revamp
-
+ 
 Summary::
-To reboot the websites team to include webapps in the scope of work and set up the team so that they can grow capacity in the future to build new exciting apps to meet community needs.
-
+To reboot the websites team to include webapps in the scope of work and set up the team so that they can grow capacity 
+in the future to build new exciting apps to meet community needs.
+ 
 Community Initiative Leads::
 https://fedoraproject.org/wiki/User:T0xic0der[Akashdeep Dhar]
-
+ 
 Timeframe::
 8–12 months
-
+ 
 Community Initiative Details::
 See the https://fedoraproject.org/wiki/Objectives/Websites_%26_Apps_Community_Revamp[wiki page].
-
-
+ 
+ 
 [[history]]
 == History
-
+ 
 See https://fedoraproject.org/wiki/Objectives/Completed[completed Community Initiatives] and https://fedoraproject.org/wiki/Objectives/Potential[potential Community Initiatives].
-
+ 
 Historically, Community Initiatives were known as Objectives.
 This transition was made in February 2023 following in-person discussion by the Fedora Council in our 2023 Council hackfest in Frankfurt, Germany.
 We agreed to convert "Objectives" into "Community Initiatives", which the Council felt was easier to understand and communicate the roles of these efforts in Fedora.
diff --git a/project/modules/ROOT/pages/join.adoc b/project/modules/ROOT/pages/join.adoc
index edcf10d..c41bbce 100644
--- a/project/modules/ROOT/pages/join.adoc
+++ b/project/modules/ROOT/pages/join.adoc
@@ -7,7 +7,7 @@ This guide is intended for people that are interested in learning more about Fed
 == What is Fedora?
 
 The Fedora project is a community of people working together to build a Free and Open Source software platform: link:https://getfedora.org[the Fedora Operating System], and its various editions.
-You can learn more about Fedora, our mission, our four foundations, our leadership, our current objectives, and how we are organised using the pages linked to in the left hand sidebar.
+You can learn more about Fedora, our mission, our four foundations, our leadership, our current Communitiy Initiatives, and how we are organised using the pages linked to in the left hand sidebar.
 
 If you are looking to contribute and already have an idea of how and what to do, go ahead and get started!
 If you are not so sure, read on.

From 79b5108567b6eefd8ffc51def9749c77a266dd8e Mon Sep 17 00:00:00 2001
From: Karl Stevens <karlosfandango64@gmail.com>
Date: Feb 24 2023 08:05:18 +0000
Subject: [PATCH 2/4] Amendments as per comments on PR#180


---

diff --git a/project/modules/ROOT/pages/initiatives.adoc b/project/modules/ROOT/pages/initiatives.adoc
index 6137562..a278dd4 100644
--- a/project/modules/ROOT/pages/initiatives.adoc
+++ b/project/modules/ROOT/pages/initiatives.adoc
@@ -1,19 +1,18 @@
-= What are Community Initiatives?
-
-:page-aliases: objectives.adoc
+= What are Community Initiatives?  :page-aliases: initiatives.adoc
  
-Fedora Community Intitiatives (formerly "Objectives") contain projects which do not fall neatly into the 6 monthly Fedora release-cycle. 
-Typically they require longer to complete; 12-18 or even up to 24 months, and they are not limited to engineering projects.
-The Council looks to achieve a balance between engineering projects and those from the wider Fedora community.
+Fedora Community Intitiatives (formerly "Objectives") contain projects which do not fall neatly into the biannual Fedora release-cycle. 
+Typically they require longer to complete; 12-18 or even up to 24 months, and are not limited to engineering projects.
+The Project necessarily has oversight of more than purely the engineering of Fedora.
+Other key concerns are aspects such as administration; documentations; outreach; motivation; communications; budgets and best practice.
+Within the Project these are grouped under a heading of https://docs.fedoraproject.org/en-US/mindshare-committee/[Mindshare]
+The Council looks to achieve a balance between engineering projects and those aligned with Mindshare.
  
-The primary role of the xref:council::index.adoc[Fedora Council] is to identify the short-, medium-, 
-and long-term goals of the Fedora community and to organize and enable the project to best achieve them. 
-Anyone can propose a Community Initiative to the Council. 
-To be accepted it should to align with Fedora's https://docs.fedoraproject.org/en-US/project/#_our_mission[mission statement] and long-term goals. 
+The primary role of the xref:council::index.adoc[Fedora Council] is to identify the short-, medium-, and long-term goals of the Fedora community and to organize and enable the project to best achieve them. 
+Anyone can propose a xref:initiatives.adoc[Community Initiative] to the Council. 
+To be accepted it should align with Fedora's https://docs.fedoraproject.org/en-US/project/#_our_mission[mission statement] and long-term goals. 
  
 Each Community Initiative has a designated Community Initiative Lead.
-This Lead sits on the council for the duration of the Initiative and is responsible for coordinating efforts
-to reach the Community Initiative's goals, as well as evaluating and reporting on progress. 
+This Lead sits on the council for the duration of the Initiative and is responsible for coordinating efforts to reach the Community Initiative's goals, as well as evaluating and reporting on progress. 
 The Initiative Lead works regularly with all relevant groups in Fedora to ensure that progress is made.
  
 [[proposing]]
@@ -27,14 +26,12 @@ To succeed, Community Initiatives ideally require a leadership team with divisio
 For example separating roles of project leadership, engineering, marketing and documentation, depending on the size and scope of the Initiative.
 The Council can assist a proposer in finding the right people to work on the project if required.
  
-Community Initiatives will be assigned an Executive Sponsor from amongst the existing Council members, 
-to assist with raising and maintaining the visibility of the Initiative in the community.
+Community Initiatives will be assigned an Executive Sponsor from amongst the existing Council members, to assist with raising and maintaining the visibility of the Initiative in the community.
  
 [[completing]]
 == How are Community Initiatives Finalized?
  
-At the end of the expected duration of the Initiative (as specified at the proposal / acceptance stage), 
-the Council will assess the progress of the Initiative. 
+At the end of the expected duration of the Initiative (as specified at the proposal / acceptance stage), the Council will assess the progress of the Initiative. 
 If the all of the aims, or all of the most significant of them have been achieved the Initiative will be terminated.
 If the aims are close to complete and further work will substantially increase the impact it may be allowed to continue for a further agreed period, after which it will be terminated. 
 Initiatives will not be allowed to run indefinitely.
@@ -48,8 +45,7 @@ This section documents the current Initiatives we, the Council, have accepted fo
 === Websites & Apps Revamp
  
 Summary::
-To reboot the websites team to include webapps in the scope of work and set up the team so that they can grow capacity 
-in the future to build new exciting apps to meet community needs.
+To reboot the websites team to include webapps in the scope of work and set up the team so that they can grow capacity in the future to build new exciting apps to meet community needs.
  
 Community Initiative Leads::
 https://fedoraproject.org/wiki/User:T0xic0der[Akashdeep Dhar]

From c177bccbc14eec614b21c97043481ced02bb98c3 Mon Sep 17 00:00:00 2001
From: Karl Stevens <karlosfandango64@gmail.com>
Date: Feb 24 2023 08:09:58 +0000
Subject: [PATCH 3/4] Missed the change needed to nav.adoc from jflory7's comment on PR #180. Fixed that here.


---

diff --git a/project/modules/ROOT/nav.adoc b/project/modules/ROOT/nav.adoc
index fb9ab5b..3995b95 100644
--- a/project/modules/ROOT/nav.adoc
+++ b/project/modules/ROOT/nav.adoc
@@ -1,6 +1,6 @@
 * xref:index.adoc[Mission and Foundations]
 * xref:leadership.adoc[Leadership]
-* xref:objectives.adoc[Current Initiatives]
+* xref:initiatives.adoc[Current Initiatives]
 * xref:orgchart.adoc[High-Level Organization]
 * xref:brand.adoc[Brand]
 * xref:code-of-conduct.adoc[Code of Conduct]

From 988104f5d8ac3e68bcf5959f42557876d1fac12c Mon Sep 17 00:00:00 2001
From: Karl Stevens <karlosfandango64@gmail.com>
Date: Feb 27 2023 21:08:22 +0000
Subject: [PATCH 4/4] Fixing for comments on lines 14 and 26 in PR#180


---

diff --git a/project/modules/ROOT/pages/initiatives.adoc b/project/modules/ROOT/pages/initiatives.adoc
index a278dd4..8032d59 100644
--- a/project/modules/ROOT/pages/initiatives.adoc
+++ b/project/modules/ROOT/pages/initiatives.adoc
@@ -1,6 +1,6 @@
 = What are Community Initiatives?  :page-aliases: initiatives.adoc
  
-Fedora Community Intitiatives (formerly "Objectives") contain projects which do not fall neatly into the biannual Fedora release-cycle. 
+Fedora Community Intitiatives (formerly "Objectives") contain projects which do not fall neatly into the biannual Fedora Linux release cycle. 
 Typically they require longer to complete; 12-18 or even up to 24 months, and are not limited to engineering projects.
 The Project necessarily has oversight of more than purely the engineering of Fedora.
 Other key concerns are aspects such as administration; documentations; outreach; motivation; communications; budgets and best practice.
@@ -12,7 +12,7 @@ Anyone can propose a xref:initiatives.adoc[Community Initiative] to the Council.
 To be accepted it should align with Fedora's https://docs.fedoraproject.org/en-US/project/#_our_mission[mission statement] and long-term goals. 
  
 Each Community Initiative has a designated Community Initiative Lead.
-This Lead sits on the council for the duration of the Initiative and is responsible for coordinating efforts to reach the Community Initiative's goals, as well as evaluating and reporting on progress. 
+This Lead sits on the Council for the duration of the Initiative and is responsible for coordinating efforts to reach the Community Initiative's goals, as well as evaluating and reporting on progress. 
 The Initiative Lead works regularly with all relevant groups in Fedora to ensure that progress is made.
  
 [[proposing]]

