#207 docs(council): Introduce macros via Antora partials
Merged 9 months ago by jflory7. Opened 9 months ago by jflory7.
Fedora-Council/ jflory7/council-docs change/use-partials  into  main

@@ -11,7 +11,7 @@ 

  ** xref:policy/guiding-policy.adoc[Guiding Policy]

  ** xref:policy/policy-change-policy.adoc[Policy Change Policy]

  ** xref:policy/edition-promotion-policy.adoc[Edition Promotion Policy]

- ** xref:policy/legal.adoc[Legal & Licensing Policies]

+ ** xref:legal::index.adoc[Legal & Licensing Policies]

  ** xref:policies.adoc[Additional Policies]

  * Council Procedures

  ** xref:procedures/welcome.adoc[Welcome to Council]

@@ -1,15 +1,15 @@ 

  include::ROOT:partial$attributes.adoc[]

  

- = Contacting the Fedora Council

+ = Contacting the {team_name}

  

- The Fedora Council uses three platforms for communications, one for asynchronous, one for asynchronous, and one for decision-making.

+ The {team_name} uses three platforms for communications, one for asynchronous, one for asynchronous, and one for decision-making.

  Anyone registered with an account in the https://accounts.fedoraproject.org[Fedora Account System] (FAS) can log in with their account to participate in either platform.

  

  

  [[discussion]]

  == Fedora Discussion (asynchronous)

  

- The https://discussion.fedoraproject.org/tag/council[*#council tag*] on https://discussion.fedoraproject.org/[Fedora Discussion] is the primary space for Fedora Council conversations.

