Merge pull request #4686 from MGatner/spaces

Spacing issues

public/.htaccess

@@ -19,31 +19,31 @@ Options All -Indexes
 	# Redirect Trailing Slashes...
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteCond %{REQUEST_URI} (.+)/$
-      RewriteRule ^ %1 [L,R=301]
+	RewriteRule ^ %1 [L,R=301]
 
 	# Rewrite "www.example.com -> example.com"
 	RewriteCond %{HTTPS} !=on
 	RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
 	RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
 
 	# Checks to see if the user is attempting to access a valid file,
-    # such as an image or css document, if this isn't true it sends the
-    # request to the front controller, index.php
+	# such as an image or css document, if this isn't true it sends the
+	# request to the front controller, index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^([\s\S]*)$ index.php/$1 [L,NC,QSA]
 
 	# Ensure Authorization header is passed along
-    RewriteCond %{HTTP:Authorization} .
-    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+	RewriteCond %{HTTP:Authorization} .
+	RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 </IfModule>
 
 <IfModule !mod_rewrite.c>
-    # If we don't have mod_rewrite installed, all 404's
-    # can be sent to index.php, and everything works as normal.
-    ErrorDocument 404 index.php
+	# If we don't have mod_rewrite installed, all 404's
+	# can be sent to index.php, and everything works as normal.
+	ErrorDocument 404 index.php
 </IfModule>
 
 # Disable server signature start
-    ServerSignature Off
+	ServerSignature Off
 # Disable server signature end

user_guide_src/source/libraries/uri.rst

@@ -35,7 +35,7 @@ Many times, all you really want is an object representing the current URL of thi
 You can use one of the functions available in the **url_helper**::
 
 	$uri = current_url(true);
-	
+
 You must pass ``true`` as the first parameter, otherwise, it will return the string representation of the current URL.
 This URI is based on the path (relative to your ``baseURL``) as determined by the current request object and
 your settings in ``Config\App`` (baseURL, indexPage, and forceGlobalSecureRequests).