Merge lp:~giuseppeterrasi-deactivatedaccount/serverguide/serverguide-review-12-3 into lp:~ubuntu-core-doc/serverguide/precise

[Giuseppe Terrasi]

Reviewing sub-chapter 12.3:
- istruction/path/url: ok
- specified that memory limit is disable by default (then suggest an example size)

[Peter Matulis (petermatulis)]

Should

(disable by default)

be

(disabled by default)

?

review: Needs Fixing

[lp:~giuseppeterrasi-deactivatedaccount/serverguide/serverguide-review-12-3]

40. By Giuseppe Terrasi on 2012-03-09

typo

[Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount)]

uhg... sorry :-)
fixed :-)

[Doug Smythies (dsmythies)]

This is O.K. and should be approved.

As a side note, please know that both the resulting HTML and PDF have double spaces taken out.

review: Approve

[Peter Matulis (petermatulis)]

Thank you Doug. Dealing with this one now.

=== modified file 'serverguide/C/lamp-applications.xml'
--- serverguide/C/lamp-applications.xml	2012-03-09 12:55:08 +0000
+++ serverguide/C/lamp-applications.xml	2012-03-09 20:16:18 +0000
@@ -277,7 +277,7 @@
       Before installing <application>MediaWiki</application> you should also install 
       <application>Apache2</application>, the <application>PHP5</application> scripting language 
       and Database a Management System.  <application>MySQL</application> or <application>PostgreSQL</application>
-      are the most common, choose one depending on your need.  Please refer to those 
+      are the most common, choose one depending on your need. Please refer to those 
       sections in this manual for installation instructions.
       </para>
 
@@ -341,7 +341,7 @@
 
       <para>
       You may also want to edit <filename>/etc/mediawiki/LocalSettings.php</filename> 
-      adjusting:
+      in order to set the memory limit (disabled by default):
       </para>
 
 <programlisting>