7 files changed, 3 insertions, 74 deletions
diff --git a/doc/server/admin/bundle.txt b/doc/server/admin/bundle.txt
deleted file mode 100644
index e9cb79781..000000000
--- a/doc/server/admin/bundle.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-.. -*- mode: rst -*-
-
-.. _server-admin-bundle:
-
-bundle
-======
-
-For a list of all available xml bundles use ``list-xml``. ``list-genshi``
-will list all available genshi bundles.::
-
-.. code-block:: sh
-
-    # bcfg2-admin bundles list-xml
-    # bcfg2-admin bundles list-genshi
-
-``show`` provides an interactive dialog to get details about the available
-bundles.::
-
-.. code-block:: sh
-
-    # bcfg2-admin bundles show
-    Available bundles (Number of bundles: 4)
-    ----------------------------------------
-    [0]	motd.xml
-    [1]	snmpd.xml
-    [2]	bcfg2.xml
-    [3]	ntp.xml
-    Enter the line number of a bundle for details: 3
-    Details for the "ntp" bundle:
-    Package:	xntp
-    Path:		/etc/sysconfig/xntp
-    Path:		/etc/sysconfig/clock
-    Path:		/etc/ntp.conf
-    Service:	xntpd
diff --git a/doc/server/admin/compare.txt b/doc/server/admin/compare.txt
index 6a770055e..ffe19efdf 100644
--- a/doc/server/admin/compare.txt
+++ b/doc/server/admin/compare.txt
@@ -6,11 +6,10 @@ compare
 =======
 
 Determine differences between files or directories of client
-specification instances.::
+specification instances::
 
     bcfg2-admin compare <file1> <file2>
 
-If you want to compare two directories recursively then use ``-r`` as an
-option. ::
+Or::
 
-    bcfg2-admin compare -r <dir1> <dir2>
+    bcfg2-admin compare <dir1> <dir2>
diff --git a/doc/server/admin/index.txt b/doc/server/admin/index.txt
index ee03cedda..707f7c724 100644
--- a/doc/server/admin/index.txt
+++ b/doc/server/admin/index.txt
@@ -16,15 +16,11 @@ functionality. Available modes are listed below.
    :maxdepth: 1
 
    backup
-   bundle
    client
    compare
    init
    minestruct
    perf
    pull
-   query
-   snapshots
-   tidy
    viz
    xcmd
diff --git a/doc/server/admin/init.txt b/doc/server/admin/init.txt
index 0e8b3afd3..db42c8222 100644
--- a/doc/server/admin/init.txt
+++ b/doc/server/admin/init.txt
@@ -36,7 +36,6 @@ detected or a default value is provided. ::
 A toplevel repository structure was created under the provided path. ::
 
     /var/lib/bcfg2
-    |-- Base
     |-- Bundler
     |-- Cfg
     |-- etc
diff --git a/doc/server/admin/query.txt b/doc/server/admin/query.txt
deleted file mode 100644
index 65851a43d..000000000
--- a/doc/server/admin/query.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-.. -*- mode: rst -*-
-
-.. _server-admin-query:
-
-query
-=====
-
-Query clients.
-
-The default result format is suitable for consumption by `pdsh`_.
-This example queries the server for all clients in the *ubuntu* group::
-
-    bcfg2-admin query g=ubuntu
-
-.. _pdsh: http://sourceforge.net/projects/pdsh/
diff --git a/doc/server/admin/snapshots.txt b/doc/server/admin/snapshots.txt
deleted file mode 100644
index 25a7286c2..000000000
--- a/doc/server/admin/snapshots.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-.. -*- mode: rst -*-
-
-.. _server-admin-snapshots:
-
-snapshots
-=========
-
-Interact with the Snapshots system.
diff --git a/doc/server/admin/tidy.txt b/doc/server/admin/tidy.txt
deleted file mode 100644
index 816d6cdb3..000000000
--- a/doc/server/admin/tidy.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-.. -*- mode: rst -*-
-
-.. _server-admin-tidy:
-
-tidy
-====
-
-Clean up useless files in the repo.