openstack/glance
Code Issues Proposed changes

Merge "Fix five typos on doc"

Browse Source
This commit is contained in:
Jenkins 2016-09-16 14:42:37 +00:00 committed by Gerrit Code Review
commit 2337c9b98f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/cache.rst
View File

@ -47,7 +47,7 @@ same values otherwise the cache will potentially run into problems.
- ``image_cache_dir`` This is the base directory where Glance stores
the cache data (Required to be set, as does not have a default).
- ``image_cache_sqlite_db`` Path to the sqlite file database that will
be used for cache manangement. This is a relative path from the
be used for cache management. This is a relative path from the
``image_cache_dir`` directory (Default:``cache.db``).
- ``image_cache_driver`` The driver used for cache management.
(Default:``sqlite``)
@ -67,7 +67,7 @@ correctly.
- ``admin_password`` The password to the admin account.
- ``admin_tenant_name`` The tenant of the admin account.
- ``auth_url`` The URL used to authenticate to keystone. This will
be taken from the environment varibles if it exists.
be taken from the environment variables if it exists.
- ``filesystem_store_datadir`` This is used if using the filesystem
store, points to where the data is kept.
- ``filesystem_store_datadirs`` This is used to point to multiple

2
doc/source/formats.rst
View File

@ -39,7 +39,7 @@ You can set your image's disk format to one of the following:
* **vhd**
This is the VHD disk format, a common disk format used by virtual machine
monitors from VMWare, Xen, Microsoft, VirtualBox, and others
monitors from VMware, Xen, Microsoft, VirtualBox, and others
* **vhdx**

2
doc/source/notifications.rst
View File

@ -26,7 +26,7 @@ Notification Drivers
* log
This driver uses the standard Python logging infrastructure with
the notifications ending up in file specificed by the log_file
the notifications ending up in file specified by the log_file
configuration directive.
* messaging

2
doc/source/signature.rst
View File

@ -146,7 +146,7 @@ Create the image::
$ glance image-create --name mySignedImage --container-format bare --disk-format qcow2 --property img_signature="$image_signature" --property img_signature_certificate_uuid="$cert_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < myimage
.. note:: Creating the image can fail if validation does not succeeed.
.. note:: Creating the image can fail if validation does not succeed.
This will cause the image to be deleted.
Other Links