# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: awardle@awardle-desktop-20100312173933-b17w6566nzylzjie
# target_branch: lp:ubuntu-doc
# testament_sha1: c7cb6cc0d2c8d05d556e493fa919c217110e005e
# timestamp: 2010-03-12 17:40:18 +0000
# source_branch: /home/awardle/ubuntu-doc/trunk
# base_revision_id: rocket2dmn@ubuntu.com-20100307030731-\
#   z0a2p0si2stata7o
# 
# Begin patch
=== modified file 'internet/C/connecting.xml'
--- internet/C/connecting.xml	2010-02-27 04:35:32 +0000
+++ internet/C/connecting.xml	2010-03-12 17:39:33 +0000
@@ -87,13 +87,66 @@
 
 	<sect1 id="connecting-vpn" status="review">
 		<title>Virtual Private Networks</title>
-		<para>There are three types of Virtual Private Networks (VPNs) that are currently supported by NetworkManager (NM).  It is important to know which type of VPN network you are attempting to connect to. 
-		</para>
-		<orderedlist>
-			<listitem><para>Begin by installing <ulink url="apt:network-manager-openvpn">network-manager-openvpn</ulink>, <ulink url="apt:network-manager-pptp">network-manager-pptp</ulink> and/or <ulink url="apt:network-manager-vpnc">network-manager-vpnc</ulink>.</para></listitem>
-			<listitem><para>Left click the <guiicon>NetworkManager</guiicon> icon and click <guilabel>Configure VPN...</guilabel> from the <guilabel>VPN Connections</guilabel> option.</para></listitem>
-			<listitem><para>Click <guibutton>Add</guibutton>.</para></listitem>
-		</orderedlist>
+		<para>There are three types of Virtual Private Networks (VPNs) that are currently supported by NetworkManager.</para>
+		<sect2 id="connecting-vpn-config">
+			<title>From a Configuration File</title>
+			<para>You can configure a VPN if you have a configuration file without having to enter as many details yourself.</para>
+			<procedure>
+				<step><para>Right click the <guiicon>NetworkManager</guiicon> icon in the system notification area and click <guilabel>Edit Connections...</guilabel></para></step>
+				<step><para>Select the <guilabel>VPN</guilabel> tab.</para></step>
+				<step><para>Click <guibutton>Import</guibutton>.</para></step>
+				<step><para>Select your config file and click <guibutton>Open</guibutton>.</para></step>
+				<step><para>Click <guibutton>Apply</guibutton>.</para></step>
+				<step><para>Click <guibutton>Close</guibutton>.</para></step>
+			</procedure>
+		</sect2>
+		<sect2 id="connecting-vpn-cicso">
+			<title>Cicso VPN</title>
+			<caution><para>You will need to have <ulink url="apt:network-manager-vpnc">network-manager-vpnc</ulink> and <ulink url="apt:network-manager-vpnc-gnome">network-manager-vpnc-gnome</ulink> installed to be able to connect to a Cicso VPN.</para></caution>
+			<procedure>
+				<step><para>Right click the <guiicon>NetworkManager</guiicon> icon in the system notification area and click <guilabel>Edit Connections...</guilabel></para></step>
+				<step><para>Select the <guilabel>VPN</guilabel> tab.</para></step>
+				<step><para>Click <guibutton>Add</guibutton>.</para></step>
+				<step><para>Select <guilabel>Cicso Compatible VPN (vpnc)</guilabel> from the drop down box.</para></step>
+				<step><para>Click <guibutton>Create...</guibutton>.</para></step>
+				<step><para>Specify a connection name in <guilabel>Connection name</guilabel>.</para></step>
+				<step><para>Enter your details and click <guibutton>Apply</guibutton>.</para></step>
+				<step><para>Click <guibutton>Close</guibutton>.</para></step>
+			</procedure>
+		</sect2>
+		<sect2 id="connecting-vpn-pptp">
+			<title>PPTP VPN</title>
+			<caution><para>You will need to have <ulink url="apt:network-manager-pptp">network-manager-pptp</ulink> and <ulink url="apt:network-manager-pptp-gnome">network-manager-pptp-gnome</ulink> installed to be able to connect to a PPTP VPN.</para></caution>
+			<procedure>
+				<step><para>Right click the <guiicon>NetworkManager</guiicon> icon in the system notification area and click <guilabel>Edit Connections...</guilabel></para></step>
+				<step><para>Select the <guilabel>VPN</guilabel> tab.</para></step>
+				<step><para>Click <guibutton>Add</guibutton>.</para></step>
+				<step><para>Select <guilabel>Point-to-Point Tunneling Protocol (PPTP)</guilabel> from the drop down box.</para></step>
+				<step><para>Click <guibutton>Create...</guibutton>.</para></step>
+				<step><para>Specify a connection name in <guilabel>Connection name</guilabel>.</para></step>
+				<step><para>Specify the address of VPN you wish to connect to in <guilabel>Gateway</guilabel>.</para></step>
+				<step><para>Enter a user name and password if required by your VPN.</para></step>
+				<step><para>Enter the domain of your VPN if required, in <guilabel>NT Domain</guilabel>.</para></step>
+				<step><para>Click <guibutton>Apply</guibutton>.</para></step>
+				<step><para>Click <guibutton>Close</guibutton>.</para></step>
+			</procedure>
+		</sect2>
+		<sect2 id="connecting-vpn-openvpn">
+			<title>OpenVPN</title>
+			<caution><para>You will need to have <ulink url="apt:network-manager-openvpn">network-manager-openvpn</ulink> and <ulink url="apt:network-manager-openvpn-gnome">network-manager-openvpn-gnome</ulink> installed to be able to connect to a OpenVPN.</para></caution>
+			<procedure>
+				<step><para>Right click the <guiicon>NetworkManager</guiicon> icon in the system notification area and click <guilabel>Edit Connections...</guilabel></para></step>
+				<step><para>Select the <guilabel>VPN</guilabel> tab.</para></step>
+				<step><para>Click <guibutton>Add</guibutton>.</para></step>
+				<step><para>Select <guilabel>OpenVPN</guilabel> from the drop down box.</para></step>
+				<step><para>Click <guibutton>Create...</guibutton>.</para></step>
+				<step><para>Specify a connection name in <guilabel>Connection name</guilabel>.</para></step>
+				<step><para>Specify the address of VPN you wish to connect to in <guilabel>Gateway</guilabel>.</para></step>
+				<step><para>Select the authentication you wish to use from the <guilabel>Authentication</guilabel> drop down box.</para></step>
+				<step><para>Enter your details and click <guibutton>Apply</guibutton>.</para></step>
+				<step><para>Click <guibutton>Close</guibutton>.</para></step>
+			</procedure>
+		</sect2>
 	</sect1>
 
 	<sect1 id="connecting-dsl" status="review">

# Begin bundle
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