openstack/openstack-manuals
Code Issues Proposed changes

Merge "Update the links to Image Guide"

Browse Source
This commit is contained in:
Jenkins 2015-11-24 11:43:44 +00:00 committed by Gerrit Code Review
commit 6e64d503f2
13 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/admin-guide-cloud/source/compute-images-instances.rst
View File

@ -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 <http://docs.openstack.org/image-guide/content/>`__.
Guide <http://docs.openstack.org/image-guide/>`__.
- For more information about image configuration options, see the
`Image

2
doc/common-rst/app_support.rst
View File

@ -55,7 +55,7 @@ The following books explain how to configure and run an OpenStack cloud:
- `Security Guide <http://docs.openstack.org/sec/>`__
- `Virtual Machine Image
Guide <http://docs.openstack.org/image-guide/content/>`__
Guide <http://docs.openstack.org/image-guide/>`__
The following books explain how to use the OpenStack dashboard and
command-line clients:

2
doc/common-rst/cli_manage_images.rst
View File

@ -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 <http://docs.openstack.org/image-guide/content/>`__.
Guide <http://docs.openstack.org/image-guide/>`__.
List or get details for images (glance)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
doc/common/app_support.xml
View File

@ -100,7 +100,7 @@
</listitem>
<listitem>
<para><link
xlink:href="http://docs.openstack.org/image-guide/content/"
xlink:href="http://docs.openstack.org/image-guide/"
><citetitle>Virtual Machine Image
Guide</citetitle></link></para>
</listitem>

4
doc/config-reference/compute/section_hypervisor_xen_libvirt.xml
View File

@ -124,7 +124,7 @@ virt_type = xen</programlisting></para>
<listitem>
<para><emphasis role="bold">Image Formats:</emphasis> Xen supports raw, qcow2 and vhd
image formats. For more information on image formats, refer to the <link
xlink:href="http://docs.openstack.org/image-guide/content/ch_introduction.html"
xlink:href="http://docs.openstack.org/image-guide/introduction.html"
>OpenStack Virtual Image Guide</link> and the <link
xlink:href="http://wiki.xenproject.org/wiki/Storage_options"
>Storage Options Guide on the Xen Project Wiki</link>.</para>
@ -142,7 +142,7 @@ virt_type = xen</programlisting></para>
<screen><prompt>$</prompt> <userinput>glance image-update <replaceable>img-uuid</replaceable> --property hypervisor_type=xen --property vm_mode=hvm</userinput></screen>
</para>
<para>For more more information on image metadata, refer to the <link
xlink:href="http://docs.openstack.org/image-guide/content/image-metadata.html"
xlink:href="http://docs.openstack.org/image-guide/image-metadata.html"
>OpenStack Virtual Image Guide</link>.
</para>
</listitem>

2
doc/contributor-guide/source/content-specs.rst
View File

@ -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

2
doc/contributor-guide/source/docs-builds.rst
View File

@ -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
--------------------

6
doc/image-guide/source/conf.py
View File

@ -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

4
doc/install-guide/source/glance-verify.rst
View File

@ -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
<http://docs.openstack.org/image-guide/content/index.html>`__.
<http://docs.openstack.org/image-guide/>`__.
For information about how to manage images, see the
`OpenStack User Guide
<http://docs.openstack.org/user-guide/common/cli_manage_images.html>`__.
@ -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
<http://docs.openstack.org/image-guide/content/image-formats.html>`__
<http://docs.openstack.org/image-guide/image-formats.html>`__
in the ``OpenStack Virtual Machine Image Guide``.
.. note::

2
doc/user-guide-admin/source/dashboard_manage_images.rst
View File

@ -18,7 +18,7 @@ Create images
~~~~~~~~~~~~~
For details about image creation, see the `Virtual Machine Image
Guide <http://docs.openstack.org/image-guide/content/>`_.
Guide <http://docs.openstack.org/image-guide/>`_.
#. Log in to the dashboard.

2
doc/user-guide/source/cli_nova_launch_instance_using_ISO_image.rst
View File

@ -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 <http://docs.openstack.org/image-guide/content/ch_creating_images_manually.html>`_
`Virtual Machine Image Guide <http://docs.openstack.org/image-guide/create_images_manually.html>`_
for reference.
.. _Make_instance_booted_from_ISO_image_functional:

2
doc/user-guide/source/dashboard_launch_instances.rst
View File

@ -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 <http://docs.openstack.org/image-guide/content/ch_creating_images_manually.html>`__
manually <http://docs.openstack.org/image-guide/create-images-manually.html>`__
in the *OpenStack Virtual Machine Image Guide*.
#. Select an image and click :guilabel:`Launch Instance`.

2
doc/user-guide/source/dashboard_manage_images.rst
View File

@ -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 <http://docs.openstack.org/image-guide/content/>`_.
Image Guide <http://docs.openstack.org/image-guide/>`_.
Depending on your role, you may have permission to upload and manage
virtual machine images. Operators might restrict the upload and