From e86ee74a72f7deb8f75e0ede68bba7ba520c7298 Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Wed, 12 Jul 2017 22:45:21 +0800 Subject: [PATCH] Fix URLs according to document migration Change-Id: I5e452dfc33c4bdf8f344f6e28ff1fd4a5e049476 --- HACKING.rst | 2 +- README.rst | 2 +- doc/source/user/examples/usage.py | 2 +- doc/source/user/examples/usage_simple.py | 2 +- doc/source/user/usage.rst | 8 ++++---- oslo_context/context.py | 2 +- setup.cfg | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 5c3da69..2a183d0 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,4 +1,4 @@ oslo.context Style Commandments =============================== -Read the OpenStack Style Commandments https://docs.openstack.org/developer/hacking/ +Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/ diff --git a/README.rst b/README.rst index 5bfb284..7590a6f 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ about a request context. The request context is usually populated in the WSGI pipeline and used by various modules such as logging. * License: Apache License, Version 2.0 -* Documentation: https://docs.openstack.org/developer/oslo.context +* Documentation: https://docs.openstack.org/oslo.context/latest/ * Source: https://git.openstack.org/cgit/openstack/oslo.context * Bugs: https://bugs.launchpad.net/oslo.context diff --git a/doc/source/user/examples/usage.py b/doc/source/user/examples/usage.py index aa5318f..51ff4e2 100644 --- a/doc/source/user/examples/usage.py +++ b/doc/source/user/examples/usage.py @@ -22,7 +22,7 @@ $ pip install oslo.context oslo.log More information can be found at: - https://docs.openstack.org/developer/oslo.context/usage.html + https://docs.openstack.org/oslo.context/latest/user/usage.html """ from oslo_config import cfg diff --git a/doc/source/user/examples/usage_simple.py b/doc/source/user/examples/usage_simple.py index 3c247f8..59eafdd 100644 --- a/doc/source/user/examples/usage_simple.py +++ b/doc/source/user/examples/usage_simple.py @@ -22,7 +22,7 @@ $ pip install oslo.context oslo.log More information can be found at: - https://docs.openstack.org/developer/oslo.context/usage.html + https://docs.openstack.org/oslo.context/latest/user/usage.html """ from oslo_config import cfg diff --git a/doc/source/user/usage.rst b/doc/source/user/usage.rst index 6f4dafa..cc77d90 100644 --- a/doc/source/user/usage.rst +++ b/doc/source/user/usage.rst @@ -9,7 +9,7 @@ object. This code example demonstrates two INFO log records with varying output format due to the use of RequestContext. -.. _oslo.log: https://docs.openstack.org/developer/oslo.log/ +.. _oslo.log: https://docs.openstack.org/oslo.log/latest/ .. highlight:: python .. literalinclude:: examples/usage_simple.py @@ -31,9 +31,9 @@ The format of these log records are defined by the configuration options respectively. The `logging_user_identity_format`_ option also provides further context aware definition flexibility. -.. _logging_default_format_string: https://docs.openstack.org/developer/oslo.log/opts.html#logging_default_format_string -.. _logging_context_format_string: https://docs.openstack.org/developer/oslo.log/opts.html#logging_context_format_string -.. _logging_user_identity_format: https://docs.openstack.org/developer/oslo.log/opts.html#logging_user_identity_format +.. _logging_default_format_string: https://docs.openstack.org/oslo.log/latest/configuration/index.html#DEFAULT.logging_default_format_string +.. _logging_context_format_string: https://docs.openstack.org/oslo.log/latest/configuration/index.html#DEFAULT.logging_context_format_string +.. _logging_user_identity_format: https://docs.openstack.org/oslo.log/latest/configuration/index.html#DEFAULT.logging_user_identity_format ----------------- Context Variables diff --git a/oslo_context/context.py b/oslo_context/context.py index 5f290b9..555ac3e 100644 --- a/oslo_context/context.py +++ b/oslo_context/context.py @@ -393,7 +393,7 @@ class RequestContext(object): """ # Load a new context object from the environment variables set by # auth_token middleware. See: - # https://docs.openstack.org/developer/keystonemiddleware/api/keystonemiddleware.auth_token.html#what-auth-token-adds-to-the-request-for-use-by-the-openstack-service + # https://docs.openstack.org/keystonemiddleware/latest/api/keystonemiddleware.auth_token.html#what-auth-token-adds-to-the-request-for-use-by-the-openstack-service # add kwarg if not specified by user from a list of possible headers for k, v_list in _ENVIRON_HEADERS.items(): diff --git a/setup.cfg b/setup.cfg index ab199af..6d81485 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description-file = README.rst author = OpenStack author-email = openstack-dev@lists.openstack.org -home-page = https://docs.openstack.org/developer/oslo.context +home-page = https://docs.openstack.org/oslo.context/latest/ classifier = Environment :: OpenStack Intended Audience :: Information Technology