[website] 06/06: Improve quilt command formating.

[Bas Couwenberg]

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

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

commit 779a8caadb032b7848364ea4172071ec9927c4ca
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 16 01:11:52 2014 +0100

    Improve quilt command formating.
---
 policy.xml | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/policy.xml b/policy.xml
index 72d7505..9099fed 100644
--- a/policy.xml
+++ b/policy.xml
@@ -2036,51 +2036,67 @@ QUILT_PATCHES="debian/patches"
 </programlisting>
           <para>
             If the patch is already applied, but is not the topmost, run
-            <command>quilt pop</command> until it becomes the currently
-            applied one.
+<programlisting>
+<command>quilt pop</command>
+</programlisting>
+            until it becomes the currently applied one.
           </para>
           <para>
-            You can now run <command>quilt edit</command> on the files you
-            want to change, and, when you're done,
-            <command>quilt refresh</command>.
+            You can now run
+<programlisting>
+<command>quilt edit</command>
+</programlisting>
+            on the files you want to change, and, when you're done:
+<programlisting>
+<command>quilt refresh</command>
+</programlisting>
+            to update the patch with your changes.
           </para>
         </sect4>
         <sect4 id="quilt-rename">
           <title>Renaming patches</title>
           <para>
-            Sometimes it's useful to rename a patch. Without any hassle, do:
-          </para>
+            Sometimes it's useful to rename a patch.
+            Without any hassle, do:
 <programlisting>
-<command>quilt rename -P</command> <replaceable><old_name>.patch</replaceable> <replaceable><new_name>.patch</replaceable>
+<command>quilt rename</command> <option>-P</option> <replaceable><old_name>.patch</replaceable> <replaceable><new_name>.patch</replaceable>
 </programlisting>
+          </para>
         </sect4>
         <sect4 id="quilt-other">
           <title>Other commands</title>
           <para>
-            Please see <command>man 1 quilt</command> to have a comprehensive
-            list of commands.
+            Please see
+            <ulink url="http://manpages.debian.net/cgi-bin/man.cgi?query=quilt"><command>man</command> <literal>1</literal> <literal>quilt</literal></ulink>
+            to have a comprehensive list of commands.
           </para>
         </sect4>
         <sect4 id="quilt-integration">
           <title>Integration in the build process</title>
           <para>
+            Please not that the <literal>3.0 (quilt)</literal> source version
+            supports quilt automatically, the following instructions are
+            deprecated but may still be used by packages in
+            <literal>oldstable</literal>.
+          </para>
+          <para>
             Add in the very first part of <filename>debian/rules</filename>
             (i.e. before the targets), the line:
-          </para>
 <programlisting>
 include <filename class="headerfile">/usr/share/quilt/quilt.make</filename>
 </programlisting>
+          </para>
           <para>
             Please use this to import patch and unpatch rules instead of
             writing them, and remember to add the needed dependencies to
             its targets:
-          </para>
 <programlisting>
 ...
 build:patch build-stamp
 build-stamp: configure
 ...
 </programlisting>
+          </para>
           <para>
             This kind of dependency will ensure that if you also patch the
             build system, you get a working patched build process.

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