summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2013-06-16 11:40:49 +0200
committerJouke Witteveen <j.witteveen@gmail.com>2013-06-16 11:40:49 +0200
commit277b1cf277e0d6c6cc439d0684954503f6b2ed14 (patch)
tree99d5fdc5b2135600f32021365fbe1004ca6fc4c3 /docs
parentc3f16e68c8476357370131547c22f4dcc6b9e2ff (diff)
downloadnetctl-277b1cf277e0d6c6cc439d0684954503f6b2ed14.tar.gz
netctl-277b1cf277e0d6c6cc439d0684954503f6b2ed14.tar.xz
Documentation updates
Diffstat (limited to 'docs')
-rw-r--r--docs/netctl.1.txt2
-rw-r--r--docs/netctl.profile.5.txt21
2 files changed, 16 insertions, 7 deletions
diff --git a/docs/netctl.1.txt b/docs/netctl.1.txt
index 9edd74a..954d62a 100644
--- a/docs/netctl.1.txt
+++ b/docs/netctl.1.txt
@@ -89,4 +89,4 @@ ENVIRONMENT
SEE ALSO
--------
-*netctl.profile*(5) *netctl.special*(7) *systemctl*(1)
+*netctl.profile*(5), *netctl.special*(7), *systemctl*(1)
diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt
index caffdc9..a50dbed 100644
--- a/docs/netctl.profile.5.txt
+++ b/docs/netctl.profile.5.txt
@@ -23,8 +23,10 @@ The name of the profile is the name of the file. Profile names must not
contain newlines and should not end in '.service' or '.conf'. Whenever a
profile is read, all executable scripts in '/etc/netctl/hooks/' and any
executable script in '/etc/netctl/interfaces/' with the name of the
-interface for the profile are sourced. For each connection type, there
-are example profile files in '/etc/netctl/examples/'.
+interface for the profile are sourced. Declarations in an interface
+script override declarations in a profile, which override declarations
+in hooks. For each connection type, there are example profile files in
+'/etc/netctl/examples/'.
AVAILABLE CONNECTION TYPES
@@ -87,6 +89,10 @@ GENERAL OPTIONS
A command that is executed before a connection is brought down.
Similar precautions should be taken as with 'ExecUpPost'.
+'ForceConnect='::
+ Set to `++yes++' to force connecting even if the interface is up.
+ Do not use this unless you know what you are doing.
+
IP OPTIONS
----------
@@ -149,13 +155,16 @@ network. In particular, these connection types are +ethernet+,
of the DNS nameservers.
'DNSDomain='::
- A `++domain++' line for '/etc/resolv.conf'.
+ A `++domain++' line for '/etc/resolv.conf', passed to
+ *resolvconf*(5).
'DNSSearch='::
- A `++search++' line for '/etc/resolv.conf'.
+ A `++search++' line for '/etc/resolv.conf', passed to
+ *resolvconf*(5).
'DNSOptions=()'::
- An array of `++options++' lines for '/etc/resolv.conf'.
+ An array of `++options++' lines for '/etc/resolv.conf', passed to
+ *resolvconf*(5).
'TimeoutDHCP='::
Maximum time, in seconds, to wait for DHCP to be successful.
@@ -454,4 +463,4 @@ A mnemonic is to think of the prefix ``\"`' as saying `non'-`quote'.
SEE ALSO
--------
-*netctl*(1)
+*netctl*(1), *resolvconf.conf*(5)