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

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

commit 29a86b9d4d7e7a622b9d42069104c72d2986f3f1
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun Oct 26 21:33:21 2014 +0100

    Start new sentences on a new line, misc whitespace fixes.
---
 policy.xml | 97 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/policy.xml b/policy.xml
index 8969c99..44d9195 100644
--- a/policy.xml
+++ b/policy.xml
@@ -94,20 +94,21 @@
       <para>
         Please contact us on
         <ulink 
url="mailto:debian-...@lists.debian.org";>debian-...@lists.debian.org</ulink>
-        if you want to help to make GIS and/or OpenStreetMap software 
available to
-        users of Debian and its derivative distributions such as Ubuntu,
-        OSGeo-Live, Mint, etc. 
+        if you want to help to make GIS and/or OpenStreetMap software available
+        to users of Debian and its derivative distributions such as Ubuntu,
+        OSGeo-Live, Mint, etc.
         Read the <link linkend="membership">Membership</link>
         section if you're interested in joining us.
       </para>
       <para>
-        There are many ways to contribute to the Debian GIS Team other than 
packaging
-        new software and updating existing packages to the latest version. 
People
-        that triage bugs and contribute patches, monitor the GIS landscape for 
new
-        software, write arcticles, write "HOWTO" tutorials on the wiki, 
translate
-        package descriptions (if you speak a language in addition to English), 
tag
-        packages so that people can find the software they need, and upload
-        screenshots are also most welcome.
+        There are many ways to contribute to the Debian GIS Team other than
+        packaging new software and updating existing packages to the latest
+        version.
+        People that triage bugs and contribute patches, monitor the GIS
+        landscape for new software, write arcticles, write "HOWTO" tutorials on
+        the wiki, translate package descriptions (if you speak a language in
+        addition to English), tag packages so that people can find the software
+        they need, and upload screenshots are also most welcome.
         Join the team as described above and begin contributing!
       </para>
       <para>
@@ -122,39 +123,45 @@
       </para>
       <para>
         A good route to find the Debian GIS descriptions needing translation is
-        to use one of the Debian GIS task pages (for example the workstation 
task):
-        <ulink 
url="http://blends.debian.org/gis/tasks/workstation";>Workstation Tasks</ulink>
+        to use one of the Debian GIS task pages (for example the
+        <ulink 
url="http://blends.debian.org/gis/tasks/workstation";>workstation task</ulink>).
         If you are using a non-English locale, you should see that untranslated
         descriptions are in English, and there is a button you can click to
-        contribute a translation. If you use an English locale, there are 
links at
-        the bottom of the webpage that switch the webpage to other languages.
+        contribute a translation.
+        If you use an English locale, there are links at the bottom of the
+        webpage that switch the webpage to other languages.
       </para>
       <para>
         You can also contribute and edit Debtags on the task pages. Debtags
         are used in Debian so that people can type in keywords and search
         for packages that they might need. Please help us to make sure a
         user will find our packages if they are searching for them.
-        If a package is currently not tagged, you should see a "Go tagging" 
button.
+        If a package is currently not tagged, you should see a
+        "<ulink url="http://debtags.debian.net/edit/";>Go tagging</ulink>"
+        button.
         By clicking "Edit Tags" you can double check the packages that have
         already been tagged.
       </para>
       <para>
         A well chosen screenshot can also help to sell each Debian GIS package.
-        Clicking on "Upload screenshot" will take you to a page where you can
-        upload a screenshot. Instructions can be found on the page that you are
-        taken to. You can also click on an existing screen shot to send an
-        updated one if you think the current one is out of date.
+        Clicking on
+        "<ulink url="http://screenshots.debian.net/uploadfile";>Upload 
screenshot</ulink>"
+        will take you to a page where you can upload a screenshot.
+        Instructions can be found on the page that you are taken to.
+        You can also click on an existing screen shot to send an updated one
+        if you think the current one is out of date.
       </para>
-      <para>  
+      <para>
         Also very welcome, are tutorials that guide Debian users towards the 
use of
         packages to their immediate benefit.
         You may also consider writing relevant articles for Magazines,
         be they online or in print.
       </para>
       <para>
