From eb73ed07b217743bf7a2c589f112657d60dd3cbb Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 24 May 2015 13:12:45 -0400 Subject: switch to gettext() - TODO: i18n --- diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..7c1c6c7 --- /dev/null +++ b/README.txt @@ -0,0 +1,40 @@ +How to fork libreboot.org. (but why would you do that?) + +Make sure you have gettext enabled in PHP. + +You also need some symlinks. I won't explain too much about it, it's self-explanatory. +Just have a look at this output for a rough idea (it's from the site/ directory): + +$ ls -lh +total 52K +drwxr-xr-x 3 fchmmr fchmmr 4.0K May 17 16:59 ccsource +drwxr-xr-x 2 fchmmr fchmmr 4.0K May 15 13:46 contrib +drwxr-xr-x 2 fchmmr fchmmr 4.0K May 22 08:55 css +lrwxrwxrwx 1 fchmmr fchmmr 27 Apr 5 03:58 docs -> ../../lbdev/libreboot/docs/ +drwxr-xr-x 2 fchmmr fchmmr 4.0K May 23 20:33 download +-rw-r--r-- 1 fchmmr fchmmr 1.2K May 23 20:35 footer.php +-rw-r--r-- 1 fchmmr fchmmr 1.3K May 15 13:02 functions.php +lrwxrwxrwx 1 fchmmr fchmmr 30 Apr 5 03:57 git -> ../../lbdev/libreboot/release/ +drwxr-xr-x 2 fchmmr fchmmr 4.0K May 23 20:33 github +drwxr-xr-x 2 fchmmr fchmmr 4.0K May 23 20:33 gitorious +-rw-r--r-- 1 fchmmr fchmmr 3.9K May 23 20:33 index.php +lrwxrwxrwx 1 fchmmr fchmmr 49 Apr 5 03:59 libreboot.git -> ../../lbdev/libreboot.org_addition/libreboot.git/ +lrwxrwxrwx 1 fchmmr fchmmr 53 Apr 5 03:58 libreboot.org.git -> ../../lbdev/libreboot.org_addition/libreboot.org.git/ +drwxr-xr-x 2 fchmmr fchmmr 4.0K May 19 21:53 logo +lrwxrwxrwx 1 fchmmr fchmmr 13 Apr 11 23:30 lp2014 -> ../../lp2014/ +lrwxrwxrwx 1 fchmmr fchmmr 13 Apr 5 03:59 lp2015 -> ../../lp2015/ +lrwxrwxrwx 1 fchmmr fchmmr 14 Apr 5 03:58 release -> ../../archive/lb/ +-rw-r--r-- 1 fchmmr fchmmr 24 Apr 5 04:16 robots.txt +-rw-r--r-- 1 fchmmr fchmmr 4.5K May 23 20:35 variables.php + +(notice how anything not part of the git repository, i.e. in .gitignore, is a symlink to some place outside this git clone) +(notice also that the repository that this clone is from, is stored *inside* this clone and in the .gitignore) + +This document is.... +Copyright 2015 Francis Rowe +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. + diff --git a/cc-by-sa-4.txt b/cc-by-sa-4.txt new file mode 100644 index 0000000..c333481 --- /dev/null +++ b/cc-by-sa-4.txt @@ -0,0 +1,426 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public licenses. +Notwithstanding, Creative Commons may elect to apply one of its public +licenses to material it publishes and in those instances will be +considered the "Licensor." Except for the limited purpose of indicating +that material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the public +licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/site/common/snippets/where-share.php b/site/common/snippets/where-share.php new file mode 100644 index 0000000..5bebf05 --- /dev/null +++ b/site/common/snippets/where-share.php @@ -0,0 +1,19 @@ +
+ +

+

+ +

+ + +
\ No newline at end of file diff --git a/site/contrib/index.php b/site/contrib/index.php index c5b5c20..2a2a19e 100644 --- a/site/contrib/index.php +++ b/site/contrib/index.php @@ -28,7 +28,7 @@ - Libreboot project maintainers + <?php echo gettext("Libreboot project maintainers"); ?> @@ -38,10 +38,11 @@
-

Libreboot project maintainers

+

- List of project maintainers, and how to contact them. Back to homepage + +

@@ -50,35 +51,29 @@

Francis Rowe

- Main developer, manages the libreboot website and git repository. - He can be contacted on IRC (freenode) in #libreboot by the alias fchmmr, or - you can contact him by his email address info@gluglug.org.uk - (GPG). + + fchmmr, or you can contact him by his email address info@gluglug.org.uk (GPG)."); ?>

Michał Masłowski

- Maintains the libreboot bug tracker linked from the homepage. - Coreboot developer, responsible for porting new boards that are compatible with libreboot. - Contact him by his alias mtjm on the - libreboot IRC channel, or find contact information (including GPG keys) on his website http://mtjm.eu/ + + + mtjm on the libreboot IRC channel, or find contact information (including GPG keys) on his website http://mtjm.eu/"); ?>

Patrick "P. J." McDermott

- ProteanOS maintainer, responsible for maintaining ProteanOS builds on many libreboot - targets. His alias on the libreboot IRC channel is pehjota, or you can find contact information on - the ProteanOS website. + ProteanOS maintainer, responsible for maintaining ProteanOS builds on many libreboot targets."); ?> + pehjota, or you can find contact information on the ProteanOS website."); ?>

