diff --git a/README.rst b/README.rst
index 52a132cd2..2f3bc086a 100644
--- a/README.rst
+++ b/README.rst
@@ -9,15 +9,15 @@ Test Big Cloud Operations
 Tobiko is a project used to write system tests for OpenStack. Main projects
 goals are:
 
-- Provide a Python framewor to write system scenario test cases
-- Provide CLI tools to implement a workflow designed to test potentially
+- provide a Python framework to write system scenario test cases;
+- provide CLI tools to implement a workflow designed to test potentially
   destructive operations.
 
 Links
 ~~~~~
 
+* Documentation: `Tobiko Documentation <https://docs.openstack.org/tobiko/latest/>`__
+* Usage: `Tobiko User Guide <https://docs.openstack.org/tobiko/latest/user/>`__
+* Bugs: `Tobiko StoryBoard <https://storyboard.openstack.org/#!/project/x/tobiko>`__
+* Source Code: https://opendev.org/x/tobiko.git
 * License: `Apache License v2.0 <https://opendev.org/x/tobiko/src/branch/master/LICENSE>`__
-* Documentation: `Tobiko Documentation <https://docs.openstack.org/>`__
-* Source: https://opendev.org/x/tobiko.git
-* Bugs: `StoryBoard <https://storyboard.openstack.org/#!/project/x/tobiko>`__
-* Usage: `Quick Start Guide <https://opendev.org/x/tobiko/src/branch/master/doc/source/user/index.rst>`__
diff --git a/doc/source/index.rst b/doc/source/index.rst
index dd8da1e43..b1247a9ab 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -8,18 +8,18 @@ Test Big Cloud Operations
 Tobiko is a project used to write system tests for OpenStack. Main projects
 goals are:
 
-- Provide a Python framework to write system scenario test cases
-- Provide CLI tools to implement a workflow designed to test potentially
+- provide a Python framework to write system scenario test cases;
+- provide CLI tools to implement a workflow designed to test potentially
   destructive operations.
 
 Links
 ~~~~~
 
+* Documentation: `Tobiko Documentation <https://docs.openstack.org/tobiko/latest/>`__
+* Usage: `Tobiko User Guide <https://docs.openstack.org/tobiko/latest/user/>`__
+* Bugs: `Tobiko StoryBoard <https://storyboard.openstack.org/#!/project/x/tobiko>`__
+* Source Code: https://opendev.org/x/tobiko.git
 * License: `Apache License v2.0 <https://opendev.org/x/tobiko/src/branch/master/LICENSE>`__
-* Documentation: `Tobiko Documentation <https://docs.openstack.org/>`__
-* Source: https://opendev.org/x/tobiko.git
-* Bugs: `StoryBoard <https://storyboard.openstack.org/#!/project/x/tobiko>`__
-* Usage: `Quick Start Guide <https://opendev.org/x/tobiko/src/branch/master/doc/source/user/index.rst>`__
 
 
 Document Overview