[SCM] website branch, master, updated. 49998d71ec2ce0d5f125499df02c2a212be4f58f

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 49998d71ec2ce0d5f125499df02c2a212be4f58f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 6 01:19:49 2014 +0100

    List format for debcheckout commands, git subcommands as part of the command.

diff --git a/policy.xml b/policy.xml
index f0a6614..53fc8fa 100644
--- a/policy.xml
+++ b/policy.xml
@@ -213,19 +213,25 @@
               If you are a member of Debian GIS or a Debian Developer,
               with account name <emphasis><username></emphasis>,
               you have write permission:
-            </para>
-            <para>
-              If the package is already in the archive:
+              <itemizedlist>
+                <listitem>
+                  <para>
+                    If the package is already in the archive:
 <programlisting>
-<command>debcheckout</command> <option>--user</option> <replaceable><username></replaceable> <option>--git-track <replaceable>'*'</replaceable></option> <replaceable><package></replaceable>   # When the package is already in the archive 
+<command>debcheckout</command> <option>--user</option> <replaceable><username></replaceable> <option>--git-track <replaceable>'*'</replaceable></option> <replaceable><package></replaceable>
 </programlisting>
-            </para>
-            <para>
-              For draft packages that are only on Alioth:
+                  </para>
+                </listitem>
+                <listitem>
+                  <para>
+                    For draft packages that are only on Alioth:
 <programlisting>
 <command>debcheckout</command> <option>--user</option> <replaceable><username></replaceable> git://git.debian.org/pkg-grass/<replaceable><package></replaceable>.git <option>--git-track <replaceable>'*'</replaceable></option>
 <command>debcheckout</command> <option>--user</option> <replaceable><username></replaceable> svn://svn.debian.org/pkg-grass/packages/<replaceable><package></replaceable>/trunk <replaceable><package></replaceable>
 </programlisting>
+                  </para>
+                </listitem>
+              </itemizedlist>
              </para>
           </listitem>
           <listitem>
@@ -908,7 +914,7 @@ For <command>pbuilder</command> replace <option>--basepath</option> with <option
             first time, an empty repository needs to be created there.
             And you need to configure a Git remote for the repository on Alioth.
           </para>
-          <sect5 id="create-git-repository-on-alioth">
+          <sect5 id="git-repository-on-alioth">
             <title>Create a Git repository on Alioth</title>
             <para>
               To create a Git repository on Alioth, connect to
@@ -927,6 +933,9 @@ For <command>pbuilder</command> replace <option>--basepath</option> with <option
               This will create an empty, bare, shared Git repository and setup some
               hooks. Each package is kept in its own Git repository.
             </para>
+            <para>
+              See the <link linkend="ssh-config">SSH tips</link> section for how to configure the default <command>ssh</command> username for <literal>git.debian.org</literal>.
+            </para>
           </sect5>
           <sect5 id="git-alioth-remote">
             <title>Configure a Git remote for the repository</title>
@@ -947,17 +956,26 @@ For <command>pbuilder</command> replace <option>--basepath</option> with <option
           <sect5 id="push-package-to-alioth">
             <title>To push the package</title>
             <para>
-              (make sure you've added the alioth remote!), do the following:
-              <command>git push</command> <option>origin master</option>.
+              Make sure you've
+              <link linkend="git-repository-on-alioth">created the repository on Alioth</link>
+              and that you've
+              <link linkend="git-alioth-remote">added the remote</link>!
+            </para>
+            <para>
+              Push you're local changes to Alioth:
+<programlisting>
+<command>git push</command> <option>origin master</option>
+</programlisting>
               For the first push, it's necessary to specify
-              <option>origin master</option>. The next time you will push, a
+              <option>origin master</option>.
+              The next time you will push, a
               <command>git push</command> will suffice.
             </para>
             <para>
               Or use the <option>--set-upstream</option> option, helps future use of
               <command>git pull</command>.
 <programlisting>
-<command>git</command> push --set-upstream
+<command>git push</command> --set-upstream
 </programlisting>
             </para>
           </sect5>
@@ -968,8 +986,8 @@ For <command>pbuilder</command> replace <option>--basepath</option> with <option
               <option>--all</option>, and one with <option>--tags</option>
               if you created new tags. 
 <programlisting>
-<command>git</command> push --all --set-upstream 
-<command>git</command> push --tags
+<command>git push</command> --all --set-upstream 
+<command>git push</command> --tags
 </programlisting>
             </para>
           </sect5>
@@ -1039,7 +1057,7 @@ For <command>pbuilder</command> replace <option>--basepath</option> with <option
           <title>To track extra remote branches, simply check them out</title>
           <para>
             With recent versions of git, the remote branch will be automatically
-            tracked when running <command>git</command> checkout.
+            tracked when running <command>git checkout</command>.
           </para>
           <para>
             For example, when a <literal>pristine-tar</literal> branch is
@@ -1079,7 +1097,7 @@ get-orig-source:
 </programlisting>
           </para>
         </sect4>
-        <sect4 id="git-pbuilder">
+        <sect4 id="git-pdebuild">
           <title>
             To make <command>git-buildpackage</command> build the package
             with <command>pdebuild</command>
@@ -1581,7 +1599,7 @@ pristine-tar = True
           Git repositories should be stored in the
           <filename class="directory">/git/pkg-grass</filename> directory on
           Alioth and created with the
-          <link linkend="create-git-repository-on-alioth"><command>setup-repository</command></link>
+          <link linkend="git-repository-on-alioth"><command>setup-repository</command></link>
           script available there. There, they must give write access to the
           <literal>pkg-grass</literal> Alioth group and all the Debian
           Developers, with appropriate Unix permissions (including SGID bit on

-- 
pkg-grass website