From b88dd6d17ba88c9ca972f1a7f1076c7e4df7f613 Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Mon, 23 Nov 2015 18:59:11 +0900 Subject: [PATCH] Update the links to Image Guide Change-Id: Icf6d35f6f9b7b5d96955d41f643ef17c9bf9eb35 Implements: blueprint image-guide-rst Depends-On: I694301758f7f85290d4c9f9b01fbd1924b02b476 --- doc/admin-guide-cloud/source/compute-images-instances.rst | 2 +- doc/common-rst/app_support.rst | 2 +- doc/common-rst/cli_manage_images.rst | 2 +- doc/common/app_support.xml | 2 +- .../compute/section_hypervisor_xen_libvirt.xml | 4 ++-- doc/contributor-guide/source/content-specs.rst | 2 +- doc/contributor-guide/source/docs-builds.rst | 2 +- doc/image-guide/source/conf.py | 6 +++--- doc/install-guide/source/glance-verify.rst | 4 ++-- doc/user-guide-admin/source/dashboard_manage_images.rst | 2 +- .../source/cli_nova_launch_instance_using_ISO_image.rst | 2 +- doc/user-guide/source/dashboard_launch_instances.rst | 2 +- doc/user-guide/source/dashboard_manage_images.rst | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/admin-guide-cloud/source/compute-images-instances.rst b/doc/admin-guide-cloud/source/compute-images-instances.rst index 94b790a499..7903352260 100644 --- a/doc/admin-guide-cloud/source/compute-images-instances.rst +++ b/doc/admin-guide-cloud/source/compute-images-instances.rst @@ -25,7 +25,7 @@ flavors that you can edit or add to. - For more information about creating and troubleshooting images, see the `OpenStack Virtual Machine Image - Guide `__. + Guide `__. - For more information about image configuration options, see the `Image diff --git a/doc/common-rst/app_support.rst b/doc/common-rst/app_support.rst index 872aa5e33e..258c6f4963 100644 --- a/doc/common-rst/app_support.rst +++ b/doc/common-rst/app_support.rst @@ -55,7 +55,7 @@ The following books explain how to configure and run an OpenStack cloud: - `Security Guide `__ - `Virtual Machine Image - Guide `__ + Guide `__ The following books explain how to use the OpenStack dashboard and command-line clients: diff --git a/doc/common-rst/cli_manage_images.rst b/doc/common-rst/cli_manage_images.rst index 9e63eca396..690bbbeea6 100644 --- a/doc/common-rst/cli_manage_images.rst +++ b/doc/common-rst/cli_manage_images.rst @@ -15,7 +15,7 @@ backup types. After you upload an image, you cannot change it. For details about image creation, see the `Virtual Machine Image -Guide `__. +Guide `__. List or get details for images (glance) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml index 3e84c875a3..2145aa8ce4 100644 --- a/doc/common/app_support.xml +++ b/doc/common/app_support.xml @@ -100,7 +100,7 @@ Virtual Machine Image Guide diff --git a/doc/config-reference/compute/section_hypervisor_xen_libvirt.xml b/doc/config-reference/compute/section_hypervisor_xen_libvirt.xml index 97c03d0173..cac7a150c9 100644 --- a/doc/config-reference/compute/section_hypervisor_xen_libvirt.xml +++ b/doc/config-reference/compute/section_hypervisor_xen_libvirt.xml @@ -124,7 +124,7 @@ virt_type = xen Image Formats: Xen supports raw, qcow2 and vhd image formats. For more information on image formats, refer to the OpenStack Virtual Image Guide and the Storage Options Guide on the Xen Project Wiki. @@ -142,7 +142,7 @@ virt_type = xen $ glance image-update img-uuid --property hypervisor_type=xen --property vm_mode=hvm For more more information on image metadata, refer to the OpenStack Virtual Image Guide. diff --git a/doc/contributor-guide/source/content-specs.rst b/doc/contributor-guide/source/content-specs.rst index 3fe36c5a1b..d0c1f2198c 100644 --- a/doc/contributor-guide/source/content-specs.rst +++ b/doc/contributor-guide/source/content-specs.rst @@ -163,7 +163,7 @@ This guide has a review in place to get a license indicator in output: .. _`OpenStack Cloud Administrator Guide`: http://docs.openstack.org/admin-guide-cloud/index.html .. _`OpenStack High Availability Guide`: http://docs.openstack.org/ha-guide/index.html .. _`OpenStack Security Guide`: http://docs.openstack.org/sec/ -.. _`Virtual Machine Image Guide`: http://docs.openstack.org/image-guide/content/ +.. _`Virtual Machine Image Guide`: http://docs.openstack.org/image-guide/ .. _`OpenStack End User Guide`: http://docs.openstack.org/user-guide/index.html .. _`OpenStack Admin User Guide`: http://docs.openstack.org/user-guide-admin/index.html diff --git a/doc/contributor-guide/source/docs-builds.rst b/doc/contributor-guide/source/docs-builds.rst index df2d4c12eb..507a113ba1 100644 --- a/doc/contributor-guide/source/docs-builds.rst +++ b/doc/contributor-guide/source/docs-builds.rst @@ -92,7 +92,7 @@ Guides for deployers and administrators * - Virtual Machine Image Guide - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/image-guide - - http://docs.openstack.org/image-guide/content + - http://docs.openstack.org/image-guide/ Guides for end users -------------------- diff --git a/doc/image-guide/source/conf.py b/doc/image-guide/source/conf.py index bf6a4c7efa..b1d244cf29 100644 --- a/doc/image-guide/source/conf.py +++ b/doc/image-guide/source/conf.py @@ -54,7 +54,7 @@ master_doc = 'index' # General information about the project. project = u'Virtual Machine Image Guide' -bug_tag = u'image-guide-rst' +bug_tag = u'image-guide' copyright = u'2015, OpenStack contributors' # The version info for the project you're documenting, acts as replacement for @@ -71,7 +71,7 @@ release = '0.9' # gitsha: The SHA checksum of the bug description. Automatically extracted from git log. # bug_tag: Tag for categorizing the bug. Must be set manually. # These variables are passed to the logabug code via html_context. -giturl = u'http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/image-guide-rst/source' +giturl = u'http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/image-guide/source' git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" gitsha = os.popen(git_cmd).read().strip('\n') html_context = {"gitsha": gitsha, "bug_tag": bug_tag, @@ -203,7 +203,7 @@ html_show_sourcelink = False # html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'image-guide-rst' +htmlhelp_basename = 'image-guide' # If true, publish source files html_copy_source = False diff --git a/doc/install-guide/source/glance-verify.rst b/doc/install-guide/source/glance-verify.rst index 6ccb6fbb44..108a94e263 100644 --- a/doc/install-guide/source/glance-verify.rst +++ b/doc/install-guide/source/glance-verify.rst @@ -7,7 +7,7 @@ Linux image that helps you test your OpenStack deployment. For more information about how to download and build images, see `OpenStack Virtual Machine Image Guide -`__. +`__. For information about how to manage images, see the `OpenStack User Guide `__. @@ -73,7 +73,7 @@ For information about how to manage images, see the For information about disk and container formats for images, see `Disk and container formats for images - `__ + `__ in the ``OpenStack Virtual Machine Image Guide``. .. note:: diff --git a/doc/user-guide-admin/source/dashboard_manage_images.rst b/doc/user-guide-admin/source/dashboard_manage_images.rst index 30e0e16cf8..37f3af26a0 100644 --- a/doc/user-guide-admin/source/dashboard_manage_images.rst +++ b/doc/user-guide-admin/source/dashboard_manage_images.rst @@ -18,7 +18,7 @@ Create images ~~~~~~~~~~~~~ For details about image creation, see the `Virtual Machine Image -Guide `_. +Guide `_. #. Log in to the dashboard. diff --git a/doc/user-guide/source/cli_nova_launch_instance_using_ISO_image.rst b/doc/user-guide/source/cli_nova_launch_instance_using_ISO_image.rst index 5a90971fa4..f28a5e7404 100644 --- a/doc/user-guide/source/cli_nova_launch_instance_using_ISO_image.rst +++ b/doc/user-guide/source/cli_nova_launch_instance_using_ISO_image.rst @@ -66,7 +66,7 @@ system as using ISO images on regular computers. When the installation is finished and system is rebooted, the instance asks you again to install the operating system, which means your instance is not usable. If you have problems with image creation, please check the -`Virtual Machine Image Guide `_ +`Virtual Machine Image Guide `_ for reference. .. _Make_instance_booted_from_ISO_image_functional: diff --git a/doc/user-guide/source/dashboard_launch_instances.rst b/doc/user-guide/source/dashboard_launch_instances.rst index 9d5fb85dfb..ea160517e2 100644 --- a/doc/user-guide/source/dashboard_launch_instances.rst +++ b/doc/user-guide/source/dashboard_launch_instances.rst @@ -42,7 +42,7 @@ copy of the image on the compute node where the instance starts. Image service and are available for this project. For details on creating images, see `Creating images - manually `__ + manually `__ in the *OpenStack Virtual Machine Image Guide*. #. Select an image and click :guilabel:`Launch Instance`. diff --git a/doc/user-guide/source/dashboard_manage_images.rst b/doc/user-guide/source/dashboard_manage_images.rst index ef2f285fcb..a2a91f7798 100644 --- a/doc/user-guide/source/dashboard_manage_images.rst +++ b/doc/user-guide/source/dashboard_manage_images.rst @@ -7,7 +7,7 @@ as an image, is a single file that contains a virtual disk that has a bootable operating system installed on it. Images are used to create virtual machine instances within the cloud. For information about creating image files, see the `OpenStack Virtual Machine -Image Guide `_. +Image Guide `_. Depending on your role, you may have permission to upload and manage virtual machine images. Operators might restrict the upload and