5 files changed, 28 insertions, 24 deletions
diff --git a/doc/appendix/guides/authentication.txt b/doc/appendix/guides/authentication.txt
index dab122f80..68a232f6f 100644
--- a/doc/appendix/guides/authentication.txt
+++ b/doc/appendix/guides/authentication.txt
@@ -62,7 +62,7 @@ How Authentication Works
 
 #. Next, the ip address is verified against the client record. If the
    address doesn't match, then the client must be set to
-   location=floating
+   floating='true'
 
 #. Finally, the password is verified. If the client is set to secure
    mode, the only its per-client password is accepted. If it is not set
diff --git a/doc/appendix/guides/fedora.txt b/doc/appendix/guides/fedora.txt
index f8dea2192..1e49084ef 100644
--- a/doc/appendix/guides/fedora.txt
+++ b/doc/appendix/guides/fedora.txt
@@ -143,18 +143,20 @@ The ``bcfg2.conf`` file contains only standard plugins so far.
 
     [statistics]
     sendmailpath = /usr/lib/sendmail
-    database_engine = sqlite3
+
+    [database]
+    engine = sqlite3
     # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'.
-    database_name =
+    name =
     # Or path to database file if using sqlite3.
     #<repository>/etc/brpt.sqlite is default path if left empty
-    database_user =
+    user =
     # Not used with sqlite3.
-    database_password =
+    password =
     # Not used with sqlite3.
-    database_host =
+    host =
     # Not used with sqlite3.
-    database_port =
+    port =
 
     [communication]
     protocol = xmlrpc/ssl
diff --git a/doc/appendix/guides/nat_howto.txt b/doc/appendix/guides/nat_howto.txt
index 818d3e644..b3492e871 100644
--- a/doc/appendix/guides/nat_howto.txt
+++ b/doc/appendix/guides/nat_howto.txt
@@ -43,14 +43,14 @@ the Client entry in clients.xml will look something like this:
 
 .. code-block:: xml
 
-    <Client profile="desktop" name="test1" pingable="N"
-     uuid='9001ec29-1531-4b16-8198-a71bea093d0a' location='floating'/>
+    <Client profile="desktop" name="test1"
+     uuid='9001ec29-1531-4b16-8198-a71bea093d0a' floating='true'/>
 
 Alternatively, the Client entry can be setup like this:
 
 .. code-block:: xml
 
-    <Client profile="desktop" name="test1" pingable="N"
+    <Client profile="desktop" name="test1"
      uuid='9001ec29-1531-4b16-8198-a71bea093d0a' address='ip-address-of-NAT'/>
 
 The difference between these definitions is explained in detail in the
diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt
index f72247220..5a67d0a37 100644
--- a/doc/appendix/guides/ubuntu.txt
+++ b/doc/appendix/guides/ubuntu.txt
@@ -121,18 +121,20 @@ Replace Pkgmgr with Packages in the plugins line of ``bcfg2.conf``::
 
     [statistics]
     sendmailpath = /usr/lib/sendmail
-    database_engine = sqlite3
+
+    [database]
+    engine = sqlite3
     # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'.
-    database_name =
+    name =
     # Or path to database file if using sqlite3.
     #<repository>/etc/brpt.sqlite is default path if left empty
-    database_user =
+    user =
     # Not used with sqlite3.
-    database_password =
+    password =
     # Not used with sqlite3.
-    database_host =
+    host =
     # Not used with sqlite3.
-    database_port =
+    port =
 
     [communication]
     protocol = xmlrpc/ssl
diff --git a/doc/appendix/guides/web-reports-install.txt b/doc/appendix/guides/web-reports-install.txt
index c03682974..489a7673d 100644
--- a/doc/appendix/guides/web-reports-install.txt
+++ b/doc/appendix/guides/web-reports-install.txt
@@ -52,18 +52,18 @@ then have something like this::
 
     [statistics]
     sendmailpath = /usr/lib/sendmail
-    database_engine = sqlite3
+
+    [database]
+    engine = sqlite3
     # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'.
-    database_name =
-    # Or path to database file if using sqlite3.
-    #<repository>/etc/brpt.sqlite is default path if left empty
-    database_user =
+    name =
+    user =
     # Not used with sqlite3.
-    database_password =
+    password =
     # Not used with sqlite3.
-    database_host =
+    host =
     # Not used with sqlite3.
-    database_port =
+    port =
 
 Restart apache and point a browser to your Bcfg2 server.