#124 format
Merged 2 years ago by bcotton. Opened 2 years ago by jibecfed.
Fedora-Council/ jibecfed/council-docs format  into  main

@@ -9,10 +9,10 @@ 

  

  * The candidate Edition must be backed by a team that holds regular public meetings

  * The candidate Edition must get trademark approval from the Fedora Council.

- If this includes a name change or a new name (e.g. “Fedora Bilverslue”), plan time for legal review.

+   If this includes a name change or a new name (e.g. “Fedora Bilverslue”), plan time for legal review.

  * The candidate Edition must have a product requirements document (PRD) (https://fedoraproject.org/wiki/Workstation/Workstation_PRD[example]).

- The PRD is used by other teams within Fedora (for example: the QA team uses it to develop release criteria and test cases, the marketing team uses it to develop collateral and positioning).

- The PRD must include:

+   The PRD is used by other teams within Fedora (for example: the QA team uses it to develop release criteria and test cases, the marketing team uses it to develop collateral and positioning).

+   The PRD must include:

  ** Market target, including key use cases and personas

  ** Core services and features

  ** Core applications
@@ -32,26 +32,26 @@ 

  Prior to submitting the Change proposal, the following tasks should be completed:

  

  * *Review test cases and release criteria with QA.*

- The QA team will draft test cases and release criteria based on the PRD.

- However, the Edition team must verify that these are valid.

- The Edition team may choose to assign a person to be the liaison with the QA team.

+   The QA team will draft test cases and release criteria based on the PRD.

+   However, the Edition team must verify that these are valid.

+   The Edition team may choose to assign a person to be the liaison with the QA team.

  * *Work with Release Engineering.*

- The Edition team should work with release engineering on how they are planning on composing the new edition, release process, mirrors sync locations, any changes needed to koji, bodhi or autosigning.

+   The Edition team should work with release engineering on how they are planning on composing the new edition, release process, mirrors sync locations, any changes needed to koji, bodhi or autosigning.

  

  After the change proposal is approved, the following additional tasks should be completed no later than the Beta freeze, which should be considered the contingency deadline for the change.

  Note that these tasks should be started as early as possible.

  

  * *Request design deliverables.*

- If customized graphics for the website, stickers, et cetera are needed, the Edition team should contact the Design team as soon as possible.

+   If customized graphics for the website, stickers, et cetera are needed, the Edition team should contact the Design team as soon as possible.

  * *Provide updated website content.*

- The Edition team should send text, graphics, and screenshots to the Websites team as soon as possible to ensure getfedora.org will be up-to-date on release day.

+   The Edition team should send text, graphics, and screenshots to the Websites team as soon as possible to ensure getfedora.org will be up-to-date on release day.

  * *Notify Documentation and Translation teams.*

- The Edition team should let the Documentation team know of any updates or new documentation required.

- The Edition team should also inform the Translation team of incoming website and documentation updates so they can prepare to translate it in advance of the release

+   The Edition team should let the Documentation team know of any updates or new documentation required.

+   The Edition team should also inform the Translation team of incoming website and documentation updates so they can prepare to translate it in advance of the release

  * *Provide marketing blurbs.*

- The Edition team should send basic promotional text to the Marketing and Magazine teams.

- This will allow the release announcement, et cetera to include meaningful information about the new Edition.

- The Edition team may consider writing one or several full Fedora Magazine articles in support of the Edition.

+   The Edition team should send basic promotional text to the Marketing and Magazine teams.

+   This will allow the release announcement, et cetera to include meaningful information about the new Edition.

+   The Edition team may consider writing one or several full Fedora Magazine articles in support of the Edition.

  

  == History

  

@@ -0,0 +1,20 @@ 

+ === Features

+ 

+ image:divider-top-features.png[Four Foundations: Features,title="Four Foundations: Features"]

+ 

+ We care about excellent software.

+ 

+ The Fedora community creates many of the technical features that have

+ made Linux powerful, flexible, and usable for a wide spectrum of

+ millions of users, administrators, and developers worldwide. We

+ recognize the status quo is worth changing to empower additional

+ end-users, or to create a more flexible and powerful environment for

+ building new solutions on the free software we provide.

+ 

+ We also believe that these changes are best developed in direct concert with

+ the https://fedoraproject.org/wiki/Staying_close_to_upstream_projects[upstream

+ software communities] whose work is part of the Fedora distribution. We work

+ with the upstream in cases where we find opportunities for improvement, so

+ all free software users benefit — even if they don’t use Fedora directly.

