diff --git a/HACKING.rst b/HACKING.rst
index 7134811b..3fb9088d 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,5 +1,5 @@
monasca-log-api Style Commandments
==================================
-- Step 1: Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
+- Step 1: Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
- Step 2: Read on
diff --git a/README.rst b/README.rst
index 10b667dc..91004612 100644
--- a/README.rst
+++ b/README.rst
@@ -43,7 +43,7 @@ in the HACKING.rst file, and pass all unit tests as well as linters.
Further developer focused documentation is available at:
-* `Openstack Monasca-Log-Api `_
+* `Openstack Monasca-Log-Api `_
Operators
---------
diff --git a/api-guide/source/index.rst b/api-guide/source/index.rst
index 1de38b1a..97f33f3a 100644
--- a/api-guide/source/index.rst
+++ b/api-guide/source/index.rst
@@ -23,7 +23,7 @@ cloud.
This guide covers the concepts in the Monasca Log API.
For a full reference listing, please see:
-`Monasca Log API Reference `__.
+`Monasca Log API Reference `__.
We welcome feedback, comments, and bug reports at
`storyboard/monasca `__.
diff --git a/devstack/README.md b/devstack/README.md
index 452c4938..34738a9c 100644
--- a/devstack/README.md
+++ b/devstack/README.md
@@ -8,7 +8,7 @@ Running the Monasca DevStack plugin and Monasca Log Management Devstack plugin r
Directions for installing and running Devstack can be found here:
```
-http://docs.openstack.org/developer/devstack/
+https://docs.openstack.org/devstack/latest/
```
To run Monasca Log Management in DevStack, do the following three steps.
diff --git a/doc/source/deprecation_note.inc b/doc/source/deprecation_note.inc
index 191950fe..e7c0ca9c 100644
--- a/doc/source/deprecation_note.inc
+++ b/doc/source/deprecation_note.inc
@@ -1,6 +1,6 @@
.. note:: The Log API v2 has been DEPRECATED in the Mitaka release. The
migration path is to use the `Log API v2
- `_ instead of version 2
+ `_ instead of version 2
of the API. The Log API v1 will ultimately be removed, following the
`OpenStack standard deprecation policy
`_.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index ffd2972b..9f060eaf 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -31,7 +31,7 @@ any specific prior release.
general documentation including API, install, operator and user
guides see `docs.openstack.org`_
-.. _`docs.openstack.org`: http://docs.openstack.org
+.. _`docs.openstack.org`: https://docs.openstack.org
.. toctree::
:maxdepth: 2
diff --git a/monasca_log_api_tempest/README.md b/monasca_log_api_tempest/README.md
index 657a9794..3674c0b0 100644
--- a/monasca_log_api_tempest/README.md
+++ b/monasca_log_api_tempest/README.md
@@ -130,13 +130,13 @@ Tempest root dir.
```
See the [OpenStack Tempest Plugin
-Interface](http://docs.openstack.org/developer/tempest/plugin.html), for more
+Interface](https://docs.openstack.org/tempest/latest/plugin.html), for more
details on Tempest Plugins and the plugin registration process.
# Running the Monasca Log Api Tempest
The Monasca Tempest Tests can be run using a variety of methods including:
1. [Testr](https://wiki.openstack.org/wiki/Testr)
-2. [Os-testr](http://docs.openstack.org/developer/os-testr/)
+2. [Os-testr](https://docs.openstack.org/os-testr/latest/)
3. [PyCharm](https://www.jetbrains.com/pycharm/)
4. Tempest Scripts in Devstack
@@ -159,7 +159,7 @@ The Monasca Tempest Tests can be run using a variety of methods including:
You can also use testr to create a list of specific tests for your needs.
## Run the tests from the CLI using os-testr (no file necessary)
-[Os-testr](http://docs.openstack.org/developer/os-testr/) is a test wrapper
+[Os-testr](https://docs.openstack.org/os-testr/latest/) is a test wrapper
that can be used to run the Monasca Tempest tests.
1. In the Tempest root dir:
@@ -196,9 +196,9 @@ Assuming that you have already created a PyCharm project for the
# References
This section provides a few additional references that might be useful:
-* [Tempest - The OpenStack Integration Test Suite](http://docs.openstack.org/developer/tempest/overview.html#quickstart)
+* [Tempest - The OpenStack Integration Test Suite](https://docs.openstack.org/tempest/latest/overview.html#quickstart)
* [Tempest Configuration Guide](https://github.com/openstack/tempest/blob/master/doc/source/configuration.rst#id1)
-* [OpenStack Tempest Plugin Interface](http://docs.openstack.org/developer/tempest/plugin.html)
+* [OpenStack Tempest Plugin Interface](https://docs.openstack.org/tempest/latest/plugin.html)
In addition to the above references, another source of information is the following OpenStack projects:
* [Manila Tempest Tests](https://github.com/openstack/manila/tree/master/manila_tempest_tests)