Dropping powerpc bootloader support (yaboot), there is nobody actively maintaining this in live-build.

8 files changed, 127 insertions, 155 deletions

diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 8c14ed89a..ed8960020 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -44,7 +44,7 @@
 .br
   [\fB\-\-bootappend\-live\fP \fIPARAMETER\fP|\fI"PARAMETERS"\fP]
 .br
-  [\fB\-\-bootloader\fP grub|syslinux|yaboot]
+  [\fB\-\-bootloader\fP grub|syslinux]
 .br
   [\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap]
 .br
@@ -329,7 +329,7 @@ sets boot parameters specific to debian\-installer, if included.
 sets boot parameters specific to debian\-live. A complete list of boot
 parameters can be found in the \fIlive\-boot\fP(7) and \fIlive\-config\fP(7) manual
 pages.
-.IP "\fB\-\-bootloader\fP grub|syslinux|yaboot" 4
+.IP "\fB\-\-bootloader\fP grub|syslinux" 4
 defines which bootloader is beeing used in the generated image. This has
 only an effect if the selected binary image type does allow to choose the
 bootloader. For example, if you build a iso, always syslinux (or more
@@ -337,7 +337,7 @@ precise, isolinux) is being used. Also note that some combinations of binary
 images types and bootloaders may be possible but live\-build does not support
 them yet. \fBlb config\fP will fail to create such a not yet supported
 configuration and give a explanation about it. For hdd images on amd64 and
-i386, the default is syslinux. yaboot is only used on powerpc.
+i386, the default is syslinux.
 .IP "\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap" 4
 defines which program is used to bootstrap the debian chroot, default is
 debootstrap.
@@ -381,12 +381,12 @@ defines whetever live\-build should use the tools from within the chroot to
 build the binary image or not by using and including the host systems
 tools. This is a very dangerous option, using the tools of the host system
 can lead to tainted and even non\-bootable images if the host systems version
-of the required tools (mainly these are the bootloaders such as syslinux,
-grub and yaboot, and the auxilliary tools such as dosfstools, xorriso,
-squashfs\-tools and others) do not \fBexactely\fP match what is present at
-build\-time in the target distribution. Never do disable this option unless
-you are \fBexactely\fP sure what you are doing and have \fBcompletely\fP\fI
-understood its consequences.\fP
+of the required tools (mainly these are the bootloaders such as syslinux and
+grub, and the auxilliary tools such as dosfstools, xorriso, squashfs\-tools
+and others) do not \fBexactely\fP match what is present at build\-time in the
+target distribution. Never do disable this option unless you are \fBexactely\fP
+sure what you are doing and have \fBcompletely\fP\fI understood its
+consequences.\fP
 .IP "\fB\-\-chroot\-filesystem\fP ext2|ext3|ext4|squashfs|jffs2|none" 4
 defines which filesystem type should be used for the root filesystem
 image. If you use none, then no filesystem image is created and the root
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 472cc121d..f7107a1b7 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -203,8 +203,6 @@ build harddisk binary image
 build binary hdd image
 .IP \fBlb_binary_win32\-loader\fP(1) 4
 installs win32\-loader into binary
-.IP \fBlb_binary_yaboot\fP(1) 4
-installs yaboot into binary
 .SS "Source commands"
 .IP \fBlb_source_debian\fP(1) 4
 download sources
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index df60bb1d2..ca11f6e73 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -39,7 +39,7 @@
 .br
 	[\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR]
 .br
-	[\fB\-\-bootloader\fR grub|syslinux|yaboot]
+	[\fB\-\-bootloader\fR grub|syslinux]
 .br
 	[\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap]
 .br
@@ -273,8 +273,8 @@ defines the filesystem to be used in the image type. This only has an effect if
 sets boot parameters specific to debian\-installer, if included.
 .IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4
 sets boot parameters specific to debian\-live. A complete list of boot parameters can be found in the \fIlive\-boot\fR(7) and \fIlive\-config\fR(7) manual pages.