Lisa Maginnis

- FSF sysadmin, responsible for maintaining the libreboot and libreboot-dev mailing lists. - Contact nully in the libreboot IRC channel. + FSF sysadmin, responsible for maintaining the libreboot and libreboot-dev mailing lists."); ?> + nully in the libreboot IRC channel."); ?>

Steve Shenton

- Wrote the original ich9deblob utility (ich9gen is based on it), which was used to - remove the ME on ICH9-M - laptops (originally the ThinkPad X200, and later expanded to more laptops). Contact sgsit on - the libreboot IRC channel. + remove the ME on ICH9-M laptops (originally the ThinkPad X200, and later expanded to more laptops)."); ?> + sgsit on the libreboot IRC channel."); ?>

diff --git a/site/download/index.php b/site/download/index.php index d3fd58f..22ddc48 100644 --- a/site/download/index.php +++ b/site/download/index.php @@ -29,7 +29,7 @@ - Download libreboot + <?php echo gettext("Download libreboot"); ?> @@ -39,48 +39,46 @@
-

Download libreboot

+

-

Links to HTTP mirrors, rsync mirrors and git repositories. Download libreboot here.

+

- Back to home page +

-

GPG signing key

+

- Download the key:
+
$ gpg --recv-keys

- Download the SHA512 manifest and it's corresponding GPG signature - for the release that you are using, and put them in a directory. - Put the src, util and docs archives in the root of that directory, - alongside the SHA512 manifest file. - Put your ROM image archives under rom/ in that directory. - Put your crossgcc tarballs under crossgcc/ in that directory. + + + rom/ in that directory."); ?> + crossgcc/ in that directory."); ?>

- After you've done this, verify the SHA512 checksums:
+
$ sha512sum -c sha512sum.txt

- You can verify the downloaded SHA512 manifest as follows:
+
$ gpg --verify sha512sum.txt.sig

@@ -88,55 +86,54 @@
-

HTTP mirrors (releases)

+

- These releases are more rigorously tested. However, they might be - out of date compared to the current development snapshots. + +

- These archives are not updated very often, and will not receive any further changes. +

- Download libreboot from one of these mirrors. +

- The latest release has a version number of , - and was released on . + . + .

FTP mirrors

-

Rsync mirrors (for mirroring libreboot)

+

- Create a directory in your web server document root (e.g. libreboot/), - and add one of these to your crontab: +

