[website] 01/01: Further tweak based on Bas's comments

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository website.

commit 9c3b2f2dbba7c7587a8905633d75d86d26cfd44f
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sat Feb 6 12:25:17 2016 +0100

    Further tweak based on Bas's comments
    
    Add a section after pbuilder hooks about overriding the configuration.
    Move the gpg key global setting to Tips & Tricks. Drop the link to
    the wiki on multiple pbuilder distributions.
---
 policy.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/policy.xml b/policy.xml
index b8beed7..2e37aae 100644
--- a/policy.xml
+++ b/policy.xml
@@ -936,7 +936,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
 <command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=sid</option> <option>--basepath=/var/cache/pbuilder/base-sid.cow</option>
 </programlisting>
             </para>
-            <para>
+            <para id="git-pbuilder-tip">
               You can also use the
               <ulink url="http://manpages.debian.org/cgi-bin/man.cgi?query=git-pbuilder">git-pbuilder</ulink>
               wrapper to create (and
@@ -984,6 +984,10 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
 <programlisting>
 <command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=<replaceable>sid</replaceable></option> <option>--basepath=/var/cache/pbuilder/base-<replaceable>sid</replaceable>.cow</option> <option>--hookdir=/var/cache/pbuilder/hook.d/</option>
 </programlisting>
+              If you have already created the chroot, then you will need to do an update and override the configuration to ensure the hook is found:
+<programlisting>
+<command>sudo cowbuilder</command> <option>--update</option> <option>--override-config</option> <option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.cow</option>
+</programlisting>
             </para>
           </sect5>
           <sect5 id="git-pbuilder-update">
@@ -1001,17 +1005,6 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
 </programlisting>
             </para>
           </sect5>
-          <sect5 id="git-pbuilder-tips">
-            <title>Other useful set up tips</title>
-            <para>
-              To ensure the correct gpg key is used when signing git tags:
-              <command>git config</command> <option>--global user.signingkey yourkeyID</option>
-            </para>
-            <para>
-              To set up multiple chroots for different distributions (e.g. stable, testing, sid, and Ubuntu), see:
-              <ulink url="https://wiki.debian.org/PbuilderTricks#How_to_build_for_different_distributions">Pbuilder Tricks</ulink>
-            </para>
-          </sect5>
         </sect4>
         <sect4 id="git-new-package">
           <title>Starting a new package</title>
@@ -1768,6 +1761,13 @@ allowed_distributions = .*
             accordingly.
           </para>
         </sect4>
+        <sect4 id="git-signing-tags-tips">
+          <title>Setting the gpg key for signing git tags</title>
+          <para>
+            To ensure the correct gpg key is used when signing git tags:
+            <command>git config</command> <option>--global user.signingkey yourkeyID</option>
+          </para>
+        </sect4>
         <sect4 id="debcheckout-sets-git-options">
           <title>Configure Git to commit using your packager name and address</title>
           <para>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.git