312153: synchronize pbuilder and pbuilderrc man page

4 files changed, 28 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c7ac74..324f6bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-12  Junichi Uekawa  <dancer@debian.org>
 
+	* pbuilderrc.5: synchronize --othermirror documentation.
+	* pbuilder.8: 
+
 	* testsuite/test-pdebuild.sh: add a sample command-line that should
 	work.
 
diff --git a/debian/changelog b/debian/changelog
index c7f7a6a..b827673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,10 @@ pbuilder (0.128) UNRELEASED; urgency=low
     --distribution", thanks to Matt Kraai (Closes: #305944).
   * man pages fixup: add \% for non-hyphenation (closes: #310656)
   * Fix find options -xdev location. (closes: #312913)
+  * Bug fix: "pbuilder: Please document proper format of OTHERMIRROR",
+    thanks to Roberto C. Sanchez (Closes: #312153).
 
- -- Junichi Uekawa <dancer@debian.org>  Sun, 12 Jun 2005 17:32:04 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Sun, 12 Jun 2005 20:37:34 +0900
 
 pbuilder (0.127) unstable; urgency=low
 
diff --git a/pbuilder.8 b/pbuilder.8
index e91d9de..05ef5b0 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -152,7 +152,7 @@ The non-US mirror, specified like the
 .B "--mirror"
 option
 .TP
-.BI "--othermirror [" "apt deb line " "|" " other deb lines... " "]"
+.BI "--othermirror [" "deb http://xxx/xxx/ ./ " "|" " other deb lines... " "]"
 The lines which is added to the sources.list, delimited with 
 .B "|"
 Like 
@@ -161,6 +161,16 @@ Like
 The deb lines here are the ones that will appear at the top of the 
 .B "sources.list"
 inside the chroot.
+Be sure to follow the syntax rules of
+.RI "sources.list (" 5 ")."
+These lines appear at the beginning of the
+constructed sources file, so this is the place to list your
+.B "local"
+mirror sites; apt will then use them in preference to the ones 
+listed in 
+.B "--mirror"
+and
+.B "--nonusmirror".
 
 These options are only valid when
 .B "--override-config"
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 96ecd86..44270ed 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -65,17 +65,20 @@ Specify the mirror site which contains
 distribution.
 
 .TP
-.BI "OTHERMIRROR=" """deb http://www.home.com/updates/ ./"""
-Add other lines which you want to have added to
-.B "/etc/apt/sources.list" 
-here.
-The contents of this variable are inserted into the
-.B "/etc/apt/sources.list" 
-verbatim inside the chroot, so be sure to follow the syntax rules of
+.BI "OTHERMIRROR=" "deb http://xxx/xxx/ ./ " "[|" " other deb lines... " "]"
+The lines which is added to the sources.list, delimited with 
+.B "|"
+Like 
+.B "deb http://local/mirror stable main|deb file:/usr/local/mirror ./"
+
+The deb lines here are the ones that will appear at the top of the 
+.B "sources.list"
+inside the chroot.
+Be sure to follow the syntax rules of
 .RI "sources.list (" 5 ")."
 These lines appear at the beginning of the
 constructed sources file, so this is the place to list your
-.B local
+.B "local"
 mirror sites; apt will then use them in preference to the ones 
 listed in 
 .B "MIRRORSITE"