# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrew@andrew-laptop-20100705144400-ugcnn7le6rg58m6c
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/ubuntu-docs/maverick/
# testament_sha1: ddf653cec507387bcff7779c5d93161c9a2d752b
# timestamp: 2010-07-05 09:44:17 -0500
# base_revision_id: asommer@ubuntu.com-20100617135618-5my02mlr2cm1zkgy
# 
# Begin patch
=== modified file 'serverguide/C/lamp-applications.xml'
--- serverguide/C/lamp-applications.xml	2010-03-24 17:46:46 +0000
+++ serverguide/C/lamp-applications.xml	2010-07-05 08:04:29 +0000
@@ -46,7 +46,7 @@
       </listitem>
       <listitem>
         <para>
-        Depending on where the source was extracted, configure a web browser to serve the files.
+        Depending on where the source was extracted, configure a web server to serve the files.
         </para>
       </listitem>
       <listitem>

=== modified file 'windows/C/preparing.xml'
--- windows/C/preparing.xml	2010-03-11 03:46:38 +0000
+++ windows/C/preparing.xml	2010-07-05 14:44:00 +0000
@@ -149,7 +149,7 @@
 			<para>Follow the instructions below to obtain a copy of the network settings which you may need:</para>
 			<orderedlist>
 				<listitem><para>Press <menuchoice><guimenuitem>Start</guimenuitem><guimenuitem>All Programs</guimenuitem><guisubmenu>Accessories</guisubmenu><guimenuitem>Command Prompt</guimenuitem></menuchoice>.</para></listitem>
-				<listitem><para>A black screen called <application>Command Prompt</application> will appear. Into the screen, type <screen>ipconfig /all</screen> and press <keycap>Enter</keycap>. This will list a set of network settings for each of the networking devices you have installed. You may have one or several networking devices.</para></listitem>
+				<listitem><para>A black screen called <application>Command Prompt</application> will appear. Into the screen, type <screen>ipconfig /all</screen> and press <keycap>Enter</keycap>. This will list a set of network settings for each of the networking devices you have installed. You may have one or more networking devices, although it is not necessary to have any at all.</para></listitem>
 				<listitem><para>Now, type <screen>ipconfig /all &gt; C:\network_settings.txt</screen> and then press <keycap>Enter</keycap>. This will store the settings you have just seen in the file <filename>C:\network_settings.txt</filename>.</para></listitem>
 				<listitem><para>Locate and open <filename>C:\network_settings</filename> in a text editing program, such as <application>Notepad</application>. Print out a copy of the file if possible.</para></listitem>
 			</orderedlist>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWScA4gAAyHfgEQwUOf/938k
RCC////wYAZ8r4AAIgtgA0D6IQptMmkNPUek9T1MQAAAA9TQBzTEwAJgAmAAEwABMOaYmABMAEwA
AmAAJglAkFG9DU1T9U9MiYn6oYmNNRgIyDBkqGg2kPSDTEANDJoaYgNAAkkAhoCCZMmRoynqanqj
9KeoAZlPUaFSLtOOxC/xl6HWa8tbNJDZwNlrvRErgWuuC6IclVRH23SyPxeWiiqir5dwmmCsUozM
zKxg9n5d5f0nSeUwECIxKGm7/c/RK8qbAeqyhI9QN9lUeR8h4nBA+EIzInBXWbyhOJ0P3ESBdFTd
GG9SLccqH22bM9Q/yU5OBn7EPg5IxOipduweRXoVLBj90fwkoyB3IoXnRAczqG8+TWLqg+mrDfrk
S0xRP1TG1Z38XOd9jUx4N410LAWhwH5Cg5LcQBExRGBEyIQaLhqqRxhtb2HDpIXX3QWsKiaVr0lY
MDIJ3DyI4hFMDKxKVIIHPL4EBjzsImryDL5ZGFbbYIvJdi4EZVXa3gHH6ET1KGyZUIhhQsJhAMfv
eQUKcS04mpUW0TSLRbCprNizZY7iGEdykseJ7wUzf00nHWGos3YT6rUWDb3F4hWGwmXBHcWjw0hp
vmQhEixrfbwQOQSq7UMNiiiWLtRhAisZHjMprYIqlDeZ2agxorCywa1neDrk5xow8x8WnUpk8fMd
PY+omB1kEtVxAxnQxozOaxBuzNn4C8utFN4pF9uGb4eHIGRMMw1WXKzSEJFRHEPwgiQxiKbySgPW
t9sQhlbZhDJYc7PUUY1LmKg4fecV+ieluVMs0y22kuDab4xupSzEiLkKOWxBsFRyCABS9g7sazdw
9NCNVkOMTIYT9XDKiDVmeIsw0svez7+IyexuwihPfs1lcR/xc8rjarv/IOiCROBfrOFmsVyDKVB6
B+d4+Tg4aQzwIXFNtZ2MYB5wc39GGqyWAxQoQg6FpAxBULUYDBAwilRc0gsRK7BSDTP754cSbgXt
k1ZqL+LFVRnZV4zl8Co5uSFd0XNAFoE8zfMEVBRf1EeEO9ELChJA27nhE8Hgczf6eflCWZ9CuvjD
hDgd7C3Mml+2fHLU/WYPGJnGP+UBQ5DbgYcM75N8qjRhnsKoDnsektOdQxuYKovTu/xatp4BY5xw
QNg87HW+Yx9kuZ7AMbhvc0vV/f3fb9j0RL9sbPPH+RhQ2VNnqQweOJ7V4C+EeBypyCtrK5hmN8C1
Xm3xxHblrtQ+RYKF0S6wRS6JilwVTefKQCBafUxez47cz5srtJxnwkInbM6YIPx70KAFeZGgMYT3
YyiQoIBIi6yzIMrDwpWwpqPbl9f7bYm6jiwqF5B+ht6OLOHwPCYwa7Q8hML4Zf8f2blQ5NyDjK0Z
Zm/oVmQYj/VtiqSBIuFzkTPU1oW30OxadjlwhHq5wZjaBPM+DuZp7B0PYtBxT3kLaLo8VyCDoDo7
V2xDeA163hX6fl+YvUcr/JHoOxPc/QmJHEN6Co8MNEvzg4ncpS/fgaFDWKQwy7z66Aak+J7H4oR8
0G8xZffHutyUSZaJvEC0CoPHgN8/NzcEBzDuJiQ3ujVPL1iNuGXqZKwf7o2L4FmS1ovmPDiVBx3F
3VyXnSiKBCH9FZdBmCm7sJ5BhquLi4KJR/6PEA+MWGTDkntuMxR8Ako0D/H5cJ7C2pOFb9cQ0Wwq
Xo/PMHEIWCG9CA9QogGLJVglq91FF2kRbMe726KXSRE0agU7DIgpBnnxkCifBMqgv0xaMhuBrheP
W9q1LpIDqG4uH1Twc4PZXReiBuel2Ijo7OITEZBedjEOYIO4upb3sVQLMf1GplKh5g5yYsYOTvLi
RUldJZHj5SOmUUNzYZsi4Bi1a2GbAJ2BK9w4oB6ksGhlKJMa0f9UGqhI+oWrEsHm8cVMSeIcRga0
x4GYTgi8gH3orMUBFJwsGkwqmbkmU6lyVT/aNW/UKXMelh6Q4RisQLxbWCgWQTUQgBfVEQtlnBdU
OwNclSg0hMFAwVa+pPpVb1Qegh/8XckU4UJBknAOIA==