-.IP "\fB\-\-bootloader\fR grub|syslinux|yaboot" 4
-defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux. yaboot is only used on powerpc.
+.IP "\fB\-\-bootloader\fR grub|syslinux" 4
+defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux.
 .IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap" 4
 defines which program is used to bootstrap the debian chroot, default is debootstrap.
 .IP "\fB\-\-cache\fR true|false" 4
@@ -292,7 +292,7 @@ defines the compression program to be used to compress tarballs. Defaults to gzi
 .IP "\fB\-\-config\fR \fIGIT_URL\fR::\fIGIT_ID\fR" 4
 allows to bootstrap a config tree from a git repositories, optionally appended by a Git Id (branch, commit, tag, etc.).
 .IP "\fB\-\-build\-with\-chroot\fR true|false" 4
-defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
+defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux and grub, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
 .IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none" 4
 defines which filesystem type should be used for the root filesystem image. If you use none, then no filesystem image is created and the root filesystem content is copied on the binary image filesystem as flat files. Depending on what binary filesystem you have choosen, it may not be possible to build with such a plain root filesystem, e.g. fat16/fat32 will not work as linux does not support to run directly on them.
 .IP "\fB\-\-clean\fR" 4
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 440325350..0ca81dd0b 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -180,8 +180,6 @@ build harddisk binary image
 build binary hdd image
 .IP "\fBlb_binary_win32\-loader\fR(1)" 4
 installs win32\-loader into binary
-.IP "\fBlb_binary_yaboot\fR(1)" 4
-installs yaboot into binary
 .SS Source commands
 .IP "\fBlb_source_debian\fR(1)" 4
 download sources
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index b64601ecc..1b008a023 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a10-1\n"
-"POT-Creation-Date: 2013-02-15 08:59+0100\n"
+"POT-Creation-Date: 2013-02-15 12:11+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -82,7 +82,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:482 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:219
+#: en/lb_testroot.1:21 en/live-build.7:217
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -90,7 +90,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:489 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:223
+#: en/lb_testroot.1:24 en/live-build.7:221
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -105,14 +105,14 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:497 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:229
+#: en/lb_testroot.1:28 en/live-build.7:227
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:498 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:230
+#: en/lb_testroot.1:29 en/live-build.7:228
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -120,7 +120,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:500 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:232
+#: en/lb_testroot.1:31 en/live-build.7:230
 msgid ""
 "More information about live-build and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -130,7 +130,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:501 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:233
+#: en/lb_testroot.1:32 en/live-build.7:231
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -138,7 +138,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:503 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:235
+#: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -149,7 +149,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:504 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:236
+#: en/lb_testroot.1:35 en/live-build.7:234
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -157,7 +157,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:505 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:237
+#: en/lb_testroot.1:36 en/live-build.7:235
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -256,7 +256,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:43
-msgid "  [B<--bootloader> grub|syslinux|yaboot]"
+msgid "  [B<--bootloader> grub|syslinux]"
 msgstr ""
 
 #. type: Plain text
@@ -991,7 +991,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:276
 #, no-wrap
-msgid "B<--bootloader> grub|syslinux|yaboot"
+msgid "B<--bootloader> grub|syslinux"
 msgstr ""
 
 #. type: Plain text
@@ -1004,7 +1004,7 @@ msgid ""
 "images types and bootloaders may be possible but live-build does not support "
 "them yet. B<lb config> will fail to create such a not yet supported "
 "configuration and give a explanation about it. For hdd images on amd64 and "
-"i386, the default is syslinux. yaboot is only used on powerpc."
+"i386, the default is syslinux."
 msgstr ""
 
 #. type: IP
@@ -1137,12 +1137,11 @@ msgid ""
 "build the binary image or not by using and including the host systems tools. "
 "This is a very dangerous option, using the tools of the host system can lead "
 "to tainted and even non-bootable images if the host systems version of the "
-"required tools (mainly these are the bootloaders such as syslinux, grub and "
-"yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools "
-"and others) do not B<exactely> match what is present at build-time in the "
-"target distribution. Never do disable this option unless you are B<exactely> "
-"sure what you are doing and have B<completely>I< understood its consequences."
-">"
+"required tools (mainly these are the bootloaders such as syslinux and grub, "
+"and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and "
+"others) do not B<exactely> match what is present at build-time in the target "
+"distribution. Never do disable this option unless you are B<exactely> sure "
+"what you are doing and have B<completely>I< understood its consequences.>"
 msgstr ""
 
 #. type: IP