0) { ?> -

Main rsync mirror:

+

$ rsync -avxP --delete --stats /path/to/docroot/libreboot/

1) { ?> -

Backup rsync mirrors:

+

- No mirrors available yet. +

- Are you running a mirror? Contact the libreboot project - (details are on the home page), and the link will be added here. +

-

Git repositories (development)

+

- The git repositories are intended for developing libreboot. - For a list of current tasks in libreboot, see ../docs/tasks.html. + + ../docs/tasks.html.

- Maintenance guides for libreboot can be found at - ../docs/maintain/index.html - and ../docs/git/index.html. + ../docs/maintain/index.html and ../docs/git/index.html."); ?>

-

How to download

+

- Firmware (coreboot distribution). This also contains the documentation:
+ This also contains the documentation:"); ?>
$ git clone

- website. The documentation is in the other repository linked above:
+ The documentation is in the other repository linked above:"); ?>
$ git clone

- You might not see a progress bar; it's still cloning, so just be patient. +

-

Submitting patches to libreboot

+

- The git documentation describes how to use git. + git documentation describes how to use git."); ?>

- Make sure that you configured git so that your name and email - address appear in the commits that you create:
+
$ git config --global user.name "Your Name"
$ git config --global user.email your@emailaddress.com

- The following is also useful:
+
$ git config --global core.editor nano
$ git config --global color.status auto
$ git config --global color.branch auto
@@ -216,89 +209,72 @@ $ git config --global color.diff auto

- Clone the git repository, and make your desired changes. You can make one or several commits (as many as you like). - Generally speaking, you should create separate commits on top of each other, for each kind of change. + + +

- Once you have made your change(s), you can use this to check the status:
+
$ git status

- If you are modifying an existing file, make sure to update the copyright license header - in that file; in source files or scripts, this would usually be at the top, and for documentation - it is typically at the bottom of the document. It is good practise to use your real name in the - commit logs.
- Example: Copyright (C) 20XX John Doe <john@doe.com> +
+ Copyright (C) 20XX John Doe <john@doe.com>"); ?>

- Generally speaking, using the same license as the file that you are modifying is much simpler. - If you are submitting new - files, please make sure that they are under a free license (copyleft preferred). - You can find a list on + + + https://www.gnu.org/licenses/license-list.html.

- The libreboot project will not accept - documentation released under the GNU Free Documentation License, because we do not want to endorse - or support the Invariant clauses that this license allows. Changes submitted under this - license will be rejected, even if it contains no Invariant sections + GNU Free Documentation License, because we do not want to endorse or support the Invariant clauses that this license allows. Changes submitted under this license will be rejected, even if it contains no Invariant sections."); ?>

- The status command will show any untracked files that you have. Add them using git add path/to/file. - You should also add any other files that are listed as modified in the git status. If there are deleted - files in the git status, you can use git rm path/to/file. As long as you have added all the untracked - files, it is generally easier to use:
+ git add path/to/file. You should also add any other files that are listed as modified in the git status. If there are deleted files in the git status, you can use git rm path/to/file. As long as you have added all the untracked files, it is generally easier to use:"); ?>
$ git commit -a
- (instead of git commit) + git commit)"); ?>

- If you need to make a change to the current commit, you can do so with:
+
$ git commit --amend
- or:
+
$ git commit -a --amend

- In your local git tree, you can use this to check your commits:
+
$ git log

- Shortened git logs showing the short commit ID and the commit title, plus info about what branch - you are on, and where all your remotes/heads are:
+
$ git config --global --add alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"
- From then on, you can use:
+
$ git lol
- This is like git log, but on steroids. + git log, but on steroids."); ?>

-

Method 1: host a repository

+

- One way of contribiting a patch for review is to host a repository containing your modified branch. - Give the checkout details to the libreboot project, along with information - on which commits in what branch contain your changes. - Contact the libreboot project using the details on the home page. +

-

Method 2: git format-patch -N

+

- Use this method (replace N with the number of commits that you made) and send the .patch files to the - libreboot project, along with details on what branch and revision these were - made on top of. - Contact the libreboot project using the details on the home page. +

-

Backup repositories

+