-               If confirming bugs and contributing and testing patches are 
your thing,
-               click here to see all the <ulink 
url="https://bugs.debian.org/cgi-bin/pkgreport.cgi?which=maint&amp;data=pkg-grass-devel%40lists.alioth.debian.org&amp;archive=no&amp;raw=yes&amp;bug-rev=yes&amp;pend-exc=fixed&amp;pend-exc=done";>Debian
 GIS Bugs</ulink>.
-         </para>
+        If confirming bugs and contributing and testing patches are your thing,
+        click here to see all the
+        <ulink 
url="https://bugs.debian.org/cgi-bin/pkgreport.cgi?which=maint&amp;data=pkg-grass-devel%40lists.alioth.debian.org&amp;archive=no&amp;raw=yes&amp;bug-rev=yes&amp;pend-exc=fixed&amp;pend-exc=done";>Debian
 GIS Bugs</ulink>.
+      </para>
       <para>
         This policy is a work in progress, and attempts to document best
         practices which evolve and change over time.
@@ -169,9 +176,9 @@
       <title>Membership</title>
       <para>
         To request membership of the Debian GIS team, and access to our 
collaboration
-        infrastructure on Alioth, please go to our 
+        infrastructure on Alioth, please go to our
         <ulink url="http://alioth.debian.org/projects/pkg-grass";>Alioth 
page</ulink>
-        or directly follow the 
+        or directly follow the
         <ulink 
url="https://alioth.debian.org/project/request.php?group_id=30241";>Request to 
join</ulink>
         link.
       </para>
@@ -374,7 +381,7 @@ pkg-grass/
             <para>
               The <literal>master</literal> branch contains the full source 
package.
             </para>
-           <para>
+            <para>
               Upstream sources are merged with Debian-specific changes in the
               <literal>master</literal> branch, which is the usual place to 
work in.
             </para>
@@ -383,14 +390,14 @@ pkg-grass/
             <para>
               The <literal>pristine-tar</literal> branch contains the data 
necessary
               to recreate an original tarball from the repository with a
-              reproducible checksum. 
+              reproducible checksum.
             </para>
-           <para>
+            <para>
               The data needed to regenerate original source tarballs from the
               <literal>upstream</literal> branch are kept with the help of the
               <command>pristine-tar</command> tool in the
               <literal>pristine-tar</literal> branch.
-           </para>
+            </para>
           </listitem>
           <listitem>
             <para>
@@ -401,7 +408,7 @@ pkg-grass/
             <para>
               Upstream sources are kept (in plain, uncompressed form) in the
               <literal>upstream</literal> branch.
-           </para>
+            </para>
           </listitem>
         </itemizedlist>
         <para>
@@ -450,7 +457,7 @@ pkg-grass/
           collaboration between Debian GIS and the UbuntuGIS and derivative
           teams.
           Changes from Debian or Ubuntu can be merged or cherry picked from
-          their respective branches without needing to obtain the source 
+          their respective branches without needing to obtain the source
           packages to manually merge the changes from.
         </para>
       </sect3>
@@ -610,7 +617,7 @@ pkg-grass/
         <listitem>
           <para>
             Document in the Subversion repository that the package has been
-            transferred elsewhere, for instance with a file named 
+            transferred elsewhere, for instance with a file named
             <filename>README.status</filename> containing the new VCS URL.
           </para>
         </listitem>
@@ -778,8 +785,8 @@ pkg-grass/
             <command>git-buildpackage</command>'s
             <option>--git-pbuilder</option> option.
           </para>
-          <literallayout><command>cowbuilder</command> is preferred over 
<command>pbuilder</command> by <command>git-buildpackage</command> for its 
increased performance using Copy-On-Write techniques. 
-<command>pbuilder</command> can be selected instead by setting the environment 
variable <literal>BUILDER</literal> to "<literal>pbuilder</literal>", and 
+          <literallayout><command>cowbuilder</command> is preferred over 
<command>pbuilder</command> by <command>git-buildpackage</command> for its 
increased performance using Copy-On-Write techniques.
+<command>pbuilder</command> can be selected instead by setting the environment 
variable <literal>BUILDER</literal> to "<literal>pbuilder</literal>", and
 <command>qemubuilder</command> can be selected by setting 
