diff --git a/doc/_static/.gitignore b/doc/source/_static/.gitignore
similarity index 100%
rename from doc/_static/.gitignore
rename to doc/source/_static/.gitignore
diff --git a/doc/_templates/.gitignore b/doc/source/_templates/.gitignore
similarity index 100%
rename from doc/_templates/.gitignore
rename to doc/source/_templates/.gitignore
diff --git a/doc/source/examples.rst b/doc/source/examples.rst
index d41800e1..19fe95fe 100644
--- a/doc/source/examples.rst
+++ b/doc/source/examples.rst
@@ -14,7 +14,7 @@ configure OpenStack Nova API service.
    of this example.
 
 Step 1: Find an appropriate puppet module
-++++++++++++++++++++++++++++++++++++++++
++++++++++++++++++++++++++++++++++++++++++
 
 The `Puppet OpenStack <https://wiki.openstack.org/wiki/Puppet>`_
 module for `Nova <https://github.com/openstack/puppet-nova>`_
diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst
index 6ca15a82..dd7f64db 100644
--- a/doc/source/glossary.rst
+++ b/doc/source/glossary.rst
@@ -96,8 +96,7 @@ transition and type of event.
 Right now we are supporting 2 types of events:
 
 1. Dependency - inserts edge between 2 changes into the deployment plan.
-2. Reaction - inserts change specified in reaction and makes edge between
-parent and child.
+2. Reaction - inserts change specified in reaction and makes edge between parent and child.
 
 Example ::
 
@@ -138,7 +137,7 @@ After action that is related to change will be executed - it will be moved to
 history with same uuid.
 
 Committed resource data
-----------------------
+-----------------------
 After each successful change committed copy of resource data will be updated
 with diff of that change.
 
diff --git a/doc/source/resource.rst b/doc/source/resource.rst
index 2b4acca4..efc55f1a 100644
--- a/doc/source/resource.rst
+++ b/doc/source/resource.rst
@@ -41,10 +41,8 @@ Solar currently supports following handlers:
 
 * puppet - first version of puppet handler (legacy, will be deprecated soon)
 * puppetv2 - second, improved version of puppet, supporting hiera integration 
-* ansible_playbook - first version of ansible handler (legacy, will be
-deprecated soon)
-* ansible_template - second generation of ansible implementation, includes
-transport support
+* ansible_playbook - first version of ansible handler (legacy, will be deprecated soon)
+* ansible_template - second generation of ansible implementation, includes transport support
 
 Handlers are pluggable, so you can write your own easily to extend
 functionality of Solar. Interesting examples might be Chef, SaltStack,