- Generally speaking, you should use the main repositories. These repositories are provided - as backups, in case the main repositories are down. +

-

Firmware (coreboot distribution)

+

-

Libreboot website

+

- Libreboot includes statically linked executables of utilities built from the libreboot source code. - These are built on in Trisquel GNU/Linux. There were links to - the Trisquel source ISO here, as a lazy way to provide CCS, but this was inefficient. Archives for - only those dependencies that comprise the CCS will be added here later instead. If you need CCS, - for now simply contact the libreboot project using the details on the home page, and the source for - the version of Trisquel used to build that release (whichever version it is) will be provided. You can - also get it on the Trisquel website. +

diff --git a/site/footer.php b/site/footer.php index 6e9fab5..6c5c969 100644 --- a/site/footer.php +++ b/site/footer.php @@ -18,10 +18,9 @@ */ ?>

- This page is released under GNU AGPLv3 or higher, - and available in a git repository. + GNU AGPLv3 or higher, and available in a git repository:"); ?> + .

- This website is hosted on a libreboot system, running a - fully libre GNU/Linux distribution. + fully libre GNU/Linux distribution."); ?>

diff --git a/site/github/index.php b/site/github/index.php index 560aac7..e3fddb3 100644 --- a/site/github/index.php +++ b/site/github/index.php @@ -28,7 +28,7 @@ - Please do not use GitHub! + <?php echo gettext("Please do not use GitHub!"); ?> @@ -38,85 +38,71 @@
-

Please do not use GitHub!

+

- Please do not use GitHub to host libreboot. - Libreboot is a free software project, so this is only a request, and not a restriction on the software. + +

- Don't use gitorious, either. + +

+

+

-

What's wrong with GitHub?

+

  • - GitHub itself is proprietary software (Tim reasons it's for business + [1])
  • - A patch[2] to - choose a license was received with some hostility. + 2] to choose a license was received with some hostility."); ?> +
    • +
  • +
    • -
  • Tim really likes to talk about freedom, but makes the following claims about the GPLv2/3:

- ...The GPL is not focused on freedom. It's too long. - Too many restrictions. -- Tom Preston-Werner OSCON2013 +

-

or how about:

+

- Notice that everything we keep closed has specific business value - that could be compromised by giving it away to our competitors. - -- Tom Preston-Werner's - blog + blog"); ?>

- GitHub simply uses Free Software for its own benefit, releasing source code under a free license - only when suited to it's business goals; they are quite happy to violate the rights of their users, for profit. +

- By contrast, the libreboot project adheres strictly to the goals of the Free Software movement, which - seeks to eliminate proprietary software to the point where all software is free. +

- The opinions expressed by Tom Preston-Werner of GitHub are incompatible with those of - the libreboot project. Users and developers of - free software - are strongly advised not to use GitHub, for any of their projects. + free software are strongly advised not to use GitHub, for any of their projects."); ?>

- -
-
    -
  • - Host your own repositories. This is exactly what libreboot does, - hosted on a machine that is running libreboot! You can use a frontend like - gitweb - for easy viewing by others. For code review, you can use an IRC channel, mailing lists and other - methods that allow mass collaboration. -
    • -
  • - Jason Self lists a few replacements on this page: - http://jxself.org/goodbye-gitorious.shtml -
    • -
+ + +

[1] @@ -138,12 +124,7 @@

- This text on this page was adapted from - http://librecmc.org/librecmc/wiki?name=github, - licensed under CC BY-SA 4.0 like the original. -

-

- Back to home page + http://librecmc.org/librecmc/wiki?name=github, licensed under CC BY-SA 4.0 like the original."); ?>

diff --git a/site/gitorious/index.php b/site/gitorious/index.php index f5d337b..86097c7 100644 --- a/site/gitorious/index.php +++ b/site/gitorious/index.php @@ -28,7 +28,7 @@ - Please do not use Gitorious! + <?php echo gettext("Please do not use Gitorious or GitLab!"); ?> @@ -38,107 +38,66 @@
-

