diff --git a/ChangeLog b/ChangeLog
index 35fe23eb2..598e85441 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   limitations and you still should set it in config file
 + [auth] cookie authentication is now default
 + [auth] do not allow root user without password unless explicitly enabled by
-  AllowEmptyRoot
+  AllowNoPasswordRoot
 + rfe #1778908 [auth] arbitrary server auth can now also accept port
 - patch #2089240 [export] handle correctly switching SQL modes
 + rfe #1612724 [export] add option to export without comments
diff --git a/Documentation.html b/Documentation.html
index 9be7f2ceb..fac231910 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1030,12 +1030,13 @@ ALTER TABLE `pma_column_comments`
         up to date.</dd>
     <dt><span id="cfg_Servers_AllowRoot">$cfg['Servers'][$i]['AllowRoot']</span>
         boolean</dt>
-    <dd>Whether to allow root access. This is just simplification of rules below.
+    <dd>Whether to allow root access. This is just a shortcut for the AllowDeny rules below.
     </dd>
-    <dt><span id="cfg_Servers_AllowNoPasswordRoot">$cfg['Servers'][$i]['AllowNoPassowdRoot']</span>
+    <dt><span id="cfg_Servers_AllowNoPasswordRoot">$cfg['Servers'][$i]['AllowNoPasswordRoot']</span>
         boolean</dt>
-    <dd>Whether to allow acces to root user without password. This is to 
-        protect against access to not configured MySQL server.
+	<dd>Whether to allow access to root user without password. The default
+	value of <tt>false</tt> for this parameter prevents unintended access 
+	to a MySQL server with was left with an empty password for root.
     </dd>
     <dt id="servers_allowdeny_order">
         <span id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span> string