summaryrefslogtreecommitdiff
path: root/manpages/en
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-08-14 20:48:41 +0200
committerDaniel Baumann <daniel@debian.org>2012-08-14 20:48:43 +0200
commitcdece4c8e50051e790d657b1ff9f090ed4737907 (patch)
treea18a9052797963ebff6ec3d7afbd0b6c69682c56 /manpages/en
parenteb77833cf3f40583fe02dad42b667cc6b091f2c3 (diff)
downloadlive-boot-cdece4c8e50051e790d657b1ff9f090ed4737907.tar.gz
live-boot-cdece4c8e50051e790d657b1ff9f090ed4737907.zip
Using /etc/live/boot/*.conf instead of /etc/live/boot.d/*.conf and /live/image/live/boot/*.conf instead of /live/image/live/boot.d/*.conf for consistency reasons.
Diffstat (limited to 'manpages/en')
-rw-r--r--manpages/en/live-boot.78
-rw-r--r--manpages/en/live-persistence.conf.52
2 files changed, 5 insertions, 5 deletions
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 5a25f11..0e5e74f 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-07\-30 3.0~a38-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-08\-14 3.0~a38-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
@@ -23,7 +23,7 @@ To configure the live\-boot parameters used by default in a live image, see the
In addition, there are some more boot parameters to influence the behaviour, see below.
.SS Configuration Files
-\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot.conf, live/boot.d/*.conf).
+\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, live/boot/*).
.SH OPTIONS
\fBlive\-boot\fR currently features the following parameters.
@@ -148,9 +148,9 @@ This optional file (inside the live media) contains a list of white\-space or ca
.SH FILES
.IP "\fB/etc/live/boot.conf\fR" 4
-.IP "\fB/etc/live/boot.d/*.conf\fR" 4
+.IP "\fB/etc/live/boot/*\fR" 4
.IP "\fBlive/boot.conf\fR" 4
-.IP "\fBlive/boot.d/*.conf\fR" 4
+.IP "\fBlive/boot/*\fR" 4
.IP "\fBlive-persistence.conf\fR" 4
.SH SEE ALSO
diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5
index caed34c..5142dc1 100644
--- a/manpages/en/live-persistence.conf.5
+++ b/manpages/en/live-persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-07\-30 3.0~a38-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-08\-14 3.0~a38-1 "Debian Live Project"
.SH NAME
\fBlive-persistence.conf\fR \- Configuration file for persistence media in