[jhbuild] [bzr] Documenting the new bzr options

[Frederic Peters <fpeters src gnome org>]

commit 059d92dbe6b3840d1d4624f24a39fea10070ca40
Author: Dmitrijs Ledkovs <dmitrij ledkov ubuntu com>
Date:   Sat May 1 17:40:34 2010 +0100

    [bzr] Documenting the new bzr options

 doc/C/jhbuild.xml |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/doc/C/jhbuild.xml b/doc/C/jhbuild.xml
index 0f22cb2..3cbc1ff 100644
--- a/doc/C/jhbuild.xml
+++ b/doc/C/jhbuild.xml
@@ -2199,25 +2199,41 @@ libgnomecanvas is missing branch definition for gnome-2-20
 
         <programlisting>
 &lt;repository type="bzr" name="launchpad.net"
-      href="http://bazaar.launchpad.net/"/&gt;
+      href="lp:"/&gt;
         </programlisting>
 
         <para>Additional attributes are: <sgmltag
-        class="attribute">trunk-template</sgmltag> (defaults to "%(module)s")
-        and <sgmltag class="attribute">branches-template</sgmltag> (defaults to
-        empty string). These attributes are used to specify templates for constructing
-        URL. If <sgmltag class="element">branch</sgmltag> element has <sgmltag
-        class="attribute">revision</sgmltag> attribute defined <sgmltag
+        class="attribute">trunk-template</sgmltag> (defaults to
+        <literal>"%(module)s"</literal>) and <sgmltag
+        class="attribute">branches-template</sgmltag> (defaults to
+        <literal>"%(module)s/%(branch)s</literal>"). These attributes are used
+        to specify templates for constructing URL.  A <sgmltag
+        class="element">branch</sgmltag> element in the module definitions can
+        specify <sgmltag class="attribute">branch</sgmltag> and <sgmltag
+        class="attribute">user</sgmltag> attributes. These values will be
+        substitued in the templates. If either of those are defined <sgmltag
         class="attribute">branches-template</sgmltag> is used, otherwise
-        <sgmltag class="attribute">trunk-template</sgmltag> is used.</para>
+        <sgmltag class="attribute">trunk-template</sgmltag> is used. This way
+        you can ovveride repository to build modules from your personal branch
+        or build many modules fron a repository with non-standard layout.</para>
+
+        <para> An addition <sgmltag class="element">branch</sgmltag> element
+        accepts <sgmltag class="attribute">revspec</sgmltag> attibute to anchor
+        on a particular revision. Any valid <literal>bzr revspec</literal> is
+        accepted, for example <literal>date:yesterday, -5, tag:0.1</literal> to
+        get first revision since yesterday, 5 commits behind the tip or tag
+        "0.1". See <literal>bzr help revisionspec</literal> for all possible
+        values.
+        </para>
 
         <para> For example repository with <sgmltag
         class="attribute">template</sgmltag> attributes defined:</para>
+
         <programlisting>
 &lt;repository type="bzr" name="launchpad.net"
       href="lp:"
       trunk-template="~bzr-pqm/%(module)s/bzr.dev"
-      branches-template="~bzr-pqm/%(module)s/%(revision)s"/&gt;
+      branches-template="~bzr-pqm/%(module)s/%(branch)s"/&gt;
         </programlisting>
 
         <para> Example <sgmltag class="element">branch</sgmltag> elements for
@@ -2231,9 +2247,10 @@ libgnomecanvas is missing branch definition for gnome-2-20
         <programlisting>
 &lt;branch repo="launchpad.net"
       module="bzr"
-      revision="2.2"
+      branch="2.2"
       checkoutdir="bzr-beta"/&gt;
         </programlisting>
+
       </section>
 
       <section id="moduleset-syntax-sources-cvs">