Merge "Fix last commit using "of" instead of "or""

This commit is contained in:
Jenkins 2013-10-09 11:32:02 +00:00 committed by Gerrit Code Review
commit c78182e94c

View File

@ -35,7 +35,7 @@
for Linux.</para> for Linux.</para>
<note> <note>
<para>The OpenStack Block Storage service is not a shared <para>The OpenStack Block Storage service is not a shared
storage solution like a Storage Area Network (SAN) of NFS volumes, storage solution like a Storage Area Network (SAN) or NFS volumes,
where you can attach a where you can attach a
volume to multiple servers. With the OpenStack Block volume to multiple servers. With the OpenStack Block
Storage service, you can attach a volume to only one Storage service, you can attach a volume to only one
@ -110,9 +110,9 @@
>Launch an instance from a volume</link> section in the >Launch an instance from a volume</link> section in the
<link xlink:href="http://docs.openstack.org/user-guide/content/"><citetitle>OpenStack End User <link xlink:href="http://docs.openstack.org/user-guide/content/"><citetitle>OpenStack End User
Guide</citetitle></link>.</para> Guide</citetitle></link>.</para>
</section> </section>
<?hard-pagebreak?> <?hard-pagebreak?>
<xi:include href="section_troubleshoot-cinder.xml"/> <xi:include href="section_troubleshoot-cinder.xml"/>
<xi:include href="section_multi_backend.xml"/> <xi:include href="section_multi_backend.xml"/>
<xi:include href="section_backup-block-storage-disks.xml"/> <xi:include href="section_backup-block-storage-disks.xml"/>
<xi:include href="section_volume-migration.xml"/> <xi:include href="section_volume-migration.xml"/>