+ Our feature development is always done openly and transparently, and anyone

+ may participate. 

\ No newline at end of file

@@ -0,0 +1,23 @@ 

+ === First

+ 

+ image:divider-top-first.png[Four Foundations: First,title="Four Foundations: First"]

+ 

+ 

+ We are committed to innovation.

+ 

+ We are not content to let others do all the heavy lifting on our behalf;

+ we provide the latest in stable and robust, useful, and powerful free

+ software in our Fedora distribution.

+ 

+ At any point in time, the latest Fedora platform shows the future

+ direction of the operating system as it is experienced by everyone from

+ the home desktop user to the enterprise business customer.

+ Our https://fedoraproject.org/wiki/Releases[rapid release cycle] is a major enabling factor in our ability to innovate.

+ 

+ We recognize that there is also a place for long-term stability in the

+ Linux ecosystem, and that there are a variety of community-oriented and

+ business-oriented Linux distributions available to serve that need.

+ However, the Fedora Project's goal of advancing free software dictates

+ that the Fedora Project itself pursue a strategy that preserves the

+ forward momentum of our technical, collateral, and community-building

+ progress. Fedora always aims to provide the future, first. 

\ No newline at end of file

@@ -0,0 +1,19 @@ 

+ === Freedom

+ 

+ image:divider-top-freedom.png[Four Foundations: Freedom,title="Four Foundations: Freedom"]

+ 

+ We are dedicated to free software and content.

+ 

+ Advancing software and content freedom is a central community goal,

+ which we accomplish through the software and content we promote. We

+ choose free alternatives to proprietary code and content and limit the

+ effects of proprietary or patent encumbered code on the Project.

+ 

+ Sometimes this goal prevents us from taking the easy way out by

+ including proprietary or patent encumbered software in Fedora. But by

+ concentrating on the free software and content we provide and promote,

+ the end result is that we are able to provide:

+ 

+ * releases that are predictable and 100% legally redistributable for everyone;

+ * innovation in free and open source software that can equal or exceed closed source or proprietary solutions;

+ * and, a completely free project that anyone can emulate or copy in whole or in part for their own purposes. 

\ No newline at end of file

@@ -0,0 +1,19 @@ 

+ === Friends

+ 

+ image:divider-top-friends.png[Four Foundations: Friends,title="Four Foundations: Friends"]

+ 

+ We are a strong, caring community.

+ 

+ image:photo-friends.png[]

+ 

+ The Fedora community is made up of people from all walks of life,

+ working together to advance free software. There is a place in Fedora

+ for https://whatcanidoforfedora.org/[anyone who wants to help],

+ regardless of technical skill level, as long as they believe in our core

+ values.

+ 

+ Like any friends, we occasionally disagree on details, but we believe in

+ finding an acceptable consensus to serve the interests of advancing free

+ software. We believe in a strong partnership between Red Hat and our

+ enormous volunteer community, since they both provide essential

+ contributions that help the Fedora Project succeed. 

\ No newline at end of file

@@ -17,8 +17,7 @@ 

  available at no cost to you, but you can share, remix, and modify.

  ****

  

- What is Fedora?

- ---------------

+ == What is Fedora?

  

  [.lead]

  The Fedora Project is a community of people working together to build a
@@ -31,120 +30,33 @@ 

  <<<

  

  

- What is Fedora all about?

- -------------------------

+ == What is Fedora all about?

  

  The Fedora community includes thousands of individuals with different

- views and approaches, but together we share some common values. We call

- these the “*Four Foundations*”: Freedom, Friends, Features, and First.

+ views and approaches, but together we share some common values.

+ We call these the “*Four Foundations*”: Freedom, Friends, Features, and First.

  

  [cols="1a,1a",frame=none,grid=none,nostriping]

  |===

- |Freedom

- ~~~~~~~

- 

- image:divider-top-freedom.png[Four Foundations: Freedom,title="Four Foundations: Freedom"]

- 

- We are dedicated to free software and content.

- 

- Advancing software and content freedom is a central community goal,

- which we accomplish through the software and content we promote. We

- choose free alternatives to proprietary code and content and limit the

- effects of proprietary or patent encumbered code on the Project.

- 

- Sometimes this goal prevents us from taking the easy way out by

- including proprietary or patent encumbered software in Fedora. But by

- concentrating on the free software and content we provide and promote,

- the end result is that we are able to provide:

- 

- * releases that are predictable and 100% legally redistributable for

