Adjust names, link contributing info in main index

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

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 @@
 <!--#include file="header.html" -->
 
+<h3>Prerequisites</h3>
+<p>
+<ul>
+<li>Send several <em>sensible</em> patches to the <a href="lists.html" title="Mailing list">Mailing list</a>.</li>
+<li>Help <em>users</em>, answer their questions, guide them, be helpful and friendly.</li>
+<li>Repeat above.
+</ul>
+</p>
+<p>
+If you feel comfortable with the above and have proven to continually
+fulfill these requirements, or somebody asks you to apply for write-access
+to the repository who itself is maintainer of a project, then please apply
+for an account (if needed).
+</p>
 <h3>Morris Dancing</h3>
 
 <p>Subversion commit access requires an account on Morris.  The server
 behind busybox.net and uclibc.org.  If you want to be able to commit things to
 Subversion, first contribute some stuff to show you are serious, can handle
 some responsibility, and that your patches don't generally need a lot of
-cleanup.  Then, very nicely ask one of us (<a href="mailto:rob@landley.net">Rob
-Landley</a> for BusyBox, or <a href="mailto:andersen@codepoet.org">Erik
-Andersen</a> for uClibc) for an account.</p>
+cleanup.  Then, very nicely ask one of us
+(<a href="mailto:vda.linux@googlemail.com">Denys Vlasenko</a> for primarily BusyBox, or
+<a href="mailto:rep&#46;<literal>dot</>&#46;nop@gmail.com">Bernhard Reutner-Fischer</a> primarily for uClibc)
+for an account.</p>
 
 <p>If you're approved for an account, you'll need to send an email from your
 preferred contact email address with the username you'd like to use when
-committing changes to SVN, and attach a public ssh key to access your account
+committing changes to GIT, and attach a public ssh key to access your account
 with.</p>
 
-<p>If you don't currently have an ssh version 2 DSA key at least 1024 bits
-long (the default), you can generate a key using the
-command <b>ssh-keygen -t dsa</b> and hitting enter at the prompts.  This
-will create the files <b>~/.ssh/id_dsa</b> and <b>~/.ssh/id_dsa.pub</b>
+<p>If you don't currently have an ssh version 2 DSA key at least 4096 bits
+long, you can generate a key using the command 
+<b>ssh-keygen -b 4096 -t dsa</b> 
+and hitting enter at the prompts.
+This will create the files <b>~/.ssh/id_dsa</b> and <b>~/.ssh/id_dsa.pub</b>
 You must then send the content of 'id_dsa.pub' to me so I can set up your
 account.  (The content of 'id_dsa' should of course be kept secret, anyone
 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>
 
 <p>Note that if you would prefer to keep your communications with us
 private, you can encrypt your email using
-<a href="http://landley.net/pubkey.gpg">Rob's public key</a> or
-<a href="http://www.codepoet.org/andersen/erik/gpg.asc">Erik's public
-key</a>.</p>
+<a href="http://busybox.net/~vda/vda_pubkey.gpg">Denys' public key</a> or
+<a href="http://uClibc.org/~aldot/gpg.asc">Bernhard's public key</a>.
+</p>
 
 <p>Once you are setup with an account, you will need to use your account to
-checkout a copy of BusyBox from Subversion:</p>
+checkout a copy of BusyBox from GIT:</p>
 
-<p><b>svn checkout svn+ssh://username@busybox.net/svn/trunk/busybox</b></p>
+<p><b>git+ssh://username@git.busybox.net/git/busybox busybox.mine</b></p>
 <p>or</p>
-<p><b>svn checkout svn+ssh://username@uclibc.org/svn/trunk/uclibc</b></p>
+<p><b>git+ssh://username@git.uClibc.org/git/uClibc uClibc.tmp</b></p>
 
 <p>You must change <em>username</em> to your own username, or omit
 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
 changes using commands such as:</p>
 
 <b><pre>
-svn diff
-svn status
-svn revert
-EDITOR=vi svn commit
-svn log -v -r PREV:HEAD
-svn help
+git diff
+git format-patch -s
+git status
+git revert <revert-hash>
+EDITOR=vi git commit -s
+git log
+git push -v --thin
+git help
 </pre></b>
 
-<p>For additional detail on how to use Subversion, please visit the
-<a href="http://subversion.tigris.org/">the Subversion website</a>.
-You might also want to read online or buy a copy of <a
-href="http://svnbook.red-bean.com/">the Subversion Book</a>...</p>
+<p>For additional detail on how to use
+<a href="http://www.kernel.org/pub/software/scm/git/">GIT</a>, please visit the
+<a href="http://git.or.cz/">GIT overview</a> site.
+You might also want to read online the <a
+href="http://www.kernel.org/pub/software/scm/git/docs">manpages</a> 
+or 
+<a href="http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html">tutorial</a>.
+</p>
 
 <p>A morris account also gives you a personal web page
 (http://busybox.net/~username comes from ~/public_html on morris), and of
 course a shell prompt you can ssh into (as a regular user, root access is
-reserved for Erik and Rob).  But keep in mind an account on Morris is a
+reserved for folks doing maintenancy stuff only).  But keep in mind an
+account on Morris is a
 priviledge, not a requirement.  Most contributors to busybox and uClibc
 haven't got one, and accounts are handed out to make the project maintainers'
-lives easier, not because "you deserve it".</p>
+lives easier, not because &quot;you deserve it&quot;.</p>
 
 <!--#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 @@
         <!--li><a href="/downloads/patches/recent.html">Recent Changes</a></li-->
         <li><a href="lists.html">Mailing Lists</a></li>
         <li><a href="https://bugs.busybox.net/">Bug Tracking</a></li>
+        <li><a href="developer.html">Contributing</a></li>
     </ul>
     <p><b>Links</b>
     <ul>