[med-svn] r9651 - trunk/community/website/docs
Charles Plessy
plessy at alioth.debian.org
Sun Feb 12 02:56:36 UTC 2012
Author: plessy
Date: 2012-02-12 02:56:36 +0000 (Sun, 12 Feb 2012)
New Revision: 9651
Modified:
trunk/community/website/docs/policy.xml
Log:
<literrallayout> is not allowed in <title>; using <sect3> instead of <formalpara>.
This roughly conserves the apparence of the HTML output, but is conformant to
DocBook syntax.
Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml 2012-02-12 01:58:46 UTC (rev 9650)
+++ trunk/community/website/docs/policy.xml 2012-02-12 02:56:36 UTC (rev 9651)
@@ -324,7 +324,7 @@
<sect2 id="git-tips">
<title>Git tips</title>
- <formalpara id="new-repository-with-gbp">
+ <sect3 id="new-repository-with-gbp">
<title>To create a new local git repository</title>
<literallayout>When the upstream sources are distributed as compressed <command>tar</command> archives (<literal>tar.gz</literal>, …):</literallayout>
<para>
@@ -340,9 +340,9 @@
<literal>pristine-tar</literal> used by the <literal>pristine-tar</literal> tool during the package build process to recreate the original tarball,
and <literal>upstream</literal>, which will contain the upstream source.
</literallayout>
- </formalpara>
- <formalpara id="debcheckout-sets-git-options">
- <title><literallayout>Configure Git to commit using your packager name and address.</literallayout></title>
+ </sect3>
+ <sect3 id="debcheckout-sets-git-options">
+ <title>Configure Git to commit using your packager name and address.</title>
<para>The <option>--global</option> option is to say Git these are the default parameters for every Git repository you commit to,
without it the settings will be per-repository only:</para>
<para>
@@ -350,32 +350,32 @@
<command>git config</command> <option><optional>--global</optional></option> <option>user.name "$DEBFULLNAME"</option>
<command>git config</command> <option><optional>--global</optional></option> <option>user.email "$DEBEMAIL"</option></programlisting>
</para>
- </formalpara>
- <formalpara id="debcheckout-git-track">
- <title><literallayout>To clone and follow every branch of a git repository.</literallayout></title>
+ </sect3>
+ <sect3 id="debcheckout-git-track">
+ <title>To clone and follow every branch of a git repository.</title>
<para>When the package is already in the Debian archive, you can use the
<command>debcheckout</command> command with its
<command><option>--git-track='*'</option></command> option.
</para>
<para> To restrict the tracked branch to the standard ones used by <command>git-buildpackage</command>, <literal>master upstream
pristine-tar</literal> can be passed instead of the wildcard.</para>
- </formalpara>
- <formalpara id="git-track-new-branches">
+ </sect3>
+ <sect3 id="git-track-new-branches">
<title>Example commands to track new branches</title>
<para><programlisting>
<command>git branch</command> <option>-t <replaceable>upstream</replaceable> <replaceable>origin/upstream</replaceable></option>
<command>git branch</command> <option>-t <replaceable>pristine-tar</replaceable> <replaceable>origin/pristine-tar</replaceable></option></programlisting>
</para>
- </formalpara>
- <formalpara id="git-options-devscripts">
+ </sect3>
+ <sect3 id="git-options-devscripts">
<title>Set the <package>devscripts</package> variables
<varname>DEBEMAIL</varname> and <varname>DEBFULLNAME</varname></title>
<para><command>debcheckout</command> will then set
<command>git</command>'s options <varname>user.email</varname> and
<varname>user.name</varname> accordingly.
</para>
- </formalpara>
- <formalpara id="create-git-repository-on-alioth">
+ </sect3>
+ <sect3 id="create-git-repository-on-alioth">
<title>Pushing to git.debian.org, creating a new bare repository on Alitoh.</title>
<literallayout>Before pushing to git.debian.org for the first time, an empty repository needs to be created there.</literallayout>
<para>To do this connect to <literal>git.debian.org</literal>, enter the<filename class="directory">/git/debian-med</filename>
@@ -399,9 +399,9 @@
<link linkend="debcheckout-git-track">debcheckout</link>. The default
remote branch is called <quote>origin</quote>.
</para>
- </formalpara>
- <formalpara id="push-package-to-alioth">
- <title><literallayout>To push the package.</literallayout></title>
+ </sect3>
+ <sect3 id="push-package-to-alioth">
+ <title>To push the package.</title>
<para>(make sure you've added the alioth remote!), do the
following: <code><command>git push</command> <option>origin
master</option></code>. For the first push, it's necessary to specify
@@ -412,8 +412,8 @@
<command>git</command> push --set-upstream
</programlisting>
</para>
- </formalpara>
- <formalpara id="git-push-all-tags">
+ </sect3>
+ <sect3 id="git-push-all-tags">
<title>To push all your work</title>
<para>Be sure to also do a run <command>git push</command> with
<option>--all</option>, and one with <option>--tags</option> if you
@@ -423,24 +423,24 @@
<command>git</command> push --tags
</programlisting>
</para>
- </formalpara>
- <formalpara id="git-tag-release">
+ </sect3>
+ <sect3 id="git-tag-release">
<title>To tag a release</title>
<para><code><command>git tag</command> <option>debian/x.y-z</option></code>.
You can also easily retroactively make tags:
<code><command>git tag</command> <option>debian/x.y-z</option> <option><commit hash></option></code>.
Remember to <code><command>git push --tags</command></code>.
</para>
- </formalpara>
- <formalpara id="git-layout-variants">
+ </sect3>
+ <sect3 id="git-layout-variants">
<title>Layout variants</title>
<para>In particular for Git repositories that are not stored in Alioth, the
layout can differ from <command>git-buildpackage</command> conventions.
In that case, look for instance for a branch called <literal>debian</literal>.
</para>
- </formalpara>
- <formalpara id="git-debian-version-from-commit">
- <title><literallayout>If upstream manages his sources with Git.</literallayout></title>
+ </sect3>
+ <sect3 id="git-debian-version-from-commit">
+ <title>If upstream manages his sources with Git.</title>
<para>
The following makefile script can help producing a version number when
no Git tag is available:<programlisting>
@@ -455,9 +455,9 @@
get-orig-source:
git archive --format=tar $(SHA1) | gzip -9 > ../$(ORIG)</programlisting>
</para>
- </formalpara>
- <formalpara id="git-pbuilder">
- <title><literallayout>To make <command>git-buildpackage</command> build the package with <command>pdebuild</command>.</literallayout></title>
+ </sect3>
+ <sect3 id="git-pbuilder">
+ <title>To make <command>git-buildpackage</command> build the package with <command>pdebuild</command>.</title>
<para>
Add the following to the configuration file
<filename>~/.gbp.conf</filename> or
@@ -477,7 +477,7 @@
while passing any more parameters directly do
<command>dpkg-buildpackage</command>.
</para>
- </formalpara>
+ </sect3>
</sect2>
<sect2 id="subversion-to-git">
More information about the debian-med-commit
mailing list