From 6b1b41f81d0f3a3ed39179b6e462a42602273a05 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 26 Jun 2013 12:27:05 +0200
Subject: [PATCH] docs: Use gbp <command> instead of {git,gbp}-<command>

---
 docs/common.ent                           | 18 +++++++++---------
 docs/manpages/gbp-clone.sgml              |  2 +-
 docs/manpages/gbp-create-remote-repo.sgml |  2 +-
 docs/manpages/gbp-pq.sgml                 |  2 +-
 docs/manpages/gbp-pull.sgml               |  2 +-
 docs/manpages/git-buildpackage.sgml       |  5 +++--
 docs/manpages/git-dch.sgml                |  6 +++---
 docs/manpages/git-import-dsc.sgml         |  6 +++---
 docs/manpages/git-import-dscs.sgml        |  6 +++---
 docs/manpages/git-import-orig.sgml        |  6 +++---
 10 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/docs/common.ent b/docs/common.ent
index 43d8210..a6da38b 100644
--- a/docs/common.ent
+++ b/docs/common.ent
@@ -4,16 +4,16 @@
   <!ENTITY dhconfsection  	"<manvolnum>5</manvolnum>">
   <!ENTITY dhemail     		"<email>agx@sigxcpu.org</email>">
   <!ENTITY dhusername  		"Guido Guenther">
-  <!ENTITY git-buildpackage 	"<command>git-buildpackage</command>">
-  <!ENTITY git-import-orig	"<command>git-import-orig</command>">
-  <!ENTITY git-import-dsc	"<command>git-import-dsc</command>">
-  <!ENTITY git-import-dscs	"<command>git-import-dscs</command>">
-  <!ENTITY git-dch		"<command>git-dch</command>">
+  <!ENTITY git-buildpackage 	"<command>gbp buildpackage</command>">
+  <!ENTITY git-import-orig	"<command>gbp import-orig</command>">
+  <!ENTITY git-import-dsc	"<command>gbp import-dsc</command>">
+  <!ENTITY git-import-dscs	"<command>gbp import-dscs</command>">
+  <!ENTITY git-dch		"<command>gbp dch</command>">
   <!ENTITY gbp		        "<command>gbp</command>">
-  <!ENTITY gbp-pull		"<command>gbp-pull</command>">
-  <!ENTITY gbp-clone		"<command>gbp-clone</command>">
-  <!ENTITY gbp-pq		"<command>gbp-pq</command>">
-  <!ENTITY gbp-create-remote-repo "<command>gbp-create-remote-repo</command>">
+  <!ENTITY gbp-pull		"<command>gbp pull</command>">
+  <!ENTITY gbp-clone		"<command>gbp clone</command>">
+  <!ENTITY gbp-pq		"<command>gbp pq</command>">
+  <!ENTITY gbp-create-remote-repo "<command>gbp create-remote-repo</command>">
   <!ENTITY gitcmd		"<command>git</command>">
   <!ENTITY gitkcmd		"<command>gitk</command>">
   <!ENTITY pbuildercmd		"<command>pbuilder</command>">
diff --git a/docs/manpages/gbp-clone.sgml b/docs/manpages/gbp-clone.sgml
index 45c7e2f..5f9ff7f 100644
--- a/docs/manpages/gbp-clone.sgml
+++ b/docs/manpages/gbp-clone.sgml
@@ -13,7 +13,7 @@
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&gbp-clone;</refname>
+    <refname>gbp-clone</refname>
 
     <refpurpose>Clone a repository from remote</refpurpose>
   </refnamediv>
diff --git a/docs/manpages/gbp-create-remote-repo.sgml b/docs/manpages/gbp-create-remote-repo.sgml
index aa49e62..6b4d2df 100644
--- a/docs/manpages/gbp-create-remote-repo.sgml
+++ b/docs/manpages/gbp-create-remote-repo.sgml
@@ -13,7 +13,7 @@
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&gbp-create-remote-repo;</refname>
+    <refname>gbp-create-remote-repo</refname>
 
     <refpurpose>Create remote repositories</refpurpose>
   </refnamediv>
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index 00cafed..99fad76 100644
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -13,7 +13,7 @@
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&gbp-pq;</refname>
+    <refname>gbp-pq</refname>
 
     <refpurpose>Manage quilt patches on patch queue branches in git</refpurpose>
   </refnamediv>
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml
index d655955..7948df9 100644
--- a/docs/manpages/gbp-pull.sgml
+++ b/docs/manpages/gbp-pull.sgml
@@ -13,7 +13,7 @@
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&gbp-pull;</refname>
+    <refname>gbp-pull</refname>
 
     <refpurpose>Safely update a repository from remote</refpurpose>
   </refnamediv>
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index be3676f..7bf1d30 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -9,11 +9,12 @@
     </author>
   </refentryinfo>
   <refmeta>
-    <refentrytitle>git-buildpackage</refentrytitle>
+    <refentrytitle>gbp-buildpackage</refentrytitle>
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&git-buildpackage;</refname>
+    <refname>git-buildpackage</refname>
+    <refname>gbp-buildpackage</refname>
     <refpurpose>Build Debian packages from a Git repository</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index 380f314..074cdc4 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -9,12 +9,12 @@
     </author>
   </refentryinfo>
   <refmeta>
-   <refentrytitle>git-dch</refentrytitle> 
+   <refentrytitle>gbp-dch</refentrytitle>
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&git-dch;</refname>
-
+    <refname>git-dch;</refname>
+    <refname>gbp-dch;</refname>
     <refpurpose>Generate the Debian changelog from git commit messages</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index cb73fed..e882e44 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -9,12 +9,12 @@
     </author>
   </refentryinfo>
   <refmeta>
-    <refentrytitle>git-import-dsc</refentrytitle>
+    <refentrytitle>gbp-import-dsc</refentrytitle>
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&git-import-dsc;</refname>
-
+    <refname>git-import-dsc</refname>
+    <refname>gbp-import-dsc</refname>
     <refpurpose>Import Debian packages into a Git repository</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
diff --git a/docs/manpages/git-import-dscs.sgml b/docs/manpages/git-import-dscs.sgml
index 3496cb1..1e64299 100644
--- a/docs/manpages/git-import-dscs.sgml
+++ b/docs/manpages/git-import-dscs.sgml
@@ -9,12 +9,12 @@
     </author>
   </refentryinfo>
   <refmeta>
-    <refentrytitle>git-import-dscs</refentrytitle>
+    <refentrytitle>gbp-import-dscs</refentrytitle>
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&git-import-dscs;</refname>
-
+    <refname>git-import-dscs</refname>
+    <refname>gbp-import-dscs</refname>
     <refpurpose>Import multiple versions of a Debian source packages into a Git repository</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index cdea133..029a547 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -9,12 +9,12 @@
     </author>
   </refentryinfo>
   <refmeta>
-   <refentrytitle>git-import-orig</refentrytitle>
+   <refentrytitle>gbp-import-orig</refentrytitle>
     &dhsection;
   </refmeta>
   <refnamediv>
-    <refname>&git-import-orig;</refname>
-
+    <refname>git-import-orig</refname>
+    <refname>gbp-import-orig</refname>
     <refpurpose>Import an upstream source into a git repository</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
-- 
2.7.4