Merge branch 'master' of git://github.com/gandro/netctl into gandro-master

4 files changed, 96 insertions, 4 deletions

diff --git a/docs/Makefile b/docs/Makefile
index 2fd858b..c90ead5 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,6 +1,6 @@
 # Makefile for netctl documentation
 
-MANPAGES = netctl.1 netctl.profile.5 netctl.special.7
+MANPAGES = netctl.1 netctl-auto.1 netctl.profile.5 netctl.special.7
 
 .PHONY: manpages install $(MANPAGES:=-install) clean
 manpages: $(MANPAGES)
diff --git a/docs/netctl-auto.1.txt b/docs/netctl-auto.1.txt
new file mode 100644
index 0000000..1fa17d8
--- /dev/null
+++ b/docs/netctl-auto.1.txt
@@ -0,0 +1,90 @@
+NETCTL-AUTO(1)
+==============
+
+NAME
+----
+netctl-auto - Control automatic selection of wireless netctl profiles
+
+
+SYNOPSIS
+--------
+*netctl-auto* {*COMMAND*} ...
+
+*netctl-auto* [--help | --version]
+
+
+DESCRIPTION
+-----------
+*netctl-auto* may be used to control the automatic network profile selection
+offered by the 'netctl-auto@.service' file. See *netctl.special*(7) for
+details about the service file.
+
+
+OPTIONS
+-------
+The following commands are understood:
+
+*list*::
+    List all profiles which are currently available for automatic selection.
+    Active profiles will be marked with a '*', disabled profiles will be
+    marked with a '!'.
+
+*current*::
+    Report currently active profiles.
+
+*switch-to [+PROFILE+]*::
+    Switch to the network profile specified on the command line. The
+    specified profile will be enabled if necessary, the state of all other
+    profiles is not changed. This command does not force *netctl-auto* to use
+    the specified profile. If a disconnect occurs, *netctl-auto* may select
+    an alternative profile.
+
+*enable [+PROFILE+]*::
+    Enable a previously disabled network profile for automatic selection.
+    Every time the *netctl-auto* service is started, all available profiles
+    are enabled by default.
+
+*disable [+PROFILE+]*::
+    Disable the specified profile for automatic selection. This will only
+    take effect until the *netctl-auto* service is stopped.
+    To permanently exclude a profile from automatic selection, use the
+    'ExcludeAuto=yes' option in the profile.
+
+*enable-all*::
+    Enable all profiles for automatic selection.
+
+*disable-all*::
+    Disable all profiles for automatic selection.
+
+*start [+INTERFACE+]*::
+    Start automatic profile selection on the specified interface. +
+    This command should not be invoked directly, use the following command
+    instead:
+---------------------------------------------
+    systemctl start netctl-auto@<interface>
+---------------------------------------------
+
+*stop [+INTERFACE+]*::
+    Stop automatic profile selection on the specified interface. This will
+    disconnect the currently active profile on the interface. +
+    This command should not be invoked directly, use the following command
+    instead:
+--------------------------------------------
+    systemctl stop netctl-auto@<interface>
+--------------------------------------------
+
+
+EXIT STATUS
+-----------
+On success 0 is returned, a non-zero failure code otherwise.
+
+
+ENVIRONMENT
+-----------
+'$NETCTL_DEBUG'::
+    If set to +"yes"+, debugging output is generated.
+
+
+SEE ALSO
+--------
+*netctl*(1), *netctl.profile*(5), *netctl.special*(7)
diff --git a/docs/netctl.1.txt b/docs/netctl.1.txt
index 954d62a..6440b00 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-auto*(1), *netctl.profile*(5), *netctl.special*(7), *systemctl*(1)
diff --git a/docs/netctl.special.7.txt b/docs/netctl.special.7.txt
index 668f7b1..c61290c 100644
--- a/docs/netctl.special.7.txt
+++ b/docs/netctl.special.7.txt
@@ -48,7 +48,9 @@ netctl-auto@<interface>.service::
     start a profile for a network it finds. It is targeted at wireless
     interfaces. Profile specific values for WPADriver are ignored, but
     it is possible to specify WPADriver in an interface hook
-    ('/etc/netctl/interfaces/<interface>').
+    ('/etc/netctl/interfaces/<interface>'). +
+    Use *netctl-auto*(1) instead of *netctl(1)* to control the automatic
+    profile selection when using this unit.
 
 netctl-ifplugd@<interface>.service::
     This unit starts ifplugd on the interface it is used for. It will
@@ -59,4 +61,4 @@ netctl-ifplugd@<interface>.service::
 
 SEE ALSO
 --------
-*netctl*(1), *netctl.profile*(5)
+*netctl*(1), *netctl-auto*(1), *netctl.profile*(5)