merge from master

Frug · Jan 10, 2014 · f050bf5 · f050bf5
1 parent ea5ad78
commit f050bf5
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/chat/readme.html b/chat/readme.html
@@ -95,26 +95,21 @@ <h2 id="requirements">Requirements</h2>
 <h2 id="installation">Installation</h2>
 <div class="subsection">
 	<p>Download your preferred version of AJAX Chat and unzip the file on your computer.<br /></p>
-	<h3>Before You Begin</h3>
-	<div class="subsection">
-      <p>In order to edit PHP files you will need a good text editor. <strong>You should not use Windows notepad, wordpad, or Microsoft Word to edit PHP files.</strong> These programs will add something called a byte-order-mark (BOM) to the files and this may prevent chat from functioning properly. We recommend using Notepad ++ ( <a href="http://notepad-plus.sourceforge.net">http://notepad-plus.sourceforge.net</a> ) for editing all files. It also has the benefit of color-coding your files so you can edit them more easily.<br>
-        If you get an error message like &quot;<strong>Cannot modify header information - headers already sent</strong>&quot; it is likely because you have used one of the above programs to edit files.</p>
+    <h3>Before You Begin</h3>
+    <div class="subsection">
+		<p>
+			In order to edit PHP files you will need a good text editor. <strong>You should not use Windows notepad, wordpad, or Microsoft Word to edit PHP files.</strong> These programs will add something called a byte-order-mark (BOM) to the files and this may prevent chat from functioning properly. 
 			We recommend using Notepad ++ ( <a href="http://notepad-plus-plus.org/">http://notepad-plus-plus.org</a> ) for editing all files. It also has the benefit of color-coding your files so you can edit them more easily.<br>
 			If you get an error message like &quot;<strong>Cannot modify header information - headers already sent</strong>&quot; it is likely because you have used one of the above programs to edit files.
 		</p>
-	</div>
+    </div>
 
 	<h3>Upload to Server</h3>
-
-
 	<div class="subsection">
-		The first and most important thing you need to do is tell AJAX Chat how to connect to your database. This, and all core settings must be located inside the file <span class="filename">lib/config.php</span>. <br>
-	  <p>
-		Upload the chat folder to your server into your PunBB forum directory:<br />
-		e.g. http://example.org/punbb/chat/</p>
-
-
-
+		<p>
+			Upload the chat folder to your server into your PunBB forum directory:<br>
+			e.g. http://example.org/punbb/chat/
+		</p>
 	</div>
 
 	<h3>Create Database Tables</h3>