-   everyone;

- * innovation in free and open source software that can equal or exceed

-   closed source or proprietary solutions;

- * and, a completely free project that anyone can emulate or copy in

-   whole or in part for their own purposes.

- 

- 

- |Friends

- ~~~~~~~

- 

- image:divider-top-friends.png[Four Foundations: Friends,title="Four Foundations: Friends"]

- 

- We are a strong, caring community.

- 

- image:photo-friends.png[]

- 

- The Fedora community is made up of people from all walks of life,

- working together to advance free software. There is a place in Fedora

- for https://whatcanidoforfedora.org/[anyone who wants to help],

- regardless of technical skill level, as long as they believe in our core

- values.

- 

- Like any friends, we occasionally disagree on details, but we believe in

- finding an acceptable consensus to serve the interests of advancing free

- software. We believe in a strong partnership between Red Hat and our

- enormous volunteer community, since they both provide essential

- contributions that help the Fedora Project succeed.

+ |

+ include::foundation_freedom.adoc[]

+ |

+ include::foundation_friends.adoc[]

  

  ^|image:divider-bottom-freedom.png[]

  ^|image:divider-bottom-friends.png[]

  

- |Features

- ~~~~~~~~

- 

- image:divider-top-features.png[Four Foundations: Features,title="Four Foundations: Features"]

- 

- We care about excellent software.

- 

- The Fedora community creates many of the technical features that have

- made Linux powerful, flexible, and usable for a wide spectrum of

- millions of users, administrators, and developers worldwide. We

- recognize the status quo is worth changing to empower additional

- end-users, or to create a more flexible and powerful environment for

- building new solutions on the free software we provide.

- 

- We also believe that these changes are best developed in direct concert with

- the https://fedoraproject.org/wiki/Staying_close_to_upstream_projects[upstream

- software communities] whose work is part of the Fedora distribution. We work

- with the upstream in cases where we find opportunities for improvement, so

- all free software users benefit — even if they don’t use Fedora directly.

- Our feature development is always done openly and transparently, and anyone

- may participate.

- 

- 

- |First

- ~~~~~

- 

- image:divider-top-first.png[Four Foundations: First,title="Four Foundations: First"]

- 

- 

- We are committed to innovation.

- 

- We are not content to let others do all the heavy lifting on our behalf;

- we provide the latest in stable and robust, useful, and powerful free

- software in our Fedora distribution.

- 

- At any point in time, the latest Fedora platform shows the future

- direction of the operating system as it is experienced by everyone from

- the home desktop user to the enterprise business customer. Our

- https://fedoraproject.org/wiki/Releases[rapid release cycle] is a major enabling factor in our

- ability to innovate.

- 

- We recognize that there is also a place for long-term stability in the

- Linux ecosystem, and that there are a variety of community-oriented and

- business-oriented Linux distributions available to serve that need.

- However, the Fedora Project's goal of advancing free software dictates

- that the Fedora Project itself pursue a strategy that preserves the

- forward momentum of our technical, collateral, and community-building

- progress. Fedora always aims to provide the future, first.

+ |

+ include::foundation_features.adoc[]

+ |

+ include::foundation_first.adoc[]

  

  ^|image:divider-bottom-first.png[]

  ^|image:divider-bottom-features.png[]

  

  |===

  

- Our Vision

- ----------

+ == Our Vision

  ____

  _The Fedora Project envisions a world where everyone benefits from free and open source software built by inclusive, welcoming, and open-minded communities._

  ____
@@ -156,8 +68,7 @@ 

  Fedora isn’t bits and bytes.

  Fedora is our people, and we want the statement to include our vision of a healthy community.

  

- Our Mission

- -----------

+ == Our Mission

  

  ____

  _Fedora creates an innovative platform for hardware, clouds, and
@@ -165,43 +76,41 @@ 

  build tailored solutions for their users._

  ____

  

- At the operating system level, we don’t just integrate. We do new things

- — we build a _platform_, not just a distribution. The _Features_ and

- _First_ foundations drive us to innovate. We do all of this as a

+ At the operating system level, we don’t just integrate.We do new things

+ — we build a _platform_, not just a distribution.The _Features_ and

+ _First_ foundations drive us to innovate.We do all of this as a

  transparent, collaborative community of _Friends_, and entirely as open

  source and free software — _Freedom_.

  

  

- Our Method

- ----------

+ == Our Method

  

  The Fedora Project is a center for innovation in free and open source

- software. In our community, contributors of all kinds come together to

