# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: awardle@awardle-desktop-20100412143517-rc4pgo3pdpctg419
# target_branch: lp:ubuntu-doc
# testament_sha1: 498ef6932988354e6a36bb9ce089ae2200b9a0b8
# timestamp: 2010-04-12 15:35:42 +0100
# source_branch: /home/awardle/ubuntu-doc/trunk
# base_revision_id: rocket2dmn@ubuntu.com-20100411144959-\
#   loka35qepln3ny2a
# 
# Begin patch
=== modified file 'internet/C/connecting.xml'
--- internet/C/connecting.xml	2010-03-21 23:42:12 +0000
+++ internet/C/connecting.xml	2010-04-12 14:35:17 +0000
@@ -212,13 +212,13 @@
 <title>Virtual Private Networks</title>
 <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>
+	<title>Cisco 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 Cisco VPN.</para></caution>
 	<procedure>
 		<step><para>Right click the Network Manager 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>Select <guilabel>Cisco 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>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUcTluIAAapfgAAwWGP/93sF
SaC/7//wUAQZE2jMA9lrlwkkQmEYjBDE0CamZTQaaaGR6gySZMCNGiTZTQyZAAAAAMgQmkGCTSaN
qfpQ0bSbJD1MmQ0HMAAAAAAAAAACSKBTzVN6U9E9TxI09IADIMQAIES3bpxUDnhsGGNBjclpAtiT
LlNm6Gzv4VREPP7HzebKLUZblCNyknLj4bOuFH9ReldSeTj8+sotXHy8fRjCDz0vmaY+LbJsbd7u
qdLe9LmuT9JIOdSrROjSgLtXHOtQfyhdRbZg2vq4Ya1eraZdXalkriJLgzCMq1gwjmoKdZGnIIsu
b7iccowllTk9r1oUDEI0kQiS2bqbhv7Km06QXh6mAYLVZ9Y1seWrYGp8zCKDU4aPRx2A2bc4FoNg
qwvemC9F9MiDo0hjKJMCgHSoE4CjIWqAdvlm47wvFRua/NbysSqVktVQO15pgwSm1ZhASl+K4ikr
a2JOBkDX6RshbJdnyI/dRkgpGWOaQuoWBLhAZJQFQDgVo859l50czDLOIvjEqYMKq36jMLwgoxmY
Et1Sppc5x20x55h5dZCjDNHoECRcgbJahYJiyoC8ppC40iW2mIxf62Qcq621tzFyRrVDWGMXWeBV
hUCliV7u/5Be7K/HjxVJBgwuwlsHx9gZE4Nw8N803h4ebh5hiXg5trQoOd2tEDwu4+P6MnASy+iP
jweROWLWFS4V9g3d7DlMxm10aFRKFIeelzeIQTSbSlwe/cScjMm3lv6SyJBsfx2+nmay7yWB2K61
rZ2f1XRG00sRHCizaKcfjTHZZFolmipc3otwdlqq1aGnLxMpmCuTeZ4VAqanwK4p9Upi1JWql4mz
Vce7YZON7AdjRYeugqgaq+To0qCSHoznyhn+1sFwcPZ8d5Pyzempur88cTUdnFx/cdxemVp7K24M
NsPGTKFLArVYZw2SKHLI3bsLPB+whoPHnypYjmTnPCcW9BzLBdJZ7JnXBnlztJoBxuuc1E/dNBsH
YeRavO3MUVBPhAmCD3tqi4VQN+BzhIY/s0MOIuB3NKZ1rwChKilZwkCClYCoQZHqzVFJWQUlXl6p
1AZxksn3HcZ4gUYDSWFNsC7vMajJZCXWwqUNCkgPdoIUTA2gPFg7RBIsFcwdZUpbCDJ2U6dXrTnV
wNSK0K8qeVWDYyi6PCEkSZgsCZUvWnvde9Kxa7B+r06HEvgZZpRMXixp8BTwXQjUsuiblNa8k9xS
zJOEAttFIBDt2AbyuAkENZzizRN2wuahTHWAyAmkFgIsmswsqgmebyL+IV1mYXVyCYRBKI2vBVW2
9NkhWcRObDQqDtSiG+FU7qdlYGStYrN0mQiXQwUeAzKKiF/ahcExdcBJb/uWOg1NID/8XckU4UJB
HE5biA==