# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: awardle@awardle-desktop-20100311201031-5qcq4bmmdl53ghc4
# target_branch: lp:ubuntu-doc
# testament_sha1: a9178ca8dfe7e9d81f0c84f529587536eb53a9a8
# timestamp: 2010-03-11 20:11:16 +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-11 20:10:31 +0000
@@ -87,13 +87,65 @@
 
 	<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-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>
+		<tip>
+			<para>You also configure a VPN if you have a config file.</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>
+		</tip>
 	</sect1>
 
 	<sect1 id="connecting-dsl" status="review">

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