From a08b01a9d19917407629903cea9deb42baacdc15 Mon Sep 17 00:00:00 2001 From: Brian (bex) Exelbierd Date: Oct 20 2017 14:20:42 +0000 Subject: rename official to project --- diff --git a/_topic_map.yml b/_topic_map.yml index 1cddde5..a281685 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -22,7 +22,7 @@ # topic groups and topics on the main page. --- Name: Project Docs -Dir: official +Dir: project Topics: - Name: Mission and Foundations File: fedora-overview diff --git a/index-main.html b/index-main.html index f789969..63d702d 100644 --- a/index-main.html +++ b/index-main.html @@ -35,7 +35,7 @@
Fedora Council Docs
diff --git a/official/council.adoc b/official/council.adoc deleted file mode 100644 index 9b045bf..0000000 --- a/official/council.adoc +++ /dev/null @@ -1,406 +0,0 @@ -Fedora Council -============== - -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. - -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 -of seats connected to medium-term project goals. Decisions are made by a -*consensus process*, in which we work together as a common team to find -shared solutions and address concerns, with a focus on giving voice -rather than on balance of power. - -The Council is ultimately accountable for the Fedora Project as a whole, -and is responsible for providing advice to and oversight of other Fedora -governance bodies and teams as needed. - -Responsibilities ----------------- - -The Council is responsible for issues of strategic importance for Fedora -that require leadership and coordination across the various teams and -subprojects to achieve. - -*Its primary role 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 is done in consultation with the entire Fedora -community through transparent, public discussion. - -The Council *governs Fedora's financial resources*, working with our -sponsor(s) to establish an annual budget allocated to support Fedora -initiatives, including Fedora Ambassadors, Fedora-managed events, and -other activities which advance the project's goals. - -The Council also decides on issues regarding use of the Fedora -*trademarks*, is responsible for final *arbitration of complaints* -related to project policies and for *settling disputes* escalated from -other committees or subgroups, and may handle *sensitive legal or -personnel issues* which require research and discussion to protect the -interests of the Fedora Project or its sponsor(s). - - -Making Decisions ----------------- - -**** -Consensus decision-making aims to be: - -*'''Agreement Seeking:''' A consensus decision-making process attempts to help everyone get what they need. -*'''Collaborative:''' Participants contribute to a shared proposal and shape it into a decision that meets the concerns of all group members as much as possible. -*'''Cooperative:''' Participants in an effective consensus process should strive to reach the best possible decision for the group and all of its members, rather than competing for personal preferences. -*'''Egalitarian:''' All members of a consensus decision-making body should be afforded, as much as possible, equal input into the process. All members have the opportunity to present, and amend proposals. -*'''Inclusive:''' As many [[wiktionary:stakeholder|stakeholders]] as possible should be involved in the consensus decision-making process. -*'''Participatory:''' The consensus process should actively solicit the input and participation of all decision-makers - -— from [https://en.wikipedia.org/wiki/Consensus_decision-making#Objectives Wikipedia on Consensus decision-making] - -}} -Many basic decisions are made through a process known as "'''lazy approval'''", in which general consent is assumed unless valid objections are raised within a period of time — generally three to seven days, although the timeframe should be stated each time and should be proportionate to the impact of the action. This process is used for decisions with short-term consequences and which can be easily reversed. Any project member can ask for the deadline to be extended or the decision escalated to require 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). A negative vote immediately halts the process and requires discussion. Therefore, in order to remain valid, negative votes must be supported with a specific concerns about the poposal, and suggestions for what could be changed in order to make the proposal acceptable. A vote of "0" is sometimes used to indicate a disagreement but willingness to stand aside; this should also be accompanied with an explanation. - -This model matches Fedora's "Friends" foundation, which calls for finding acceptable consensus to serve the interests of advancing free software. It works because we work together in a community of mutual respect even when we disagree. - -In general, the Council conducts business in public discussion, and any Fedora project member can make negative or positive votes. It is the duty of the Council to take concerns raised in this way into serious consideration, but only Council members' votes are binding in the final tally. - -When consensus can't be reached, the Council may ask the Fedora Project Leader to decide on a resolution. Such a request can be made when issues leading to negative votes are outstanding and all Council members agree that the Council is deadlocked, or if the dispute is unresolved after fourteen days and a simple majority of Council members are in favor of the request. -**** - -Many basic decisions are made through a process known as "*lazy -approval*", in which general consent is assumed unless valid objections -are raised within a period of time — generally three to seven days, -although the timeframe should be stated each time and should be -proportionate to the impact of the action. This process is used for -decisions with short-term consequences and which can be easily reversed. -Any project member can ask for the deadline to be extended or the -decision escalated to require 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). A negative vote immediately halts the -process and requires discussion. Therefore, in order to remain valid, -negative votes must be supported with a specific concerns about the -poposal, and suggestions for what could be changed in order to make the -proposal acceptable. A vote of "0" is sometimes used to indicate a -disagreement but willingness to stand aside; this should also be -accompanied with an explanation. - -This model matches Fedora's "Friends" foundation, which calls for -finding acceptable consensus to serve the interests of advancing free -software. It works because we work together in a community of mutual -respect even when we disagree. - -In general, the Council conducts business in public discussion, and any -Fedora project member can make negative or positive votes. It is the -duty of the Council to take concerns raised in this way into serious -consideration, but only Council members' votes are binding in the final -tally. - -When consensus can't be reached, the Council may ask the Fedora Project -Leader to decide on a resolution. Such a request can be made when issues -leading to negative votes are outstanding and all Council members agree -that the Council is deadlocked, or if the dispute is unresolved after -fourteen days and a simple majority of Council members are in favor of -the request. - - -Composition ------------ - - -Objective Leads -~~~~~~~~~~~~~~~ - -On an ongoing basis, including sessions at Flock and in public online -meetings, the Council will identify two to four key community objectives -with a timeframe of approximately eighteen months, and appoint -*Objective Leads* for each goal. These will serve as auxiliary Council -members, with binding votes only over concerns relevant to their -particular area. - -Each objective will be documented with measurable goals, and the -objective lead is responsible for coordinating efforts to reach those -goals, evaluating and reporting on progress, and working regularly with -all relevant groups in Fedora to ensure that progress is made. - - -Representatives -~~~~~~~~~~~~~~~ - -The Council also includes four representative seats, an *Engineering -Representative*, an *Mindshare Representative*, and two *Elected -Representatives*. - -"Engineering" and "Mindshare" are broad areas roughly encompassing two -of the major areas of activity in Fedora. _Engineering_ is the technical -work related to building and releasing the Fedora operating system and -the infrastructure related to that. _Mindshare_ includes marketing, -design, and Fedora Ambassadors — largely activities that happen between -Fedora and the world at large, with the distribution release cycle -serving as a fuel source, not the thing that's being worked on. - -The engineering and mindshare representatives' responsibility is to -represent their areas collectively, _not_ to be just an individual voice -that happens to be voted-in by some subset of Fedora. They are selected -by the people active in those areas, coordinated by the Fedora -Engineering Steering Committee (FESCo) and a to-be-created mindshare -group respectively, and serve for terms to be determined by those -committees. - -The elected positions cover Fedora's subprojects not under the -engineering or mindshare banners, and the community at large. One -specific responsibility is to represent the voice of individual -contributors to the Fedora project. Each representative will also work -on specific goals which she or he brings to the Council as highlighted -during the election process. - -Elections are held twice a year, in concert with the joint Fedora -election cycle. One seat is selected at each election, and each position -has a two-election (approximately one year) term. No person who -currently holds another Council seat can be elected. If a seat becomes -vacant, the Council will arrange for a temporary replacement. - - -Appointed Leadership Positions -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -*Fedora Project Leader* - -The link:Fedora_Project_Leader[Fedora Project Leader] serves as the -chair of the Council, organizing discussion agendas, bringing issues to -the table, and facilitating the consensus process. He or she is -accountable for success in all areas of the project, but is not a -dictator, benevolent or otherwise. The FPL often serves as the public -face and collective voice of the project, and has a corresponding duty -to listen to, understand, and fairly represent the collective views and -needs of project contributors and stakeholders. - -The Fedora Project Leader is hired by Red Hat with the advice and -consent of the Council. - -*Fedora Community Action and Impact Coordinator* - -The link:Community_Leader[ Fedora Community Action and Impact -Coordinator (FCAIC)] initiatives to grow the Fedora user and developer -communities, and to make Red Hat / Fedora interactions even more -transparent and positive. The Fedora community budget comes to us -through OSAS, and this position facilitates decision-making on how to -best focus that to meet our collective objectives. - - -Auxiliary Seats -~~~~~~~~~~~~~~~ - -As with the objective leads, the next two appointed positions are -auxiliary seats. They are intended to have significant positive impact -on the project as a whole, but in order to minimize the overall -influence of appointed positions vs. those selected by the community, -their votes in the consensus process are expected to be related to the -scope of the respective role. - -*Diversity Advisor* - -Fedora's link:Diversity_Advisor[Diversity Advisor] works on initiatives -to assess and promote equality and inclusion within the Fedora -contributor and user communities, and helps develop project strategy on -diversity issues. Additionally, the Diversity Advisor administers and is -the point of contact for Fedora's participation in third-party outreach -programs and events. - -This position is appointed by the Fedora Project Leader, with the -approval of the Council. - -*Fedora Program Manager* - -The link: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. - -This position is funded by and hired for by Red Hat, with the approval -of the Council. - - -Current Members -~~~~~~~~~~~~~~~ -image:council-badge.png[float="right"] - -* Elected Representative: *Justin Flory* _(f26-f27)_ -* Elected Representative: *Robert Mayr* _(f24-f25, f26-f27)_ -* Engineering Representative: *Josh Boyer* -* Mindshare Representative: *Robert Mayr* -* Diversity Advisor: *—* -* Fedora Project Leader: _' Matthew Miller_' -* Fedora Community Action and Impact Coordinator: *Brian Exelbierd* -* Fedora Program Manager: *Jan Kurik* -* Objective Leads: *Langdon White* (Fedora Modularity), *Stef Walter* -(Atomic CI/CD) - - -Contact Info -~~~~~~~~~~~~ - -The Fedora Council uses two mailing lists. - -** (formerly "board-discuss") is a public list. Subscription is open to -anyone, as are the archives. This list is the main discussion point for -the Fedora Council, and the goal of the list is to either reach a -decision, or to delegate the thread to a more appropriate location. For -example, engineering-specific threads may get some comments on -council-discuss, before being redirected to the devel list for in-depth -discussion. - -** is a private list. Its membership is restricted to the current -Council members, and its archives are private. This list is only used -for topics that cannot be discussed on the public council-discuss list. - -Council members are also often present on the *#fedora-council* IRC -channel on *irc.freenode.net* - -If you have an issue to be worked on by the Council you can also open a -ticket on the https://pagure.io/Fedora-Council/tickets[Council Pagure -instance]. This is a public issue tracker. However, if you have a -particularly privacy- or security-sensitive issue, you check the -*Private* box when you create the ticket. If an issue is not sensitive -the discussion should be in the open, in the public Pagure instance or -the council-discuss list. - - -Coda ----- - - -Meetings -~~~~~~~~ - -The Fedora Council is not driven by meetings or by tickets, but does -hold link:Council_meeting_process[regular public IRC meetings] to -discuss current issues, to clear through anything outstanding which can -be quickly resolved, and to ensure that nothing important is left in -limbo. All members are be expected to regularly communicate what's going -on in their area, through blog posts or other public updates. - -Additionally, the Fedora Project Leader will set aside regular times on -IRC to meet with the community. Attendance is not mandatory for all -members but is encouraged. - - -Transparency -~~~~~~~~~~~~ - -The general policy of the Fedora Council is to default to open. Meetings -are held in public IRC channels, and open to all Fedora users and -contributors. Discussion is held in on a -https://lists.fedoraproject.org/mailman/listinfo/council-discuss[public -mailing list] open to all subscribers, and formal decisions will be -recorded in a public ticket tracking system. - -Occasionally, when personal, private, or sensitive issues need to be -discussed, a phone 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. - - -Time Commitment -~~~~~~~~~~~~~~~ - -Serving on the Fedora Council 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. - -We recognize that most Fedora community members do not have the luxury -of working on Fedora full-time or as part of a paid position. The time -commitment required for these roles comes simply from what is required -to lead a large project like Fedora, and is not intended to be an -artificial limit on who can participate. We know that that it can be a -_pragmatic_ limit, and for that reason, the Council is responsible for -extra effort to receive, recognize, be responsive to, and meaningfully -reward the input of contributors offering their individual time. - - -Governance Philosophy -~~~~~~~~~~~~~~~~~~~~~ - -To advance free software, we need to provide a sustainable integration -of free software without cutting corners. By providing a positive first -impression before and during installation and real use, we support -Fedora's reputation as a leading and reliable product that attracts -future users and contributors. To provide that integration and -experience we must have a clear set of priorities to help all -contributors decide how to allocate resources and resolve conflicts. -These priorities are not meant to be exclusive, or to keep contributors -from working on the parts of Fedora that matter to them. - -These priorities will sometimes expose gaps where contributors need -additional assistance, and allow them to seek it both within the -community and by bringing in additional contributors to help, -exclusively on their particular interest area if desired. While -narrowing our focus in some areas, though, we must provide opportunities -for exploration to all contributors within the framework of our core -values and without impeding progress. - - -Historical Note -~~~~~~~~~~~~~~~ - -The previous link: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 -the previous board structure, the Fedora Project leader had a special -veto power; in the current model, all voting members can block on -issues, with a valid reason. The FPL does not have a special veto, but -does have a limited power to "unstick" things if consensus genuinely -can't be reached and a decision needs to be made. - - -Record of Former Members -~~~~~~~~~~~~~~~~~~~~~~~~ - -Former membership on the Fedora Council is documented on the -link:History_of_Council_Membership[History of Council Membership] page. -Membership on the Fedora Board, which preceded the Council, is -documented on the link:History_of_Board_seats[History of Board Seats] -page. - - -Document History -~~~~~~~~~~~~~~~~ - -This charter was approved by the Fedora Project Board on -https://fedorahosted.org/council/ticket/13[Oct. 9th, 2014] and is in -effect as of Nov. 26th, 2014. Any other significant changes will be -noted here; smaller changes (membership changes, minor wording or -formating, etc., without impact on meaning) can be found in the -https://fedoraproject.org/w/index.php?title=Council&action=history[wiki -history]. - -**** - -tl;dr? -~~~~~~ - - - -. Active body tasked with identifying and enabling strategic objectives. -. Handles governance issues like budget and project structure as well. -. Consensus-based decision-making ensures that all voices are heard. -. 6 members with full voting: -.- 2 appointed by community for engineering and mindshare project areas, -.- 2 elected by community at large, and -.- 2 appointed and paid by Red Hat (FPL and FCAI). -. 4-6 members with binding votes in areas related to their role: -.- 2-4 appointed by the Council -.- 1 hired by Red Hat, and -.- 1 appointed by the Council - - - - diff --git a/official/fedora-overview.adoc b/official/fedora-overview.adoc deleted file mode 100644 index 65929dc..0000000 --- a/official/fedora-overview.adoc +++ /dev/null @@ -1,203 +0,0 @@ -What is Fedora? -=============== - -image::fedora-logo.png[] - -The Fedora Project is a community of people working together to build a -free and open source software platform and to collaborate on and share -user-focused solutions built on that platform. Or, in plain English, we -make an operating system and we make it easy for you do useful stuff -with it. - - -How do I get the software? --------------------------- - -Download one of the different editions of Fedora for your -laptop/desktop, server, or containers at https://getfedora.org[Get -Fedora], or explore other options provided by -https://labs.fedoraproject.org/[Labs], -https://spins.fedoraproject.org/[Spins], -https://arm.fedoraproject.org/[ARM], and -https://alt.fedoraproject.org/[Alternative Downloads]. Everything -included is open source and free software — not only is it available at -no cost to you, but you can share, remix, and modify. - - -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. - - -Freedom -~~~~~~~ - -image:4Foundations-freedom100px.png[Four Foundations: -Freedom,title="Four Foundations: Freedom",float="right"] - -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:4Foundations-friends100px.png[Four Foundations: -Friends,title="Four Foundations: Friends",float="right"] - -We are a strong, caring community. - -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 http://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. - - -Features -~~~~~~~~ - -image:4Foundations-features100px.png[Four Foundations: -Features,title="Four Foundations: Features",float="right"] - -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 link: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:4Foundations-first100px.png[Four Foundations: -First,title="Four Foundations: First",float="right"] - -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 -link: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. |} - - -Our Mission ------------ - -____ -_Fedora creates an innovative platform for hardware, clouds, and -containers that enables software developers and community members to -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 -transparent, collaborative community of _Friends_, and entirely as open -source and free software — _Freedom_. - - -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 -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 -use, you are relying on code developed within the Fedora Project. - -We believe link: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 -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 of free software in the future over those that -emphasize short term ease of use. - - -Our Community -------------- - -Fedora is more than just software. It is a community of contributors -from http://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 -link:PackageMaintainers[software engineers],link:Artwork[artists], -link:Infrastructure[system administrators], link:Websites[web -designers], link:DocsProject[writers],link:Ambassadors[speakers], -link:G11N[translators], and more — and we are happy to help you get -started. - -We believe that all contributors should -https://fedoraproject.org/code-of-conduct[be excellent to each other]. -By creating an environment for constructive contribution, we can more -effectively and successfully compare and challenge different ideas to -find the best solutions for advancement, while building the size, -diversity, and strength of our community. - - -Leadership and Governance -------------------------- - -The link:Council[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 a -general rule, we want people working on a Fedora -link:Subprojects[subproject] to be make meaningful decisions about their -areas of interest and expertise. More details are available on our page -on link:Leadership[Fedora Leadership]. diff --git a/official/images/4Foundations-features100px.png b/official/images/4Foundations-features100px.png deleted file mode 100644 index c54d6a9..0000000 Binary files a/official/images/4Foundations-features100px.png and /dev/null differ diff --git a/official/images/4Foundations-first100px.png b/official/images/4Foundations-first100px.png deleted file mode 100644 index da7f5ce..0000000 Binary files a/official/images/4Foundations-first100px.png and /dev/null differ diff --git a/official/images/4Foundations-freedom100px.png b/official/images/4Foundations-freedom100px.png deleted file mode 100644 index bd2be3a..0000000 Binary files a/official/images/4Foundations-freedom100px.png and /dev/null differ diff --git a/official/images/4Foundations-friends100px.png b/official/images/4Foundations-friends100px.png deleted file mode 100644 index c3c21af..0000000 Binary files a/official/images/4Foundations-friends100px.png and /dev/null differ diff --git a/official/images/council-badge.png b/official/images/council-badge.png deleted file mode 100644 index 5e0399d..0000000 Binary files a/official/images/council-badge.png and /dev/null differ diff --git a/official/images/council-logo-500px.png b/official/images/council-logo-500px.png deleted file mode 100644 index 5f74569..0000000 Binary files a/official/images/council-logo-500px.png and /dev/null differ diff --git a/official/images/fedora-logo.png b/official/images/fedora-logo.png deleted file mode 100644 index 39b6c91..0000000 Binary files a/official/images/fedora-logo.png and /dev/null differ diff --git a/official/subprojects.adoc b/official/subprojects.adoc deleted file mode 100644 index c646852..0000000 --- a/official/subprojects.adoc +++ /dev/null @@ -1,20 +0,0 @@ -[[fedora-sub-projects-for-contributors]] -Fedora sub-projects for contributors -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -[cols=",,",] -|======================================================================= -a| a| a| - -a| a| a| - -a| a| a| - -a| a| a| - -a| a| a| - -|\{\{projectline|Projects|View All Projects... |Echo-allproj-48px.png}} -a| |\{\{projectline|SIGs|View All Special Interest Groups (SIGs)... -|Echo-SIGs-48px.png}} -|======================================================================= diff --git a/project/council.adoc b/project/council.adoc new file mode 100644 index 0000000..9b045bf --- /dev/null +++ b/project/council.adoc @@ -0,0 +1,406 @@ +Fedora Council +============== + +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. + +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 +of seats connected to medium-term project goals. Decisions are made by a +*consensus process*, in which we work together as a common team to find +shared solutions and address concerns, with a focus on giving voice +rather than on balance of power. + +The Council is ultimately accountable for the Fedora Project as a whole, +and is responsible for providing advice to and oversight of other Fedora +governance bodies and teams as needed. + +Responsibilities +---------------- + +The Council is responsible for issues of strategic importance for Fedora +that require leadership and coordination across the various teams and +subprojects to achieve. + +*Its primary role 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 is done in consultation with the entire Fedora +community through transparent, public discussion. + +The Council *governs Fedora's financial resources*, working with our +sponsor(s) to establish an annual budget allocated to support Fedora +initiatives, including Fedora Ambassadors, Fedora-managed events, and +other activities which advance the project's goals. + +The Council also decides on issues regarding use of the Fedora +*trademarks*, is responsible for final *arbitration of complaints* +related to project policies and for *settling disputes* escalated from +other committees or subgroups, and may handle *sensitive legal or +personnel issues* which require research and discussion to protect the +interests of the Fedora Project or its sponsor(s). + + +Making Decisions +---------------- + +**** +Consensus decision-making aims to be: + +*'''Agreement Seeking:''' A consensus decision-making process attempts to help everyone get what they need. +*'''Collaborative:''' Participants contribute to a shared proposal and shape it into a decision that meets the concerns of all group members as much as possible. +*'''Cooperative:''' Participants in an effective consensus process should strive to reach the best possible decision for the group and all of its members, rather than competing for personal preferences. +*'''Egalitarian:''' All members of a consensus decision-making body should be afforded, as much as possible, equal input into the process. All members have the opportunity to present, and amend proposals. +*'''Inclusive:''' As many [[wiktionary:stakeholder|stakeholders]] as possible should be involved in the consensus decision-making process. +*'''Participatory:''' The consensus process should actively solicit the input and participation of all decision-makers + +— from [https://en.wikipedia.org/wiki/Consensus_decision-making#Objectives Wikipedia on Consensus decision-making] + +}} +Many basic decisions are made through a process known as "'''lazy approval'''", in which general consent is assumed unless valid objections are raised within a period of time — generally three to seven days, although the timeframe should be stated each time and should be proportionate to the impact of the action. This process is used for decisions with short-term consequences and which can be easily reversed. Any project member can ask for the deadline to be extended or the decision escalated to require 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). A negative vote immediately halts the process and requires discussion. Therefore, in order to remain valid, negative votes must be supported with a specific concerns about the poposal, and suggestions for what could be changed in order to make the proposal acceptable. A vote of "0" is sometimes used to indicate a disagreement but willingness to stand aside; this should also be accompanied with an explanation. + +This model matches Fedora's "Friends" foundation, which calls for finding acceptable consensus to serve the interests of advancing free software. It works because we work together in a community of mutual respect even when we disagree. + +In general, the Council conducts business in public discussion, and any Fedora project member can make negative or positive votes. It is the duty of the Council to take concerns raised in this way into serious consideration, but only Council members' votes are binding in the final tally. + +When consensus can't be reached, the Council may ask the Fedora Project Leader to decide on a resolution. Such a request can be made when issues leading to negative votes are outstanding and all Council members agree that the Council is deadlocked, or if the dispute is unresolved after fourteen days and a simple majority of Council members are in favor of the request. +**** + +Many basic decisions are made through a process known as "*lazy +approval*", in which general consent is assumed unless valid objections +are raised within a period of time — generally three to seven days, +although the timeframe should be stated each time and should be +proportionate to the impact of the action. This process is used for +decisions with short-term consequences and which can be easily reversed. +Any project member can ask for the deadline to be extended or the +decision escalated to require 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). A negative vote immediately halts the +process and requires discussion. Therefore, in order to remain valid, +negative votes must be supported with a specific concerns about the +poposal, and suggestions for what could be changed in order to make the +proposal acceptable. A vote of "0" is sometimes used to indicate a +disagreement but willingness to stand aside; this should also be +accompanied with an explanation. + +This model matches Fedora's "Friends" foundation, which calls for +finding acceptable consensus to serve the interests of advancing free +software. It works because we work together in a community of mutual +respect even when we disagree. + +In general, the Council conducts business in public discussion, and any +Fedora project member can make negative or positive votes. It is the +duty of the Council to take concerns raised in this way into serious +consideration, but only Council members' votes are binding in the final +tally. + +When consensus can't be reached, the Council may ask the Fedora Project +Leader to decide on a resolution. Such a request can be made when issues +leading to negative votes are outstanding and all Council members agree +that the Council is deadlocked, or if the dispute is unresolved after +fourteen days and a simple majority of Council members are in favor of +the request. + + +Composition +----------- + + +Objective Leads +~~~~~~~~~~~~~~~ + +On an ongoing basis, including sessions at Flock and in public online +meetings, the Council will identify two to four key community objectives +with a timeframe of approximately eighteen months, and appoint +*Objective Leads* for each goal. These will serve as auxiliary Council +members, with binding votes only over concerns relevant to their +particular area. + +Each objective will be documented with measurable goals, and the +objective lead is responsible for coordinating efforts to reach those +goals, evaluating and reporting on progress, and working regularly with +all relevant groups in Fedora to ensure that progress is made. + + +Representatives +~~~~~~~~~~~~~~~ + +The Council also includes four representative seats, an *Engineering +Representative*, an *Mindshare Representative*, and two *Elected +Representatives*. + +"Engineering" and "Mindshare" are broad areas roughly encompassing two +of the major areas of activity in Fedora. _Engineering_ is the technical +work related to building and releasing the Fedora operating system and +the infrastructure related to that. _Mindshare_ includes marketing, +design, and Fedora Ambassadors — largely activities that happen between +Fedora and the world at large, with the distribution release cycle +serving as a fuel source, not the thing that's being worked on. + +The engineering and mindshare representatives' responsibility is to +represent their areas collectively, _not_ to be just an individual voice +that happens to be voted-in by some subset of Fedora. They are selected +by the people active in those areas, coordinated by the Fedora +Engineering Steering Committee (FESCo) and a to-be-created mindshare +group respectively, and serve for terms to be determined by those +committees. + +The elected positions cover Fedora's subprojects not under the +engineering or mindshare banners, and the community at large. One +specific responsibility is to represent the voice of individual +contributors to the Fedora project. Each representative will also work +on specific goals which she or he brings to the Council as highlighted +during the election process. + +Elections are held twice a year, in concert with the joint Fedora +election cycle. One seat is selected at each election, and each position +has a two-election (approximately one year) term. No person who +currently holds another Council seat can be elected. If a seat becomes +vacant, the Council will arrange for a temporary replacement. + + +Appointed Leadership Positions +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +*Fedora Project Leader* + +The link:Fedora_Project_Leader[Fedora Project Leader] serves as the +chair of the Council, organizing discussion agendas, bringing issues to +the table, and facilitating the consensus process. He or she is +accountable for success in all areas of the project, but is not a +dictator, benevolent or otherwise. The FPL often serves as the public +face and collective voice of the project, and has a corresponding duty +to listen to, understand, and fairly represent the collective views and +needs of project contributors and stakeholders. + +The Fedora Project Leader is hired by Red Hat with the advice and +consent of the Council. + +*Fedora Community Action and Impact Coordinator* + +The link:Community_Leader[ Fedora Community Action and Impact +Coordinator (FCAIC)] initiatives to grow the Fedora user and developer +communities, and to make Red Hat / Fedora interactions even more +transparent and positive. The Fedora community budget comes to us +through OSAS, and this position facilitates decision-making on how to +best focus that to meet our collective objectives. + + +Auxiliary Seats +~~~~~~~~~~~~~~~ + +As with the objective leads, the next two appointed positions are +auxiliary seats. They are intended to have significant positive impact +on the project as a whole, but in order to minimize the overall +influence of appointed positions vs. those selected by the community, +their votes in the consensus process are expected to be related to the +scope of the respective role. + +*Diversity Advisor* + +Fedora's link:Diversity_Advisor[Diversity Advisor] works on initiatives +to assess and promote equality and inclusion within the Fedora +contributor and user communities, and helps develop project strategy on +diversity issues. Additionally, the Diversity Advisor administers and is +the point of contact for Fedora's participation in third-party outreach +programs and events. + +This position is appointed by the Fedora Project Leader, with the +approval of the Council. + +*Fedora Program Manager* + +The link: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. + +This position is funded by and hired for by Red Hat, with the approval +of the Council. + + +Current Members +~~~~~~~~~~~~~~~ +image:council-badge.png[float="right"] + +* Elected Representative: *Justin Flory* _(f26-f27)_ +* Elected Representative: *Robert Mayr* _(f24-f25, f26-f27)_ +* Engineering Representative: *Josh Boyer* +* Mindshare Representative: *Robert Mayr* +* Diversity Advisor: *—* +* Fedora Project Leader: _' Matthew Miller_' +* Fedora Community Action and Impact Coordinator: *Brian Exelbierd* +* Fedora Program Manager: *Jan Kurik* +* Objective Leads: *Langdon White* (Fedora Modularity), *Stef Walter* +(Atomic CI/CD) + + +Contact Info +~~~~~~~~~~~~ + +The Fedora Council uses two mailing lists. + +** (formerly "board-discuss") is a public list. Subscription is open to +anyone, as are the archives. This list is the main discussion point for +the Fedora Council, and the goal of the list is to either reach a +decision, or to delegate the thread to a more appropriate location. For +example, engineering-specific threads may get some comments on +council-discuss, before being redirected to the devel list for in-depth +discussion. + +** is a private list. Its membership is restricted to the current +Council members, and its archives are private. This list is only used +for topics that cannot be discussed on the public council-discuss list. + +Council members are also often present on the *#fedora-council* IRC +channel on *irc.freenode.net* + +If you have an issue to be worked on by the Council you can also open a +ticket on the https://pagure.io/Fedora-Council/tickets[Council Pagure +instance]. This is a public issue tracker. However, if you have a +particularly privacy- or security-sensitive issue, you check the +*Private* box when you create the ticket. If an issue is not sensitive +the discussion should be in the open, in the public Pagure instance or +the council-discuss list. + + +Coda +---- + + +Meetings +~~~~~~~~ + +The Fedora Council is not driven by meetings or by tickets, but does +hold link:Council_meeting_process[regular public IRC meetings] to +discuss current issues, to clear through anything outstanding which can +be quickly resolved, and to ensure that nothing important is left in +limbo. All members are be expected to regularly communicate what's going +on in their area, through blog posts or other public updates. + +Additionally, the Fedora Project Leader will set aside regular times on +IRC to meet with the community. Attendance is not mandatory for all +members but is encouraged. + + +Transparency +~~~~~~~~~~~~ + +The general policy of the Fedora Council is to default to open. Meetings +are held in public IRC channels, and open to all Fedora users and +contributors. Discussion is held in on a +https://lists.fedoraproject.org/mailman/listinfo/council-discuss[public +mailing list] open to all subscribers, and formal decisions will be +recorded in a public ticket tracking system. + +Occasionally, when personal, private, or sensitive issues need to be +discussed, a phone 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. + + +Time Commitment +~~~~~~~~~~~~~~~ + +Serving on the Fedora Council 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. + +We recognize that most Fedora community members do not have the luxury +of working on Fedora full-time or as part of a paid position. The time +commitment required for these roles comes simply from what is required +to lead a large project like Fedora, and is not intended to be an +artificial limit on who can participate. We know that that it can be a +_pragmatic_ limit, and for that reason, the Council is responsible for +extra effort to receive, recognize, be responsive to, and meaningfully +reward the input of contributors offering their individual time. + + +Governance Philosophy +~~~~~~~~~~~~~~~~~~~~~ + +To advance free software, we need to provide a sustainable integration +of free software without cutting corners. By providing a positive first +impression before and during installation and real use, we support +Fedora's reputation as a leading and reliable product that attracts +future users and contributors. To provide that integration and +experience we must have a clear set of priorities to help all +contributors decide how to allocate resources and resolve conflicts. +These priorities are not meant to be exclusive, or to keep contributors +from working on the parts of Fedora that matter to them. + +These priorities will sometimes expose gaps where contributors need +additional assistance, and allow them to seek it both within the +community and by bringing in additional contributors to help, +exclusively on their particular interest area if desired. While +narrowing our focus in some areas, though, we must provide opportunities +for exploration to all contributors within the framework of our core +values and without impeding progress. + + +Historical Note +~~~~~~~~~~~~~~~ + +The previous link: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 +the previous board structure, the Fedora Project leader had a special +veto power; in the current model, all voting members can block on +issues, with a valid reason. The FPL does not have a special veto, but +does have a limited power to "unstick" things if consensus genuinely +can't be reached and a decision needs to be made. + + +Record of Former Members +~~~~~~~~~~~~~~~~~~~~~~~~ + +Former membership on the Fedora Council is documented on the +link:History_of_Council_Membership[History of Council Membership] page. +Membership on the Fedora Board, which preceded the Council, is +documented on the link:History_of_Board_seats[History of Board Seats] +page. + + +Document History +~~~~~~~~~~~~~~~~ + +This charter was approved by the Fedora Project Board on +https://fedorahosted.org/council/ticket/13[Oct. 9th, 2014] and is in +effect as of Nov. 26th, 2014. Any other significant changes will be +noted here; smaller changes (membership changes, minor wording or +formating, etc., without impact on meaning) can be found in the +https://fedoraproject.org/w/index.php?title=Council&action=history[wiki +history]. + +**** + +tl;dr? +~~~~~~ + + + +. Active body tasked with identifying and enabling strategic objectives. +. Handles governance issues like budget and project structure as well. +. Consensus-based decision-making ensures that all voices are heard. +. 6 members with full voting: +.- 2 appointed by community for engineering and mindshare project areas, +.- 2 elected by community at large, and +.- 2 appointed and paid by Red Hat (FPL and FCAI). +. 4-6 members with binding votes in areas related to their role: +.- 2-4 appointed by the Council +.- 1 hired by Red Hat, and +.- 1 appointed by the Council + + + + diff --git a/project/fedora-overview.adoc b/project/fedora-overview.adoc new file mode 100644 index 0000000..65929dc --- /dev/null +++ b/project/fedora-overview.adoc @@ -0,0 +1,203 @@ +What is Fedora? +=============== + +image::fedora-logo.png[] + +The Fedora Project is a community of people working together to build a +free and open source software platform and to collaborate on and share +user-focused solutions built on that platform. Or, in plain English, we +make an operating system and we make it easy for you do useful stuff +with it. + + +How do I get the software? +-------------------------- + +Download one of the different editions of Fedora for your +laptop/desktop, server, or containers at https://getfedora.org[Get +Fedora], or explore other options provided by +https://labs.fedoraproject.org/[Labs], +https://spins.fedoraproject.org/[Spins], +https://arm.fedoraproject.org/[ARM], and +https://alt.fedoraproject.org/[Alternative Downloads]. Everything +included is open source and free software — not only is it available at +no cost to you, but you can share, remix, and modify. + + +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. + + +Freedom +~~~~~~~ + +image:4Foundations-freedom100px.png[Four Foundations: +Freedom,title="Four Foundations: Freedom",float="right"] + +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:4Foundations-friends100px.png[Four Foundations: +Friends,title="Four Foundations: Friends",float="right"] + +We are a strong, caring community. + +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 http://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. + + +Features +~~~~~~~~ + +image:4Foundations-features100px.png[Four Foundations: +Features,title="Four Foundations: Features",float="right"] + +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 link: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:4Foundations-first100px.png[Four Foundations: +First,title="Four Foundations: First",float="right"] + +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 +link: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. |} + + +Our Mission +----------- + +____ +_Fedora creates an innovative platform for hardware, clouds, and +containers that enables software developers and community members to +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 +transparent, collaborative community of _Friends_, and entirely as open +source and free software — _Freedom_. + + +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 +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 +use, you are relying on code developed within the Fedora Project. + +We believe link: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 +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 of free software in the future over those that +emphasize short term ease of use. + + +Our Community +------------- + +Fedora is more than just software. It is a community of contributors +from http://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 +link:PackageMaintainers[software engineers],link:Artwork[artists], +link:Infrastructure[system administrators], link:Websites[web +designers], link:DocsProject[writers],link:Ambassadors[speakers], +link:G11N[translators], and more — and we are happy to help you get +started. + +We believe that all contributors should +https://fedoraproject.org/code-of-conduct[be excellent to each other]. +By creating an environment for constructive contribution, we can more +effectively and successfully compare and challenge different ideas to +find the best solutions for advancement, while building the size, +diversity, and strength of our community. + + +Leadership and Governance +------------------------- + +The link:Council[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 a +general rule, we want people working on a Fedora +link:Subprojects[subproject] to be make meaningful decisions about their +areas of interest and expertise. More details are available on our page +on link:Leadership[Fedora Leadership]. diff --git a/project/images/4Foundations-features100px.png b/project/images/4Foundations-features100px.png new file mode 100644 index 0000000..c54d6a9 Binary files /dev/null and b/project/images/4Foundations-features100px.png differ diff --git a/project/images/4Foundations-first100px.png b/project/images/4Foundations-first100px.png new file mode 100644 index 0000000..da7f5ce Binary files /dev/null and b/project/images/4Foundations-first100px.png differ diff --git a/project/images/4Foundations-freedom100px.png b/project/images/4Foundations-freedom100px.png new file mode 100644 index 0000000..bd2be3a Binary files /dev/null and b/project/images/4Foundations-freedom100px.png differ diff --git a/project/images/4Foundations-friends100px.png b/project/images/4Foundations-friends100px.png new file mode 100644 index 0000000..c3c21af Binary files /dev/null and b/project/images/4Foundations-friends100px.png differ diff --git a/project/images/council-badge.png b/project/images/council-badge.png new file mode 100644 index 0000000..5e0399d Binary files /dev/null and b/project/images/council-badge.png differ diff --git a/project/images/council-logo-500px.png b/project/images/council-logo-500px.png new file mode 100644 index 0000000..5f74569 Binary files /dev/null and b/project/images/council-logo-500px.png differ diff --git a/project/images/fedora-logo.png b/project/images/fedora-logo.png new file mode 100644 index 0000000..39b6c91 Binary files /dev/null and b/project/images/fedora-logo.png differ diff --git a/project/subprojects.adoc b/project/subprojects.adoc new file mode 100644 index 0000000..c646852 --- /dev/null +++ b/project/subprojects.adoc @@ -0,0 +1,20 @@ +[[fedora-sub-projects-for-contributors]] +Fedora sub-projects for contributors +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +[cols=",,",] +|======================================================================= +a| a| a| + +a| a| a| + +a| a| a| + +a| a| a| + +a| a| a| + +|\{\{projectline|Projects|View All Projects... |Echo-allproj-48px.png}} +a| |\{\{projectline|SIGs|View All Special Interest Groups (SIGs)... +|Echo-SIGs-48px.png}} +|=======================================================================