diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2009-05-11 22:51:49 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2009-05-11 22:51:49 +0200 |
| commit | 845142e106f00428d9325c6a741488d1f5748e78 (patch) | |
| tree | 3a5457dc5bcf84071342f0eb3d727a05cf7e93c6 /docs | |
| parent | f427c80d024221f91572ea9d6966f41d51a07319 (diff) | |
| download | busybox-w32-845142e106f00428d9325c6a741488d1f5748e78.tar.gz busybox-w32-845142e106f00428d9325c6a741488d1f5748e78.tar.bz2 busybox-w32-845142e106f00428d9325c6a741488d1f5748e78.zip | |
Adjust names, link contributing info in main index
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/busybox.net/developer.html | 75 | ||||
| -rw-r--r-- | docs/busybox.net/header.html | 1 |
2 files changed, 50 insertions, 26 deletions
diff --git a/docs/busybox.net/developer.html b/docs/busybox.net/developer.html index cdb68b78c..18e42cd2b 100644 --- a/docs/busybox.net/developer.html +++ b/docs/busybox.net/developer.html | |||
| @@ -1,24 +1,40 @@ | |||
| 1 | <!--#include file="header.html" --> | 1 | <!--#include file="header.html" --> |
| 2 | 2 | ||
| 3 | <h3>Prerequisites</h3> | ||
| 4 | <p> | ||
| 5 | <ul> | ||
| 6 | <li>Send several <em>sensible</em> patches to the <a href="lists.html" title="Mailing list">Mailing list</a>.</li> | ||
| 7 | <li>Help <em>users</em>, answer their questions, guide them, be helpful and friendly.</li> | ||
| 8 | <li>Repeat above. | ||
| 9 | </ul> | ||
| 10 | </p> | ||
| 11 | <p> | ||
| 12 | If you feel comfortable with the above and have proven to continually | ||
| 13 | fulfill these requirements, or somebody asks you to apply for write-access | ||
| 14 | to the repository who itself is maintainer of a project, then please apply | ||
| 15 | for an account (if needed). | ||
| 16 | </p> | ||
| 3 | <h3>Morris Dancing</h3> | 17 | <h3>Morris Dancing</h3> |
| 4 | 18 | ||
| 5 | <p>Subversion commit access requires an account on Morris. The server | 19 | <p>Subversion commit access requires an account on Morris. The server |
| 6 | behind busybox.net and uclibc.org. If you want to be able to commit things to | 20 | behind busybox.net and uclibc.org. If you want to be able to commit things to |
| 7 | Subversion, first contribute some stuff to show you are serious, can handle | 21 | Subversion, first contribute some stuff to show you are serious, can handle |
| 8 | some responsibility, and that your patches don't generally need a lot of | 22 | some responsibility, and that your patches don't generally need a lot of |
| 9 | cleanup. Then, very nicely ask one of us (<a href="mailto:rob@landley.net">Rob | 23 | cleanup. Then, very nicely ask one of us |
| 10 | Landley</a> for BusyBox, or <a href="mailto:andersen@codepoet.org">Erik | 24 | (<a href="mailto:vda.linux@googlemail.com">Denys Vlasenko</a> for primarily BusyBox, or |
| 11 | Andersen</a> for uClibc) for an account.</p> | 25 | <a href="mailto:rep.<literal>dot</>.nop@gmail.com">Bernhard Reutner-Fischer</a> primarily for uClibc) |
| 26 | for an account.</p> | ||
| 12 | 27 | ||
| 13 | <p>If you're approved for an account, you'll need to send an email from your | 28 | <p>If you're approved for an account, you'll need to send an email from your |
| 14 | preferred contact email address with the username you'd like to use when | 29 | preferred contact email address with the username you'd like to use when |
| 15 | committing changes to SVN, and attach a public ssh key to access your account | 30 | committing changes to GIT, and attach a public ssh key to access your account |
| 16 | with.</p> | 31 | with.</p> |
| 17 | 32 | ||
| 18 | <p>If you don't currently have an ssh version 2 DSA key at least 1024 bits | 33 | <p>If you don't currently have an ssh version 2 DSA key at least 4096 bits |
| 19 | long (the default), you can generate a key using the | 34 | long, you can generate a key using the command |
| 20 | command <b>ssh-keygen -t dsa</b> and hitting enter at the prompts. This | 35 | <b>ssh-keygen -b 4096 -t dsa</b> |
| 21 | will create the files <b>~/.ssh/id_dsa</b> and <b>~/.ssh/id_dsa.pub</b> | 36 | and hitting enter at the prompts. |
| 37 | This will create the files <b>~/.ssh/id_dsa</b> and <b>~/.ssh/id_dsa.pub</b> | ||
| 22 | You must then send the content of 'id_dsa.pub' to me so I can set up your | 38 | You must then send the content of 'id_dsa.pub' to me so I can set up your |
| 23 | account. (The content of 'id_dsa' should of course be kept secret, anyone | 39 | account. (The content of 'id_dsa' should of course be kept secret, anyone |
| 24 | who has that can access any account that's installed your public key in | 40 | who has that can access any account that's installed your public key in |
| @@ -26,16 +42,16 @@ its <b>.ssh/authorized_keys</b> file.)</p> | |||
| 26 | 42 | ||
| 27 | <p>Note that if you would prefer to keep your communications with us | 43 | <p>Note that if you would prefer to keep your communications with us |
| 28 | private, you can encrypt your email using | 44 | private, you can encrypt your email using |
| 29 | <a href="http://landley.net/pubkey.gpg">Rob's public key</a> or | 45 | <a href="http://busybox.net/~vda/vda_pubkey.gpg">Denys' public key</a> or |
| 30 | <a href="http://www.codepoet.org/andersen/erik/gpg.asc">Erik's public | 46 | <a href="http://uClibc.org/~aldot/gpg.asc">Bernhard's public key</a>. |
| 31 | key</a>.</p> | 47 | </p> |
| 32 | 48 | ||
| 33 | <p>Once you are setup with an account, you will need to use your account to | 49 | <p>Once you are setup with an account, you will need to use your account to |
| 34 | checkout a copy of BusyBox from Subversion:</p> | 50 | checkout a copy of BusyBox from GIT:</p> |
| 35 | 51 | ||
| 36 | <p><b>svn checkout svn+ssh://username@busybox.net/svn/trunk/busybox</b></p> | 52 | <p><b>git+ssh://username@git.busybox.net/git/busybox busybox.mine</b></p> |
| 37 | <p>or</p> | 53 | <p>or</p> |
| 38 | <p><b>svn checkout svn+ssh://username@uclibc.org/svn/trunk/uclibc</b></p> | 54 | <p><b>git+ssh://username@git.uClibc.org/git/uClibc uClibc.tmp</b></p> |
| 39 | 55 | ||
| 40 | <p>You must change <em>username</em> to your own username, or omit | 56 | <p>You must change <em>username</em> to your own username, or omit |
| 41 | it if it's the same as your local username.</p> | 57 | it if it's the same as your local username.</p> |
| @@ -45,25 +61,32 @@ check your changes, diff your changes, revert your changes, and and commit your | |||
| 45 | changes using commands such as:</p> | 61 | changes using commands such as:</p> |
| 46 | 62 | ||
| 47 | <b><pre> | 63 | <b><pre> |
| 48 | svn diff | 64 | git diff |
| 49 | svn status | 65 | git format-patch -s |
| 50 | svn revert | 66 | git status |
| 51 | EDITOR=vi svn commit | 67 | git revert <revert-hash> |
| 52 | svn log -v -r PREV:HEAD | 68 | EDITOR=vi git commit -s |
| 53 | svn help | 69 | git log |
| 70 | git push -v --thin | ||
| 71 | git help | ||
| 54 | </pre></b> | 72 | </pre></b> |
| 55 | 73 | ||
| 56 | <p>For additional detail on how to use Subversion, please visit the | 74 | <p>For additional detail on how to use |
| 57 | <a href="http://subversion.tigris.org/">the Subversion website</a>. | 75 | <a href="http://www.kernel.org/pub/software/scm/git/">GIT</a>, please visit the |
| 58 | You might also want to read online or buy a copy of <a | 76 | <a href="http://git.or.cz/">GIT overview</a> site. |
| 59 | href="http://svnbook.red-bean.com/">the Subversion Book</a>...</p> | 77 | You might also want to read online the <a |
| 78 | href="http://www.kernel.org/pub/software/scm/git/docs">manpages</a> | ||
| 79 | or | ||
| 80 | <a href="http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html">tutorial</a>. | ||
| 81 | </p> | ||
| 60 | 82 | ||
| 61 | <p>A morris account also gives you a personal web page | 83 | <p>A morris account also gives you a personal web page |
| 62 | (http://busybox.net/~username comes from ~/public_html on morris), and of | 84 | (http://busybox.net/~username comes from ~/public_html on morris), and of |
| 63 | course a shell prompt you can ssh into (as a regular user, root access is | 85 | course a shell prompt you can ssh into (as a regular user, root access is |
| 64 | reserved for Erik and Rob). But keep in mind an account on Morris is a | 86 | reserved for folks doing maintenancy stuff only). But keep in mind an |
| 87 | account on Morris is a | ||
| 65 | priviledge, not a requirement. Most contributors to busybox and uClibc | 88 | priviledge, not a requirement. Most contributors to busybox and uClibc |
| 66 | haven't got one, and accounts are handed out to make the project maintainers' | 89 | haven't got one, and accounts are handed out to make the project maintainers' |
| 67 | lives easier, not because "you deserve it".</p> | 90 | lives easier, not because "you deserve it".</p> |
| 68 | 91 | ||
| 69 | <!--#include file="footer.html" --> | 92 | <!--#include file="footer.html" --> |
diff --git a/docs/busybox.net/header.html b/docs/busybox.net/header.html index 9641d8c1f..16f3d7aea 100644 --- a/docs/busybox.net/header.html +++ b/docs/busybox.net/header.html | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | <!--li><a href="/downloads/patches/recent.html">Recent Changes</a></li--> | 65 | <!--li><a href="/downloads/patches/recent.html">Recent Changes</a></li--> |
| 66 | <li><a href="lists.html">Mailing Lists</a></li> | 66 | <li><a href="lists.html">Mailing Lists</a></li> |
| 67 | <li><a href="https://bugs.busybox.net/">Bug Tracking</a></li> | 67 | <li><a href="https://bugs.busybox.net/">Bug Tracking</a></li> |
| 68 | <li><a href="developer.html">Contributing</a></li> | ||
| 68 | </ul> | 69 | </ul> |
| 69 | <p><b>Links</b> | 70 | <p><b>Links</b> |
| 70 | <ul> | 71 | <ul> |