[SCM] website branch, master, updated. 726d0ebf222a4c2cc2da07456ca4946eeacd2a4f

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 726d0ebf222a4c2cc2da07456ca4946eeacd2a4f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 19 18:54:04 2014 +0100

    Don't use emphasis for literals.

diff --git a/policy.xml b/policy.xml
index 7e2a64d..bf8baf7 100644
--- a/policy.xml
+++ b/policy.xml
@@ -213,7 +213,7 @@
           <listitem>
             <para>
               If you are a member of Debian GIS or a Debian Developer,
-              with account name <emphasis><username></emphasis>,
+              with account name <replaceable><username></replaceable>,
               you have write permission to our VCS repositories:
               <itemizedlist>
                 <listitem>
@@ -580,7 +580,7 @@ pkg-grass/
         of a package available in
         <ulink url="http://snapshot.debian.org">snapshot.debian.org</ulink>
         and create tags for each of them. Note that as this paragraph is
-        written, the tool is not aware that <emphasis>backports</emphasis>
+        written, the tool is not aware that <literal>backports</literal>
         should be a different branch.
       </para>
     </sect2>
@@ -814,9 +814,9 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
           <para>
             <command>git-buildpackage</command>'s command
             <command>git-import-orig</command> makes it easy to update of the
-            <emphasis>upstream</emphasis> branch using upstream releases
+            <literal>upstream</literal> branch using upstream releases
             distributed as a compressed archive, and to merge these changes in
-            the <emphasis>master</emphasis> branch. Its option
+            the <literal>master</literal> branch. Its option
             <command>--pristine-tar</command> is useful for stabilizing the MD5 sum
             of the "<filename>orig.tar.gz</filename>" produced when building a
             source package from the repository alone (not doing so results in
@@ -1329,7 +1329,7 @@ lintian ../build-area/*changes
         is to make packages depend on versions equal or higher to the one 
         against which they were built. When using <code>r-base-dev</code>,
         this can be acheived by adding the substitution variable
-        <code>${R:Depends}</code> in the <emphasis>Depends</emphasis> field of
+        <code>${R:Depends}</code> in the <literal>Depends</literal> field of
         the binary package.
       </para>
     </sect2>
@@ -1586,14 +1586,14 @@ pristine-tar = True
       <title>Debhelper</title>
       <para>
         Debhelper uses compatibility levels to control the behaviour of its
-        commands. We currently recommend to use the level <emphasis>9</emphasis>
-        which is available in current <emphasis>stable</emphasis> (Wheezy) and
-        backported to <emphasis>oldstable</emphasis>. However, there is no
+        commands. We currently recommend to use the level <literal>9</literal>
+        which is available in current <literal>stable</literal> (Wheezy) and
+        backported to <literal>oldstable</literal>. However, there is no
         urgent need to touch packages only because it has an older Debhelper
         version.
       </para>
       <para>
-        It is strongly recommended to use the short <emphasis>dh</emphasis> 
+        It is strongly recommended to use the short <literal>dh</literal> 
         notation in <filename>debian/rules</filename> files which makes code
         factorisation very simple and easy to understand the packaging for
         other members of the team. Even complex packaging becomes quite
@@ -1603,12 +1603,12 @@ pristine-tar = True
     <sect2 id="cdbs">
       <title>CDBS</title>
       <para>
-        Before the short <emphasis>dh</emphasis> notation of debhelper existed
+        Before the short <literal>dh</literal> notation of debhelper existed
         CDBS was the only way to factorise code in
         <filename>debian/rules</filename> files.
-        We would like to standardise on <emphasis>dh</emphasis> when both
+        We would like to standardise on <literal>dh</literal> when both
         provide similar comfort. Please give it priority for new packages.
-        It is also possible to switch to <emphasis>dh</emphasis> for existing
+        It is also possible to switch to <literal>dh</literal> for existing
         packages, but this is entirely at the packagers discretion.
       </para>
       <para>
@@ -1713,8 +1713,8 @@ pristine-tar = True
       <para>
         The <literal>3.0 (quilt)</literal> dpkg source format provides its own
         patch system. Apart from this, the most popular is
-        <command>quilt</command>. <emphasis>simple-patchsys</emphasis>,
-        from the <package>CDBS</package>package, is deprecated since version
+        <command>quilt</command>. <literal>simple-patchsys</literal>,
+        from the <package>CDBS</package> package, is deprecated since version
         <literal>0.4.85</literal>. <command>dpatch</command> has been popular
         as well, but is not compatible with the <literal>3.0 (quilt)</literal>
         source format and is

-- 
pkg-grass website