- advance the ecosystem for the benefit of everyone. The Fedora community

+ software.In our community, contributors of all kinds come together to

+ advance the ecosystem for the benefit of everyone.The Fedora community

  contributes everything it builds back to the free and open source world

  and continues to make advances of significance to the broader community,

  as evidenced by the regular and rapid incorporation of its features into

- other Linux distributions. Regardless of which Linux distribution you

+ other Linux distributions.Regardless of which Linux distribution you

  use, you are relying on code developed within the Fedora Project.

  

  We believe https://fedoraproject.org/wiki/Software_Patents[software patents]

  are harmful, a hindrance to innovation in software development, and are

- inconsistent with the values of free and open source software. While tightly

+ inconsistent with the values of free and open source software.While tightly

  integrating proprietary and patent encumbered components might superficially

  improve ease of use, this practice does not benefit the community in the

- long run. The Fedora community prefers approaches that benefit the progress

+ long run.The Fedora community prefers approaches that benefit the progress

  of free software in the future over those that emphasize short term ease of

  use.

  

  

- Our Community

- -------------

+ == Our Community

  

- Fedora is more than just software. It is a community of contributors

+ Fedora is more than just software.It is a community of contributors

  from https://fedoracommunity.org/[around the world], including volunteers

  and Red Hat employees, who work with each other to advance the interests

- of the free culture movement. Everyone is invited to join. No matter

- what your skills are, we have a place for you in our community! We are

+ of the free culture movement.Everyone is invited to join.No matter

+ what your skills are, we have a place for you in our community!We are

  https://fedoraproject.org/wiki/PackageMaintainers[software engineers], https://fedoraproject.org/wiki/Design[designers and artists],

  https://fedoraproject.org/wiki/Infrastructure[system administrators], https://fedoraproject.org/wiki/Websites[web

  designers], https://fedoraproject.org/wiki/DocsProject[writers], https://fedoraproject.org/wiki/Ambassadors[speakers],
@@ -216,14 +125,13 @@ 

  diversity, and strength of our community.

  

  

- Leadership and Governance

- -------------------------

+ == Leadership and Governance

  

  The xref:council::index.adoc[Fedora Council] is responsible for

  stewardship of the Fedora Project as a whole, and supports the health and

- growth of the Fedora Community. As in any large project, there are many

- different levels of responsibility, accountability, and decision-making. As

+ growth of the Fedora Community.As in any large project, there are many

+ different levels of responsibility, accountability, and decision-making.As

  a general rule, we want people working on a Fedora

  https://fedoraproject.org/wiki/Subprojects[subproject] to be make meaningful decisions about their

- areas of interest and expertise. More details are available on our page on

+ areas of interest and expertise.More details are available on our page on

  https://fedoraproject.org/wiki/Leadership[Fedora Leadership].

@@ -4,8 +4,7 @@ 

  

  This guide is intended for people that are interested in learning more about Fedora, perhaps with the intention of contributing to the community.

  

- What is Fedora?

- ---------------

+ == 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.
@@ -13,8 +12,7 @@ 

  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.

  

- Communication in Fedora

- -----------------------

+ == Communication in Fedora

  

  Fedora is a xref:orgchart.adoc[massive global organisation] where people with many different skills carry out link:https://fedoraproject.org/wiki/Join[different roles] to keep the community ticking along.

  All services used by the Fedora community are linked to a central Fedora account that you can get link:https://admin.fedoraproject.org/accounts/user/new[here].
@@ -24,8 +22,7 @@ 

  Read the xref:code-of-conduct.adoc[Code of Conduct] to learn more of what is expected of Fedora community members.

  

  

- Not sure where to start? Come hang out with us!

- ------------------------------------------------

+ == Not sure where to start? Come hang out with us!

  

  The large scale of the community can sometimes make it a little daunting for new folks to join us.

  There is far too much happening in Fedora all the time---even we find it hard to keep up with it all!

one more little PR to reduce minor formating issues to reduce l10n log input

this was tested locally using build.sh && preview.sh
I hope this change in the way to handle our four foundations will save me about 1700 lines of warning.
total reduction of log is about 2000 lines.

Pull-Request has been merged by bcotton

2 years ago

@jibecfed @bt0dotninja I just reverted this merge. It apparently breaks the rendering of the page in production. It looks fine locally, including with a site-wide build, so I'm not sure what's going on.

I've set the docs.stg.fedoraproject.org/project path to build from the stg directory of this repo to see if we can replicate it on the server build.