diff --git a/doc/source/deployment_plan.rst b/doc/source/deployment_plan.rst
index b974c262..f8021391 100644
--- a/doc/source/deployment_plan.rst
+++ b/doc/source/deployment_plan.rst
@@ -9,11 +9,10 @@ configured between this changes.
 
 Required information
 ----------------------
-Inputs
-TODO link to the page with inputs
 
-Orchestration
-TODO link to the page with orchestration API details
+* :ref:`resource_input`
+* :ref:`orchestration`
+
 
 Changes
 --------
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 3af14d00..e764c90a 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -113,7 +113,7 @@ If you want to test Solar locally you may install it via pip:
 
   pip install solar
 
-Create solar configuration `solar_config` and paste following data:
+Create solar configuration `solar_config` file and paste following data:
 
 .. code-block:: yaml
 
@@ -121,7 +121,7 @@ Create solar configuration `solar_config` and paste following data:
 
 and set path to this configuration:
 
-.. code-bloc:: bash
+.. code-block:: bash
 
   export SOLAR_CONFIG_OVERRIDE=<full/path/solar_config>
 
diff --git a/doc/source/resource.rst b/doc/source/resource.rst
index a5f2ee48..93eebbf1 100644
--- a/doc/source/resource.rst
+++ b/doc/source/resource.rst
@@ -55,6 +55,9 @@ functionality of Solar. Interesting examples might be Chef, SaltStack,
 CFEngine etc. Using handlers allows Solar to be quickly implemented in various
 environments and integrate with already used configuration management tools.
 
+
+.. _resource_input:
+
 Input
 -----
 Inputs are essentially values that given resource can accept. Exact usage