4 files changed, 13 insertions, 25 deletions
diff --git a/doc/development/cfg.txt b/doc/development/cfg.txt
index 6533e0d7a..a4360559f 100644
--- a/doc/development/cfg.txt
+++ b/doc/development/cfg.txt
@@ -58,7 +58,6 @@ exceptions:
 Global Variables
 ================
 
-.. autodata:: Bcfg2.Server.Plugins.Cfg.SETUP
 .. autodata:: Bcfg2.Server.Plugins.Cfg.CFG
 
 Existing Cfg Handlers
@@ -81,18 +80,11 @@ Creators
 .. autoclass:: Bcfg2.Server.Plugins.Cfg.CfgPrivateKeyCreator.CfgPrivateKeyCreator
 .. autoclass:: Bcfg2.Server.Plugins.Cfg.CfgPublicKeyCreator.CfgPublicKeyCreator
 
-Filters
--------
-
-.. autoclass:: Bcfg2.Server.Plugins.Cfg.CfgCatFilter.CfgCatFilter
-.. autoclass:: Bcfg2.Server.Plugins.Cfg.CfgDiffFilter.CfgDiffFilter
-
 Info Handlers
 -------------
 
 .. autoclass:: Bcfg2.Server.Plugins.Cfg.CfgDefaultInfo
 .. autoclass:: Bcfg2.Server.Plugins.Cfg.CfgInfoXML.CfgInfoXML
-.. autoclass:: Bcfg2.Server.Plugins.Cfg.CfgLegacyInfo.CfgLegacyInfo
 
 Verifiers
 ---------
@@ -105,6 +97,5 @@ Other Cfg Objects
 These other objects comprise the remainder of the Cfg plugin, and are
 included for completeness.
 
-.. autoattribute:: Bcfg2.Server.Plugins.Cfg.DEFAULT_INFO
 .. autoclass:: Bcfg2.Server.Plugins.Cfg.CfgEntrySet
 .. autoclass:: Bcfg2.Server.Plugins.Cfg.Cfg
diff --git a/doc/development/core.txt b/doc/development/core.txt
index 3607533ea..205eb5c59 100644
--- a/doc/development/core.txt
+++ b/doc/development/core.txt
@@ -59,7 +59,7 @@ Builtin Core
 
 The builtin server core consists of the core implementation
 (:class:`Bcfg2.Server.BuiltinCore.Core`) and the XML-RPC server
-implementation (:mod:`Bcfg2.SSLServer`).
+implementation (:mod:`Bcfg2.Server.SSLServer`).
 
 Core
 ~~~~
@@ -69,7 +69,7 @@ Core
 XML-RPC Server
 ~~~~~~~~~~~~~~
 
-.. automodule:: Bcfg2.SSLServer
+.. automodule:: Bcfg2.Server.SSLServer
 
 CherryPy Core
 -------------
diff --git a/doc/development/fam.txt b/doc/development/fam.txt
index c2c3b14f5..e967aaf68 100644
--- a/doc/development/fam.txt
+++ b/doc/development/fam.txt
@@ -56,11 +56,6 @@ Pseudo
 
 .. automodule:: Bcfg2.Server.FileMonitor.Pseudo
 
-Fam
----
-
-.. automodule:: Bcfg2.Server.FileMonitor.Fam
-
 Gamin
 -----
 
diff --git a/doc/development/plugins.txt b/doc/development/plugins.txt
index 593c2f83e..3ca137159 100644
--- a/doc/development/plugins.txt
+++ b/doc/development/plugins.txt
@@ -128,13 +128,15 @@ The two attributes you need to know about are:
   of the caching mode.  See :ref:`server-caching` for a description of
   each mode.
 * :attr:`Bcfg2.Server.Core.metadata_cache`: A dict-like
-  :class:`Bcfg2.Cache.Cache` object that stores the cached data.
+  :class:`Bcfg2.Server.Cache.Cache` object that stores the cached
+  data.
 
 :class:`Bcfg2.Server.Plugin.base.Plugin` objects have access to the
 :class:`Bcfg2.Server.Core` object as ``self.core``.  In general,
-you'll be interested in the :func:`Bcfg2.Cache.Cache.expire` method;
-if called with no arguments, it expires all cached data; if called
-with one string argument, it expires cached data for the named client.
+you'll be interested in the :func:`Bcfg2.Server.Cache.Cache.expire`
+method; if called with no arguments, it expires all cached data; if
+called with one string argument, it expires cached data for the named
+client.
 
 It's important, therefore, that your Connector plugin can either track
 when changes are made to the group membership it reports, and expire
@@ -163,7 +165,7 @@ Tracking Execution Time
 .. versionadded:: 1.3.0
 
 Statistics can and should track execution time statistics using
-:mod:`Bcfg2.Statistics`.  This module tracks execution time for the
+:mod:`Bcfg2.Server.Statistics`.  This module tracks execution time for the
 server core and for plugins, and exposes that data via ``bcfg2-admin
 perf``.  This data can be invaluable for locating bottlenecks or other
 performance issues.
@@ -184,13 +186,13 @@ This will track the execution time of ``do_something``.
 
 More granular usage is possible by using :func:`time.time` to manually
 determine the execution time of a given event and calling
-:func:`Bcfg2.Statistics.Statistics.add_value` with an appropriate
+:func:`Bcfg2.Server.Statistics.Statistics.add_value` with an appropriate
 statistic name.
 
-Bcfg2.Statistics
-^^^^^^^^^^^^^^^^
+Bcfg2.Server.Statistics
+^^^^^^^^^^^^^^^^^^^^^^^
 
-.. automodule:: Bcfg2.Statistics
+.. automodule:: Bcfg2.Server.Statistics
 
 Plugin Helper Classes
 ---------------------