@@ -2402,11 +2401,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:493 en/live-build.7:225
+#: en/lb_config.1:493 en/live-build.7:223
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:495 en/live-build.7:227
+#: en/lb_config.1:495 en/live-build.7:225
 msgid "I<live-config>(7)"
 msgstr ""
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index 7b47532df..f5e57c27c 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a10-1\n"
-"POT-Creation-Date: 2013-02-15 12:10+0100\n"
+"POT-Creation-Date: 2013-02-15 12:12+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -82,7 +82,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:482 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:217
+#: en/lb_testroot.1:21 en/live-build.7:215
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -90,7 +90,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:489 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:221
+#: en/lb_testroot.1:24 en/live-build.7:219
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -98,14 +98,14 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:497 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:227
+#: en/lb_testroot.1:28 en/live-build.7:225
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:498 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:228
+#: en/lb_testroot.1:29 en/live-build.7:226
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:500 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:230
+#: en/lb_testroot.1:31 en/live-build.7:228
 msgid ""
 "More information about live-build and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -123,7 +123,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:501 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:231
+#: en/lb_testroot.1:32 en/live-build.7:229
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -131,7 +131,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:503 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:233
+#: en/lb_testroot.1:34 en/live-build.7:231
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -142,7 +142,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:504 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:234
+#: en/lb_testroot.1:35 en/live-build.7:232
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -150,7 +150,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:505 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:235
+#: en/lb_testroot.1:36 en/live-build.7:233
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -181,12 +181,12 @@ msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:493 en/live-build.7:223
+#: en/lb_config.1:493 en/live-build.7:221
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:495 en/live-build.7:225
+#: en/lb_config.1:495 en/live-build.7:223
 msgid "I<live-config>(7)"
 msgstr ""
 
@@ -1047,121 +1047,110 @@ msgstr ""
 msgid "installs win32-loader into binary"
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:183
-#, no-wrap
-msgid "B<lb_binary_yaboot>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-build.7:185
-msgid "installs yaboot into binary"
-msgstr ""
-
 #. type: SS
-#: en/live-build.7:185
+#: en/live-build.7:183
 #, no-wrap
 msgid "Source commands"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:186
+#: en/live-build.7:184
 #, no-wrap
 msgid "B<lb_source_debian>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:188
+#: en/live-build.7:186
 msgid "download sources"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:188
+#: en/live-build.7:186
 #, no-wrap
 msgid "B<lb_source_debian-live>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:190
+#: en/live-build.7:188
 msgid "copy debian-live config into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:190
+#: en/live-build.7:188
 #, no-wrap
 msgid "B<lb_source_disk>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:192
+#: en/live-build.7:190
 msgid "install disk information into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:192
+#: en/live-build.7:190
 #, no-wrap
 msgid "B<lb_source_iso>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:194
+#: en/live-build.7:192
 msgid "build iso source image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:194
+#: en/live-build.7:192
 #, no-wrap
 msgid "B<lb_source_checksums>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:196
+#: en/live-build.7:194
 msgid "create source checksums (md5, sha1, and/or sha256)"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:196
+#: en/live-build.7:194
 #, no-wrap
 msgid "B<lb_source_net>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:198
+#: en/live-build.7:196
 msgid "build source net image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:198
+#: en/live-build.7:196
 #, no-wrap
 msgid "B<lb_source_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:200
+#: en/live-build.7:198
 msgid "build source tarball"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:200
+#: en/live-build.7:198
 #, no-wrap
 msgid "B<lb_source_hdd>(1)"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:203
+#: en/live-build.7:201
 msgid "build source hdd image"
 msgstr ""
 
 #. type: SH
-#: en/live-build.7:204
+#: en/live-build.7:202
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:207
+#: en/live-build.7:205
 msgid ""
 "Many live-build commands make use of files in the I<config/> directory to "
 "control what they do. Besides the common I<config/common>, which is used by "
