Using /etc/live/build/*.conf instead of /etc/live/build.d/*.conf for consistency reasons.

41 files changed, 82 insertions, 82 deletions

diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1
index 3eb026267..862b3f73f 100644
--- a/manpages/de/lb.de.1
+++ b/manpages/de/lb.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fP \- wrapper for live\-build programs
diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1
index 4ed281517..cdfcc89b0 100644
--- a/manpages/de/lb_binary.de.1
+++ b/manpages/de/lb_binary.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fP \- Complete the binary stage
diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1
index ab715d0b2..2787c4367 100644
--- a/manpages/de/lb_bootstrap.de.1
+++ b/manpages/de/lb_bootstrap.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fP \- Complete the bootstrap stage
diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1
index 8d9103e15..6c4929c1a 100644
--- a/manpages/de/lb_build.de.1
+++ b/manpages/de/lb_build.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1
index ab93ec140..b70289db7 100644
--- a/manpages/de/lb_chroot.de.1
+++ b/manpages/de/lb_chroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fP \- Complete the chroot stage
diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1
index b4cb82646..1960bd3c4 100644
--- a/manpages/de/lb_clean.de.1
+++ b/manpages/de/lb_clean.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fP \- Clean build directory
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 676bb1049..b8345073c 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb config\fP \- Create config directory
@@ -489,10 +489,10 @@ defines which hooks available in /usr/share/live/build/examples/hooks should
 be activated. Normally, there are no hooks executed. Make sure you know and
 understood the hook before you enable it.
 .IP \fB\-\-ignore\-system\-defaults\fP 4
-\fBlb config\fP by default reads system defaults from /etc/live/build.conf and
-/etc/live/build.d when generating a new live system config directory. This
-is useful if you want to set global settings, such as mirror locations, and
-don't want to specify them all of the time.
+\fBlb config\fP by default reads system defaults from \fI/etc/live/build.conf\fP
+and \fI/etc/live/build/*\fP when generating a new live system config
+directory. This is useful if you want to set global settings, such as mirror
+locations, and don't want to specify them all of the time.
 .IP "\fB\-\-initramfs\fP auto|none|live\-boot|casper" 4
 sets the name of package that contains the live system specific initramfs
 modification. By default, auto is used, which means that at build time of
@@ -795,7 +795,7 @@ GZIP_OPTIONS, no LB_ prefix is used.
 .SH FILES
 .\" FIXME
 .IP \fBauto/config\fP 4
-.IP "\fB/etc/live/build.conf, /etc/live/build.d\fP" 4
+.IP "\fB/etc/live/build.conf, /etc/live/build/*\fP" 4
 .\" FIXME
 An optional, global configuration file for \fBlb config\fP variables. It is
 useful to specify a few system wide defaults, like
diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1
index 5413dc37b..fded185db 100644
--- a/manpages/de/lb_source.de.1
+++ b/manpages/de/lb_source.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fP \- Complete the source stage
diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1
index 3101ce73e..5a094e412 100644
--- a/manpages/de/lb_testroot.de.1
+++ b/manpages/de/lb_testroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb testroot\fP \- Ensure that a system is built as root
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 99e6c2a93..555766cc6 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 7 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-build\fP \- the Debian Live tool suite
@@ -271,7 +271,7 @@ also put comments in these files; lines beginning with "#" are ignored.
 
 .SH FILES
 .IP \fB/etc/live/build.conf\fP 4
-.IP \fB/etc/live/build.d/\fP 4
+.IP \fB/etc/live/build/*\fP 4
 
 .SH "SEE ALSO"
 \fIlive\-boot\fP(7)
diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index f7afdf6ef..b39e38f52 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fR \- wrapper for live\-build programs
diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1
index 623c371dc..dfdef32cc 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fR \- Complete the binary stage
diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1
index 475a7d9f5..2b2d0b41e 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1
index 63f6404d8..5e3cc5faf 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1
index 652d26474..03a958e9f 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fR \- Complete the chroot stage
diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1
index da805ed95..2795db57f 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fR \- Clean build directory
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index aeb466a03..9c1dfcf73 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb config\fR \- Create config directory
@@ -348,7 +348,7 @@ defines the default options that will be appended to (almost) every gzip call du
 .IP "\fB\-\-hooks\fR \fIFILE\fR" 4
 defines which hooks available in /usr/share/live/build/examples/hooks should be activated. Normally, there are no hooks executed. Make sure you know and understood the hook before you enable it.
 .IP "\fB\-\-ignore\-system\-defaults\fR" 4
-\fBlb config\fR by default reads system defaults from /etc/live/build.conf and /etc/live/build.d when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time.
+\fBlb config\fR by default reads system defaults from \fI/etc/live/build.conf\fR and \fI/etc/live/build/*\fR when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time.
 .IP "\fB\-\-initramfs\fR auto|none|live\-boot|casper" 4
 sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building ubuntu systems, to live\-boot for all other systems. Using 'none' is useful if the resulting system image should not be a live image (experimental).
 .IP "\fB\-\-initramfs\-compression\fR bzip2|gzip|lzma]
@@ -502,7 +502,7 @@ Currently, command line switches can also be specified through the corresponding
 .SH FILES
 .\" FIXME
 .IP "\fBauto/config\fR" 4
-.IP "\fB/etc/live/build.conf, /etc/live/build.d\fR" 4
+.IP "\fB/etc/live/build.conf, /etc/live/build/*\fR" 4
 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
 
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index 39df63836..a0ccfdd95 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fR \- Complete the source stage
diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1
index 160cf8795..89f55684c 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb testroot\fR \- Ensure that a system is built as root
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 54795e31e..1d1214c10 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-08\-14 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-build\fR \- the Debian Live tool suite
@@ -224,7 +224,7 @@ All config files are shell scripts which are sourced by a live\-build program. T
 
 .SH FILES
 .IP "\fB/etc/live/build.conf\fR" 4
-.IP "\fB/etc/live/build.d/\fR" 4
+.IP "\fB/etc/live/build/*\fR" 4
 
 .SH SEE ALSO
 \fIlive\-boot\fR(7)
diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po
index 7bc7f879b..c5857e0c9 100644
--- a/manpages/po/de/lb.1.po
+++ b/manpages/po/de/lb.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po
index dc4df5a87..45e0a59f6 100644
--- a/manpages/po/de/lb_binary.1.po
+++ b/manpages/po/de/lb_binary.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po
index 970155b05..0996bf3b0 100644
--- a/manpages/po/de/lb_bootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po
index cbbd06bcc..8b8967ac3 100644
--- a/manpages/po/de/lb_build.1.po
+++ b/manpages/po/de/lb_build.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po
index 76e0f637d..bfabe2ec4 100644
--- a/manpages/po/de/lb_chroot.1.po
+++ b/manpages/po/de/lb_chroot.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po
index 6f2161760..6b0e2b22d 100644
--- a/manpages/po/de/lb_clean.1.po
+++ b/manpages/po/de/lb_clean.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index a776fd810..4261de1c9 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
@@ -1488,10 +1488,10 @@ msgstr ""
 #. type: Plain text
 #: en/lb_config.1:352
 msgid ""
-"B<lb config> by default reads system defaults from /etc/live/build.conf and /"
-"etc/live/build.d when generating a new live system config directory. This is "
-"useful if you want to set global settings, such as mirror locations, and "
-"don't want to specify them all of the time."
+"B<lb config> by default reads system defaults from I</etc/live/build.conf> "
+"and I</etc/live/build/*> when generating a new live system config directory. "
+"This is useful if you want to set global settings, such as mirror locations, "
+"and don't want to specify them all of the time."
 msgstr ""
 
 #. type: IP
@@ -2489,7 +2489,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:505
 #, no-wrap
-msgid "B</etc/live/build.conf, /etc/live/build.d>"
+msgid "B</etc/live/build.conf, /etc/live/build/*>"
 msgstr ""
 
 #.  FIXME
diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po
index f1948ed9c..528d82254 100644
--- a/manpages/po/de/lb_source.1.po
+++ b/manpages/po/de/lb_source.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po
index 0b458e950..13554b43f 100644
--- a/manpages/po/de/lb_testroot.1.po
+++ b/manpages/po/de/lb_testroot.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index bd3496a2a..b3c9eec87 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
@@ -1269,5 +1269,5 @@ msgstr ""
 #. type: IP
 #: en/live-build.7:227
 #, no-wrap
-msgid "B</etc/live/build.d/>"
+msgid "B</etc/live/build/*>"
 msgstr ""
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index ea8b9a38d..f911ebc32 100644
--- a/manpages/pot/lb.1.pot
+++ b/manpages/pot/lb.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index 380c65fe9..4895239ae 100644
--- a/manpages/pot/lb_binary.1.pot
+++ b/manpages/pot/lb_binary.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 39bb528d1..edb81e7ff 100644
--- a/manpages/pot/lb_bootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index c94055f54..55f32c983 100644
--- a/manpages/pot/lb_build.1.pot
+++ b/manpages/pot/lb_build.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index e357e0815..e432d8316 100644
--- a/manpages/pot/lb_chroot.1.pot
+++ b/manpages/pot/lb_chroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index 175474609..73330ed0f 100644
--- a/manpages/pot/lb_clean.1.pot
+++ b/manpages/pot/lb_clean.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 59499a377..84aa98b52 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
@@ -1488,10 +1488,10 @@ msgstr ""
 #. type: Plain text
 #: en/lb_config.1:352
 msgid ""
-"B<lb config> by default reads system defaults from /etc/live/build.conf and /"
-"etc/live/build.d when generating a new live system config directory. This is "
-"useful if you want to set global settings, such as mirror locations, and "
-"don't want to specify them all of the time."
+"B<lb config> by default reads system defaults from I</etc/live/build.conf> "
+"and I</etc/live/build/*> when generating a new live system config directory. "
+"This is useful if you want to set global settings, such as mirror locations, "
+"and don't want to specify them all of the time."
 msgstr ""
 
 #. type: IP
@@ -2489,7 +2489,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:505
 #, no-wrap
-msgid "B</etc/live/build.conf, /etc/live/build.d>"
+msgid "B</etc/live/build.conf, /etc/live/build/*>"
 msgstr ""
 
 #.  FIXME
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index 105fcf1ec..485c74bb5 100644
--- a/manpages/pot/lb_source.1.pot
+++ b/manpages/pot/lb_source.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index eeb2709a2..d831b9612 100644
--- a/manpages/pot/lb_testroot.1.pot
+++ b/manpages/pot/lb_testroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 5a096d119..751bef3a5 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
@@ -1269,5 +1269,5 @@ msgstr ""
 #. type: IP
 #: en/live-build.7:227
 #, no-wrap
-msgid "B</etc/live/build.d/>"
+msgid "B</etc/live/build/*>"
 msgstr ""
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index cd57d4f24..13a81c6b8 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -916,7 +916,7 @@ if ! In_list "--ignore-system-defaults" "${@}"
 then
 	Echo_message "Considering defaults defined in %s" "/etc/live/build.conf"
 
-	Read_conffiles /etc/live/build.conf /etc/live/build.d/*
+	Read_conffiles /etc/live/build.conf /etc/live/build/*
 fi
 
 # Reading existing configuration