+ The link:{team_asynch_communication}[*#council tag*] on https://discussion.fedoraproject.org/[Fedora Discussion] is the primary space for {team_name} conversations.

  We use this for discussion within the Council as a team, and it is also the best place for any community member to engage in or start a conversation with us.

  

  [[discussion-private]]
@@ -24,7 +24,7 @@ 

  [[chat]]

  == Fedora Chat (synchronous)

  

- Council members are also often present on the https://matrix.to/#/#council:fedoraproject.org[*#council:fedoraproject.org* Matrix room] on https://chat.fedoraproject.org[chat.fedoraproject.org] (bridged to the *#fedora-council* IRC channel on https://libera.chat/[Libera.Chat]).

+ Council members are also often present on the link:{team_synch_communication}[*#council:fedoraproject.org* Matrix room] on https://chat.fedoraproject.org[chat.fedoraproject.org] (bridged to the *#fedora-council* IRC channel on https://libera.chat/[Libera.Chat]).

  

  

  [[decisions]]
@@ -32,10 +32,10 @@ 

  

  It is better to start with an asynchronous conversation, described above.

  

- When you have a specific proposal for the Council to make a decision, open a ticket on the https://pagure.io/Fedora-Council/tickets[*Council Pagure instance*].

+ When you have a specific proposal for the Council to make a decision, open a ticket on the link:{team_issue_tracker}[*Council Pagure instance*].

  This is a public issue tracker.

  However, if you have a privacy- or security-sensitive issue, check the *Private* box when you create the ticket.

  If an issue is not sensitive, the discussion should open and public.

  

  Note that ticket comments should be kept to a minimum.

- Discussion should be at https://discussion.fedoraproject.org/tag/council[#council] and the ticket used to record procedural actions like votes and approved resolutions.

+ Discussion should be at link:{team_asynch_communication}[#council] and the ticket used to record procedural actions like votes and approved resolutions.

@@ -1,3 +1,5 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Fedora Community Architect (FCA)

  :page-aliases: fcaic.adoc

  
@@ -17,7 +19,7 @@ 

  [.profile-picture]

  image::https://jwf.io/img/logo.jpg[Justin W. Flory (he/him)]

  

- https://fedoraproject.org/wiki/User:Jflory7[Justin W. Flory] (pronouns: he/him) became the Fedora Community Architect in October 2022.

+ link:{FWIKI}/User:Jflory7[Justin W. Flory] (pronouns: he/him) became the Fedora Community Architect in October 2022.

  

  Justin is a creative maker.

  He is best known as an Open Source contributor and Free Culture advocate originally from the United States.
@@ -67,7 +69,7 @@ 

  [[roles-budget]]

  === Budget ===

  

- The Fedora Community Architect works with the Fedora Council and Red Hat Open Source Program Office (OSPO) to determine the annual Fedora Budget.

+ The Fedora Community Architect works with the {team_name} and Red Hat Open Source Program Office (OSPO) to determine the annual Fedora Budget.

  

  * Ensure that budget is published and tracked transparently, with a public page indicating how each year’s budget is earmarked and its current state.

  
@@ -98,13 +100,13 @@ 

  [[previous]]

  == Previous Fedora Community Architects

  

- https://fedoraproject.org/wiki/User:Riecatnor[Marie Nordin]::

+ link:{FWIKI}/User:Riecatnor[Marie Nordin]::

    November 2019 – October 2022 (_Fedora Linux 31 to 37_)

  

- https://fedoraproject.org/wiki/User:Bex[Brian Exelbierd]::

+ link:{FWIKI}/User:Bex[Brian Exelbierd]::

    October 2016 – November 2019 (_Fedora Linux 25 to 31_)

  

- https://fedoraproject.org/wiki/User:Decause[Remy DeCausemaker]::

+ link:{FWIKI}/User:Decause[Remy DeCausemaker]::

    February 2015 – June 2016 (_Fedora Linux 22 to 24_)

  

  [[previous-title]]

@@ -1,3 +1,5 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Fedora Program Manager

  

  The xref:program_management::index.adoc[_Fedora Program Manager_] (or _FPgM_) is the Chief Operating Officer of the Fedora Project.
@@ -37,7 +39,7 @@ 

  [[roles-council]]

  === Council ===

  

- * Serve as a member of the Fedora Council

+ * Serve as a member of the {team_name}

  * Act as Council secretary

  

  [[roles-misc]]
@@ -52,11 +54,11 @@ 

  

  Previous Fedora Program Managers:

  

- * https://fedoraproject.org/wiki/User:Bcotton[Ben Cotton] (Fedora Linux 29–38)

- * https://fedoraproject.org/wiki/User:Jkurik[Jan Kuřík] (Fedora 23-28)

- * https://fedoraproject.org/wiki/User:Jreznik[Jaroslav Řezník] (Fedora 20-23)

- * https://fedoraproject.org/wiki/User:Rbergero[Robyn Bergeron] (Fedora 17-20)

- * https://fedoraproject.org/wiki/User:Poelstra[John Poelstra] (Fedora 8-16)

+ * link:{FWIKI}/User:Bcotton[Ben Cotton] (Fedora Linux 29–38)

+ * link:{FWIKI}/User:Jkurik[Jan Kuřík] (Fedora 23-28)

+ * link:{FWIKI}/User:Jreznik[Jaroslav Řezník] (Fedora 20-23)

+ * link:{FWIKI}/User:Rbergero[Robyn Bergeron] (Fedora 17-20)

+ * link:{FWIKI}/User:Poelstra[John Poelstra] (Fedora 8-16)

  

  == Useful links ==

  * https://fedorapeople.org/groups/schedule[Schedules] in HTML, ICS, and JSON formats

@@ -22,19 +22,19 @@ 

  [[previous]]

  == Previous Fedora Project Leaders

  

- https://fedoraproject.org/wiki/User:Rbergero[Robyn Bergeron]::

+ link:{FWIKI}/User:Rbergero[Robyn Bergeron]::

    February 2012 – June 2014 (Fedora 17 – 21)

  

- https://fedoraproject.org/wiki/User:Jsmith[Jared Smith]::

+ link:{FWIKI}/User:Jsmith[Jared Smith]::

    July 2010 – February 2012 (Fedora 14 – 16)

  

- https://fedoraproject.org/wiki/User:Pfrields[Paul W. Frields]::

+ link:{FWIKI}/User:Pfrields[Paul W. Frields]::

    February 2008 – July 2010 (Fedora 9 – 14)

  

- https://fedoraproject.org/wiki/User:Mspevack[Max Spevack]::

+ link:{FWIKI}/User:Mspevack[Max Spevack]::

    February 2006 – February 2008 (Fedora Core 5 – Fedora 9)

  

- https://fedoraproject.org/wiki/User:Gdk[Greg DeKoenigsberg]::

+ link:{FWIKI}/User:Gdk[Greg DeKoenigsberg]::

    August 2005 – February 2006 (Fedora Core 4 & 5)

  

  Cristian Gafton::

@@ -1,3 +1,5 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Fedora Governance Historical Documents

  

  Fedora has a long history,
@@ -24,4 +26,4 @@ 

  or similar,

  please submit as a pull request

  to the https://pagure.io/Fedora-Council/council-docs[Council Docs].

- Thank you! 

\ No newline at end of file

+ Thank you!

@@ -1,11 +1,13 @@ 

- = Fedora Council and Board Historical Membership

+ include::ROOT:partial$attributes.adoc[]

  

- History of Fedora Council Membership

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

- Previous members of the Fedora Council are listed here.

+ = {team_name} and Board Historical Membership

  

- Elected Representatives

- ~~~~~~~~~~~~~~~~~~~~~~~

+ == History of {team_name} Membership

+ 

+ Previous members of the {team_name} are listed here.

+ 

+ 

+ === Elected Representatives

  

  |===

  |Aleksandra Fedorova | December 2022 - present (f38-)
@@ -26,8 +28,7 @@ 

  term (through the release of F23) and the runner-up for a half term (through

  the release of F22)._

  

- Project Objective Leads

- ~~~~~~~~~~~~~~~~~~~~~~~

+ === Project Objective Leads

  

  |===

  |Stephen Gallagher | _Three Editions (Fedora.next)_ | January 2015 – November 2015
@@ -43,8 +44,7 @@ 

  |Akashdeep Dhar | _Websites & Apps Revamp_ | June 2021 – April 2023

  |===

  

- Engineering Representative

- ~~~~~~~~~~~~~~~~~~~~~~~~~~

+ === Engineering Representative

  

  |===

  |Josh Boyer | some time - November 2018
@@ -52,8 +52,7 @@ 

  |David Cantrell | June 2020 - present

  |===

  

- Mindshare Representative

- ~~~~~~~~~~~~~~~~~~~~~~~~

+ === Mindshare Representative

  

  |===

  |Christoph Wickert (Outreach Representative) | January 2015 – December 2016
@@ -63,9 +62,7 @@ 

  |Alberto Rodríguez Sánchez | April 2021 - present

  |===

  

- 

- Diversity, Equity, & Inclusion Advisor

- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+ === Diversity, Equity, & Inclusion Advisor

  

  |===

  |María Leandro    | March 2016 — March 2017
@@ -76,8 +73,7 @@ 

  |Jona Azizaj  | September 2023 - present

  |===

  

- Fedora Program Manager

- ~~~~~~~~~~~~~~~~~~~~~~

+ === Fedora Program Manager

  

  |===

  |Ben Cotton       | June 2018 – May 2023
@@ -85,8 +81,7 @@ 

  |Jaroslav Reznik  | September 2014 – May 2015

  |===

  

- Fedora Community Action and Impact Coordinator

- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+ === Fedora Community Action and Impact Coordinator

  

  |===

  |Marie Nordin      | November 2019 - October 2022

@@ -1,12 +1,10 @@ 

  include::ROOT:partial$attributes.adoc[]

  

- = Fedora Council Charter

+ = {team_name} Charter

  

  image::council-logo-500px.png[float="right"]

  

- The Fedora Council is our top-level community leadership and governance

- body. It is responsible for stewardship of the Fedora Project as a

- whole, and supports the health and growth of the Fedora Community.

+ {team_summary}

  

  The Council is composed of a mix of representatives from different areas

  of the project, named roles appointed by Red Hat, and a variable number
@@ -130,8 +128,8 @@ 

  

  ==== Diversity, Equity, & Inclusion (DEI) Advisor

  

- The *Fedora Diversity, Equity, & Inclusion (DEI) Advisor* is a liaison between the Fedora Council and the Fedora community on topics and issues related to diversity, equity, and inclusion in Fedora.

- The DEI Advisor works with Fedora Council leadership to represent perspectives and voices of the Fedora community in decision-making and project discussions.

+ The *Fedora Diversity, Equity, & Inclusion (DEI) Advisor* is a liaison between the {team_name} and the Fedora community on topics and issues related to diversity, equity, and inclusion in Fedora.

+ The DEI Advisor works with {team_name} leadership to represent perspectives and voices of the Fedora community in decision-making and project discussions.

  Additionally, they also lead initiatives to assess and promote equity and inclusion in collaboration with the xref:dei::index.adoc[Fedora DEI Team].

  

  This position is appointed by members of the Fedora DEI Team, with the approval of the Council.
@@ -175,15 +173,14 @@ 

  through the Red Hat Open Source Program Office, and this position facilitates decision-making on how to

  best focus that to meet our collective objectives.

  

- 

  *Fedora Program Manager*

  

- The https://fedoraproject.org/wiki/Fedora_Program_Management#Fedora_Program_Manager[FPgM] coordinates the planning and

+ The link:{FWIKI}/Fedora_Program_Management#Fedora_Program_Manager[FPgM] coordinates the planning and

  scheduling of Fedora releases, and tracks changes and features during

  the development and testing cycle. He or she also assists with the

  creation, maintenance, and execution of formal, repeatable Fedora

  processes. Additionally, the FPgM serves as record keeper and secretary

- for Fedora Council Meetings.

+ for {team_name} Meetings.

  

  This position is funded by and hired for by Red Hat, with the approval

  of the Council.
@@ -193,7 +190,7 @@ 

  

  === Meetings

  

- The Fedora Council is not driven by meetings or by tickets, but does hold https://fedoraproject.org/wiki/Council_Meetings[regular public meetings] (via a chat system or video call).

+ The {team_name} is not driven by meetings or by tickets, but does hold link:{FWIKI}/Council_Meetings[regular public meetings] (via a chat system or video call).

  The Council discusses current issues, clear through anything outstanding which can be quickly resolved, and to ensure that nothing urgent is left pending.

  All members are expected to regularly communicate what is going on in their area, through blog posts or other public updates.

  
@@ -207,9 +204,9 @@ 

  

  === Transparency

  

- The general policy of the Fedora Council is to default to open.

+ The general policy of the {team_name} is to default to open.

  Most meetings are held in public channels, and open to all Fedora users and contributors.

- Discussion is held in a https://discussion.fedoraproject.org/tag/council[public forum] open to all, and formal decisions will be recorded in a public ticket tracking system.

+ Discussion is held in a link:{team_asynch_communication}[public forum] open to all, and formal decisions will be recorded in a public ticket tracking system.

  

  Occasionally, when personal, private, or sensitive issues need to be discussed, a video call might be used.

  A private mailing list and ticket tracking instance also exist for these situations, but will also only be used when dealing with these uncommon issues.
@@ -218,7 +215,7 @@ 

  Time Commitment

  ~~~~~~~~~~~~~~~

  

- Serving on the Fedora Council is a significant commitment of time and

+ Serving on the {team_name} is a significant commitment of time and

  energy. Workload for the various roles will vary, but each will require

  a number of hours every week, and in most cases, the more, the better a

  Council member is able to do the job fully.
@@ -258,7 +255,7 @@ 

  Historical Note

  ~~~~~~~~~~~~~~~

  

- The previous https://fedoraproject.org/wiki/Board[previous governance structure (Fedora Board)]

+ The previous link:{FWIKI}/Board[previous governance structure (Fedora Board)]

  had five members directly appointed by Red Hat and five elected at

  large. The current structure is more complicated but has a much greater

  proportion of members selected by the community by election or merit. In
@@ -272,7 +269,7 @@ 

  Record of Former Members

  ~~~~~~~~~~~~~~~~~~~~~~~~

  

- Former membership on the Fedora Council, along with membership on the

+ Former membership on the {team_name}, along with membership on the

  previous Fedora Board, is documented on the xref:history.adoc[History of

  Council Membership] page.

  
@@ -290,7 +287,7 @@ 

  

  2023-05-04: Rename Fedora Community Action and Impact Coordinator to Fedora Community Architect

  

- 2023-04-28: Equalize the auxiliary positions based on https://pagure.io/Fedora-Council/tickets/issue/447[ticket #447]

+ 2023-04-28: Equalize the auxiliary positions based on link:{team_issue_tracker}/issue/447[ticket #447]

  

  2023-02-07: Change name of Objectives to Community Initiatives. See xref:project::initiatives.adoc#history[Community Initiatives History & Future].

  
@@ -300,6 +297,6 @@ 

  

  2017-10-20: Move current membership list and contact info to separate docs.

  

- 2017-04-05: Switched “Outreach” to Mindshare. (https://pagure.io/Fedora-Council/tickets/issue/102[ticket])

+ 2017-04-05: Switched “Outreach” to Mindshare. (link:{team_issue_tracker}/issue/102[ticket])

  

- 2014-11-26: Initital approval by the Fedora Project Board (https://pagure.io/Fedora-Council/tickets/issue/13[ticket])

+ 2014-11-26: Initital approval by the Fedora Project Board (link:{team_issue_tracker}/issue/13[ticket])

@@ -1,21 +1,23 @@ 

- = Current Members of the Fedora Council

+ include::ROOT:partial$attributes.adoc[]

+ 

+ = Current Members of the {team_name}

  

  image::council-badge.png[float="right"]

  

- * Elected Representative: *https://fedoraproject.org/wiki/User:Bookwar[Aleksandra Fedorova]* _(f38-f39)_

+ * Elected Representative: *link:{FWIKI}/User:Bookwar[Aleksandra Fedorova]* _(f38-f39)_

  +

  Aleksandra Fedorova (bookwar) works on CI for Red Hat Enterprise Linux.

- She has served on the xref:fesco::index.adoc[Fedora Engineering Steering Committee] and has been an elected representative to the Fedora Council on several occasions.

+ She has served on the xref:fesco::index.adoc[Fedora Engineering Steering Committee] and has been an elected representative to the {team_name} on several occasions.

  Aleksandra is one of the organizers of http://ru.fedoracommunity.org/[Russian Fedora] and https://www.meetup.com/Fedora-User-Group-NRW/[Fedora user Group NRW].

  

- * Elected Representative: *https://fedoraproject.org/wiki/User:Sumantrom[Sumantro Mukherjee]* _(f37-f38)_

+ * Elected Representative: *link:{FWIKI}/User:Sumantrom[Sumantro Mukherjee]* _(f37-f38)_

  +

  Sumantro Mukherjee (sumantrom) works in Fedora QA team and takes part in the day to day testing activities.

  He was formerly elected to Mindshare and represented Mindshare to council from (2018-2020).

  He loves to blog technical walkthroughs and running community onboarding calls and classroom.

  Currently, is striving to stay positive and test negative (Covid-19 Jokes) :D

  

- * Engineering Representative: *https://fedoraproject.org/wiki/User:Dcantrell[David Cantrell]*

+ * Engineering Representative: *link:{FWIKI}/User:Dcantrell[David Cantrell]*

  +

  David has been involved in the Linux community since the 1997.  He

  first worked on Fedora Core starting with Fedora Core 4 in 2005.  He
@@ -24,14 +26,14 @@ 

  workflow tools.  He is a Fedora Ambassador and a member of the Fedora

  Engineering Steering Committee.

  

- * Mindshare Representative: *https://fedoraproject.org/wiki/User:Bt0dotninja[Alberto Rodríguez Sánchez]*

+ * Mindshare Representative: *link:{FWIKI}/User:Bt0dotninja[Alberto Rodríguez Sánchez]*

  +

  Alberto 'bt0dotninja' Rodríguez S. describes himself as "a Happy Fedora Contributor".

  As part of the Ambassadors, CommOps, and Fedora-Join and member Mindshare committee,

  he is very interested in finding new ways to grow the contributor base and retain our long-term contributors.

  He loves getting involved in the local communities, make docs and translations, tacos, and cats.

  

- * DEI Advisor: *https://fedoraproject.org/wiki/User:Jonatoni[Jona Azizaj]*

+ * DEI Advisor: *link:{FWIKI}/User:Jonatoni[Jona Azizaj]*

  +

  Read more about the xref:dei:roles:council-advisor.adoc[Fedora Diversity, Equity, & Inclusion Advisor's role] and the current Advisor's xref:dei:roles:council-advisor.adoc#current-advisor[biography]:

  

@@ -1,3 +1,5 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Additional Policies

  

  * The Council will have a regular face-to-face in November each year.
@@ -12,7 +14,7 @@ 

  * The Council has no objections to events being held in the local language or in English, and separate events can be held if there are multiple audiences.

    We encourage event organizers to specify the language(s) for their event.

  * Unspent budget allocated to the $150 event program will be pulled into the Council budget at the end of each fiscal quarter.

- * The Fedora Council may choose to withdraw Fedora's support from events or other activities that involve fiscal sponsorship or use of Fedora trademarks when it determines that participation is not in the interests of the Fedora Project.

+ * The {team_name} may choose to withdraw Fedora's support from events or other activities that involve fiscal sponsorship or use of Fedora trademarks when it determines that participation is not in the interests of the Fedora Project.

    Decisions to withdraw support will be published in venues normally used for Council decisions.

    Deliberation and reasoning for the decision should be public to the extent possible.

    The Council will engage with the committee/group/team that is involved with the event in question to ensure their input is considered.

@@ -1,13 +1,15 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Code of Conduct response policy

  

  Once a ticket notifying us of a code of conduct issue has been filed, the Council will respond with an initial contact message within one week. That will come with a request for response, and further action will come within a week of the Council's initial response.

  

- (Fedora Council IRC meeting, 2018-05-23)

+ ({team_name} IRC meeting, 2018-05-23)

  

  Teams within Fedora have the freedom to decide what is on- and off-topic for their fora (IRC channel, mailing list, Telegram channel, et cetera).

  Moderators may ban participants for repeatedly engaging in off-topic discussion in contributor channels, however they must file a ticket with the Council's https://pagure.io/CoC/issues[Code of Conduct issue tracker] to report the ban.

  Bans for being off-topic in one channel may not be extended to other channels unless the behavior is displayed in that channel as well.

  In this case, each ban should be treated as a separate issue with its own ticket.

- Community members who wish to appeal the ban may file a https://pagure.io/Fedora-Council/tickets/issues[ticket with the Council].

+ Community members who wish to appeal the ban may file a link:{team_issue_tracker}/issues[ticket with the Council].

  

  The FCAIC is empowered to take action on Code of Conduct reports with an additional +1 from another core Council member or the Diversity & Inclusion Advisor and report back to Council.

@@ -1,14 +1,14 @@ 

  include::ROOT:partial$attributes.adoc[]

  

  = Community Publishing Platforms

- Justin W. Flory, Fedora Council, Fedora Community, and others

+ Justin W. Flory, {team_name}, Fedora Community, and others

  v1.1.1, 2020-10-02

  

  [link=https://creativecommons.org/licenses/by/4.0/]

  image:https://img.shields.io/badge/License-CC%20BY%204.0-lightgrey.svg[License: CC BY 4.0]

  

  This policy page describes how Community Publishing Platforms are defined, reviewed, and moderated.

- It provides a loose framework of how moderation is handled in cases that https://fedoraproject.org/wiki/Legal:Trademark_guidelines#Community_sites_and_accounts[involve the Fedora Trademark].

+ It provides a loose framework of how moderation is handled in cases that link:{FWIKI}/Legal:Trademark_guidelines#Community_sites_and_accounts[involve the Fedora Trademark].

  

  

  [[what]]
@@ -27,11 +27,11 @@ 

  * Public social media posts

  * Other written communications depending on context

  

- The Fedora Council reserves the authority to modify or expand the definition of Creative Works, based on unique context of the Fedora Project and the Fedora Community..

+ The {team_name} reserves the authority to modify or expand the definition of Creative Works, based on unique context of the Fedora Project and the Fedora Community.

  

  Community Publishing Platforms include, but are not limited to, the following examples:

  

- * https://communityblog.fedoraproject.org/[Community Blog]

+ * link:{COMMBLOG}[Community Blog]

  * http://fedoraplanet.org/[Planet]

  * Specific social media accounts

  ** https://www.facebook.com/TheFedoraProject
@@ -53,7 +53,7 @@ 

  Community Publishing Platforms are not actively curated because they rely on decentralized community labor and contributions that are difficult to centrally control.

  

  Creative Works on Platforms must comply with the xref:project:ROOT:code-of-conduct.adoc[Fedora Code of Conduct].

- These Creative Works are not officially endorsed by the Fedora Project or Red Hat, but must comply with https://fedoraproject.org/wiki/Legal:Trademark_guidelines#Community_sites_and_accounts[existing trademark rules].

+ These Creative Works are not officially endorsed by the Fedora Project or Red Hat, but must comply with link:{FWIKI}/Legal:Trademark_guidelines#Community_sites_and_accounts[existing trademark rules].

  If the Fedora Trademark is used, it must comply to this policy.

  

  

@@ -1,3 +1,5 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Process for promoting a Fedora deliverable to Edition

  

  Fedora Editions are curated sets of packages, guidelines and configuration, and artifacts built from those pieces, that address a specific, targeted use-case.
@@ -29,9 +31,9 @@ 

  == Prerequisites

  

  * 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.

+ * The candidate Edition must get trademark approval from the {team_name}.

    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 candidate Edition must have a product requirements document (PRD) (link:{FWIKI}/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:

  ** Market target, including key use cases and personas
@@ -40,14 +42,14 @@ 

  ** Unique policies for installation, updates, etc

  ** Scope of hardware support (including anything that is explicitly unsupported)

  ** Produced deliverables, and whether or not they should be considered release blocking

- * The candidate Edition may have a technical specification (https://fedoraproject.org/wiki/Workstation/Technical_Specification[example]) that provides additional detail about the specific features described in the PRD.

+ * The candidate Edition may have a technical specification (link:{FWIKI}/Workstation/Technical_Specification[example]) that provides additional detail about the specific features described in the PRD.

  

  NOTE: It is helpful to have someone on the team assigned to handle the bureaucratic tasks

  

  == Process

  

  When all of the prerequisites have been met,

- and approved by the Fedora Council,

+ and approved by the {team_name},

  the team submits promotion as a System-Wide Change.

  This ensures that Release Engineering, FESCo, and the community at large have the opportunity to provide input.

  It also implies that the promotion may be delayed to the next release if the appropriate supporting pieces are not in place by the Beta or GA freezes.
@@ -80,4 +82,4 @@ 

  

  == History

  

- This policy was approved in https://pagure.io/Fedora-Council/tickets/issue/296[Council ticket #296].

+ This policy was approved in link:{team_issue_tracker}/issue/296[Council ticket #296].

@@ -1,6 +1,8 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Guiding Policy

  

- This guiding policy represents the way the Fedora Council would like the Project to make its mission a reality.

+ This guiding policy represents the way the {team_name} would like the Project to make its mission a reality.

  

  The Fedora Project's https://docs.fedoraproject.org/en-US/project/#_our_mission[Vision] is:

  
@@ -18,7 +20,7 @@ 

  

  == Context

  

- The Fedora Council identifies the short-, medium-, and long-term goals necessary to keep the Project on the leading edge of technology.

+ The {team_name} identifies the short-, medium-, and long-term goals necessary to keep the Project on the leading edge of technology.

  The Fedora.next initiative focused the outputs of the project around use cases.

  In 2017, we updated the mission statement to reflect changes in the computing landscape.

  Today, it’s too difficult to build new solutions in Fedora.

@@ -2,5 +2,6 @@ 

  

  = Policy Change policy

  

- Proposed changes to Fedora Council policies must be publicly announced on the https://discussion.fedoraproject.org/tag/council[Fedora Council tag on Fedora Discussion] and in a https://communityblog.fedoraproject.org/[Fedora Community Blog] post in order to get feedback from the community.

- After a minimum of two calendar weeks, the Council may vote on the proposed change using the *full consensus* voting model. After approval, the change is reflected on the https://docs.fedoraproject.org/en-US/council/policies/[Council policies page].

+ Proposed changes to {team_name} policies must be publicly announced on the link:{team_asynch_communication}[#council tag on Fedora Discussion] and in a link:{COMMBLOG}[Fedora Community Blog] post in order to get feedback from the community.

+ After a minimum of two calendar weeks, the Council may vote on the proposed change using the *full consensus* voting model.

+ After approval, the change is reflected on the xref:policies.adoc[Council policies page].

@@ -1,21 +1,23 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = How to run the Fedora Annual Contributor Survey 

  

  ### Survey Schedule

  

- * **Apr 1st** Open https://pagure.io/Fedora-Council/tickets/new_issue[Council ticket] to track progress and collect feedback

+ * **Apr 1st** Open link:{team_issue_tracker}/new_issue[Council ticket] to track progress and collect feedback

  * **Apr 1st** Open https://pagure.io/fedora-badges/new_issue[Badges ticket] to request badge design & publication

  * **April 1st** Open https://pagure.io/design/new_issue[Design ticket] to request banner design

  * **May 1st** Open https://docs.fedoraproject.org/en-US/websites/[Websites and Apps Team ticket] to request banner published on Fedora sites

  * **May 15-24th** Update LimeSurvey data according to the changes in the Survey Questions accumulated over the last year.

  * **May 24-31st** Review of actual survey in LimeSurvey. Approval from https://docs.fedoraproject.org/en-US/council/fcaic/[FCAIC] is necessary at this step. 

- * **June 1st** Publish https://communityblog.fedoraproject.org/[Community Blog] Post promoting survey

+ * **June 1st** Publish link:{COMMBLOG}/[Community Blog] Post promoting survey

  * **June 1st-30th** Survey runs

  ** **June 1st** Announce survey is open for month of June on IRC and Twitter

  ** **June 15th** Two week reminder to fill out survey on IRC and Twitter

  ** **June 30th** One day reminder to fill out survey on IRC and Twitter

  * **July 1st-31st** First round of survey analysis

  * **First weekend in August** Flock to Fedora/Nest with Fedora presentation

- * **By end of August** Publish https://communityblog.fedoraproject.org/writing-community-blog-article/[Community Blog] Post with results, analysis, and overview of presence at Flock/Nest. 

+ * **By end of August** Publish link:{COMMBLOG}/writing-community-blog-article/[Community Blog] Post with results, analysis, and overview of presence at Flock/Nest.

  

  ### Promotion

  
@@ -39,18 +41,18 @@ 

  Each year we need to write at least two blog posts for the survey. The

  first one is to promote taking the survey, the second features the

  released dataset and any findings. These are published on the

- https://communityblog.fedoraproject.org/[CommBlog], make sure to follow https://communityblog.fedoraproject.org/writing-community-blog-article/[the guidelines]. The promotional blog post should then be pinned on

+ link:{COMMBLOG}/[CommBlog], make sure to follow link:{COMMBLOG}/writing-community-blog-article/[the guidelines]. The promotional blog post should then be pinned on

  Discussion.fpo for the month the survey is open.

  

  * 2021

- ** https://communityblog.fedoraproject.org/help-make-fedora-awesome-by-taking-the-first-annual-contributor-survey/[Survey Promotion]

- ** https://communityblog.fedoraproject.org/fedora-contributor-annual-survey-data-set-available/[Dataset]

+ ** link:{COMMBLOG}/help-make-fedora-awesome-by-taking-the-first-annual-contributor-survey/[Survey Promotion]

+ ** link:{COMMBLOG}/fedora-contributor-annual-survey-data-set-available/[Dataset]

  

  #### Fedora Websites Banner

  

  To help ensure we reach the maximum number of Fedora contributors, we

  promote the survey across as many Fedora spaces as possible including

- our websites. This work is done with the assistance of the https://fedoraproject.org/wiki/Design[Design Team]

+ our websites. This work is done with the assistance of the link:{FWIKI}/Design[Design Team]

  and the https://docs.fedoraproject.org/en-US/websites/[Websites and Apps Team].

  

  The first step is to open a ticket on the https://pagure.io/design/issues[Design Team pagure] to get
@@ -64,7 +66,7 @@ 

  * https://lists.fedorahosted.org/archives/list/hyperkitty-devel@lists.fedorahosted.org/[Hyperkitty]

  * https://docs.fedoraproject.org/en-US/docs/[Docs.fpo]

  * https://accounts.fedoraproject.org/[Accounts.fpo]

- * https://fedoraproject.org/wiki/Fedora_Project_Wiki[Fedora Wiki]

+ * link:{FWIKI}/Fedora_Project_Wiki[Fedora Wiki]

  * https://start.fedoraproject.org/[Start.fpo]

  

  #### Mailing Lists

@@ -1,3 +1,5 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Fedora Annual Contributor Survey Overview

  

  == Goals
@@ -38,8 +40,8 @@ 

  

  - Suggest new questions or edits to current questions with a Fedora Council ticket.

  - Analyze data and publish results to the Community Blog and make sure to let the Council know.

- - Provide feedback and share ideas about the survey with the Fedora Council via https://discussion.fedoraproject.org/tag/council[Discussion site] and use the tag #council

+ - Provide feedback and share ideas about the survey with the Fedora Council via link:{team_asynch_communication}[Discussion site] and use the tag #council

  

  == Past Survey CSVs

  

- - https://fedoraproject.org/wiki/Fedora_Annual_Contributor_Survey_2021[Contributor Survey 2021 Responses CSV]

+ - link:{FWIKI}/Fedora_Annual_Contributor_Survey_2021[Contributor Survey 2021 Responses CSV]

@@ -1,4 +1,6 @@ 

- # Fedora Contributor Annual Survey

+ include::ROOT:partial$attributes.adoc[]

+ 

+ = Fedora Contributor Annual Survey

  

  ## Intro

  

@@ -1,6 +1,8 @@ 

+ include::ROOT:partial$attributes.adoc[]

+ 

  = Fedora Team Directory

  

- In order to provide visibility into what teams exist _and are active_ in Fedora, the Council https://communityblog.fedoraproject.org/fedora-council-november-2019-meeting-more-miscellaneous-stuff[decided] to maintain a directory that receives regular checks.

+ In order to provide visibility into what teams exist _and are active_ in Fedora, the Council link:{COMMBLOG}/fedora-council-november-2019-meeting-more-miscellaneous-stuff[decided] to maintain a directory that receives regular checks.

  Council representatives are responsible for periodic evaluation of the teams under their area (D&I, Engineering, and Mindshare).

  "Teams" should be read as a catch-all term for groups in Fedora that may call themselves "Special Interest Groups (SIGs)", "Working Groups", or any other similar term.

  
@@ -39,7 +41,7 @@ 

  

  Teams are responsible for ensuring their entries are up to date.

  

- The Diversity & Inclusion, Engineering, and Mindshare representatives to the Fedora Council are responsible for ensuring that the team that fall under their area keep the information is up-to-date and removing teams that do not appear to be active.

+ The Diversity & Inclusion, Engineering, and Mindshare representatives to the {team_name} are responsible for ensuring that the team that fall under their area keep the information is up-to-date and removing teams that do not appear to be active.

  They are _not_ responsible for _providing_ the information.

  Representatives may delegate sections of their area as they see fit.

  Checks can be done at any time, but should be done around the branch date for each release at a minimum.

@@ -2,9 +2,9 @@ 

  

  = Council ticket queue

  

- The Fedora Council uses a https://pagure.io/Fedora-Council/tickets/issues[ticket queue] to track decisions and other work.

+ The {team_name} uses a link:{team_issue_tracker}[ticket queue] to track decisions and other work.

  When opening a ticket to request a decision from the Council, please describe the issue in detail but have an explicit question (or better, a proposal) to decide on.

- If you are looking to start a discussion, consider posting to the https://lists.fedoraproject.org/archives/list/council-discuss@lists.fedoraproject.org/[council-discuss mailing list] first.

+ If you are looking to start a discussion, consider posting to the link:{team_asynch_communication}[#council tag on Fedora Discussion] first.

  

  NOTE: Do not file Code of Conduct reports in the Council issue tracker. Those should be filed against the https://pagure.io/coc/issues[Code of Conduct] issue tracker.

  
@@ -41,6 +41,6 @@ 

  When a vote is called for, the **ticket-vote** tag should be applied.

  Council members should vote by leaving a comment of +1 (in favor), 0 (abstain/no opinion/weakly opposed), or -1 (opposed).

  If multiple proposals or multiple versions of a proposal have been made, please indicate which the vote applies to.

- Council members can provide additional context explaining their vote, but should still indicate explictly which of +1, 0, or -1 applies.

+ Council members can provide additional context explaining their vote, but should still indicate explicitly which of +1, 0, or -1 applies.

  

  Policies for voting and approval are covered xref:index#_making_decisions[elsewhere].

@@ -2,12 +2,12 @@ 

  

  = Welcome to Council

  

- Welcome to the Fedora Council!

+ Welcome to the {team_name}!

  You have just joined

  (or perhaps you are thinking about joining)

  and now you want to learn your way around.

  If you have any questions,

- don't hestitate to ask for help.

+ don't hesitate to ask for help.

  Ask for a mentor if you think that would help you.

  

  == General expectations
@@ -31,15 +31,15 @@ 

  feel free to do it!

  

  *Ask for help.*

- Every member of the Fedora Council was new at some point.

+ Every member of the {team_name} was new at some point.

  Don't feel bad if you need to ask for help or if something is unclear.

  Think of it as finding a bug in the documentation!

  

  

  == Access

  

- When you were elected or appointed to the Fedora Council,

- the FPgM (or someone else) opened an issue in our https://pagure.io/Fedora-Council/tickets/issues[ticket tracker].

+ When you were elected or appointed to the {team_name},

+ the FPgM (or someone else) opened an issue in our link:{team_issue_tracker}[ticket tracker].

  This provides a checklist for all of the places you need to be granted access.

  Don't worry!

  There's not much you need to do there.
@@ -48,14 +48,14 @@ 

  

  == Communication

  

- We have asynchronous conversations in the https://discussion.fedoraproject.org/c/project/council-discuss/60[Council Discussions topic] on Discussion.

+ We have asynchronous conversations in the link:{team_asynch_communication}[#council tag] on Fedora Discussion.

  This is a public forum,

  so we expect—and welcome—input from community members who are not on Council.

  On the rare occasions when we need to discuss confidential matters,

  we have a private mailing list.

  

  For synchronous communication,

- we use the https://matrix.to/#/#council:fedoraproject.org[*#council*] channel on chat.fedoraproject.org

+ we use the link:{team_synch_communication}[*#council*] channel on chat.fedoraproject.org

  (bridged to the *#fedora-council* IRC channel on https://libera.chat/[Libera.Chat]).

  

  == Meetings
@@ -71,7 +71,7 @@ 

  or ask for a poll.

  

  Once a month,

- we hold https://fedoraproject.org/wiki/Council/Video_Meetings[video meetings].

+ we hold link:{FWIKI}/Council/Video_Meetings[video meetings].

  These are an opportunity to let the community showcase their work

  and ask the Council and broader community for help.

  Video meetings are open to the community at large.
@@ -89,4 +89,4 @@ 

  If you have an idea that needs broader discussion or brainstorming,

  start a thread on Discussion.

  

- Procedures for labels, priorities, and voting on tickets are in the xref:tickets.adoc[Ticket Queue docs].

+ Procedures for labels, priorities, and voting on tickets are in the xref:procedures/tickets.adoc[Ticket Queue docs].

@@ -1,6 +1,28 @@ 

+ // This is a data store of information about the Fedora Council.

+ 

+ // Team name:

+ :team_name: Fedora Council

+ 

+ // Team summary:

+ :team_summary: The {team_name} is our top-level community leadership and governance body. It is responsible for stewardship of the Fedora Project as a whole, and supports the health and growth of the Fedora community.

+ 

+ // Team page URL:

+ :team_url: https://docs.fedoraproject.org/en-US/council/

+ 

+ // Preferred asynchronous communication channel

+ :team_asynch_communication: https://discussion.fedoraproject.org/tag/council

+ 

+ // Preferred synchronous communication channel

+ :team_synch_communication: https://matrix.to/#/#council:fedoraproject.org

+ 

+ // Issue tracker

+ :team_issue_tracker: https://pagure.io/Fedora-Council/tickets

+ 

+ // Meetings

+ :team_meetings: https://apps.fedoraproject.org/calendar/council/

+ 

+ // Imported from our old attributes file.

  :COMMBLOG: https://communityblog.fedoraproject.org

  :FWIKI: https://fedoraproject.org/wiki

- :URL-CHAT: https://matrix.to/#/#council:fedoraproject.org

- :URL-DISCUSS: https://discussion.fedoraproject.org/tag/council

- :URL-TICKETS: https://pagure.io/Fedora-Council/tickets/issues

  :YEAR: 2023

+ :MAJOROSVER: 39

NOTE: This commit does NOT change content, policy, or the substance of
any written documentation that requires Fedora Council review. This
change only impacts changes related to the Antora toolchain.

This commit integrates the team directory profile that was introduced a
few years ago into the Fedora Council documentation. This makes several
common URLs used across the Fedora Council Antora component accessible
as macros. Instead of hard-coding the same URL across all of the Fedora
Council documentation, the macros can be used to more easily re-use the
same URL consistently across multiple pages.

This commit is one of several that gradually refactors the Fedora
Council documentation to properly fit into an AsciiDoc and Antora
workflow.

Metadata Update from @jflory7:
- Pull-request tagged with: type - existing docs
- Request assigned

9 months ago

Pull-Request has been merged by jflory7

9 months ago
Metadata
Changes Summary 22
+1 -1
file changed
council/modules/ROOT/nav.adoc
+6 -6
file changed
council/modules/ROOT/pages/contact.adoc
+7 -5
file changed
council/modules/ROOT/pages/fca.adoc
+8 -6
file changed
council/modules/ROOT/pages/fpgm.adoc
+5 -5
file changed
council/modules/ROOT/pages/fpl.adoc
+3 -1
file changed
council/modules/ROOT/pages/historical/historical_note.adoc
+14 -19
file changed
council/modules/ROOT/pages/history.adoc
+15 -18
file changed
council/modules/ROOT/pages/index.adoc
+9 -7
file changed
council/modules/ROOT/pages/members.adoc
+3 -1
file changed
council/modules/ROOT/pages/policies.adoc
+4 -2
file changed
council/modules/ROOT/pages/policy/coc-response-policy.adoc
+5 -5
file changed
council/modules/ROOT/pages/policy/community-publishing-platforms.adoc
+7 -5
file changed
council/modules/ROOT/pages/policy/edition-promotion-policy.adoc
+4 -2
file changed
council/modules/ROOT/pages/policy/guiding-policy.adoc
+3 -2
file changed
council/modules/ROOT/pages/policy/policy-change-policy.adoc
+10 -8
file changed
council/modules/ROOT/pages/procedures/survey/how-to.adoc
+4 -2
file changed
council/modules/ROOT/pages/procedures/survey/overview.adoc
+3 -1
file changed
council/modules/ROOT/pages/procedures/survey/questions.adoc
+4 -2
file changed
council/modules/ROOT/pages/procedures/team_directory.adoc
+3 -3
file changed
council/modules/ROOT/pages/procedures/tickets.adoc
+9 -9
file changed
council/modules/ROOT/pages/procedures/welcome.adoc
+25 -3
file changed
council/modules/ROOT/partials/attributes.adoc