<literal>BUILDER</literal> to "<literal>qemubuilder</literal>".
 </literallayout>
           <literallayout>Root privileges are required to run 
<command>cowbuilder</command> and <command>pbuilder</command>.
@@ -897,10 +904,10 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, 
/usr/sbin/cowbuilder
             is taken from the Debian GIS package template.
           </para>
           <para>
-            Change the placeholders in the files under the 
+            Change the placeholders in the files under the
             <filename class="directory">debian/</filename> directory
             for the package in question following the requirements documented
-            in the <link linkend="policy">Policy</link> section, 
+            in the <link linkend="policy">Policy</link> section,
             and you can start
             <link linkend="git-build-package">building the package</link>.
           </para>
@@ -1029,7 +1036,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, 
/usr/sbin/cowbuilder
               to have <command>git-import-orig</command> download the upstream
               tarball using <command>uscan</command> before importing it,
               its use is not recommended when the upstream tarball is repacked.
-              There is a bug 
+              There is a bug
               (<ulink url="https://bugs.debian.org/635920";>#635920</ulink>)
               that causes <command>git-import-orig</command> to import the
               unrepacked tarball.
@@ -1215,7 +1222,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, 
/usr/sbin/cowbuilder
                   but the latter are reasonable when codenames are not used.
                 </para>
                 <para>
-                  If the packaging work flow benefits more from tracking 
+                  If the packaging work flow benefits more from tracking
                   release aliases such as <literal>stable</literal>,
                   <literal>testing</literal> or <literal>unstable</literal>
                   this is also possible.
@@ -1241,8 +1248,8 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, 
/usr/sbin/cowbuilder
             </para>
             <para>
 <programlisting>
-<command>ssh</command> git.debian.org 
-<command>cd</command> /git/pkg-grass 
+<command>ssh</command> git.debian.org
+<command>cd</command> /git/pkg-grass
 <command>./setup-repository</command> 
<replaceable>&lt;package&gt;</replaceable> 'Packaging of 
<replaceable>&lt;package&gt;</replaceable> in Debian'
 </programlisting>
             </para>
@@ -1722,14 +1729,14 @@ lintian ../build-area/*changes
       <ulink url="http://blends.debian.org/blends/ch08.html";>Debian Blends 
website</ulink>.
     </para>
     <sect2 id="installing-tasks">
-      <title>Installing Debian GIS Blend tasks</title>  
+      <title>Installing Debian GIS Blend tasks</title>
       <para>
         The Debian GIS Blend metapackages can be installed on a normal Debian
         installation. How this can be achieved depends on which version of
         Debian you are running. On Debian Wheezy, there is the
         <literal>gis-tasks</literal> package which adds the Debian GIS package
         groups to <command>tasksel</command>. After installing the
-        <literal>gis-tasks</literal> package you can run 
+        <literal>gis-tasks</literal> package you can run
         <command>tasksel</command> and select the package groups to install.
         Run as root:
 <programlisting>
@@ -1740,7 +1747,7 @@ lintian ../build-area/*changes
         the metapackages directly. Again, as root:
 <programlisting>
 <command>apt-get install</command> 
<replaceable>&lt;metapackage&gt;</replaceable>
-</programlisting>      
+</programlisting>
       </para>
       <para>
         These are the metapackages/tasks can that be installed using this 
method,
@@ -1985,7 +1992,7 @@ Vcs-Svn: 
svn://anonscm.debian.org/pkg-grass/packages/<replaceable>&lt;package&gt
 <command>cme check</command> <option>dpkg-copyright</option>
 <command>cme fix</command> <option>dpkg-copyright</option>
 </programlisting>
-        or 
+        or
 <programlisting>
 <command>config-edit</command> <option>-application dpkg-copyright</option> 
<option>-ui none</option>
 </programlisting>
@@ -2114,7 +2121,7 @@ pristine-tar = True
           has an older Debhelper version.
         </para>
         <para>
-          It is strongly recommended to use the short <literal>dh</literal> 
+          It is strongly recommended to use the short <literal>dh</literal>
           notation in <filename>debian/rules</filename> files which makes code
           factorization very simple and easy to understand the packaging for
           other members of the team.

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to