diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-30 13:26:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-30 13:26:11 +0000 |
| commit | 25199fdebd8803a64a99e675bfda893d5b596852 (patch) | |
| tree | 079b0b59fb383837095644a3adf474a2faed9d8a | |
| parent | bc7d4b8be81d7b504b5c77ad212222f6d9bfea2c (diff) | |
| parent | a2780e0cfcc30eab63cd3b90f4827df5e30616df (diff) | |
| download | oslo-middleware-25199fdebd8803a64a99e675bfda893d5b596852.tar.gz | |
Merge "rearrange content to fit the new standard layout"
| -rw-r--r-- | doc/source/configuration/index.rst (renamed from doc/source/oslo_config.rst) | 2 | ||||
| -rw-r--r-- | doc/source/contributor/index.rst (renamed from doc/source/contributing.rst) | 2 | ||||
| -rw-r--r-- | doc/source/history.rst | 1 | ||||
| -rw-r--r-- | doc/source/index.rst | 12 | ||||
| -rw-r--r-- | doc/source/install/index.rst (renamed from doc/source/installation.rst) | 0 | ||||
| -rw-r--r-- | doc/source/reference/api.rst (renamed from doc/source/api.rst) | 0 | ||||
| -rw-r--r-- | doc/source/reference/cors.rst (renamed from doc/source/cors.rst) | 0 | ||||
| -rw-r--r-- | doc/source/reference/healthcheck_plugins.rst (renamed from doc/source/healthcheck_plugins.rst) | 0 | ||||
| -rw-r--r-- | doc/source/reference/index.rst | 8 | ||||
| -rw-r--r-- | doc/source/user/history.rst | 1 |
10 files changed, 16 insertions, 10 deletions
diff --git a/doc/source/oslo_config.rst b/doc/source/configuration/index.rst index e6134a5..6ca076e 100644 --- a/doc/source/oslo_config.rst +++ b/doc/source/configuration/index.rst @@ -53,5 +53,5 @@ This will override any configuration done via oslo.config .. note:: - healtcheck middleware does not yet use oslo.config, see :doc:`healthcheck_plugins` + healtcheck middleware does not yet use oslo.config, see :doc:`../reference/healthcheck_plugins` diff --git a/doc/source/contributing.rst b/doc/source/contributor/index.rst index 2ca75d1..ed5290b 100644 --- a/doc/source/contributing.rst +++ b/doc/source/contributor/index.rst @@ -2,4 +2,4 @@ Contributing ============== -.. include:: ../../CONTRIBUTING.rst +.. include:: ../../../CONTRIBUTING.rst diff --git a/doc/source/history.rst b/doc/source/history.rst deleted file mode 100644 index 69ed4fe..0000000 --- a/doc/source/history.rst +++ /dev/null @@ -1 +0,0 @@ -.. include:: ../../ChangeLog diff --git a/doc/source/index.rst b/doc/source/index.rst index f53e5bd..4929168 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -6,12 +6,10 @@ Contents .. toctree:: :maxdepth: 2 - installation - api - healthcheck_plugins - cors - oslo_config - contributing + install/index + contributor/index + configuration/index + reference/index Release Notes ============= @@ -19,4 +17,4 @@ Release Notes .. toctree:: :maxdepth: 1 - history + user/history diff --git a/doc/source/installation.rst b/doc/source/install/index.rst index 4fd1d47..4fd1d47 100644 --- a/doc/source/installation.rst +++ b/doc/source/install/index.rst diff --git a/doc/source/api.rst b/doc/source/reference/api.rst index 50ad06d..50ad06d 100644 --- a/doc/source/api.rst +++ b/doc/source/reference/api.rst diff --git a/doc/source/cors.rst b/doc/source/reference/cors.rst index 77bb6ed..77bb6ed 100644 --- a/doc/source/cors.rst +++ b/doc/source/reference/cors.rst diff --git a/doc/source/healthcheck_plugins.rst b/doc/source/reference/healthcheck_plugins.rst index 3ea93c5..3ea93c5 100644 --- a/doc/source/healthcheck_plugins.rst +++ b/doc/source/reference/healthcheck_plugins.rst diff --git a/doc/source/reference/index.rst b/doc/source/reference/index.rst new file mode 100644 index 0000000..5a2d80a --- /dev/null +++ b/doc/source/reference/index.rst @@ -0,0 +1,8 @@ +============================== + oslo.middleware Reference +============================== + +.. toctree:: + :glob: + + * diff --git a/doc/source/user/history.rst b/doc/source/user/history.rst new file mode 100644 index 0000000..f69be70 --- /dev/null +++ b/doc/source/user/history.rst @@ -0,0 +1 @@ +.. include:: ../../../ChangeLog |