From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 user_guide/general/reserved_names.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'user_guide/general/reserved_names.html')

diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index 48b6b2a5e..00bebff61 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -61,8 +61,8 @@ Controllers
 <h3>Controller names</h3>
 <p>Since your controller classes will extend the main application controller you
 must be careful not to name your functions identically to the ones used by that class, otherwise your local functions
-will override them. The following
-is a list of reserved names. Do not name your controller any of these:</p>
+will override them.  The following
+is a list of reserved names.  Do not name your controller any of these:</p>
 <ul>
 	<li>Controller</li>
 	<li>CI_Base</li>
-- 
cgit v1.2.3-24-g4f1b