From 5caedffe7c2a308dceca5848c0419ed8edd6a215 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 2 Oct 2017 21:29:46 +0200 Subject: docs: fix syntax errors noticed during XML conversion --- docs/chapters/intro.xml | 2 +- docs/chapters/patches.xml | 5 +++-- docs/chapters/special.xml | 7 ++++--- docs/common.ent | 6 +++--- docs/manpages/gbp-buildpackage-rpm.xml | 2 +- docs/manpages/gbp-buildpackage.xml | 3 ++- docs/manpages/gbp-dch.xml | 2 +- docs/manpages/gbp-import-srpm.xml | 2 +- docs/manpages/gbp-rpm-ch.xml | 6 +++--- 9 files changed, 19 insertions(+), 16 deletions(-) (limited to 'docs') diff --git a/docs/chapters/intro.xml b/docs/chapters/intro.xml index fceff318..88c45a6c 100644 --- a/docs/chapters/intro.xml +++ b/docs/chapters/intro.xml @@ -15,7 +15,7 @@ downstream modifications Import new upstream versions from tarballs with optionally filters applied Recreate the upstream tarball from information stored in &git; - Maintain a consistent branch and tag naming within a &git repository, across + Maintain a consistent branch and tag naming within a &git; repository, across repositories or across a team of developers Automatically sign generated tags Make sure you have committed all changes to the right diff --git a/docs/chapters/patches.xml b/docs/chapters/patches.xml index e020cfd3..9efa61f0 100644 --- a/docs/chapters/patches.xml +++ b/docs/chapters/patches.xml @@ -158,6 +158,7 @@ build the package as usual. + Importing a new upstream version @@ -241,7 +242,7 @@ - or you can invoke &gitcmd directly: + or you can invoke &gitcmd; directly: @@ -360,7 +361,7 @@ Note that you can you can push out patch-queue branches. Other team - members must just be aware that that branches in the patch-queue/ + members must just be aware that branches in the patch-queue/ namespace are being rebased frequently and therefore cause non fast-forward updates. diff --git a/docs/chapters/special.xml b/docs/chapters/special.xml index 66eaebad..789ace6d 100644 --- a/docs/chapters/special.xml +++ b/docs/chapters/special.xml @@ -142,7 +142,7 @@ EOF Whenever you need to work on an arbitrary &debian; package, you can check it right into &git; with one command: - &gbp-import-dsc apt:package + &gbp-import-dsc; apt:package cd package &gitcmd; branch debian @@ -164,7 +164,7 @@ EOF fetch the source package from a URL: - &gbp-import-dsc http://mentors.debian.net/debian/pool/main/i/ipsec-tools/ipsec-tools_0.7.3-9.dsc + &gbp-import-dsc; http://mentors.debian.net/debian/pool/main/i/ipsec-tools/ipsec-tools_0.7.3-9.dsc The import works incrementally; you can import new versions on top of @@ -206,7 +206,7 @@ means. for the packaging. - &gbp-buildpackage --git-ignore-new --git-force-create --git-upstream-tree=SLOPPY --git-no-pristine-tar + &gbp-buildpackage; --git-ignore-new --git-force-create --git-upstream-tree=SLOPPY --git-no-pristine-tar The important part is the SLOPPY above. The @@ -229,4 +229,5 @@ means. See the dpkg-source manpage for details. + diff --git a/docs/common.ent b/docs/common.ent index 2e3d09b6..dae43c70 100644 --- a/docs/common.ent +++ b/docs/common.ent @@ -27,9 +27,9 @@ gbp import-orig"> gbp import-srpm"> gbp pq"> - gbp pq "> - gbp pq "> - gbp pq "> + gbp pq "> + gbp pq "> + gbp pq "> gbp pq-rpm"> gbp pristine-tar"> gbp pull"> diff --git a/docs/manpages/gbp-buildpackage-rpm.xml b/docs/manpages/gbp-buildpackage-rpm.xml index 7de20ed3..251bf528 100644 --- a/docs/manpages/gbp-buildpackage-rpm.xml +++ b/docs/manpages/gbp-buildpackage-rpm.xml @@ -639,7 +639,7 @@ , , - , + , rpmbuild 8 diff --git a/docs/manpages/gbp-buildpackage.xml b/docs/manpages/gbp-buildpackage.xml index a3135a4c..e42edf49 100644 --- a/docs/manpages/gbp-buildpackage.xml +++ b/docs/manpages/gbp-buildpackage.xml @@ -609,12 +609,13 @@ &gbp.conf;. + Build area options - &gbp-buildpackage can export the source tree to a different + &gbp-buildpackage; can export the source tree to a different build-area before performing the build. This options specify if and how this is done: diff --git a/docs/manpages/gbp-dch.xml b/docs/manpages/gbp-dch.xml index 2613d22a..0cfd9bdc 100644 --- a/docs/manpages/gbp-dch.xml +++ b/docs/manpages/gbp-dch.xml @@ -128,7 +128,7 @@ you're not using the defaults check the and options and make sure they match - the tags created by e.g. &gbp-import-orig (when using tarballs) + the tags created by e.g. &gbp-import-orig; (when using tarballs) or upstream's tagging pattern (when using upstream's git directly). diff --git a/docs/manpages/gbp-import-srpm.xml b/docs/manpages/gbp-import-srpm.xml index 94a74d7e..ead40e67 100644 --- a/docs/manpages/gbp-import-srpm.xml +++ b/docs/manpages/gbp-import-srpm.xml @@ -248,7 +248,7 @@ , , - , + , , &man.seealso.common; diff --git a/docs/manpages/gbp-rpm-ch.xml b/docs/manpages/gbp-rpm-ch.xml index 4e4621b3..e0f0d9d7 100644 --- a/docs/manpages/gbp-rpm-ch.xml +++ b/docs/manpages/gbp-rpm-ch.xml @@ -338,9 +338,9 @@ SEE ALSO - , - , - , + , + , + , &man.seealso.common; Cl2vcs, -- cgit v1.2.3