Renaming mirror options to parent mirror for handling derivatives nice in future.

4 files changed, 111 insertions, 108 deletions

diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 8d7a59fd7..cf3ff78d0 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -142,25 +142,25 @@
 .br
   [\fB\-\-memtest\fP memtest86+|memtest86|none]
 .br
-  [\-m|\fB\-\-mirror\-bootstrap\fP \fIURL\fP]
+  [\-m|\fB\-\-parent\-mirror\-bootstrap\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-chroot\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-chroot\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-chroot\-security\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-chroot\-security\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-chroot\-volatile\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-chroot\-volatile\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-chroot\-backports\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-chroot\-backports\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-binary\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-binary\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-binary\-security\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-binary\-security\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-binary\-volatile\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-binary\-volatile\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-binary\-backports\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-binary\-backports\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-debian\-installer\fP \fIURL\fP]
+  [\fB\-\-parent\-mirror\-debian\-installer\fP \fIURL\fP]
 .br
   [\fB\-\-mode\fP debian|emdebian|ubuntu]
 .br
@@ -556,48 +556,48 @@ used. This is autodetected and does generally not need any customization.
 defines if memtest, memtest86+ or no memory tester at all should be included
 as secondary bootloader configuration. This is only available on amd64 and
 i386 and defaults to memtest86+.
-.IP "\-m|\fB\-\-mirror\-bootstrap\fP \fIURL\fP" 4
+.IP "\-m|\fB\-\-parent\-mirror\-bootstrap\fP \fIURL\fP" 4
 sets the location of the debian package mirror that should be used to
 bootstrap 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\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-chroot\fP \fIURL\fP" 4
 sets the location of the debian package mirror that will be used to fetch
 the packages in order to build the live system. By default, this is set to
-the value of \-\-mirror\-bootstrap.
-.IP "\fB\-\-mirror\-chroot\-security\fP \fIURL\fP" 4
+the value of \-\-parent\-mirror\-bootstrap.
+.IP "\fB\-\-parent\-mirror\-chroot\-security\fP \fIURL\fP" 4
 sets the location of the debian security package mirror that will be used to
 fetch the packages in order to build the live system. By default, this
 points to http://security.debian.org/debian/.
-.IP "\fB\-\-mirror\-chroot\-volatile\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-chroot\-volatile\fP \fIURL\fP" 4
 sets the location of the debian volatile package mirror that will be used to
 fetch packages in order to build the live system. By default, this is set to
-the value of \-\-mirror\-chroot.
-.IP "\fB\-\-mirror\-chroot\-backports\fP \fIURL\fP" 4
+the value of \-\-parent\-mirror\-chroot.
+.IP "\fB\-\-parent\-mirror\-chroot\-backports\fP \fIURL\fP" 4
 sets the location of the debian backports package mirror that will be used
 to fetch packages in order to build the live system. By default, this points
 to http://backports.debian.org/debian\-backports/.
-.IP "\fB\-\-mirror\-binary\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-binary\fP \fIURL\fP" 4
 sets the location of the debian package mirror that should end up configured
 in the final image and which is the one a user would see and use. This has
 not necessarily to be the same that is used to build the image, e.g. if you
 use a local mirror but want to have an official mirror in the image. By
 default, 'http://cdn.debian.net/debian/' is used.
-.IP "\fB\-\-mirror\-binary\-security\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-binary\-security\fP \fIURL\fP" 4
 sets the location of the debian security package mirror that should end up
 configured in the final image. By default,
 \&'http://cdn.debian.net/debian\-security/' is used.
-.IP "\fB\-\-mirror\-binary\-volatile\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-binary\-volatile\fP \fIURL\fP" 4
 sets the location of the debian volatile package mirror that should end up
-configured in the final image. By default, the value of \-\-mirror\-binary is
-used.
-.IP "\fB\-\-mirror\-binary\-backports\fP \fIURL\fP" 4
+configured in the final image. By default, the value of
+\-\-parent\-mirror\-binary is used.
+.IP "\fB\-\-parent\-mirror\-binary\-backports\fP \fIURL\fP" 4
 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\-\-mirror\-debian\-installer\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-debian\-installer\fP \fIURL\fP" 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 \-\-mirror\-bootstrap.
+the live system, i.e. the value of \-\-parent\-mirror\-bootstrap.
 .IP "\fB\-\-mode\fP debian|emdebian|ubuntu" 4
 defines a global mode to load project specific defaults. By default this is
 set to debian.
@@ -743,8 +743,9 @@ GZIP_OPTIONS, no LB_ prefix is used.
 .IP "\fB/etc/live/build.conf, /etc/live/build.d\fP" 4
 .\" FIXME
 An optional, global configuration file for \fBlb config\fP variables. It is
-useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This
-feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fP option.
+useful to specify a few system wide defaults, like
+LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the
+\fB\-\-ignore\-system\-defaults\fP option.
 
 .SH "SEE ALSO"
 \fIlive\-build\fP(7)
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index d17283121..e178b47f1 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -137,25 +137,25 @@
 .br
 	[\fB\-\-memtest\fR memtest86+|memtest86|none]
 .br
-	[\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR]
+	[\-m|\fB\-\-parent\-mirror\-bootstrap\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-chroot\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-chroot\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-chroot\-security\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-chroot\-security\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-chroot\-volatile\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-chroot\-volatile\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-chroot\-backports\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-chroot\-backports\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-binary\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-binary\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-binary\-security\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-binary\-volatile\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-binary\-volatile\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-binary\-backports\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-binary\-backports\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
+	[\fB\-\-parent\-mirror\-debian\-installer\fR \fIURL\fR]
 .br
 	[\fB\-\-mode\fR debian|emdebian|ubuntu]
 .br
@@ -363,26 +363,26 @@ sets the internal name of the kernel packages naming scheme. If you use debian k
 sets the filename of the losetup binary from the host system that should be used. This is autodetected and does generally not need any customization.
 .IP "\fB\-\-memtest\fR memtest86+|memtest86|none" 4
 defines if memtest, memtest86+ or no memory tester at all should be included as secondary bootloader configuration. This is only available on amd64 and i386 and defaults to memtest86+.
-.IP "\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
+.IP "\-m|\fB\-\-parent\-mirror\-bootstrap\fR \fIURL\fR" 4
 sets the location of the debian package mirror that should be used to bootstrap 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 in order to build the live system. By default, this is set to the value of \-\-mirror\-bootstrap.
-.IP "\fB\-\-mirror\-chroot\-security\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-chroot\fR \fIURL\fR" 4
+sets the location of the debian package mirror that will be used to fetch the packages in order to build the live system. By default, this is set to the value of \-\-parent\-mirror\-bootstrap.
+.IP "\fB\-\-parent\-mirror\-chroot\-security\fR \fIURL\fR" 4
 sets the location of the debian security package mirror that will be used to fetch the packages in order to build the live system. By default, this points to http://security.debian.org/debian/.
-.IP "\fB\-\-mirror\-chroot\-volatile\fR \fIURL\fR" 4
-sets the location of the debian volatile package mirror that will be used to fetch packages in order to build the live system. By default, this is set to the value of \-\-mirror\-chroot.
-.IP "\fB\-\-mirror\-chroot\-backports\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-chroot\-volatile\fR \fIURL\fR" 4
+sets the location of the debian volatile package mirror that will be used to fetch packages in order to build the live system. By default, this is set to the value of \-\-parent\-mirror\-chroot.
+.IP "\fB\-\-parent\-mirror\-chroot\-backports\fR \fIURL\fR" 4
 sets the location of the debian backports package mirror that will be used to fetch packages in order to build the live system. By default, this points to http://backports.debian.org/debian-backports/.
-.IP "\fB\-\-mirror\-binary\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-binary\fR \fIURL\fR" 4
 sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://cdn.debian.net/debian/' is used.
-.IP "\fB\-\-mirror\-binary\-security\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR" 4
 sets the location of the debian security package mirror that should end up configured in the final image. By default, 'http://cdn.debian.net/debian-security/' is used.
-.IP "\fB\-\-mirror\-binary\-volatile\fR \fIURL\fR" 4
-sets the location of the debian volatile package mirror that should end up configured in the final image. By default, the value of \-\-mirror\-binary is used.
-.IP "\fB\-\-mirror\-binary\-backports\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-binary\-volatile\fR \fIURL\fR" 4
+sets the location of the debian volatile package mirror that should end up configured in the final image. By default, the value of \-\-parent\-mirror\-binary is used.
+.IP "\fB\-\-parent\-mirror\-binary\-backports\fR \fIURL\fR" 4
 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\-\-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 \-\-mirror\-bootstrap.
+.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 "\fB\-\-mode\fR debian|emdebian|ubuntu" 4
 defines a global mode to load project specific defaults. By default this is set to debian.
 .IP "\fB\-\-net\-root\-filesystem\fR nfs|cfs" 4
@@ -467,7 +467,7 @@ Currently, command line switches can also be specified through the corresponding
 .\" FIXME
 .IP "\fBauto/config\fR" 4
 .IP "\fB/etc/live/build.conf, /etc/live/build.d\fR" 4
-An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option.
+An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option.
 .\" FIXME
 
 .SH SEE ALSO
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index 9943118bb..33472a197 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2011-02-14 12:33+0100\n"
+"POT-Creation-Date: 2011-02-14 13:10+0100\n"
 "PO-Revision-Date: 2011-01-02 01:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -1005,52 +1005,52 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:141
-msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
+msgid "  [-m|B<--parent-mirror-bootstrap> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:143
-msgid "  [B<--mirror-chroot> I<URL>]"
+msgid "  [B<--parent-mirror-chroot> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:145
-msgid "  [B<--mirror-chroot-security> I<URL>]"
+msgid "  [B<--parent-mirror-chroot-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:147
-msgid "  [B<--mirror-chroot-volatile> I<URL>]"
+msgid "  [B<--parent-mirror-chroot-volatile> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:149
-msgid "  [B<--mirror-chroot-backports> I<URL>]"
+msgid "  [B<--parent-mirror-chroot-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:151
-msgid "  [B<--mirror-binary> I<URL>]"
+msgid "  [B<--parent-mirror-binary> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:153
-msgid "  [B<--mirror-binary-security> I<URL>]"
+msgid "  [B<--parent-mirror-binary-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:155
-msgid "  [B<--mirror-binary-volatile> I<URL>]"
+msgid "  [B<--parent-mirror-binary-volatile> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:157
-msgid "  [B<--mirror-binary-backports> I<URL>]"
+msgid "  [B<--parent-mirror-binary-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:159
-msgid "  [B<--mirror-debian-installer> I<URL>]"
+msgid "  [B<--parent-mirror-debian-installer> I<URL>]"
 msgstr ""
 
 #. type: Plain text
@@ -2182,7 +2182,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:366
 #, no-wrap
-msgid "-m|B<--mirror-bootstrap> I<URL>"
+msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2196,7 +2196,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:368
 #, no-wrap
-msgid "B<--mirror-chroot> I<URL>"
+msgid "B<--parent-mirror-chroot> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2204,13 +2204,13 @@ msgstr ""
 msgid ""
 "sets the location of the debian package mirror that will be used to fetch "
 "the packages in order to build the live system. By default, this is set to "
-"the value of --mirror-bootstrap."
+"the value of --parent-mirror-bootstrap."
 msgstr ""
 
 #. type: IP
 #: en/lb_config.1:370
 #, no-wrap
-msgid "B<--mirror-chroot-security> I<URL>"
+msgid "B<--parent-mirror-chroot-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2224,7 +2224,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:372
 #, no-wrap
-msgid "B<--mirror-chroot-volatile> I<URL>"
+msgid "B<--parent-mirror-chroot-volatile> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2232,13 +2232,13 @@ msgstr ""
 msgid ""
 "sets the location of the debian volatile package mirror that will be used to "
 "fetch packages in order to build the live system. By default, this is set to "
-"the value of --mirror-chroot."
+"the value of --parent-mirror-chroot."
 msgstr ""
 
 #. type: IP
 #: en/lb_config.1:374
 #, no-wrap
-msgid "B<--mirror-chroot-backports> I<URL>"
+msgid "B<--parent-mirror-chroot-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2252,7 +2252,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:376
 #, no-wrap
-msgid "B<--mirror-binary> I<URL>"
+msgid "B<--parent-mirror-binary> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2268,7 +2268,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:378
 #, no-wrap
-msgid "B<--mirror-binary-security> I<URL>"
+msgid "B<--parent-mirror-binary-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2282,21 +2282,21 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:380
 #, no-wrap
-msgid "B<--mirror-binary-volatile> I<URL>"
+msgid "B<--parent-mirror-binary-volatile> I<URL>"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:382
 msgid ""
 "sets the location of the debian volatile package mirror that should end up "
-"configured in the final image. By default, the value of --mirror-binary is "
-"used."
+"configured in the final image. By default, the value of --parent-mirror-"
+"binary is used."
 msgstr ""
 
 #. type: IP
 #: en/lb_config.1:382
 #, no-wrap
-msgid "B<--mirror-binary-backports> I<URL>"
+msgid "B<--parent-mirror-binary-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2310,7 +2310,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:384
 #, no-wrap
-msgid "B<--mirror-debian-installer> I<URL>"
+msgid "B<--parent-mirror-debian-installer> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2318,7 +2318,7 @@ msgstr ""
 msgid ""
 "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 --mirror-bootstrap."
+"the live system, i.e. the value of --parent-mirror-bootstrap."
 msgstr ""
 
 #. type: IP
@@ -2817,6 +2817,7 @@ msgstr ""
 #: en/lb_config.1:472
 msgid ""
 "An optional, global configuration file for B<lb config> variables. It is "
-"useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This "
-"feature can be false by specifying the B<--ignore-system-defaults> option."
+"useful to specify a few system wide defaults, like "
+"LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the B<--"
+"ignore-system-defaults> option."
 msgstr ""
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index c817fb59f..b12c32633 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2011-02-14 12:33+0100\n"
+"POT-Creation-Date: 2011-02-14 13:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1005,52 +1005,52 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:141
-msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
+msgid "  [-m|B<--parent-mirror-bootstrap> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:143
-msgid "  [B<--mirror-chroot> I<URL>]"
+msgid "  [B<--parent-mirror-chroot> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:145
-msgid "  [B<--mirror-chroot-security> I<URL>]"
+msgid "  [B<--parent-mirror-chroot-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:147
-msgid "  [B<--mirror-chroot-volatile> I<URL>]"
+msgid "  [B<--parent-mirror-chroot-volatile> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:149
-msgid "  [B<--mirror-chroot-backports> I<URL>]"
+msgid "  [B<--parent-mirror-chroot-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:151
-msgid "  [B<--mirror-binary> I<URL>]"
+msgid "  [B<--parent-mirror-binary> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:153
-msgid "  [B<--mirror-binary-security> I<URL>]"
+msgid "  [B<--parent-mirror-binary-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:155
-msgid "  [B<--mirror-binary-volatile> I<URL>]"
+msgid "  [B<--parent-mirror-binary-volatile> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:157
-msgid "  [B<--mirror-binary-backports> I<URL>]"
+msgid "  [B<--parent-mirror-binary-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:159
-msgid "  [B<--mirror-debian-installer> I<URL>]"
+msgid "  [B<--parent-mirror-debian-installer> I<URL>]"
 msgstr ""
 
 #. type: Plain text
@@ -2182,7 +2182,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:366
 #, no-wrap
-msgid "-m|B<--mirror-bootstrap> I<URL>"
+msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2196,7 +2196,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:368
 #, no-wrap
-msgid "B<--mirror-chroot> I<URL>"
+msgid "B<--parent-mirror-chroot> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2204,13 +2204,13 @@ msgstr ""
 msgid ""
 "sets the location of the debian package mirror that will be used to fetch "
 "the packages in order to build the live system. By default, this is set to "
-"the value of --mirror-bootstrap."
+"the value of --parent-mirror-bootstrap."
 msgstr ""
 
 #. type: IP
 #: en/lb_config.1:370
 #, no-wrap
-msgid "B<--mirror-chroot-security> I<URL>"
+msgid "B<--parent-mirror-chroot-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2224,7 +2224,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:372
 #, no-wrap
-msgid "B<--mirror-chroot-volatile> I<URL>"
+msgid "B<--parent-mirror-chroot-volatile> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2232,13 +2232,13 @@ msgstr ""
 msgid ""
 "sets the location of the debian volatile package mirror that will be used to "
 "fetch packages in order to build the live system. By default, this is set to "
-"the value of --mirror-chroot."
+"the value of --parent-mirror-chroot."
 msgstr ""
 
 #. type: IP
 #: en/lb_config.1:374
 #, no-wrap
-msgid "B<--mirror-chroot-backports> I<URL>"
+msgid "B<--parent-mirror-chroot-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2252,7 +2252,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:376
 #, no-wrap
-msgid "B<--mirror-binary> I<URL>"
+msgid "B<--parent-mirror-binary> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2268,7 +2268,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:378
 #, no-wrap
-msgid "B<--mirror-binary-security> I<URL>"
+msgid "B<--parent-mirror-binary-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2282,21 +2282,21 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:380
 #, no-wrap
-msgid "B<--mirror-binary-volatile> I<URL>"
+msgid "B<--parent-mirror-binary-volatile> I<URL>"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:382
 msgid ""
 "sets the location of the debian volatile package mirror that should end up "
-"configured in the final image. By default, the value of --mirror-binary is "
-"used."
+"configured in the final image. By default, the value of --parent-mirror-"
+"binary is used."
 msgstr ""
 
 #. type: IP
 #: en/lb_config.1:382
 #, no-wrap
-msgid "B<--mirror-binary-backports> I<URL>"
+msgid "B<--parent-mirror-binary-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2310,7 +2310,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:384
 #, no-wrap
-msgid "B<--mirror-debian-installer> I<URL>"
+msgid "B<--parent-mirror-debian-installer> I<URL>"
 msgstr ""
 
 #. type: Plain text
@@ -2318,7 +2318,7 @@ msgstr ""
 msgid ""
 "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 --mirror-bootstrap."
+"the live system, i.e. the value of --parent-mirror-bootstrap."
 msgstr ""
 
 #. type: IP
@@ -2817,6 +2817,7 @@ msgstr ""
 #: en/lb_config.1:472
 msgid ""
 "An optional, global configuration file for B<lb config> variables. It is "
-"useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This "
-"feature can be false by specifying the B<--ignore-system-defaults> option."
+"useful to specify a few system wide defaults, like "
+"LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the B<--"
+"ignore-system-defaults> option."
 msgstr ""