diff --git a/content/about/governance/appendix-glossary.md b/content/about/governance/appendix-glossary.md index 4ec30a1..de4aba8 100644 --- a/content/about/governance/appendix-glossary.md +++ b/content/about/governance/appendix-glossary.md @@ -14,23 +14,23 @@ is_dynamic: true ## Meritocracy In the free and open source software communities, meritocracy is one of the 3 main governance models in use and is likely the most popular, powerful, and successful. However, there is still, at times, confusion over how exactly this model works. -First and foremost, the basic tenet behind meritocracy is that people gain merit by their actions and activities within the community. What actually comprises that merit is determined by the pre-existing community itself, and so there exists an internal, stabilizing feedback system that prevents a healthy meritocracy from going askew. This basis of “what is merit” and “how one earns it” is self-defined and known within the community and can, and does, vary from community and project. For example, one FOSS project/community may value simple coding capability above all, and thus heavy-coders will gain merit quickly, whether they do so as volunteers or are paid to do so, and whether they work well with others or not. Other communities value a healthy balance of coding skills with consensus-based collaboration skills, whereas others also include the individual's personal stake in the project (how much they are personally involved and invested). +First and foremost, the basic tenet behind meritocracy is that people gain merit by their actions and activities within the community. What actually comprises that merit is determined by the pre-existing community itself, and so there exists an internal, stabilizing feedback system that prevents a healthy meritocracy from going askew. This basis of "what is merit" and "how one earns it" is self-defined and known within the community and can, and does, vary from community and project. For example, one FOSS project/community may value simple coding capability above all, and thus heavy-coders will gain merit quickly, whether they do so as volunteers or are paid to do so, and whether they work well with others or not. Other communities value a healthy balance of coding skills with consensus-based collaboration skills, whereas others also include the individual's personal stake in the project (how much they are personally involved and invested). As the above shows, a meritocracy is not, therefore, a democracy proper but a pseudo-republic. The wants and desires of the community are weighed in the atmosphere of merit that enables access and control. ##Consensus decision making -One practice of meritocracy is the consensus-based decision model. From http://en.wikipedia.org/wiki/Consensus_decision-making, “Consensus decision-making is a group decision making process that seeks the consent of all participants.” In practice, it is different from a majority-vote-wins approach. In the CentOS Project a discussion toward a decision follows this process: +One practice of meritocracy is the consensus-based decision model. From http://en.wikipedia.org/wiki/Consensus_decision-making, "Consensus decision-making is a group decision making process that seeks the consent of all participants." In practice, it is different from a majority-vote-wins approach. In the CentOS Project a discussion toward a decision follows this process: 1. A proposal is put forth and a check for consensus is made. 1. Consensus is signified through a +1 vote. 1. A check is made for any dissent on the proposal. - 1. Reservations? State reservation, sometimes with a ‘-1’ signifier + 1. Reservations? State reservation, sometimes with a '-1' signifier 1. Reservations about the proposal are worked through, seeking consensus to resolve the reservations. 1. A reservation is not a vote against the proposal, but may turn into a vote against if unresolved. It is often expressed with an initial -1 vote to indicate reservations and concerns. This indicates there is still discussion to be had. - 1. Stand aside? No comment, or state concerns without a -1 reservation; sometimes the ‘-0’ signifier is used. + 1. Stand aside? No comment, or state concerns without a -1 reservation; sometimes the '-0' signifier is used. 1. This option allows a member to have issues with the proposal without choosing to block the proposal, by instead standing aside with a +/-0 vote. 1. The stated concerns may influence other people to have or release reservations. - 1. Block? Vote ‘-1’ with reasons for the block. + 1. Block? Vote '-1' with reasons for the block. 1. This is a complete block on a proposal, refusing to let it pass. A block is a -1 vote and must be accompanied with substantive arguments that are rooted in the merit criteria of the Project -- protecting the community, the upstream, technical reasons, and so forth. Block (-1) votes used as a veto are typically used only when consensus cannot otherwise be met, and are effectively a veto that any sitting Board member can utilize with sufficient substantiation. diff --git a/content/about/governance/board-responsibilities.md b/content/about/governance/board-responsibilities.md index 5a3b4f4..e8775e3 100644 --- a/content/about/governance/board-responsibilities.md +++ b/content/about/governance/board-responsibilities.md @@ -55,6 +55,6 @@ The CentOS Governing Board shall include two named roles: a Chair and a Liaison, The Liaison is required to be a Red Hat employee, which will enable this person to be an effective bi-directional conduit between Red Hat and the CentOS Project. The Chair, however, can be anyone selected by the Board from among its members. The Liaison may be rotated at any time to an alternate Red Hat employee who is a Board member. Newly appointed Board members may also hold the Liaison seat. The Chair and the Liaison cannot be the same person. -The Board will operate under the principles of [meritocracy](/about/governance/appendix-glossary/#meritocracy), having the Board be driven by a [consensus-based decision model](/about/governance/appendix-glossary/#consensus-decision-making). This model fosters an active healthy debate that furthers the Project while recognising its relationship to Red Hat’s product source, the new formal relationship with Red Hat, and preserving the viability of the key upstream that feeds it. +The Board will operate under the principles of [meritocracy](/about/governance/appendix-glossary/#meritocracy), having the Board be driven by a [consensus-based decision model](/about/governance/appendix-glossary/#consensus-decision-making). This model fosters an active healthy debate that furthers the Project while recognising its relationship to Red Hat's product source, the new formal relationship with Red Hat, and preserving the viability of the key upstream that feeds it. [« Back to Governance](/about/governance) diff --git a/content/about/governance/joining-the-project.md b/content/about/governance/joining-the-project.md index b629894..8d7ac55 100644 --- a/content/about/governance/joining-the-project.md +++ b/content/about/governance/joining-the-project.md @@ -24,7 +24,7 @@ A SIG with a higher barrier to entry is the CentOS Core SIG, which has the ultim A SIG that consistently has a significant number of -1 votes, especially from a single person, indicates an issue that should be brought to the attention of the Board , as it may be an indicator of a dis-functional SIG and may adversely impact the meritocracy. ##Board Members -Each Board member appointed or reconfirmed by the Board will be selected based on merit. Merit criteria have been defined to recognize, among other things, active participation in the CentOS Project, an understanding of the Project, and an understanding and ability to balance the objectives derived from the relationship with it’s Red Hat-based upstream. In this regard, Candidate Board members must: +Each Board member appointed or reconfirmed by the Board will be selected based on merit. Merit criteria have been defined to recognize, among other things, active participation in the CentOS Project, an understanding of the Project, and an understanding and ability to balance the objectives derived from the relationship with it's Red Hat-based upstream. In this regard, Candidate Board members must: * Have demonstrated, including through active participation and contribution to the broader aspects of running the CentOS Project for an extended period of time, a solid understanding of and motivation to foster a healthy relationship to it's upstream, the factors that influence and guide that ecosystem, and the need to maintain the health and vitality of that ecosystem. * Promote CentOS and the needs of the community projects in CentOS to achieve active and vibrant adoption in the community for CentOS. diff --git a/content/about/governance/sigs.md b/content/about/governance/sigs.md index 5f5c0fe..c44c649 100644 --- a/content/about/governance/sigs.md +++ b/content/about/governance/sigs.md @@ -17,7 +17,7 @@ SIGs are usually self-forming around a technology by a small community of enthus Each group will be responsible for its own variant in CentOS that is specifically targeted towards its community (e.g., The CentOS FooBar SIG creates a CentOS variant targeted to FooBar users and developers, the CentOS Hosting SIG builds a variant for web hosters, included in the CentOS distribution). The SIG is the deciding authority on what is required in their variant to satisfy the needs of their community, with the understanding that the Board has ultimate oversight as explained elsewhere. If required, the CentOS Board will help the individual SIGs to reach consensus on any issues or problems. -SIGs are the only way for an entity to use and associate the CentOS brand with a variant. You can always use Git and the repo to fork and try-out ideas, but only those packages in git.centos.org and released and signed by CentOS can be called ‘CentOS’. +SIGs are the only way for an entity to use and associate the CentOS brand with a variant. You can always use Git and the repo to fork and try-out ideas, but only those packages in git.centos.org and released and signed by CentOS can be called 'CentOS'. Another type of SIG is functional, focused on maintaining parts of the Project itself, such as infrastructure, documentation, and design. A unique SIG is the Core SIG that builds and maintains the core CentOS derivative of Red Hat Enterprise Linux. It is unique because it is the central, orchestrating platform that all other variants are built from. @@ -52,7 +52,7 @@ Another type of SIG is functional, focused on maintaining parts of the Project i -The SIGs themselves also have a merit path toward autonomy and accountability for Project aspects. The determination of merit level is reflected in the amount of oversight required by the Board and the SIGs ability to self-sign and release software builds. As merit increases, Board oversight goes down, with a transition spot in the middle where the SIG naturally obtains more autonomy, usually toward the end of the “Early” phase. +The SIGs themselves also have a merit path toward autonomy and accountability for Project aspects. The determination of merit level is reflected in the amount of oversight required by the Board and the SIGs ability to self-sign and release software builds. As merit increases, Board oversight goes down, with a transition spot in the middle where the SIG naturally obtains more autonomy, usually toward the end of the "Early" phase. __Sandboxes__ are the entry point for all proposed SIGs. To enter, there must be a Champion from or approved by the Board and a proposal (which indicates the reason for the SIG, the expected audience, initial team, risks, etc.) For a SIG to be created, there must be at least 3 +1 votes from the Board (NOT including the Champion) and zero (nil) -1 votes. When approved, the Champion becomes the formal Mentor of the Sandbox SIG. @@ -68,7 +68,7 @@ In both the Sandbox and Early SIGs, the role of the Board is primarily to facili Note that in all cases, maturity is a measure of the community itself, and not the codebase or the actual SIG variant release. A mature SIG could create a non-mature (e.g., Alpha or Beta release) distribution and, conversely, a Sandbox SIG could produce a very mature (robust and reliable) distro. ##Community and SIGs -SIGs represent the true power and value of the CentOS Project. As seen in the current CentOS Dojos, and in the CentOS community itself, the builds provide a safe, neutral, and communal central meeting place for major technology areas. This is the reason why SIGs should not be program/project specific (e.g., a MariaDB rebuild), but rather technology-area focused (e.g., the “Hoster's” rebuild). By creating a central point where all projects and communities can interact, using the OS as the common foundation, upstream projects will be able to reach and interface with a much larger audience. +SIGs represent the true power and value of the CentOS Project. As seen in the current CentOS Dojos, and in the CentOS community itself, the builds provide a safe, neutral, and communal central meeting place for major technology areas. This is the reason why SIGs should not be program/project specific (e.g., a MariaDB rebuild), but rather technology-area focused (e.g., the "Hoster's" rebuild). By creating a central point where all projects and communities can interact, using the OS as the common foundation, upstream projects will be able to reach and interface with a much larger audience. It is expected that SIGs may propose significant forking of the base CentOS core, such as introducing a new Python version or Linux kernel. It is the job of the Board and CentOS Core SIG to oversee and approve any forks that are pulled back into Git, including to ensure that these forks are supportable. This support is best done by an active and engaged variant SIG. The Board or CentOS Core SIG can pull a variant from release if they reasonably believe the variant SIG is unable to support the variant. Another option is reassigning an active variant from a dead SIG to a willing living SIG. The Board is specifically not limited in what it can do to protect the quality of the CentOS mark where it comes to the content and quality of a variant. diff --git a/content/about/governance/voting.md b/content/about/governance/voting.md index 59febee..c7bb128 100644 --- a/content/about/governance/voting.md +++ b/content/about/governance/voting.md @@ -29,6 +29,6 @@ A. If a decision/solution cannot be found on an issue that is deemed time and/or B. The Liaison may, in exceptional circumstances, make a decision on behalf of the Board if a consensus has not been reached on an issue that is deemed time or business critical by Red Hat if: (1) a board quorum (i.e., a majority) is present or a quorum of Board members has cast their votes; or (2) after 3 working days if a Board quorum is not present at a meeting or a quorum has not cast their votes (list votes); provided that the Chair may (or at the request of the Liaison, will) call a meeting and demand that a quorum be present. -Unless the Liaison specifically indicates on a specific issue that he/she is acting in his/her official capacity as Liaison, either prior to a vote or later (e.g., after an issue has been deemed time or business critical), the Liaison’s voice and vote is treated the same as any other member of the Board. Decisions indicated as Liaison decisions made on behalf of the Board by the Liaison may not be overturned. +Unless the Liaison specifically indicates on a specific issue that he/she is acting in his/her official capacity as Liaison, either prior to a vote or later (e.g., after an issue has been deemed time or business critical), the Liaison's voice and vote is treated the same as any other member of the Board. Decisions indicated as Liaison decisions made on behalf of the Board by the Liaison may not be overturned. [« Back to Governance](/about/governance) diff --git a/content/assets/css/bootstrap/_grid.scss b/content/assets/css/bootstrap/_grid.scss index 7b33ecd..b739362 100644 --- a/content/assets/css/bootstrap/_grid.scss +++ b/content/assets/css/bootstrap/_grid.scss @@ -76,7 +76,7 @@ // Grid classes for extra small devices like smartphones. No offset, push, or // pull classes are present here due to the size of the target. // -// Note that `.col-xs-12` doesn't get floated on purpose—there's no need since +// Note that `.col-xs-12` doesn't get floated on purpose-there's no need since // it's full-width. .col-xs-1, @@ -111,7 +111,7 @@ // Columns, offsets, pushes, and pulls for the small device range, from phones // to tablets. // -// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since +// Note that `.col-sm-12` doesn't get floated on purpose-there's no need since // it's full-width. @media (min-width: $screen-tablet) { @@ -189,7 +189,7 @@ // // Columns, offsets, pushes, and pulls for the desktop device range. // -// Note that `.col-md-12` doesn't get floated on purpose—there's no need since +// Note that `.col-md-12` doesn't get floated on purpose-there's no need since // it's full-width. @media (min-width: $screen-desktop) { @@ -269,7 +269,7 @@ // // Columns, offsets, pushes, and pulls for the large desktop device range. // -// Note that `.col-lg-12` doesn't get floated on purpose—there's no need since +// Note that `.col-lg-12` doesn't get floated on purpose-there's no need since // it's full-width. @media (min-width: $screen-lg-desktop) { diff --git a/content/community/calendar.md b/content/community/calendar.md new file mode 100644 index 0000000..2dfb769 --- /dev/null +++ b/content/community/calendar.md @@ -0,0 +1,82 @@ +# CentOS IRC meetings + +## Meeting schedule + +The IRC meetings schedule is driven by the [github.com/CentOS/Calendar](https://github.com/CentOS/Calendar) repository. To propose a change or add a meeting, please submit a pull-request to that git-hub repository. This repository is mirrored to git.centos.org. + +Here is the link to a `.ical` file containing all CentOS IRC meetings, for use in your favorite calendaring app: [iCalendar Meeting Schedule](https://git.centos.org/raw/sig-core!calendar.git/master/output!irc-meetings.ical) + +A [list of all meetings](#list) is available below. + +## Logging + +CentOS IRC channels and meetings are logged. You can find them [here](http://www.centos.org/minutes/). + +## Meeting List + +Here is a list of current meetings with their descriptions: + +* [Atomic SIG](#Atomic_SIG) +* [Cloud SIG](#Cloud_SIG) +* [Community Buildsystem & Infrastructure Meeting](#Community_Buildsystem_&_Infrastructure_Meeting) +* [Karanbir Singh Office Hours](#Karanbir_Singh_Office_Hours) +* [Software Collections SIG Sync-up](#Software_Collections_SIG_Sync-up) +* [Storage SIG](#Storage_SIG) + +### Atomic SIG + +* Weekly on Thursday at [1600 UTC](http://www.timeanddate.com/worldclock/fixedtime.html?hour=16&min=00&sec=0) in #centos-devel +* Chair (to contact for more information): Joe Brockmeier (jzb) +* [Link to Project Site](http://wiki.centos.org/SpecialInterestGroup/Atomic) +* The SIG is working on several goals including shipping a minimal CentOS Atomic Host that focuses on running Docker containers in production. + + +### Cloud SIG + +* Weekly on Thursday at [1500 UTC](http://www.timeanddate.com/worldclock/fixedtime.html?hour=15&min=00&sec=0) in #centos-devel +* Chair (to contact for more information): Rich Bowen (rbowen) and Kushal Das (kushal) +* [Link to Project Site](http://wiki.centos.org/SpecialInterestGroup/Cloud) +* The proposed CentOS Cloud SIG (CCS) is a group of people coming together to focus on packaging and maintaining different FOSS based Private cloud infrastructure applications that one can install and run natively on CentOS. We are a non vendor, non technology and non agent specific focus group, but we will gladly work with and build content to suit relevant niches or vendor ecosystems. This group specifically targets users who wish to install and run their own, independent ( or hybrid ) cloud infrastructure on CentOS Linux. + +The CCS intends to take ownership of existing CentOS Project relationships with vendors, and help to maintain the updated package repositories for all participating cloud projects. + + +### Community Buildsystem & Infrastructure Meeting + +* Every two weeks (on even weeks) on Monday at [1700 UTC](http://www.timeanddate.com/worldclock/fixedtime.html?hour=17&min=00&sec=0) in #centos-devel +* Chair (to contact for more information): Brian Stinson (bstinson), Fabian Arrotin (Arrfab), Karanbir Singh (kbsingh), Thomas Oulevey (alphacc) +* [Link to Project Site](http://wiki.centos.org/HowTos/CommunityBuildSystem) +* The CBS/Infra meeting is for discussing and coordinating operations in the Community Buildsystem. Anyone are welcome to attend and discuss client tools, jobs in the buildsystem, feature requests, and anything related. + + +### Karanbir Singh Office Hours + +* Weekly on Thursday at [0830 UTC](http://www.timeanddate.com/worldclock/fixedtime.html?hour=08&min=30&sec=0) in #centos-devel +* Weekly on Wednesday at [1600 UTC](http://www.timeanddate.com/worldclock/fixedtime.html?hour=16&min=00&sec=0) in #centos-devel +* Chair (to contact for more information): Karanbir Singh (kbsingh) +* [Link to Project Site](http://www.karan.org/blog/2015/06/08/regular-office-hours/) +* I am going to make myself available to anyone who wants to come along and +talk about CentOS Linux, the CentOS Project, the SIGs or anything else that +is related to these. During this time, you can find me on #centos-devel @ +irc.freenode.net as kbsingh, and you can also call me on the phone +at +44 207 009 4455. + + +### Software Collections SIG Sync-up + +* Every two weeks (on even weeks) on Wednesday at [1500 UTC](http://www.timeanddate.com/worldclock/fixedtime.html?hour=15&min=00&sec=0) in #centos-devel +* Chair (to contact for more information): Honza Horak (hhorak) +* [Link to Project Site](http://wiki.centos.org/SpecialInterestGroup/SCLo) +* The Software Collections SIG will provide an upstream development area for various software collections and related tools. Developers can build on and extend existing SCLs, so they don't need to re-invent the wheel or take responsibility for packaging unnecessary dependencies. + + +### Storage SIG + +* Every two weeks (on odd weeks) on Friday at [1530 UTC](http://www.timeanddate.com/worldclock/fixedtime.html?hour=15&min=30&sec=0) in #centos-devel +* Chair (to contact for more information): Karabir Singh (kbsingh) and Lalatendu Mohanty (lalatenduM) +* [Link to Project Site](http://wiki.centos.org/SpecialInterestGroup/Storage) +* The CentOS Storage Special Interest Group (SIG) is a collection of like-minded individuals coming together to ensure that CentOS is a suitable platform for many different storage solutions. This group will ensure that all Open Source storage options seeking to utilize CentOS as a delivery platform have a voice in packaging, orchestration, deployment, and related work. + + + +Page generated on 2015-06-22 14:47:42.409749 UTC \ No newline at end of file diff --git a/content/community/stories.md b/content/community/stories.md index 99114ef..a782a1e 100644 --- a/content/community/stories.md +++ b/content/community/stories.md @@ -65,9 +65,9 @@ packages[3] that may be of interest. ##Christoph Galuschka -My name is Christoph Galuschka - tigalch on IRC and in the fora - and I'm part of the CentOS QA team. I’m from Innsbruck, Austria, 36 years old and I’m working for a local utility company in their IT operations department. My responsibilities include VMware, everything VPN and firewall-related, the companywide internet access including security, and operating the company network. Previously to that I was working for an IT consulting company, which also operated its own WAN network to interconnect various customers. Apart from consulting I also handled most of the network related things (FrameRelay, ISDN- and ADSL-dialup, running internet related services like bind, apache, sendmail and the corporate firewall). As we also provided internet access and related services to our customers, we used Linux as the OS of choice for our servers. At was Slackware at that time, and OpenSuSE later. My first contact with CentOS was in 2007 or 2008. A company selling opengroupware.org as a ready to deploy collaboration server used CentOS5 as OS of choice. +My name is Christoph Galuschka - tigalch on IRC and in the fora - and I'm part of the CentOS QA team. I'm from Innsbruck, Austria, 36 years old and I'm working for a local utility company in their IT operations department. My responsibilities include VMware, everything VPN and firewall-related, the companywide internet access including security, and operating the company network. Previously to that I was working for an IT consulting company, which also operated its own WAN network to interconnect various customers. Apart from consulting I also handled most of the network related things (FrameRelay, ISDN- and ADSL-dialup, running internet related services like bind, apache, sendmail and the corporate firewall). As we also provided internet access and related services to our customers, we used Linux as the OS of choice for our servers. At was Slackware at that time, and OpenSuSE later. My first contact with CentOS was in 2007 or 2008. A company selling opengroupware.org as a ready to deploy collaboration server used CentOS5 as OS of choice. -Within the CentOS Project I’m doing QA. I’m also contributing to the wiki (German release notes) and the fora. Together with Athmane Madjoudj I’m also handling the t_functional stack (take a look at [http://ci.dev.centos.org](http://ci.dev.centos.org)) which helps us automate tests around CentOS-QA and Updates and the infra behind that setup. +Within the CentOS Project I'm doing QA. I'm also contributing to the wiki (German release notes) and the fora. Together with Athmane Madjoudj I'm also handling the t_functional stack (take a look at [http://ci.dev.centos.org](http://ci.dev.centos.org)) which helps us automate tests around CentOS-QA and Updates and the infra behind that setup. At my current company we used to use OpenSuSE for various tasks i.e. syslog, rsync, local update repositories, internal firewalls or as base OS for virus scanners. The change in OpenSuSEs lifecycle policy forced us to reconsider the Distro of our choice, and so I recommended CentOS (C6 at that time). Within the time of 2 years I replaced almost every Linux installation (3 SLES servers are still left, but working on that) with CentOS6. Locking back, this was the right choice, which is proven by stability, easy applying of updates/point releases, manageability by using funcd and in general ease of use. Also the lifecycle expansion to 10 years and the joining of forces with RedHat are a big plus for CentOS in my view. diff --git a/content/download.haml b/content/download.haml index 10035a3..d3df9ca 100644 --- a/content/download.haml +++ b/content/download.haml @@ -61,4 +61,4 @@ title: Download CentOS .col-sm-12 %h3.text-center.smallprint Export Regulations %p.smallprint - By downloading CentOS software, you acknowledge that you understand all of the following: CentOS software and technical information may be subject to the U.S. Export Administration Regulations (the “EAR”) and other U.S. and foreign laws and may not be exported, re-exported or transferred (a) to any country listed in Country Group E:1 in Supplement No. 1 to part 740 of the EAR (currently, Cuba, Iran, North Korea, Sudan & Syria); (b) to any prohibited destination or to any end user who has been prohibited from participating in U.S. export transactions by any federal agency of the U.S. government; or (c) for use in connection with the design, development or production of nuclear, chemical or biological weapons, or rocket systems, space launch vehicles, or sounding rockets, or unmanned air vehicle systems. You may not download CentOS software or technical information if you are located in one of these countries or otherwise subject to these restrictions. You may not provide CentOS software or technical information to individuals or entities located in one of these countries or otherwise subject to these restrictions. You are also responsible for compliance with foreign law requirements applicable to the import, export and use of CentOS software and technical information. + By downloading CentOS software, you acknowledge that you understand all of the following: CentOS software and technical information may be subject to the U.S. Export Administration Regulations (the "EAR") and other U.S. and foreign laws and may not be exported, re-exported or transferred (a) to any country listed in Country Group E:1 in Supplement No. 1 to part 740 of the EAR (currently, Cuba, Iran, North Korea, Sudan & Syria); (b) to any prohibited destination or to any end user who has been prohibited from participating in U.S. export transactions by any federal agency of the U.S. government; or (c) for use in connection with the design, development or production of nuclear, chemical or biological weapons, or rocket systems, space launch vehicles, or sounding rockets, or unmanned air vehicle systems. You may not download CentOS software or technical information if you are located in one of these countries or otherwise subject to these restrictions. You may not provide CentOS software or technical information to individuals or entities located in one of these countries or otherwise subject to these restrictions. You are also responsible for compliance with foreign law requirements applicable to the import, export and use of CentOS software and technical information. diff --git a/content/legal.md b/content/legal.md index 80d3b62..27650b6 100644 --- a/content/legal.md +++ b/content/legal.md @@ -11,7 +11,7 @@ is_dynamic: true #Export Regulations -By downloading CentOS software, you acknowledge that you understand all of the following: CentOS software and technical information may be subject to the U.S. Export Administration Regulations (the “EAR”) and other U.S. and foreign laws and may not be exported, re-exported or transferred (a) to any country listed in Country Group E:1 in Supplement No. 1 to part 740 of the EAR (currently, Cuba, Iran, North Korea, Sudan & Syria); (b) to any prohibited destination or to any end user who has been prohibited from participating in U.S. export transactions by any federal agency of the U.S. government; or (c) for use in connection with the design, development or production of nuclear, chemical or biological weapons, or rocket systems, space launch vehicles, or sounding rockets, or unmanned air vehicle systems. You may not download CentOS software or technical information if you are located in one of these countries or otherwise subject to these restrictions. You may not provide CentOS software or technical information to individuals or entities located in one of these countries or otherwise subject to these restrictions. You are also responsible for compliance with foreign law requirements applicable to the import, export and use of CentOS software and technical information. +By downloading CentOS software, you acknowledge that you understand all of the following: CentOS software and technical information may be subject to the U.S. Export Administration Regulations (the "EAR") and other U.S. and foreign laws and may not be exported, re-exported or transferred (a) to any country listed in Country Group E:1 in Supplement No. 1 to part 740 of the EAR (currently, Cuba, Iran, North Korea, Sudan & Syria); (b) to any prohibited destination or to any end user who has been prohibited from participating in U.S. export transactions by any federal agency of the U.S. government; or (c) for use in connection with the design, development or production of nuclear, chemical or biological weapons, or rocket systems, space launch vehicles, or sounding rockets, or unmanned air vehicle systems. You may not download CentOS software or technical information if you are located in one of these countries or otherwise subject to these restrictions. You may not provide CentOS software or technical information to individuals or entities located in one of these countries or otherwise subject to these restrictions. You are also responsible for compliance with foreign law requirements applicable to the import, export and use of CentOS software and technical information. #Trademark Guidelines diff --git a/content/legal/trademarks.md b/content/legal/trademarks.md index 147dcf7..b53bd86 100644 --- a/content/legal/trademarks.md +++ b/content/legal/trademarks.md @@ -7,7 +7,7 @@ is_dynamic: true {:toc} #Introduction - + This document (the "Guidelines") contains guidelines for use of the CentOS word mark (the "Word Mark"), as well as the CentOS logotype, the CentOS graphical symbol, the 'Powered by CentOS' logo, and all other CentOS logos (the "Logos") (collectively, the "CentOS Marks"). The CentOS Marks are trademarks of Red Hat, Inc. ("Red Hat"). Trademarks provide assurance about the quality of the goods or services with which the trademarks are associated. Confusion can arise if the same or similar names are used on identical or similar offerings. Red Hat's protection of the CentOS Marks thus benefits the CentOS Project and the CentOS community. @@ -25,7 +25,7 @@ Red Hat welcomes the assistance of the entire CentOS community in reporting non- Whenever you use the CentOS Marks, you must do so in a way that does not mislead others, either directly or by omission, concerning what they are obtaining and from whom. The law reflects this requirement in two principal ways: it prohibits creation of a "likelihood of confusion" but allows for "nominative use". -For example, you are not allowed to say you are distributing CentOS software when you are actually distributing some downstream modification of an official CentOS release (“Official” packages, builds, and releases are those that have been approved for the CentOS Project's release by the CentOS Project) . Otherwise, your recipients would be confused if they do not receive the same features and functionality they would have obtained had they received software officially released by the CentOS Project. As another example, you are not allowed to use the Logos on your website in a way that suggests that your website is an official website of the CentOS Project, or that the CentOS Project endorses your website. On the other hand, you may of course say, for example, that you like the CentOS software distribution or that you participate in the CentOS Project. +For example, you are not allowed to say you are distributing CentOS software when you are actually distributing some downstream modification of an official CentOS release ("Official" packages, builds, and releases are those that have been approved for the CentOS Project's release by the CentOS Project) . Otherwise, your recipients would be confused if they do not receive the same features and functionality they would have obtained had they received software officially released by the CentOS Project. As another example, you are not allowed to use the Logos on your website in a way that suggests that your website is an official website of the CentOS Project, or that the CentOS Project endorses your website. On the other hand, you may of course say, for example, that you like the CentOS software distribution or that you participate in the CentOS Project. You may not use or register, in whole or in part, the CentOS Marks as part of your own trademark, service mark, domain name, company name, trade name, product name, or service name. diff --git a/layouts/navbar.haml b/layouts/navbar.haml index 258a6e1..23d7fa5 100644 --- a/layouts/navbar.haml +++ b/layouts/navbar.haml @@ -41,6 +41,8 @@ %li %a( href="http://wiki.centos.org/irc" ) IRC %li + %a( href="community/calendar/" ) Calendar & IRC Meeting List + %li %a( href="http://planet.centos.org" ) Planet %li %a( href="http://bugs.centos.org" ) Submit a Bug