[SCM] Debian Live Manual branch, master, updated. 20090301-1-8-gb6bbd1b

Jonas Stein news at jonasstein.de
Sun Mar 1 16:09:09 UTC 2009


The following commit has been merged in the master branch:
commit b6bbd1bb15dcd9efbb3e852167644d7232c593e3
Author: Jonas Stein <news at jonasstein.de>
Date:   Sun Mar 1 17:03:12 2009 +0100

    Adding further steps for using git to contribute to this manual.

diff --git a/xml/chapters/about/manual.xml b/xml/chapters/about/manual.xml
index 6900375..afdfaf4 100644
--- a/xml/chapters/about/manual.xml
+++ b/xml/chapters/about/manual.xml
@@ -112,11 +112,7 @@
 
 <sect3 id="commiting">
 <title>Applying patches</title>
-<para>Directly commiting to the repository is possibly by anyone. However, we ask you to send bigger changes to the mailinglist for discussing them before you push them.</para>
-
-<para>Make sure that all commits you do have a proper name and email address, use <screen>git config --global user.name</screen> and <screen>git config --global user.email</screen> to set them. Also use full sentences for commit messages.</para>
-
-<para>In order to push to the repository, the following steps are required.</para>
+<para>Directly commiting to the repository is possibly by anyone. However, we ask you to send bigger changes to the mailinglist before commiting them. In order to push to the repository, the following steps are required.</para>
 
 <itemizedlist>
 <listitem><para>Fetch the public commit key:</para>
@@ -131,10 +127,18 @@ Host git.debian.net
 	Hostname git.debian.net
 	User gitosis
 	IdentityFile ~/.ssh/identity.d/live-manual at debian-live
-EOF</screen></listitem>
+EOF
+</screen></listitem>
 
-<listitem><para>Checkout the manual through ssh:</para>
+<listitem><para>Get a recent clone of the manual through ssh:</para>
 <screen>$ git clone gitosis at git.debian.net:debian-live/live-manual.git</screen></listitem>
+<listitem><para>commit the file after editing. Write comments, that consist of full sefull sentences, 
+starting with a capital letter, ending with a full stop.  Usually starting with the form 'Fixing/Adding/Removing/Correcting/':</para>
+<screen>$ git commit mychangedfile</screen></listitem>
+<listitem><para>push the changes to the server:</para>
+<screen>$ git push gitosis at git.debian.net:debian-live/live-manual.git</screen></listitem>
+
+
 </itemizedlist>
 
 </sect3>

-- 
Debian Live Manual



More information about the debian-live-changes mailing list