summaryrefslogtreecommitdiff
path: root/rc.conf.5.txt
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-05-06 15:03:49 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-05-06 15:03:49 -0300
commit10c7127d5ff693a8f0c9671b9d3253315f2095be (patch)
tree07cc635750c86f96e3544f47deebdfd9bb50dcb7 /rc.conf.5.txt
parent9e13f3aecd7c8c716929be9d9faf8725e3065a0e (diff)
parent86b2cb99028d81a6cb608f09e1a31bc7744a991c (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.05.2
Conflicts: Makefile
Diffstat (limited to 'rc.conf.5.txt')
-rw-r--r--rc.conf.5.txt13
1 files changed, 2 insertions, 11 deletions
diff --git a/rc.conf.5.txt b/rc.conf.5.txt
index cf3c649..7352d6a 100644
--- a/rc.conf.5.txt
+++ b/rc.conf.5.txt
@@ -102,7 +102,7 @@ HARDWARE[[H]]
-------------
*MODULES=*
-Modules to load at boot-up. To blacklist modules, see "man modprobe.conf".
+Modules to load at boot-up. To blacklist modules, see "man modprobe.d".
Default: ().
@@ -200,16 +200,7 @@ Default: "no"
*NETWORKS=*
-Enable these netcfg profiles at boot-up. These replace the network
-configuration above and are useful if you happen to need more advanced
-network features than the simple network service supports,
-such as multiple network configurations (ie, laptop users).
- - set to 'menu' to present a menu during boot-up (dialog package required)
- - prefix an entry with a ! to disable it
-
-Network profiles are found in /etc/network.d
-There is a template file included there that can be used to create
-new profiles. This requires the netcfg package.
+This functionality is deprecated, please refer to the 'netcfg' documentation.
DAEMONS[[D]]
------------