From dd82e8f28b2a86a14e5479226ada44a10a9453da Mon Sep 17 00:00:00 2001 From: junboli Date: Mon, 28 Aug 2017 16:01:36 +0800 Subject: [PATCH] doc migration: update the doc link address Update the doc link brought by the doc migration. Change-Id: I6000856c22dbc47a1349d061927a47405ba0d66c --- api-ref/source/share-networks.inc | 3 ++- api-ref/source/share-types.inc | 4 ++-- doc/source/admin/shared-file-systems-crud-share.rst | 8 ++++---- doc/source/admin/shared-file-systems-network-plugins.rst | 3 ++- doc/source/admin/shared-file-systems-scheduling.rst | 3 ++- doc/source/admin/shared-file-systems-share-types.rst | 2 +- doc/source/contributor/development.environment.rst | 4 ++-- doc/source/contributor/driver_requirements.rst | 7 +++---- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/api-ref/source/share-networks.inc b/api-ref/source/share-networks.inc index 86e666b8a1..d5811cebc7 100644 --- a/api-ref/source/share-networks.inc +++ b/api-ref/source/share-networks.inc @@ -19,7 +19,8 @@ neutron network and subnetwork: For more information about supported plug-ins for share networks, -see `Manila Network Plugins `_. +see `Manila Network Plugins `_. A share network has these attributes: diff --git a/api-ref/source/share-types.inc b/api-ref/source/share-types.inc index 3979584dd8..d523620fc3 100644 --- a/api-ref/source/share-types.inc +++ b/api-ref/source/share-types.inc @@ -74,7 +74,7 @@ The scheduler uses the special ``capabilities`` prefix for filtering. The scheduler can only create a share on a back end that reports capabilities that match the un-scoped extra-spec keys for the share type. For details, see `Capabilities and Extra-Specs -`_. Each driver implementation determines which extra specification @@ -288,7 +288,7 @@ Sets an extra specification for the share type. Each driver implementation determines which extra specification keys it uses. For details, see `Capabilities and Extra-Specs -`_ and documentation for your driver. Normal response codes: 200 diff --git a/doc/source/admin/shared-file-systems-crud-share.rst b/doc/source/admin/shared-file-systems-crud-share.rst index 1483cbcc2c..3452066b04 100644 --- a/doc/source/admin/shared-file-systems-crud-share.rst +++ b/doc/source/admin/shared-file-systems-crud-share.rst @@ -232,9 +232,9 @@ To create a file share in share servers mode, you need to: filtering the extra specifications of the share type. * The share driver will create a share server with the share network. For - details of creating the resources, see the `documentation `_ of the - specific share driver. + details of creating the resources, see the `documentation `_ of the specific + share driver. #. After the share becomes available, use the :command:`manila show` command to get the share export location. @@ -740,7 +740,7 @@ Allow access to the share with ``user`` access type: For the example, the Generic driver with the Block Storage service as a back-end doesn't support ``user`` and ``cert`` authentications methods. For details of supporting of features by different drivers, see `Manila share - features support mapping `_. To verify that the access rules (ACL) were configured correctly for a share, diff --git a/doc/source/admin/shared-file-systems-network-plugins.rst b/doc/source/admin/shared-file-systems-network-plugins.rst index fa644be7e5..5c3394bc02 100644 --- a/doc/source/admin/shared-file-systems-network-plugins.rst +++ b/doc/source/admin/shared-file-systems-network-plugins.rst @@ -85,4 +85,5 @@ Shared File Systems service: share driver to support the network type for which the network plug-in is configured. -More information about network plug-ins can be found in `Manila developer documentation `_ +More information about network plug-ins can be found in `Manila developer documentation +`_ diff --git a/doc/source/admin/shared-file-systems-scheduling.rst b/doc/source/admin/shared-file-systems-scheduling.rst index a970733893..301c1f2e9e 100644 --- a/doc/source/admin/shared-file-systems-scheduling.rst +++ b/doc/source/admin/shared-file-systems-scheduling.rst @@ -15,7 +15,8 @@ A share type is a list from key-value pairs called extra-specs. The scheduler uses required and un-scoped extra-specs to look up the shared service most suitable for a new share with the specified share type. For more information about extra-specs and their type, see `Capabilities -and Extra-Specs `_ section in developer documentation. +and Extra-Specs `_ section in developer documentation. The general scheduler workflow: diff --git a/doc/source/admin/shared-file-systems-share-types.rst b/doc/source/admin/shared-file-systems-share-types.rst index fa260b6ef7..dd421d63d8 100644 --- a/doc/source/admin/shared-file-systems-share-types.rst +++ b/doc/source/admin/shared-file-systems-share-types.rst @@ -59,7 +59,7 @@ for the following purposes: The scheduler uses the special capabilities prefix for filtering. The scheduler can only create a share on a back end that reports capabilities matching the un-scoped extra-spec keys for the share type. For details, see `Capabilities -and Extra-Specs `_. Each driver implementation determines which extra specification keys it uses. diff --git a/doc/source/contributor/development.environment.rst b/doc/source/contributor/development.environment.rst index d0371735b0..c3dfec6fb5 100644 --- a/doc/source/contributor/development.environment.rst +++ b/doc/source/contributor/development.environment.rst @@ -33,7 +33,7 @@ complete OpenStack development environments). You can check out `Setting up a development environment with devstack`_ for instructions on how to enable manila on devstack. -.. _Setting up a development environment with devstack: https://docs.openstack.org/manila/latest/devref/development-environment-devstack.html +.. _Setting up a development environment with devstack: https://docs.openstack.org/manila/latest/contributor/development-environment-devstack.html Virtual environments -------------------- @@ -172,4 +172,4 @@ into trunk unless you are listed in the Authors file. Manila uses the Gerrit code review system. For information on how to submit your branch to Gerrit, see GerritWorkflow_. -.. _GerritWorkflow: http://docs.openstack.org/infra/manual/developers.html#development-workflow +.. _GerritWorkflow: https://docs.openstack.org/infra/manual/developers.html#development-workflow diff --git a/doc/source/contributor/driver_requirements.rst b/doc/source/contributor/driver_requirements.rst index 8120e0bffd..dc914c4e7a 100644 --- a/doc/source/contributor/driver_requirements.rst +++ b/doc/source/contributor/driver_requirements.rst @@ -102,7 +102,7 @@ function correctly in manila, such as: - replication_type: string specifying the type of replication supported by the driver. Can be one of ('readable', 'writable' or 'dr'). -.. note:: for more information please see https://docs.openstack.org/manila/latest/devref/capabilities_and_extra_specs.html +.. note:: for more information please see https://docs.openstack.org/manila/latest/contributor/capabilities_and_extra_specs.html Continuous Integration systems ------------------------------ @@ -136,8 +136,7 @@ openstack-manuals, containing instructions on how to properly install and configure. The intended audience for this manual is cloud operators and administrators. Also, driver maintainers must update the manila share features support mapping documentation found at -https://docs.openstack.org/manila/latest/devref/share_back_ends_feature_support_mapping.html - +https://docs.openstack.org/manila/latest/contributor/share_back_ends_feature_support_mapping.html Manila optional requirements and features since Mitaka ====================================================== @@ -215,7 +214,7 @@ report the ``replication_type`` they support as a capability and implement necessary methods. More details can be found at: -https://docs.openstack.org/manila/latest/devref/share_replication.html +https://docs.openstack.org/manila/latest/contributor/share_replication.html Update "used_size" of shares ----------------------------