# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mikeua89@gmail.com-20080924172612-xw9ew7ks0ljxylzf
# target_branch: http://bazaar.launchpad.net/%7Etcarrez/ubuntu-\
#   doc/ubuntu-intrepid/
# testament_sha1: 9d9e079a7ef160f901ef0bd2118aec4a4fdd3093
# timestamp: 2008-09-24 11:26:50 -0600
# base_revision_id: thierry.carrez@ubuntu.com-20080918130415-\
#   rqnglyfgv1p2u67s
# 
# Begin patch
=== modified file 'internet/C/networking.xml'
--- internet/C/networking.xml	2008-07-19 20:57:13 +0000
+++ internet/C/networking.xml	2008-09-24 17:26:12 +0000
@@ -14,7 +14,7 @@
 <?yelp:chunk-depth 4?>
 <chapter id="networking" status="review">
 	<title>Home Networks</title>
-	<para>This section provides instructions on how to communicate with other computers using a Local Area Network.</para>
+	<para>This section provides instructions on how to communicate with other computers using a Local Area Network (LAN).</para>
 	<sect1 id="networking-browsenetcomps" status="review">
 		<title>View other computers on the network</title>
                 <para>To view computers on the network, open &network-servers;.</para>
@@ -57,14 +57,15 @@
 					<para>Type <command>shares-admin</command> and press <keycap>Return</keycap> to open <application>Shared Folders</application>.</para>
 				</step>
 				<step>
+					<para>You may receive a message which says <guilabel>Sharing services are not installed</guilabel>. If this happens, ensure that the two checkboxes in the message box are checked and press <guibutton>Install services</guibutton>. Sharing service support will then be downloaded and installed; this may take a while.</para>
+				</step>
+				<step>
 					<para>Press the <guibutton>Unlock</guibutton> button and enter your password in the <guilabel>Password for (username): </guilabel> field.</para>
 				</step>	
 				<step>
 					<para>Press the <guibutton>Authenticate</guibutton> button.</para>
 				</step>
-				<step>
-					<para>You may receive a message which says <guilabel>Sharing services are not installed</guilabel>. If this happens, ensure that the two checkboxes in the message box are checked and press <guibutton>Install services</guibutton>. Sharing service support will then be downloaded and installed; this may take a while.</para>
-				</step>
+				
 				<step>
 					<para>Select the <guilabel>Shared Folders</guilabel> tab and press <guibutton>Add</guibutton>.</para>
 				</step>
@@ -81,7 +82,7 @@
 					<para>If you would like people accessing the shared folder to be able to add, change and remove files in the folder, uncheck <guilabel>Read only</guilabel>. If you leave <guilabel>Read only</guilabel> checked, people will only be able to view files in the folder.</para>
 				</step>
 				<step>
-					<para>Press <guibutton>OK</guibutton> to make the shared folder available. Other people on the same network (LAN) as you should now be able to access the folder.</para>
+					<para>Press <guibutton>Share</guibutton> to make the shared folder available. Other people on the same network (LAN) as you should now be able to access the folder.</para>
 				</step>
 			</procedure>
 			<para>See the <ulink type='help' url='ghelp:shares-admin'>Shared Folders Administration Tool manual</ulink> for more information on managing network shares.</para>
@@ -97,7 +98,7 @@
 				<para>Right click the folder you wish to share and select <guimenuitem>Sharing Options</guimenuitem> on the popup menu.</para>
 			</step>
 			<step>
-				<para>Select <guilabel>Share this folder</guilabel> from the popup menu. You may change the <guilabel> Share name</guilabel> field if you want to use a different share name.</para>
+				<para>Select <guilabel>Share this folder</guilabel> from the popup menu. Ensure that the <guilabel>Share this folder</guilabel> checkbox is checked. You may change the <guilabel> Share name</guilabel> field if you want to use a different share name.</para>
 			</step>
 			<step>
 				<para>You may receive a message which says <guilabel>Sharing services are not installed</guilabel>. If this happens, ensure that the two checkboxes in the message box are checked and press <guibutton>Install services</guibutton>. Sharing service support will then be downloaded and installed; this may take a while.</para>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZClJVkAAghfgGAwUWf//3In
zCC////wUAVe7lzuqnHXJuuDrduXXCSRAgGCJspp5J6mNQAAAABJIp6aabUmVP9U1P0iZqDQaaAB
p6mjTR5QJTRI0aJpNppqnqepk9BNGQ0ep6hoaaADmAAmTAAmEwTCGAIwAJIiaMRNNTSenpTNRk/V
AbSaaAepoBofFkkRSx52ZsmGcJMce43TirRlcz48sIgs+YzJyskeXx7yvI4XoSY+3eN+JVoo9IMK
1fGpRsmoN+k7B4dsfKfYbRjfqDxbzhTn7+HLfxfCN8ozxl6pwdrzdurdqrMg1oPPKHA1f19bD3wM
Lod+cmjLGcl55Tv2GmctbUoO0p0/alKxy73WEZ25WS1y0RjU8qbnw6d+nmfrsSq4DPbvvEcobfMy
ajIX5hG9BTqnCVbhQac7WUQwF2GxZqsKcK1PznYlrjw1wIN0QZWFU5z9UqE7cDWka0K8isIzQnHQ
WjxJHQLzqodTHjm5RqsfKZ3HPesFmKi8cVEx2PirGJga7JsRiLwL5C63ddEmqDkzr8FflGmQqciF
fQisyMyE2UhZFwpeIiWBIgVWitg5jfFMnOT65G06aa1toQWAmH4rwEuYbgrFIkS1srK69lgUMC1z
DqKOPgMthuJhW96i5YQpHPnjkdKhYdGZY0GqcinTm2SS+Ulgrj3CoqKrXlELCCzMSJUvLjYk99sW
ym01JhTIlxUctGiSNI1lul6ptg0XlAqkaOrk5+d1LbmHAhZrMZHGOLwdqJU6FswNEXS9TkI80/O4
/zddmuqblmsEk6iZIhOVRuZv833NlmKZHgobL6j0jwIHEmSEtl5amBs3HNCRxMthCEpebktJUBTo
AwM2niPDJcTBgD4M3di/H3w1eYPPQZdq38gERJCQQMijRdAiBB1ThwXadhIqIb5nT384bA0AjnwU
SbS3OZbx8+L6mYLntCaRFOTZb2udnw3hMqWL2FieRUWRnwtuEircYY3uuUjsnym2/e/T8rXnMg3q
IbdBXNyqqXRBNUyFZicuV1mfU5eddy0aJBZgkEYZaauR6ihXvkUVAFX1jrrjNKZFEE4+WMYpYgpo
cY00gPWW2OFxgQqjRb2WiUgOoW7FRU8jb3PEHPIWGPQeseu8jXKmq8trqWSkTXPFsZkmXGl1kiYG
WNZ5Q1A1GfpBmIiKxB12MmYP5K3FKO7rDG/RaWEdPBFkpK4poH76UuZLABrrmMpkzQNeWRBRVjd/
xzujdJkmHqjICuOlvBLUZh5OQ8UCCW0LFxFK0opJTWKhUCKBtvpDGO7rHUqFfOJosT6P3LtXoFgC
dLPYmU0MtOe8/UDuTcvaFSfoHjdsgnZCqElAReSpRVM1fi2vp32G1ri/uo3GC5QJkJigJ29O+rBn
x9ezXaD6CU8mZlMOpw9zEkYbJBqRRQIK3DT+lpfiidfsWihd6smMlgXA5ztahJ4ZgjbanwHA5HDA
aE6dSsqlG0TCgBcGcBVGXbhDrnAXLlxz4XZMoYqdNtTECJfrlgjarVILWM07lzJ6JinkN1XMCFYp
PO3OO4aZcJTDUZkx9yZGodpXgRNsLWa5lllQJUdzDnxiBarTqkS7C3EJQ5hUaqy3J0ivh7MSIR1D
m/WYxUUYBqDUhmIsr9QOEUqITEEkLLtUKXt3LRJ0gsFl04WzBfKPgCRUUTq9X6wNzjicVMWCOwUH
LG+wOu/zC/wsKzccINuTiclRNrJCj/xdyRThQkJClJVk