diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2016-01-09 19:47:13 (EST) |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2016-01-09 19:47:13 (EST) |
| commit | 16000edc8246eef667ba826f6e4c7970de6e5caa (patch) | |
| tree | 814129565e948deeddd01086a0feeec2237f8aee /site/git/index.php | |
| parent | aa9e4531ae394815b33d5ff5ef323239b465b07e (diff) | |
| download | libreboot.org-16000edc8246eef667ba826f6e4c7970de6e5caa.zip libreboot.org-16000edc8246eef667ba826f6e4c7970de6e5caa.tar.gz libreboot.org-16000edc8246eef667ba826f6e4c7970de6e5caa.tar.bz2 | |
git page: fix inconsistent indentation
Diffstat (limited to 'site/git/index.php')
| -rw-r--r-- | site/git/index.php | 292 |
1 files changed, 146 insertions, 146 deletions
diff --git a/site/git/index.php b/site/git/index.php index a616765..e99dd88 100644 --- a/site/git/index.php +++ b/site/git/index.php @@ -54,63 +54,63 @@ <div> - <h2 id="howtohelp">How can I help the libreboot project? <span class="r"><a href="#howtohelp">#howtohelp</a></span></h2> - <p> - <strong>Libreboot is becoming part of the GNU project, and we need help with the transition. <a href="../gnu/">Click here</a> for more information</strong> - </p> - <p> - There are many ways that you can assist the libreboot project. We have a <a href="../docs/tasks.html">list of tasks that need to be completed</a>, - which you can work on (you can also add to that list). Generally speaking, adding support for more hardware is a priority for the libreboot project. - Information about maintaining libreboot can be found <a href="../docs/maintain/index.html">here</a> and building libreboot <a href="../docs/git/index.html">here</a>. - </p> - <p> - We especially need more skilled coreboot hackers to do work that will benefit the libreboot project. This includes porting new boards to coreboot, which are likely to be valid candidates for libreboot. - </p> - <p> - Learn libreboot from the inside out; download the git repository, and study libreboot. We need more full-time developers - who can help to maintain the project. - </p> - <p> - Not a developer? You can still help! - </p> - <ul class="c"> - <li>Work towards convincing hardware manufacturers and designers to start caring about free software. Perhaps even build your own hardware.</li> - <li>Spread the word about libreboot! Tell your friends about it, and talk about it on public internet-based discussion networks (e.g. <em>social networks</em>).</li> - <li>Install and use libreboot yourself, showing it to others and promoting it that - way. <a href="../suppliers/">Computers with libreboot preinstalled are also available</a>, which helps to fund the libreboot project.</li> - <li>Help others to install libreboot. For example, organize an installation workshop at your local GNU/Linux users group or local meeting place.</li> - <li>Assist with improving the libreboot documentation, so that others may find it easier to use.</li> - </ul> + <h2 id="howtohelp">How can I help the libreboot project? <span class="r"><a href="#howtohelp">#howtohelp</a></span></h2> + <p> + <strong>Libreboot is becoming part of the GNU project, and we need help with the transition. <a href="../gnu/">Click here</a> for more information</strong> + </p> + <p> + There are many ways that you can assist the libreboot project. We have a <a href="../docs/tasks.html">list of tasks that need to be completed</a>, + which you can work on (you can also add to that list). Generally speaking, adding support for more hardware is a priority for the libreboot project. + Information about maintaining libreboot can be found <a href="../docs/maintain/index.html">here</a> and building libreboot <a href="../docs/git/index.html">here</a>. + </p> + <p> + We especially need more skilled coreboot hackers to do work that will benefit the libreboot project. This includes porting new boards to coreboot, which are likely to be valid candidates for libreboot. + </p> + <p> + Learn libreboot from the inside out; download the git repository, and study libreboot. We need more full-time developers + who can help to maintain the project. + </p> + <p> + Not a developer? You can still help! + </p> + <ul class="c"> + <li>Work towards convincing hardware manufacturers and designers to start caring about free software. Perhaps even build your own hardware.</li> + <li>Spread the word about libreboot! Tell your friends about it, and talk about it on public internet-based discussion networks (e.g. <em>social networks</em>).</li> + <li>Install and use libreboot yourself, showing it to others and promoting it that + way. <a href="../suppliers/">Computers with libreboot preinstalled are also available</a>, which helps to fund the libreboot project.</li> + <li>Help others to install libreboot. For example, organize an installation workshop at your local GNU/Linux users group or local meeting place.</li> + <li>Assist with improving the libreboot documentation, so that others may find it easier to use.</li> + </ul> </div> <div> - <h2 id="guidelines">General guidelines for submitting patches <span class="r"><a href="#guidelines">#guidelines</a></span></h2> - <p> - Some people put their name on their work, for recognition, and it's OK if you want to do that; however, the libreboot project does not require this. Some projects - (such as coreboot) require a legal name, and this can be problematic for certain groups of people. - </p> - <p> - Using your legal name is <strong>not</strong> required when submitting patches to libreboot. For reasons why we have this policy, read <a href='http://geekfeminism.org/2012/09/29/quick-hit-how-git-shows-the-patriarchal-nature-of-the-software-industry/'>this article</a>. You can use a pseudonym (alternative name), or your company name (if you have one), if you want or need to do that. You can also - submit patches <em>without a name</em>, if you want or need to do that (instructions are provided on this page). Also, read <a href='http://www.kalzumeus.com/2010/06/17/falsehoods-programmers-believe-about-names/'>this article</a>. Unfortunately, git appears to be stuck with these problems, when an author changes their name, and we don't have a concrete answer to it. - As far as we know, publishing your legal name isn't even required for copyright purposes; in fact, "pen" names are commonly used by literary authors (computer programs are literary works). - </p> - <p> - When submitting any kind of documentation, try not to use the terms him/her, she/he, his/her, or anything that is gender biased. <strong>Use their, they, them, those people, that person, and so on.</strong> <a href="https://gist.githubusercontent.com/0xabad1dea/8870b192fd1758743f66/raw/a230fa3438ce60c538dba31830fa88143245b719/singularthey.md">You are making a huge difference</a>. - </p> - <p> - <?php echo gettext("Generally speaking, using the same license as the file that you are modifying is much simpler."); ?> - <?php echo gettext("If you are submitting new files, please make sure that they are under a free license (<a href='https://copyleft.org/'>copyleft</a> preferred)."); ?> - <?php echo gettext("You can find a list on:"); ?> <a href="https://www.gnu.org/licenses/license-list.html">https://www.gnu.org/licenses/license-list.html</a>. NOTE: - not putting a copyright notice on a work does not mean it lacks copyright. Copyright is <em>automatic</em> in most countries. Not putting a license - on a work also does not make that work <em>free</em>; you have to declare a free license, otherwise the default, restrictive copyright laws apply for those - who wish to do anything with your work. Always put a license on your work! - </p> - <p> - Small technical note: libreboot is working to convert all documentation to <em>texinfo</em>, where - it is currently written in HTML, directly. Therefore, please submit any new documentation under this format, during the transition period. <a href="../gnu/">Learn more</a>. - </p> + <h2 id="guidelines">General guidelines for submitting patches <span class="r"><a href="#guidelines">#guidelines</a></span></h2> + <p> + Some people put their name on their work, for recognition, and it's OK if you want to do that; however, the libreboot project does not require this. Some projects + (such as coreboot) require a legal name, and this can be problematic for certain groups of people. + </p> + <p> + Using your legal name is <strong>not</strong> required when submitting patches to libreboot. For reasons why we have this policy, read <a href='http://geekfeminism.org/2012/09/29/quick-hit-how-git-shows-the-patriarchal-nature-of-the-software-industry/'>this article</a>. You can use a pseudonym (alternative name), or your company name (if you have one), if you want or need to do that. You can also + submit patches <em>without a name</em>, if you want or need to do that (instructions are provided on this page). Also, read <a href='http://www.kalzumeus.com/2010/06/17/falsehoods-programmers-believe-about-names/'>this article</a>. Unfortunately, git appears to be stuck with these problems, when an author changes their name, and we don't have a concrete answer to it. + As far as we know, publishing your legal name isn't even required for copyright purposes; in fact, "pen" names are commonly used by literary authors (computer programs are literary works). + </p> + <p> + When submitting any kind of documentation, try not to use the terms him/her, she/he, his/her, or anything that is gender biased. <strong>Use their, they, them, those people, that person, and so on.</strong> <a href="https://gist.githubusercontent.com/0xabad1dea/8870b192fd1758743f66/raw/a230fa3438ce60c538dba31830fa88143245b719/singularthey.md">You are making a huge difference</a>. + </p> + <p> + <?php echo gettext("Generally speaking, using the same license as the file that you are modifying is much simpler."); ?> + <?php echo gettext("If you are submitting new files, please make sure that they are under a free license (<a href='https://copyleft.org/'>copyleft</a> preferred)."); ?> + <?php echo gettext("You can find a list on:"); ?> <a href="https://www.gnu.org/licenses/license-list.html">https://www.gnu.org/licenses/license-list.html</a>. NOTE: + not putting a copyright notice on a work does not mean it lacks copyright. Copyright is <em>automatic</em> in most countries. Not putting a license + on a work also does not make that work <em>free</em>; you have to declare a free license, otherwise the default, restrictive copyright laws apply for those + who wish to do anything with your work. Always put a license on your work! + </p> + <p> + Small technical note: libreboot is working to convert all documentation to <em>texinfo</em>, where + it is currently written in HTML, directly. Therefore, please submit any new documentation under this format, during the transition period. <a href="../gnu/">Learn more</a>. + </p> <p> <a href="#pagetop">Back to top of page</a> @@ -152,7 +152,7 @@ <?php for ($server=0; $server<count($lbFirmwareBackupGitRepoAddress); $server++) { ?> - $ <strong>git clone <?php echo $lbFirmwareBackupGitRepoAddress[$server]; ?></strong> + <strong>git clone <?php echo $lbFirmwareBackupGitRepoAddress[$server]; ?></strong> <?php if ($server!=count($lbFirmwareBackupGitRepoAddress)-1) echo "<br/>"; ?> <?php } @@ -164,7 +164,7 @@ <?php for ($server=0; $server<count($lbWebsiteBackupGitRepoAddress); $server++) { ?> - $ <strong>git clone <?php echo $lbWebsiteBackupGitRepoAddress[$server]; ?></strong> + <strong>git clone <?php echo $lbWebsiteBackupGitRepoAddress[$server]; ?></strong> <?php if ($server!=count($lbWebsiteBackupGitRepoAddress)-1) echo "<br/>"; ?> <?php } @@ -178,26 +178,26 @@ <div> <h2 id="sendpatch">How to submit your patches <span class="r"><a href="#sendpatch">#sendpatch</a></span></h2> - <h3><?php echo gettext("Method 1: host a repository"); ?></h3> - <p> - <?php echo gettext("Give the checkout details to the libreboot project, along with information on which commits in what branch contain your changes."); ?> - </p> - <p> - You can email this information to <a href="mailto:<?php echo $devMailingListEmail; ?>"><?php echo $devMailingListEmail; ?></a>, which is the mailing list used for libreboot development discussion. - </p> - <p> - <strong>Check <a href="#githosting">#githosting</a>, for a list of Git hosting providers that we recommend.</strong> - </p> - <h3><?php echo gettext("Method 2: git format-patch -N"); ?></h3> - <p> - <?php echo gettext("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."); ?> - </p> - <p> - You can email your patches to <a href="mailto:<?php echo $devMailingListEmail; ?>"><?php echo $devMailingListEmail; ?></a>, which is the mailing list used for libreboot development discussion. - </p> - <p> - <?php echo gettext("Contact the libreboot project using the details on the home page, sending your patch(es). The mailing list is generally preferable, although IRC can also be just as good for small patches (you would probably put the patch on a paste site). If you'll be using the mailing list(s) a lot, then it probably makes sense to subscribe to them."); ?> - </p> + <h3><?php echo gettext("Method 1: host a repository"); ?></h3> + <p> + <?php echo gettext("Give the checkout details to the libreboot project, along with information on which commits in what branch contain your changes."); ?> + </p> + <p> + You can email this information to <a href="mailto:<?php echo $devMailingListEmail; ?>"><?php echo $devMailingListEmail; ?></a>, which is the mailing list used for libreboot development discussion. + </p> + <p> + <strong>Check <a href="#githosting">#githosting</a>, for a list of Git hosting providers that we recommend.</strong> + </p> + <h3><?php echo gettext("Method 2: git format-patch -N"); ?></h3> + <p> + <?php echo gettext("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."); ?> + </p> + <p> + You can email your patches to <a href="mailto:<?php echo $devMailingListEmail; ?>"><?php echo $devMailingListEmail; ?></a>, which is the mailing list used for libreboot development discussion. + </p> + <p> + <?php echo gettext("Contact the libreboot project using the details on the home page, sending your patch(es). The mailing list is generally preferable, although IRC can also be just as good for small patches (you would probably put the patch on a paste site). If you'll be using the mailing list(s) a lot, then it probably makes sense to subscribe to them."); ?> + </p> <p> <a href="#pagetop">Back to top of page</a> </p> @@ -238,81 +238,81 @@ </div> <div> - <h2 id="contrib"><?php echo gettext("How to use git, for creating patches"); ?> <span class="r"><a href="#contrib">#contrib</a></span></h2> - <p> - Libreboot development is facilitated by <em>git</em>, a <em>distributed</em> version control system that is in wide use today. Git provides many practical benefits, - making collective development of software very easy. - </p> - <p> - <?php echo gettext("The <a href=\"http://git-scm.com/doc\">git documentation</a> describes how to use git. The following notes include simple tips for how to use git, but it is a good idea to get fully acquainted with git."); ?> - </p> - <p> - <?php echo gettext("Make sure that you configured git so that your name and email address appear in the commits that you create:"); ?><br/> - $ <strong>git config --global user.name "Your Name"</strong><br/> - $ <strong>git config --global user.email your@emailaddress.com</strong><br/> - <strong>NOTE: you do not have to use your legal name; we don't care what name you use. Pseudonyms (alternative names) are OK. If you wish to be anonymous (no name), you can also use <em>Libreboot Contributor</em> as your name, and <em>noname@libreboot.org</em> as the email address. <em>We will happily accept anonymous contributions in the libreboot project.</em></strong> - </p> - <p> - <?php echo gettext("The following is also useful:"); ?><br/> - $ <strong>git config --global core.editor nano</strong><br/> - $ <strong>git config --global color.status auto</strong><br/> - $ <strong>git config --global color.branch auto</strong><br/> - $ <strong>git config --global color.interactive auto</strong><br/> - $ <strong>git config --global color.diff auto</strong> - </p> - <p> - <strong>NOTE: the above steps for colour make git use red/green font colours for showing diffs. If you are red/green colour-blind, please ignore the above steps. The default configuration in git is no-colour (all one colour, usually the default that your terminal uses). If you are colour-blind, git can display in other colours; refer - to the git documentation.</strong> - </p> - <p> - <?php echo gettext("Clone the git repository, and make your desired changes inside the newly created <em>libreboot</em> directory."); ?> - <?php echo gettext("You can make one or several commits (as many as you like)."); ?> - <?php echo gettext("Generally speaking, you should create separate commits on top of each other, for each kind of change."); ?> - </p> - <p> - When working with git, you will need your current working directory to be inside the <em>libreboot</em> directory that was just created.<br/> - $ <strong>cd libreboot/</strong> - </p> - <p> - <?php echo gettext("Once you have made your change(s), you can use this to check the status:"); ?><br/> - $ <strong>git status</strong> - </p> + <h2 id="contrib"><?php echo gettext("How to use git, for creating patches"); ?> <span class="r"><a href="#contrib">#contrib</a></span></h2> + <p> + Libreboot development is facilitated by <em>git</em>, a <em>distributed</em> version control system that is in wide use today. Git provides many practical benefits, + making collective development of software very easy. + </p> + <p> + <?php echo gettext("The <a href=\"http://git-scm.com/doc\">git documentation</a> describes how to use git. The following notes include simple tips for how to use git, but it is a good idea to get fully acquainted with git."); ?> + </p> + <p> + <?php echo gettext("Make sure that you configured git so that your name and email address appear in the commits that you create:"); ?><br/> + $ <strong>git config --global user.name "Your Name"</strong><br/> + $ <strong>git config --global user.email your@emailaddress.com</strong><br/> + <strong>NOTE: you do not have to use your legal name; we don't care what name you use. Pseudonyms (alternative names) are OK. If you wish to be anonymous (no name), you can also use <em>Libreboot Contributor</em> as your name, and <em>noname@libreboot.org</em> as the email address. <em>We will happily accept anonymous contributions in the libreboot project.</em></strong> + </p> + <p> + <?php echo gettext("The following is also useful:"); ?><br/> + $ <strong>git config --global core.editor nano</strong><br/> + $ <strong>git config --global color.status auto</strong><br/> + $ <strong>git config --global color.branch auto</strong><br/> + $ <strong>git config --global color.interactive auto</strong><br/> + $ <strong>git config --global color.diff auto</strong> + </p> + <p> + <strong>NOTE: the above steps for colour make git use red/green font colours for showing diffs. If you are red/green colour-blind, please ignore the above steps. The default configuration in git is no-colour (all one colour, usually the default that your terminal uses). If you are colour-blind, git can display in other colours; refer + to the git documentation.</strong> + </p> + <p> + <?php echo gettext("Clone the git repository, and make your desired changes inside the newly created <em>libreboot</em> directory."); ?> + <?php echo gettext("You can make one or several commits (as many as you like)."); ?> + <?php echo gettext("Generally speaking, you should create separate commits on top of each other, for each kind of change."); ?> + </p> + <p> + When working with git, you will need your current working directory to be inside the <em>libreboot</em> directory that was just created.<br/> + $ <strong>cd libreboot/</strong> + </p> + <p> + <?php echo gettext("Once you have made your change(s), you can use this to check the status:"); ?><br/> + $ <strong>git status</strong> + </p> - <p> - <?php echo gettext("The status command will show any untracked files that you have. Add them using <strong>git add path/to/file</strong>. 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 <strong>git rm path/to/file</strong>. As long as you have added all the untracked files, it is generally easier to use:"); ?><br/> - $ <strong>git commit -a</strong><br/> - <?php echo gettext("(instead of <strong>git commit</strong>)"); ?> - </p> - <p> - <?php echo gettext("If you need to make a change to the current commit, you can do so with:"); ?><br/> - $ <strong>git commit --amend</strong><br/> - <?php echo gettext("or:"); ?><br/> - $ <strong>git commit -a --amend</strong> - </p> + <p> + <?php echo gettext("The status command will show any untracked files that you have. Add them using <strong>git add path/to/file</strong>. 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 <strong>git rm path/to/file</strong>. As long as you have added all the untracked files, it is generally easier to use:"); ?><br/> + $ <strong>git commit -a</strong><br/> + <?php echo gettext("(instead of <strong>git commit</strong>)"); ?> + </p> + <p> + <?php echo gettext("If you need to make a change to the current commit, you can do so with:"); ?><br/> + $ <strong>git commit --amend</strong><br/> + <?php echo gettext("or:"); ?><br/> + $ <strong>git commit -a --amend</strong> + </p> - <p> - If you wish to use a different author name for the commit command, add <strong><em>--author="Author's Name <author's email address>"</em></strong> at the end. This - could be a pseudonym (alternative name), or it could be because you are submitting a patch on someone else's - behalf. <strong>If you wish to be anonymous (no name), you can also use <em>Libreboot Contributor</em> as your name, and <em>noname@libreboot.org</em> as the email address. <em>We will happily accept anonymous contributions in the libreboot project.</em></strong> - </p> - <p> - Check once more that everything you want is added. Use the <strong>git status</strong> command to check for untracked changes/files, and adapt accordingly. - Once you've committed everything, your changes will appear in a <em>diff</em> format, using this command:<br/> - $ <strong>git show</strong><br/> - Use PgUp/PgDown to navigate the diff output. This uses the <em>less</em> utility, so all the features from that (e.g. keyword search) are also available. - </p> + <p> + If you wish to use a different author name for the commit command, add <strong><em>--author="Author's Name <author's email address>"</em></strong> at the end. This + could be a pseudonym (alternative name), or it could be because you are submitting a patch on someone else's + behalf. <strong>If you wish to be anonymous (no name), you can also use <em>Libreboot Contributor</em> as your name, and <em>noname@libreboot.org</em> as the email address. <em>We will happily accept anonymous contributions in the libreboot project.</em></strong> + </p> + <p> + Check once more that everything you want is added. Use the <strong>git status</strong> command to check for untracked changes/files, and adapt accordingly. + Once you've committed everything, your changes will appear in a <em>diff</em> format, using this command:<br/> + $ <strong>git show</strong><br/> + Use PgUp/PgDown to navigate the diff output. This uses the <em>less</em> utility, so all the features from that (e.g. keyword search) are also available. + </p> - <p> - <?php echo gettext("In your local git tree, you can use this to check your commits:"); ?><br/> - $ <strong>git log</strong> - </p> - <p> - <?php echo gettext("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:"); ?><br/> - $ <strong>git config --global --add alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"</strong><br/> - <?php echo gettext("From then on, you can use:"); ?><br/> - $ <strong>git lol</strong><br/> - <?php echo gettext("This is like <strong>git log</strong>, but it's much better and shows branches, etc."); ?> - </p> + <p> + <?php echo gettext("In your local git tree, you can use this to check your commits:"); ?><br/> + $ <strong>git log</strong> + </p> + <p> + <?php echo gettext("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:"); ?><br/> + $ <strong>git config --global --add alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"</strong><br/> + <?php echo gettext("From then on, you can use:"); ?><br/> + $ <strong>git lol</strong><br/> + <?php echo gettext("This is like <strong>git log</strong>, but it's much better and shows branches, etc."); ?> + </p> <p> <a href="#pagetop">Back to top of page</a> |