@@ -1173,7 +1162,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:209
+#: en/live-build.7:207
 msgid ""
 "For example, lb_bootstrap_debootstrap uses files named config/bootstrap and "
 "config/bootstrap_debootstrap to read the options it will use. See the man "
@@ -1184,7 +1173,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:211
+#: en/live-build.7:209
 msgid ""
 "Note that live-build will respect environment variables which are present in "
 "the context of the shell it is running. If variables can be read from config "
@@ -1195,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:213
+#: en/live-build.7:211
 msgid ""
 "In some rare cases, you may want to have different versions of these files "
 "for different architectures or distributions. If files named config/stage."
@@ -1208,7 +1197,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:216
+#: en/live-build.7:214
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -1216,13 +1205,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:218
+#: en/live-build.7:216
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:219
+#: en/live-build.7:217
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr ""
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 8269dcd08..ee6c6b4f9 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: 2013-02-15 08:59+0100\n"
+"POT-Creation-Date: 2013-02-15 12:11+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"
@@ -83,7 +83,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:482 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:219
+#: en/lb_testroot.1:21 en/live-build.7:217
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:489 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:223
+#: en/lb_testroot.1:24 en/live-build.7:221
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -106,14 +106,14 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:497 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:229
+#: en/lb_testroot.1:28 en/live-build.7:227
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:498 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:230
+#: en/lb_testroot.1:29 en/live-build.7:228
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -121,7 +121,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:500 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:232
+#: en/lb_testroot.1:31 en/live-build.7:230
 msgid ""
 "More information about live-build and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -131,7 +131,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:501 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:233
+#: en/lb_testroot.1:32 en/live-build.7:231
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -139,7 +139,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:503 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:235
+#: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -150,7 +150,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:504 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:236
+#: en/lb_testroot.1:35 en/live-build.7:234
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:505 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:237
+#: en/lb_testroot.1:36 en/live-build.7:235
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -257,7 +257,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:43
-msgid "  [B<--bootloader> grub|syslinux|yaboot]"
+msgid "  [B<--bootloader> grub|syslinux]"
 msgstr ""
 
 #. type: Plain text
@@ -992,7 +992,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:276
 #, no-wrap
-msgid "B<--bootloader> grub|syslinux|yaboot"
+msgid "B<--bootloader> grub|syslinux"
 msgstr ""
 
 #. type: Plain text
@@ -1005,7 +1005,7 @@ msgid ""
 "images types and bootloaders may be possible but live-build does not support "
 "them yet. B<lb config> will fail to create such a not yet supported "
 "configuration and give a explanation about it. For hdd images on amd64 and "
-"i386, the default is syslinux. yaboot is only used on powerpc."
+"i386, the default is syslinux."
 msgstr ""
 
 #. type: IP
@@ -1138,12 +1138,11 @@ msgid ""
 "build the binary image or not by using and including the host systems tools. "
 "This is a very dangerous option, using the tools of the host system can lead "
 "to tainted and even non-bootable images if the host systems version of the "
-"required tools (mainly these are the bootloaders such as syslinux, grub and "
-"yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools "
-"and others) do not B<exactely> match what is present at build-time in the "
-"target distribution. Never do disable this option unless you are B<exactely> "
-"sure what you are doing and have B<completely>I< understood its consequences."
-">"
+"required tools (mainly these are the bootloaders such as syslinux and grub, "
+"and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and "
+"others) do not B<exactely> match what is present at build-time in the target "
+"distribution. Never do disable this option unless you are B<exactely> sure "
+"what you are doing and have B<completely>I< understood its consequences.>"
 msgstr ""
 
 #. type: IP