Please do not use Gitorious or GitLab!

+

- Please do not use Gitorious or GitLab to host libreboot. - Libreboot is a free software project, so this is only a request, and not a restriction on the software. + +

- Don't use github, either. + +

+

+

-

What's wrong with Gitorious?

+

  • - They have completely sold us out - to a company whose main business model is proprietary software. + completely sold us out to a company whose main business model is proprietary software."); ?>
  • - Gitorious is now owned by GitLab. GitLab is essentially the same as GitHub; there is a - free (libre) version of GitLab, but this is bait-and-switch for their so-called enterprise - version which is proprietary software. + + enterprise version which is proprietary software."); ?>
  • - The GitLab site itself also runs on a proprietary version of GitLab. GitLab has the same - rotten attitude - as GitHub when it comes to free software. + + rotten attitude as GitHub when it comes to free software."); ?>
  • - GitLab is permissively licensed, which means that it completely lacks copyleft. - Anyone (including the main GitLab upstream) can re-release a proprietary version - and completely refuse to give out source code. + +
  • - GitLab CEO Sytse Sijbrandij has the same attitude - as the github CEO, regarding GPL, quote "We're very happy with the MIT since it has the least amount of restrictions for everyone. But we respect your opinion and hope you will consider contributing to GitLab in the future." - -- the statement was made by him in response to a question asking about copyleft in GitLab, and more specifically about AGPL (which - the gitorious software was released under). + attitude as the github CEO, regarding GPL, quote "We're very happy with the MIT since it has the least amount of restrictions for everyone. But we respect your opinion and hope you will consider contributing to GitLab in the future." -- the statement was made by him in response to a question asking about copyleft in GitLab, and more specifically about AGPL (which the gitorious software was released under)."); ?>

- Gitorious now simply uses Free Software for its own benefit, releasing source code under a free license - only when suited to it's business goals; they are quite happy to violate the rights of their users, for profit - (since they are now part of GitLab, which has been doing so for quite some time). +

- The old gitorious website was however run by fully AGPL licensed software, which you could - self-host. This page is anti-gitorious-company. Gitorious (software) will most likely be forked. +

- By contrast, the libreboot project adheres strictly to the goals of the Free Software movement, which - seeks to eliminate proprietary software to the point where all software is free. +

- The proprietary developments in GitLab are unacceptable to - the libreboot project. Users and developers of - free software - are strongly advised not to use GitLab or Gitorious, for any of their projects. + free software are strongly advised not to use GitLab or Gitorious, for any of their projects."); ?>

- -
- -

Where should I host and share my code?

-

- Here are a few examples: -

-
    -
  • - Host your own repositories. This is exactly what libreboot does, - hosted on a machine that is running libreboot! You can use a frontend like - gitweb - for easy viewing by others. For code review, you can use an IRC channel, mailing lists and other - methods that allow mass collaboration. -
    • -
  • - Jason Self lists a few replacements on this page: - http://jxself.org/goodbye-gitorious.shtml -
    • -
-
- -
- -

- Jason Self also posted his own article here: http://jxself.org/goodbye-gitorious.shtml -

- -

- Back to home page -

- -
+
diff --git a/site/index.php b/site/index.php index 0472174..9d4e2a5 100644 --- a/site/index.php +++ b/site/index.php @@ -28,7 +28,7 @@ - Libreboot project + <?php echo gettext("Libreboot project"); ?> @@ -40,57 +40,57 @@

" />

-

Libreboot project

+

- Libreboot is a free (libre) - BIOS/UEFI replacement for your computer. Based on coreboot, the aim is to distribute - low-level boot firmware that is 100% free software, and to make coreboot easy to use. + free (libre) BIOS/UEFI replacement for your computer. Based on coreboot, the aim is to distribute low-level boot firmware that is 100% free software, and to make coreboot easy to use."); + ?>

-

Download libreboot

+

-

Support

+

-

Contact information

+

-- cgit v0.9.1