# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: awardle@awardle-desktop-20100205224623-b6beq2ra9tpv8mqs
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/ubuntu-docs/lucid/
# testament_sha1: 981f6600744eae2fe46d23710a713f1550e79781
# timestamp: 2010-02-05 22:49:08 +0000
# base_revision_id: rocket2dmn@ubuntu.com-20100124153353-\
#   dexulfyewmzb1hy4
# 
# Begin patch
=== modified file 'internet/C/troubleshooting.xml'
--- internet/C/troubleshooting.xml	2009-08-31 18:20:07 +0000
+++ internet/C/troubleshooting.xml	2010-02-05 22:46:23 +0000
@@ -126,7 +126,7 @@
 			<title>Check DNS</title>
 			<orderedlist>
 				<listitem><para>Open a <application>Terminal</application> (&terminal;) and type the command: <code>ping -c3 85.190.27.2</code>.</para></listitem>
-				<listitem><para>Now type the command: <code>ping www.ubuntu.com</code>. If you get a response from the both then see <xref linkend="troubleshooting-wireless-ipv6"/>.</para></listitem>
+				<listitem><para>Now type the command: <code>ping www.ubuntu.com</code>. If you get a response from both then see <xref linkend="troubleshooting-wireless-ipv6"/>.</para></listitem>
 				<listitem><para>Type the command: <code>cat /etc/resolv.conf</code>. If there is no nameserver listed then contact your ISP and find out your primary and secondary domain name servers. Once you have this information see <xref linkend="connecting-wireless"/>.</para></listitem>
 			</orderedlist>
 		</sect2>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQb+yaIAAZBfgEAwWOP/93Il
UIC/7//wUAPeoB16HIAcNFJmjJMCMh6EaBoABoGIMAAAAAAAAAABGik9TY1QP1QAAAAAAAGqan6Q
mE9QyMCaGhhDBMEDQJJAQAKejQTTRPRPTRMieUaNo1GB1uW1e35MeqMjPCFIFmvSUKKHPz2+Xv0n
n54MzEfwv9ggxmFcDJs9Hjf7WqhypdacfNddzjNivMlh4jDphv2m6NMsv67XfS3X6D2S+my+94d3
UWHGYfAoXCpSZactOF90lu15eGr09JwqtDdStfXfbj6rHvmJutzILxL6rJPYW9D4C7YxCfH5gQmD
g56xndasUWT8poObvU7i7wr4YqpOLpT4GNqmmVtyd38ticvYzrzWEqyy3p+yHgxYxnU6Klu0QsRR
WFYs7qtYpLNlil4Vvkb3KOThbOrkpr+Cnfa4TkyyvGhBbtxWGZdRJbGqwJK+GARUdWhgoCfRK2Si
8rMztWmmJ+KxSeqFvUNUaHGMXmt71a+iRkbvmquo2iq0asfqtuWYqr6CE4NXTIyiO0ye9yWAoPVU
MJKFBslZylJAzmxYhAnBotTQMHPonXJCnHIXxfDGnGhw2Npqzac3E3JpWJ0SkJ0NDy6ZZH3LTlwf
RO2kRpGLzmdI0hwAqBzQQBh5zaAj2oSulRIdqyOcthAN9OkgPPOFZi1kg8rrroNnnSfz7iWL0RX/
JbDAbD78+szXcd69RYHgLL+gb3svfBHcGFXoeJxsJ/3x4dhFoLTTmi/Gikrw7X9LPMmnyXe8iM0C
nxNmBjtEU8TkknJ86oT+1/0djU94HZSrQdH37eUiaVXqc3PmDaL6OmRcNUzkRo2yTuQJOfgwERi6
9FW0IiMqgUuNL1DC6FgNkSWJhNhfJ5AHgm3S0KJUdszK8mUDdTPhFVL4kMa9ScfZ+a6SRzRLWYnY
DOKGeGSpsVOuRtT+z5TQ0NE4u4BVxgFjfvXjLELPryCkpON04ajJlkEEpLMHBQpvDq3MkzJN3A/+
bls2fbXv1ys8wKjCpT2XEPhTMFROZ+RbVCmLphSmwgRBowrgLTc704KUyDJmWKHLfsxrW8YGSitz
dK4+QUJOYKVBy6y1HSQZ/MBZJ7tXDhueyiU85+nqs8NKdWQtgtqtFv1qCj4igXBo4A41OR1Wdzir
l2OqTSVlqli8I8VMPgM2i6Ma41b2KpBeDnJUlrM4IEUXvqYHOwLGkUQsOVw7o1L+Ng4M7CCl4pPC
peQrnex3NQ9YMjGqzFDBd7r2zxuW1yMdqVNqtB3jqErtsVDB2N673pdS+qwEsZFwCJP/i7kinChI
A39k0QA=