@@ -2403,11 +2402,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:493 en/live-build.7:225
+#: en/lb_config.1:493 en/live-build.7:223
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:495 en/live-build.7:227
+#: en/lb_config.1:495 en/live-build.7:225
 msgid "I<live-config>(7)"
 msgstr ""
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 0f7d7354b..3daf99668 100644
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-15 12:10+0100\n"
+"POT-Creation-Date: 2013-02-15 12:12+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"
@@ -83,7 +83,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:482 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:217
+#: en/lb_testroot.1:21 en/live-build.7:215
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:489 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:221
+#: en/lb_testroot.1:24 en/live-build.7:219
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -99,14 +99,14 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:497 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:227
+#: en/lb_testroot.1:28 en/live-build.7:225
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:498 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:228
+#: en/lb_testroot.1:29 en/live-build.7:226
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -114,7 +114,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:500 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:230
+#: en/lb_testroot.1:31 en/live-build.7:228
 msgid ""
 "More information about live-build and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -124,7 +124,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:501 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:231
+#: en/lb_testroot.1:32 en/live-build.7:229
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -132,7 +132,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:503 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:233
+#: en/lb_testroot.1:34 en/live-build.7:231
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -143,7 +143,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:504 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:234
+#: en/lb_testroot.1:35 en/live-build.7:232
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:505 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:235
+#: en/lb_testroot.1:36 en/live-build.7:233
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -182,12 +182,12 @@ msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:493 en/live-build.7:223
+#: en/lb_config.1:493 en/live-build.7:221
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:495 en/live-build.7:225
+#: en/lb_config.1:495 en/live-build.7:223
 msgid "I<live-config>(7)"
 msgstr ""
 
@@ -1048,121 +1048,110 @@ msgstr ""
 msgid "installs win32-loader into binary"
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:183
-#, no-wrap
-msgid "B<lb_binary_yaboot>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-build.7:185
-msgid "installs yaboot into binary"
-msgstr ""
-
 #. type: SS
-#: en/live-build.7:185
+#: en/live-build.7:183
 #, no-wrap
 msgid "Source commands"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:186
+#: en/live-build.7:184
 #, no-wrap
 msgid "B<lb_source_debian>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:188
+#: en/live-build.7:186
 msgid "download sources"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:188
+#: en/live-build.7:186
 #, no-wrap
 msgid "B<lb_source_debian-live>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:190
+#: en/live-build.7:188
 msgid "copy debian-live config into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:190
+#: en/live-build.7:188
 #, no-wrap
 msgid "B<lb_source_disk>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:192
+#: en/live-build.7:190
 msgid "install disk information into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:192
+#: en/live-build.7:190
 #, no-wrap
 msgid "B<lb_source_iso>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:194
+#: en/live-build.7:192
 msgid "build iso source image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:194
+#: en/live-build.7:192
 #, no-wrap
 msgid "B<lb_source_checksums>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:196
+#: en/live-build.7:194
 msgid "create source checksums (md5, sha1, and/or sha256)"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:196
+#: en/live-build.7:194
 #, no-wrap
 msgid "B<lb_source_net>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:198
+#: en/live-build.7:196
 msgid "build source net image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:198
+#: en/live-build.7:196
 #, no-wrap
 msgid "B<lb_source_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:200
+#: en/live-build.7:198
 msgid "build source tarball"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:200
+#: en/live-build.7:198
 #, no-wrap
 msgid "B<lb_source_hdd>(1)"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:203
+#: en/live-build.7:201
 msgid "build source hdd image"
 msgstr ""
 
 #. type: SH
-#: en/live-build.7:204
+#: en/live-build.7:202
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:207
+#: en/live-build.7:205
 msgid ""
 "Many live-build commands make use of files in the I<config/> directory to "
 "control what they do. Besides the common I<config/common>, which is used by "
@@ -1174,7 +1163,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:209
+#: en/live-build.7:207
 msgid ""
 "For example, lb_bootstrap_debootstrap uses files named config/bootstrap and "
 "config/bootstrap_debootstrap to read the options it will use. See the man "
@@ -1185,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:211
+#: en/live-build.7:209
 msgid ""
 "Note that live-build will respect environment variables which are present in "
 "the context of the shell it is running. If variables can be read from config "
@@ -1196,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:213
+#: en/live-build.7:211
 msgid ""
 "In some rare cases, you may want to have different versions of these files "
 "for different architectures or distributions. If files named config/stage."
@@ -1209,7 +1198,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:216
+#: en/live-build.7:214
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -1217,13 +1206,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:218
+#: en/live-build.7:216
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:219
+#: en/live-build.7:217
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr ""