War on sphinx war-nings... BRING IT!

doc/contents.rst

@@ -13,9 +13,11 @@ Full Table of Contents
     topics/tutorials/modules
     topics/tutorials/starting_states
     topics/tutorials/states*
+    topics/tutorials/firewall
     topics/pillar/index
     topics/jobs/index
     topics/troubleshooting/index
+    topics/troubleshooting/yaml_idiosyncrasies
     topics/community
 
     ref/index
@@ -32,6 +34,7 @@ Full Table of Contents
     ref/syndic
     ref/python-api
     ref/file_server/index
+    ref/file_server/dynamic-modules
     ref/configuration/*
 
     ref/cli/index

doc/ref/file_server/file_roots.rst

@@ -6,10 +6,10 @@ The Salt file server is a high performance file server written in ZeroMQ. It
 manages large files quickly and with little overhead, and has been optimized
 to handle small files in an extremely efficient manner.
 
-The Salt file server is an environment aware file server, this means that
+The Salt file server is an environment aware file server. This means that
 files can be allocated within many root directories and accessed by
 specifying both the file path and the environment to search. The
-individual environments can also be spanned across multiple directory roots
+individual environments can span across multiple directory roots
 to crate overlays and to allow for files to be organized in many flexible
 ways.
 
@@ -17,21 +17,21 @@ Environments
 ============
 
 The Salt file server defaults to the mandatory ``base`` environment. This
-environment MUST be defined and is used to download files when no
+environment **MUST** be defined and is used to download files when no
 environment is specified.
 
 Environments allow for files and sls data to be logically separated, but
 environments are not isolated from each other. This allows for logical
 isolation of environments by the engineer using Salt, but also allows
-for information to be used in multiple environments for maximum flexibility.
+for information to be used in multiple environments.
 
 
 Directory Overlay
 =================
 
-The environment setting is a list of directories to publish files from. These
-directories are searched in order to find the specified file and the first file
-found is returned.
+The ``environment`` setting is a list of directories to publish files from.
+These directories are searched in order to find the specified file and the
+first file found is returned.
 
 This means that directory data is prioritized based on the order in which they
 are listed. In the case of this ``file_roots`` configuration:
@@ -43,10 +43,10 @@ are listed. In the case of this ``file_roots`` configuration:
         - /srv/salt/base
         - /srv/salt/failover
 
-If a file uri os salt://httpd/httpd.conf will first search for the file at
-/srv/salt/base/httpd/httpd.conf, if the file is found there it will be
-returned, if the file is not found there, then
-/srv/salt/failover/httpd/httpd.conf is searched for the file.
+If a file's uri is ``salt://httpd/httpd.conf``, it will first search for the
+file at ``/srv/salt/base/httpd/httpd.conf``. If the file is found there it
+will be returned. If the file is not found there, then
+``/srv/salt/failover/httpd/httpd.conf`` will be used for the source.
 
 This allows for directories to be overlaid and prioritized based on the order
 they are defined in the configuration.
@@ -54,6 +54,9 @@ they are defined in the configuration.
 Local File Server
 =================
 
+.. versionadded:: 0.9.7
+
+
 The file server can be rerouted to run from the minion. This is primarily to
 enable running salt states without a salt master. To use the local file server
 interface, copy the file server data to the minion and set the file_roots

doc/topics/installation/index.rst

@@ -35,7 +35,7 @@ Optional Dependencies
 .. _`Jinja2`: http://jinja.pocoo.org/
 
 Platform-specific installation instructions
-------------------------------------------
+-------------------------------------------
 
 .. toctree::
     :maxdepth: 1