[jhbuild] Fix docs for <patch> elements in a tarbal <branch>



commit d42d02566463a308dd285b13e2f20312eef2f8de
Author: Mikkel Kamstrup Erlandsen <mikkel kamstrup canonical com>
Date:   Fri Sep 10 10:25:23 2010 +0200

    Fix docs for <patch> elements in a tarbal <branch>
    
    Add docs for <quilt> elements in tarball <branch>es

 doc/C/jhbuild.xml |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/doc/C/jhbuild.xml b/doc/C/jhbuild.xml
index 3cb7f1a..9d71586 100644
--- a/doc/C/jhbuild.xml
+++ b/doc/C/jhbuild.xml
@@ -2464,13 +2464,14 @@ libgnomecanvas is missing branch definition for gnome-2-20
         If these attributes are present, they are used to check
         that the source package was downloaded correctly.</para>
 
-        <para>The <sgmltag class="element">patches</sgmltag> element
-        is used to specify one or more patches to apply to the source
-        tree after unpacking, the <sgmltag class="attribute">file</sgmltag>
+        <para>Any number of <sgmltag class="element">patch</sgmltag> elements
+        may be nested inside the <sgmltag class="element">branch</sgmltag>
+        element. These patches are applied, in order, to the source
+        tree after unpacking. The <sgmltag class="attribute">file</sgmltag>
         attribute gives the patch filename, and the <sgmltag
         class="attribute">strip</sgmltag> attribute says how
         many levels of directories to prune when applying the
-        patch.</para>
+        patch.</para>        
 
         <para>For module sets shipped with JHBuild, the patch files are
         looked up in the <filename>jhbuild/patches/</filename> directory;
@@ -2488,6 +2489,11 @@ libgnomecanvas is missing branch definition for gnome-2-20
   &lt;patch file="dbus-glib-build.patch" strip="1" /&gt;
 &lt;branch&gt;
 </programlisting>
+
+        <para>A tarball <sgmltag class="element">branch</sgmltag> element
+        may also contain <sgmltag class="element">quilt</sgmltag> elements
+        which specify nested <sgmltag class="element">branch</sgmltag> to
+        import.</para>
           
       </section>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]