From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 Aug 2017 12:28:39 +0000 (+0000)
Subject: man: Update wireless zone documentation according to latest changes
X-Git-Tag: 010~187
X-Git-Url: http://git.ipfire.org/?p=network.git;a=commitdiff_plain;h=d54626ef46baa502044e6159a60717a7ba8352e2

man: Update wireless zone documentation according to latest changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/man/network-zone-wireless.xml b/man/network-zone-wireless.xml
index 0eaca8bb..09312456 100644
--- a/man/network-zone-wireless.xml
+++ b/man/network-zone-wireless.xml
@@ -40,6 +40,17 @@
 			The wireless hook uses a WiFi interface and connects to a
 			wireless access point in station mode.
 		</para>
+
+		<para>
+			Configuration and credentials for any wireless networks to
+			connect to can be configured by using the
+			<command>network wireless network</command> command.
+
+			See <citerefentry>
+				<refentrytitle>network-wireless-networks</refentrytitle>
+				<manvolnum>8</manvolnum>,
+			</citerefentry> for details.
+		</para>
 	</refsect1>
 
 	<refsect1>
@@ -76,78 +87,6 @@
 					</para>
 				</listitem>
 			</varlistentry>
-
-			<varlistentry>
-				<term>
-					<option>--ssid=<replaceable>SSID</replaceable></option>
-				</term>
-
-				<listitem>
-					<para>
-						Connect to this SSID.
-					</para>
-				</listitem>
-			</varlistentry>
-
-			<varlistentry>
-				<term>
-					<option>--encryption-mode=<replaceable>ALGO</replaceable></option>
-				</term>
-
-				<listitem>
-					<para>
-						Sets the encryption mode that is used to connect to the
-						wireless network.
-					</para>
-					<para>
-						<replaceable>ALGO</replaceable> can be one of the following:
-					</para>
-					<itemizedlist>
-						<listitem>
-							<para>
-								<emphasis>WPA2-PSK</emphasis>
-								WPA2 with pre-shared key
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								<emphasis>WPA2-PSK-SHA256</emphasis>
-								WPA2 with pre-shared key and stronger hash
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								<emphasis>WPA-PSK</emphasis>
-								WPA with pre-shared key
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								<emphasis>WPA-PSK-SHA256</emphasis>
-								WPA with pre-shared key and stronger hash
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								<emphasis>WEP</emphasis>
-								WEP
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								<emphasis>8021X</emphasis>
-								IEEE802.1X Wireless Enterprise
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								<emphasis>NONE</emphasis>
-								No encryption
-							</para>
-						</listitem>
-					</itemizedlist>
-				</listitem>
-			</varlistentry>
 		</variablelist>
 	</refsect1>