# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrew@andrew-laptop-20100705080429-v86j50b7f28t86zt
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/ubuntu-docs/maverick/
# testament_sha1: 0edfd2740d3c0512ee248c3a07f80d3266c75987
# timestamp: 2010-07-05 03:15:04 -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>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbl68sUAAYrfgAQQUOf/934E
AAC////wUAN0zKq3oR7m9wyRAm0mmBJs0mmmRHpojE009QCSiaaGJpGUzKZA9QaaA0AAJImhGk02
qMUb1Q/VAMjCGQ00aDJFPU9J6mg8o09Ro00AAAAAkomp5NTEynptJNPTU9QHpAAaBo3TkR4XfBo1
0BO+QDilsKGvim7oOnusYMZ6eKm54y0NVyUrOJzLdV5cHb9fl6/ajQwQLCDa6rrTwo8TjWmIUgOg
NNkqBdbdA+gPILxTPVFYT55V5C4HDdStgCzRFBVpvyoLLolLmkIms2EZlIZidlTXTYYml2ixonh0
qCm5YlZgYsGEhMTlx7M1lR1L3VEfPA1NvltQufF9VLp8IOHY4mhPM1Ivjeo8RhqyWve1OxzvJ55R
vzWNqihYEMSsbovyiOWULvkTRV6SdQMwKFbsHFZKh0F7TV6FF6H3sSIcxu7QsYNSYvKZTnLtw2YF
JIlGY1sUtofYpXMYrE+qOpR6KqKsCLSiGS/ivPet1osCOMRlNSuKGE4q1ZdO85iWizsZMn25VFtj
TW1lmIwLLUmyK4KyD6v0WYpUQnyV2CeMFxQH4OcdN5KdjavKLU3ZRJGcPFGpZyHTUaCoUq0N6CVr
Zwxat/e6wmcDB8MQIM193I9MayMclh1QE2ye8sruouIF9Tw314WMHcEthyjJcLs7SKXW1GEA71vW
Gs0Cl5BUCkO5yzoRcBRFvrMN7lUHWx9kapDzA1OzPIBJa+fXKGYxGkQGVjjxYFmoONQku3CZdFm0
clxOe9XJWXbG/ZQkioXgI8DGt6NN9uPZsqP0wR8Ep8KDdQ2FDzzXgnRldYGx6FDVa6IiQIDxXITx
EQvFVoEIXry4MC0G3+KGughlZH4W41gy0n6qlg4jJMoz4pmiRchprrDjS/9vsdaEViHNNydwpHOr
QepBAIzzBn7MkltDJYWelK0+IWLcoaAu0jclkp0PB56qDlawxe4Nf9MCVsCBUIVDVIYheQo0uFD4
ARASy0DAtRY0lHOGK885LPKri5aN9iW+Rxdk5uiy7W4LhV0uq4+CdlqsXC7h98SL4It69D0pLUr7
clue+cT6XdMtzyUL5s9VS2NKdoMnVdAQiQRgOYUseeAnOyNVQ3EnlIxYWadcyhN30mpK0Jq1j2LB
iJIh7hfsxRC7mzEwNiUoIgFaEv5oiSNHYsAacpcaRHVML5kWD/F3JFOFCQuXryxQ