summaryrefslogtreecommitdiff
path: root/rc.conf.5.txt
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-01 12:57:32 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-01 12:57:32 -0300
commita8a948b7ae57f660f61ce44251f938d9317c113b (patch)
tree519d9eb03bc0352e6a084c336f63bcc7ae00e794 /rc.conf.5.txt
parent10c7127d5ff693a8f0c9671b9d3253315f2095be (diff)
parenta20ce0e666b5c97080a880eee9d8301c3d48b177 (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.06.1
Conflicts: hostname.5.txt locale.conf.5.txt
Diffstat (limited to 'rc.conf.5.txt')
-rw-r--r--rc.conf.5.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/rc.conf.5.txt b/rc.conf.5.txt
index 7352d6a..89d6e5f 100644
--- a/rc.conf.5.txt
+++ b/rc.conf.5.txt
@@ -102,7 +102,8 @@ HARDWARE[[H]]
-------------
*MODULES=*
-Modules to load at boot-up. To blacklist modules, see "man modprobe.d".
+Modules to load at boot-up. To blacklist modules, see "man modprobe.d". See also
+"man modules-load.d".
Default: ().
@@ -218,6 +219,11 @@ If you use a network filesystem you should enable 'netfs'.
Default: (syslog-ng network crond)
+SEE ALSO
+--------
+
+hostname(5), vconsole.conf(5), locale.conf(5), hwclock(8)
+
AUTHORS
-------
Written by Dieter Plaetinck, Tom Gundersen and others.