diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/download.md | 13 | ||||
| -rw-r--r-- | www/footer.md | 7 | ||||
| -rw-r--r-- | www/git.md | 25 | ||||
| -rw-r--r-- | www/global.css | 15 | ||||
| -rw-r--r-- | www/headercenter.css | 3 | ||||
| -rw-r--r-- | www/headerleft.css | 3 | ||||
| -rw-r--r-- | www/index.md | 28 | ||||
| -rw-r--r-- | www/license.md | 15 | ||||
| -rw-r--r-- | www/management.md | 115 | ||||
| -rw-r--r-- | www/news/formalised-structure.md | 35 | ||||
| -rw-r--r-- | www/news/fsf-domain-offer.md | 15 | ||||
| -rw-r--r-- | www/news/proposal-rejoin-gnu.md | 9 | ||||
| -rw-r--r-- | www/news/sfc-domain-offer.md | 36 | ||||
| -rwxr-xr-x | www/publish.sh | 15 |
14 files changed, 285 insertions, 49 deletions
diff --git a/www/download.md b/www/download.md index 321d0679..325c29c5 100644 --- a/www/download.md +++ b/www/download.md @@ -36,28 +36,21 @@ HTTPS mirrors {#https} These mirrors are recommended, since they use TLS (https://) encryption. -<https://mirrors.peers.community/mirrors/libreboot/> (Peers Community -Project, USA) - <https://www.mirrorservice.org/sites/libreboot.org/release/> (University of Kent, UK) <https://mirror.math.princeton.edu/pub/libreboot/> (Princeton university, USA) -<https://mirrors.cicku.me/libreboot/> (CICKU FOSS Mirror Service, -Germany) +<https://mirrors.peers.community/mirrors/libreboot/> (Peers Community +Project, USA) <https://vimuser.org/libreboot/> (vimuser.org, Netherlands) -<https://ginette.swordarmor.fr/libreboot/> (swordarmor.fr, France) - <https://mirror.se.partyvan.eu/pub/libreboot/> (partyvan.eu, Sweden) <https://elgrande74.net/libreboot/> (elgrande74.net, France) -<https://nedson.net/libreboot> (nedson.net, USA) - HTTP mirrors {#http} ------------ @@ -78,6 +71,8 @@ Undisclosed location) <http://libreboot.mirror.si/> (mirror.si, Slovenia) +<http://ginette.swordarmor.fr/libreboot/> (swordarmor.fr, France) + FTP mirrors {#ftp} ----------- diff --git a/www/footer.md b/www/footer.md new file mode 100644 index 00000000..dfddfd75 --- /dev/null +++ b/www/footer.md @@ -0,0 +1,7 @@ + +[License](/docs/fdl-1.3.md) -- +[Template](/license.md) -- +[Authors](/contrib.md) -- +[Conduct Guidelines](/conduct.md) -- +[Management Guidelines](/management.md) -- +[Peers Community](https://peers.community/) -- @@ -33,6 +33,31 @@ GNU+Linux distributions package it in their repositories). GNU+Linux is generally recommended as the OS of choice, for Libreboot development. +General code review guidelines +------------------------------ + +Non-core members will push to their own repository, and issue a Pull Request. +Core maintainers of Libreboot can push to the repository, but not to the master +branch; they must push it to a non-master branch, and again issue a Pull +Request. + +An individual or group of people will then review the patch sent by the +contributor. With approval from a core maintainer, or otherwise someone with +merge rights on the repository, the patch will be merged into the official +*master* branch. + +Those with push/merge access on the official Libreboot repository must never +directly push their own patches to the master branch, and they must never +merge their own Pull Request. Regardless of the individual's standing and +frequency of contributions within the project, those who decide whether to +merge a patch will *always* differ from the original contributor. + +These guidelines are *enforced*, to avoid the appearance of a BDFL (Benevolent +Dictator for Life) in the Libreboot project, as one previously existed in the +project. Libreboot is a collectively and democratically governed project. +Maintainers who violate these guidelines may, at the discretion of other +maintainers, have their push/merge rights revoked. + How to download Libreboot from the Git repository ------------------------------------------------- diff --git a/www/global.css b/www/global.css index 0264e4ef..b325ef31 100644 --- a/www/global.css +++ b/www/global.css @@ -13,11 +13,8 @@ body { body { line-height: 1.6; font-family: Cantarell, sans-serif; - font-size: 1.1em; color: #222; -} - -header { - text-align: center; + font-size: 1.1em; + color: #222; } #logo { @@ -37,3 +34,11 @@ a:hover { .date { display: block; } + +h1, h2, h3, .h:hover a { + display: inline; +} + +.h a { + display: none; +} diff --git a/www/headercenter.css b/www/headercenter.css new file mode 100644 index 00000000..6b8c294c --- /dev/null +++ b/www/headercenter.css @@ -0,0 +1,3 @@ +header { + text-align: center; +} diff --git a/www/headerleft.css b/www/headerleft.css deleted file mode 100644 index 645ab4ea..00000000 --- a/www/headerleft.css +++ /dev/null @@ -1,3 +0,0 @@ -header { - text-align: left !important; -} diff --git a/www/index.md b/www/index.md index 63dc327b..f15b3082 100644 --- a/www/index.md +++ b/www/index.md @@ -8,19 +8,24 @@ mascot"){#logo}](faq.md#who-did-the-logo) [FAQ](faq.md) -- [Download](download.md) -- [Install](docs/install/) -- -[Documentation](docs/) -- +[Docs](docs/) -- [News](news/) -- -[Contact/IRC](https://webchat.freenode.net/?channels=libreboot) -- -[Report bugs](https://notabug.org/libreboot/libreboot/issues) -- -[Send patches](git.md) +[IRC](https://webchat.freenode.net/?channels=libreboot) -- +[Bugs](https://notabug.org/libreboot/libreboot/issues) -- +[Contribute](git.md) -- +[Management](management.md) -- +[Tasks](https://notabug.org/libreboot/libreboot/milestones) -Libreboot is a [free](https://www.gnu.org/philosophy/free-sw.html) and Open -Source BIOS or UEFI replacement, initialising the hardware and booting your -operating system. We are a member of the -[Peers Community](https://peers.community/) project, an organisation that -supports Free Software. +Libreboot is a [free](https://www.gnu.org/philosophy/free-sw.html) (as in +freedom) BIOS or UEFI replacement, initialising the hardware and booting your +operating system. -**[Libreboot no longer opposes FSF/GNU. Read our open peace letter to the community.](news/unity.md)** +**[Community feedback is needed on whether libreboot.org domain name +ownership should be transferred to the +Software Freedom Conservancy](news/sfc-domain-offer.md)** + +**[Libreboot has applied to re-join the GNU project, +under new democratic leadership](news/formalised-structure.md)** Why use Libreboot? ------------------ @@ -42,6 +47,3 @@ which we deblob. We upstream our custom patches to projects like coreboot, depthcharge, GRUB, and flashrom where possible. Together, we provide an automated build and installation system with nontechnical documentation, allowing Libreboot to be widely used. - -[Watch our FOSDEM 2017 presentation about Libreboot (speaker is Leah -Rowe)](https://video.fosdem.org/2017/K.1.105/libreboot.mp4) diff --git a/www/license.md b/www/license.md index eecf1c2f..d70a4733 100644 --- a/www/license.md +++ b/www/license.md @@ -1,17 +1,4 @@ -Website: - -Copyright 2015-2017 Leah Rowe <info@minifree.org> \ -Copyright 2017 Alyssa Rosenzweig <alyssa@rosenzweig.io> - -This document is released under the Creative Commons Attribution-ShareAlike 4.0 -International Public License and all future versions. A copy of the license -can be found at "cc-by-sa-4.txt". - -This document is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE. See cc-by-sa-4.txt for more information. - -Template: +Pandoc template used on the Libreboot website: Copyright (c) 2014--2017, John MacFarlane diff --git a/www/management.md b/www/management.md new file mode 100644 index 00000000..629d5cd7 --- /dev/null +++ b/www/management.md @@ -0,0 +1,115 @@ +--- +title: General management guidelines and leadership information +x-toc-enable: true +... + +This document sets out general guidelines for how the Libreboot project is +governed, managed and who constitutes the core leadership of the project. + +All project members must act according to the +[Guidelines for Good Conduct in the Libreboot community](conduct.md). + +Democratic governance of the Libreboot project +---------------------------------------------- + +Previously, the Libreboot leadership was a BDFL (Benevolent Dictator For Life) +arrangement, with the project's founder (Leah Rowe) having exclusive control +over the project, delegating tasks (by her own exclusive discretion) to others. +This style was very similar to the leadership structure of the Linux kernel +project via Linus Torvalds and, while initially effective, was found to be +ineffective and counter-productive in the long term. + +The old leadership structure has been **abandoned**, and Leah is no longer leader +of the Libreboot project. This decision was made democratically and +collectively, by the same overall standards set out in this document, with +Leah's direct approval and participation, in the best long-term interests of +the Libreboot project, where she agreed to stand down as project leader. + +In principle and in practise, Libreboot is now a collectively and democratically +governed project. Any individual member of the community, regardless of their +current standing or reputation, can propose changes to the project (this +includes code/documentation contributions, project management decisions and +so on). The proposal can be absolutely anything, within reason where it is +relevant to Libreboot and could be beneficial. + +All proposals are subject to review and approval by the community. In the case +of code patches, any member of the public can also voice their opinions on a +contribution; the patch will also be reviewed by one of the core maintainers +of the project. In the case of general project decisions, such as general +policies of the project and management roles (such as, removing a core member +who starts acting out of line with and/or in violation of project policies), +the decision will also be polled by the community, to assess public support for +such a decision. With public approval, and agreement among the core maintainers, +the decision would then be enacted, and it falls on them to implement the +mandate that was set, whatever that mandate might be. + +Actual places to poll members of the public, shall be decided on by the core +maintainers. Examples could include the IRC channel, the subreddit r/libreboot, +the mailing list (if one exists), and any other place deemed appropriate. + +Those who are part of the core maintainers and core management team, can be +appointed and removed at the behest of popular public demand, with approval +from the current +core maintainers and/or management team within the Libreboot project. + +Generally, the project should not have a single leader, but if such a role is +required in the future, it will be a rotating leadership, to be changed +after a certain period, subject to approval by the core maintainers and by +popular public demand. Exact infrastructure for how to cast such votes and +make such appointments will be decided at that time, when it becomes necessary +for the Libreboot project. + +Information about Libreboot's code review and code management guidelines +can be found +[on the Git section of the website](git.md#general-code-review-guidelines). + +Information about core team members, responsible for the Libreboot project +-------------------------------------------------------------------------- + +- Alyssa Rosenzweig handles Communications and Public Relations\*, acting + additionally as the official System Administrator for the Libreboot project + infrastructure. + IRC nick **alyssa** on Freenode. +- Paul Kocialkowski is one of the core developers. IRC nick **paulk-X** on + Freenode (**X** is variable, for this individual, and changes over time) +- Leah Rowe is one of the core developers. IRC nick **\_4of7** on Freenode +- Swift Geek is one of the core developers. IRC nick **swiftgeek** on Freenode + +All of the people above are moderators in the Libreboot IRC channel, and +form the basis of the project's collective inner leadership, responsible as +trustees for the project in ensuring the projects long-term success and for +general management of the project. + +All core members have push access to the Git repository for Libreboot. +Additionally, Alyssa and Leah have SSH access (including root) to the main +server for libreboot.org (this list will expand, if Alyssa and Leah both agree +and if it is appropriate, e.g. if more System Administrators join the +project). + +Any member of the public can join this list, if they make substantial +contributions and the core team members agree to it. Libreboot's leadership is +open to the public. + +Other team members (IRC operators) who also have influence: + +- IRC nick **specing** on the Libreboot IRC channel. +- IRC nick **pizzaiolo** on the Libreboot IRC channel. +- IRC nick **jxself** on the Libreboot IRC channel. + +Additionally, Libreboot has a separate set of operators on the subreddit +r/libreboot. Check Reddit for more information. Actions taken by moderators +there are also subject to these management guidelines. + +GNU project oversight (pending Libreboot's potential GNU membership) +-------------------------------------------------------------------- + +Libreboot has applied to become a member of the GNU project, per agreement by +the core maintainers, plus widespread public support. This is being +handled by Alyssa. It is not yet known whether GNU will accept Libreboot, and +we (the core maintainers) are awaiting their response. + +If Libreboot is accepted as a GNU member, then the GNU project will also form +as part of Libreboot's core leadership, overseeing the project. This will +include Richard Stallman. GNU's own leadership is separate from that of the +Libreboot project (and vice versa), at present, but they would merge on +Libreboot's side if a union does occur. diff --git a/www/news/formalised-structure.md b/www/news/formalised-structure.md new file mode 100644 index 00000000..a630ff23 --- /dev/null +++ b/www/news/formalised-structure.md @@ -0,0 +1,35 @@ +% Formalising Democracy +% Alyssa Rosenzweig +% 25 Apr 2017 + +One month ago, the [Open Letter to the Free Software Community](/news/unity.md) +was published, alluding to the new Libreboot leadership. Today, the ideals +expressed there have been formalised into an official project policy. In the +new [General Management Guidelines](/management.md), the ins-and-outs of our +democratic system is codified, including the formal team list. Hint, hint: the +structure isn't "I, Alyssa Rosenzweig, decide everything and Thou shall bow +down to me"! There are four core team members, and we welcome community +feedback for major decisions. + +There was an underlying tension in the letter: should Libreboot rejoin GNU? On +purely political and technical levels, the answer is a resounding "yes". We +share the mission of spreading free software. Our communities overlap. Most of +the Libreboot community uses GNU software, and much of GNU uses libreboot. +Technically, the tighter integration is useful. Politically, closer ties will +strengthen both of our projects. But this is neither completely a political or +technical question -- it is a human one. + +There is no easy answer to this. But the best course of action is to reach out +beyond the team to the community at large. A number of people ranging from +Libreboot users to GNU developers to casual bystanders chimed in, and the +answer was an overwhelming "yes, you should have done this a month ago!" + +With that in mind, we have reapplied for GNU. Leah conducted the initial +discussions, such as the Reddit thread, as she felt that she needed to correct +her own error. I have since been handling the application itself, which was +submitted recently. GNU has not yet made a decision on the matter. Ultimately, +it will be up to Richard Stallman himself whether the mutual benefits of +joining will outweigh any potential awkwardness. + +No matter the response, Libreboot remains committed to free software. Whether +or not we need a g'new name, this will never change. diff --git a/www/news/fsf-domain-offer.md b/www/news/fsf-domain-offer.md new file mode 100644 index 00000000..486e4cfc --- /dev/null +++ b/www/news/fsf-domain-offer.md @@ -0,0 +1,15 @@ +% Community feedback on whether to offer libreboot.org domain name to FSF +% Leah Rowe +% 26 Apr 2017 + +I, Leah Rowe, have stepped down as leader of the Libreboot project. This means +that I must also transfer ownership of the libreboot.org domain name to +another entity. I have chosen to propose the FSF as that entity. + +This is something that could be offered to GNU as part of Libreboot's +filed application to re-join GNU. + +Commenting will be taken on +<https://www.reddit.com/r/libreboot/comments/67rd46/proposal_transfer_librebootorg_ownership_to_fsf/> +as to whether this decision should be taken. Full reasoning is documented +there. diff --git a/www/news/proposal-rejoin-gnu.md b/www/news/proposal-rejoin-gnu.md new file mode 100644 index 00000000..795821e1 --- /dev/null +++ b/www/news/proposal-rejoin-gnu.md @@ -0,0 +1,9 @@ +% Community feedback needed on whether Libreboot should re-join the GNU project +% +% 22 Apr 2017 + +Community feedback is needed on whether Libreboot should re-join the GNU +project, having previously been a member. The discussion place for this topic +is on [this thread in the Libreboot subreddit at reddit.com/r/libreboot/](https://www.reddit.com/r/libreboot/comments/66tdds/proposal_for_libreboot_rejoin_gnu_community/). With sufficient community support, Libreboot will +apply to re-join to become a member of the GNU project. Full reasoning and +history behind this proposal is detailed in the thread. diff --git a/www/news/sfc-domain-offer.md b/www/news/sfc-domain-offer.md new file mode 100644 index 00000000..f53ce283 --- /dev/null +++ b/www/news/sfc-domain-offer.md @@ -0,0 +1,36 @@ +% Community feedback on whether to offer libreboot.org domain name to SFC +% Leah Rowe +% 27 Apr 2017 + +I, Leah Rowe, have stepped down as leader of the Libreboot project. This means +that I must also transfer ownership of the libreboot.org domain name to +another entity. I have chosen to propose the Software Freedom Conservancy (SFC) +as that entity. + +Commenting will be taken on +<https://www.reddit.com/r/libreboot/comments/67x3bs/proposal_transfer_librebootorg_domain_name/> +as to whether this decision should be taken. Full reasoning is documented +there. + +Software Freedom Conservancy is heavily affiliated with the FSF. Conservancy +provides legal services, e.g. GPL enforcement, for those who violate the GNU +General Public License. They generally offer legal services related to Free +Software. Its founder, Bradley Kuhn, is also a former Executive Director of +the FSF. (Karen Sandler, is SFC's current Executive Director). + +In addition to legal services, Conservancy also helps promote Free Software +and provides certain infrastructure for Free Software projects, and does +sometimes assist in development of projects. + +More information: +<https://en.wikipedia.org/wiki/Software_Freedom_Conservancy> + +Conservancy website: +<https://sfconservancy.org/> + +This is something that could be offered to GNU as part of Libreboot's +filed application to re-join GNU. + +Previously, it was proposed that the domain name be transferred to the FSF, but +this was vetoed by an opposing member of the core leadership, when I proposed +it. SFC was then recommended as an alternative, hence this new proposal. diff --git a/www/publish.sh b/www/publish.sh index 098df29c..e75ec332 100755 --- a/www/publish.sh +++ b/www/publish.sh @@ -35,13 +35,15 @@ if [ "${FILE}" != "./index" ]; then fi RETURN="<a href='$DEST'>Back to previous index</a>" - OPTS="--css /headerleft.css -T Libreboot" + OPTS="-T Libreboot" +else + OPTS="--css /headercenter.css" fi -echo "" >> temp.md -printf "[License](/license.md) --\n" >> temp.md -printf "[Information about the Libreboot authors](/contrib.md) --\n" >> temp.md -printf "[Please read our guidelines for good conduct](/conduct.md)\n" >> temp.md + +if [ "${FILE}" != "./docs/fdl-1.3" ] && [ "${FILE}" != "./conduct" ]; then + cat footer.md >> temp.md +fi # change out .md -> .html sed temp.md -i -e 's/\.md\(#[a-z\-]*\)*)/.html\1)/g' @@ -59,3 +61,6 @@ pandoc $TOC $SMART temp.md -s --css /global.css $OPTS \ # additionally, produce bare file for RSS pandoc $1 > $FILE.bare.html + +# generate section title anchors as [link] +sed $FILE.html -i -e 's_^<h\([123]\) id="\(.*\)">\(.*\)</h\1>_<div class="h"><h\1 id="\2">\3</h\1><a aria-hidden="true" href="#\2">[link]</a></div>_' |