Bug#626905: live-build: incorrectly documents that -m == --mirror-bootstrap
Package: live-build
Version: 3.0~a16-1
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch oneiric
Part of lb_config(1) incorrectly documents that -m is synonymous with
both --parent-mirror-bootstrap and --mirror-bootstrap. Only the first
is true. The attached patch corrects this.
Thanks,
--
Colin Watson [cjwatson@ubuntu.com]
>From 68e7bb22ecb1b76d3a84c9ad0cc4587a10ab9f2c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Mon, 16 May 2011 10:50:13 +0100
Subject: [PATCH] Fix documentation of -m in lb_config(1).
---
manpages/de/lb_config.de.1 | 2 +-
manpages/en/lb_config.1 | 2 +-
manpages/po/de/lb_config.1.po | 2 +-
manpages/pot/lb_config.1.pot | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 3212dae..869f364 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -618,7 +618,7 @@ configured in the final image. By default,
sets the location of the mirror that will be used to fetch the debian
installer images. By default, this points to the same mirror used to build
the live system, i.e. the value of \-\-parent\-mirror\-bootstrap.
-.IP "\-m|\fB\-\-mirror\-bootstrap\fP \fIURL\fP" 4
+.IP "\fB\-\-mirror\-bootstrap\fP \fIURL\fP" 4
sets the location of the debian package mirror that should be used to
bootstrap the derivative from. This defaults to
http://ftp.de.debian.org/debian/ which may not be a good default if you live
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index badbfa1..7d781d7 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -403,7 +403,7 @@ sets the location of the debian volatile package mirror that should end up confi
sets the location of the debian backports package mirror that should end up configured in the final image. By default, 'http://backports.debian.org/debian-backports/' is used.
.IP "\fB\-\-parent\-mirror\-debian\-installer\fR \fIURL\fR" 4
sets the location of the mirror that will be used to fetch the debian installer images. By default, this points to the same mirror used to build the live system, i.e. the value of \-\-parent\-mirror\-bootstrap.
-.IP "\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
+.IP "\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
sets the location of the debian package mirror that should be used to bootstrap the derivative from. This defaults to http://ftp.de.debian.org/debian/ which may not be a good default if you live outside of Europe.
.IP "\fB\-\-mirror\-chroot\fR \fIURL\fR" 4
sets the location of the debian package mirror that will be used to fetch the packages of the derivative in order to build the live system. By default, this is set to the value of \-\-mirror\-bootstrap.
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index f828ec7..681035b 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -2374,7 +2374,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:406
#, no-wrap
-msgid "-m|B<--mirror-bootstrap> I<URL>"
+msgid "B<--mirror-bootstrap> I<URL>"
msgstr ""
#. type: Plain text
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 13ff952..e26e6aa 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -2374,7 +2374,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:406
#, no-wrap
-msgid "-m|B<--mirror-bootstrap> I<URL>"
+msgid "B<--mirror-bootstrap> I<URL>"
msgstr ""
#. type: Plain text
--
1.7.4.1
Reply to: