Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix bug 1017775, fix bug 1017766

Some changes to the Dashboard chapter created an incorrect <section> nesting.
Also fixed a typo in the VNC console docs.
Fix bug with the internals images not appearing correctly in the HTML by
referring to png rather than svg.

Change-Id: Ic953ae30219ee216880b49a090f2ac855cbe307d
  • Loading branch information...
commit bc60e06b72d474ce25b40f311d2e29ceae7a3bf1 1 parent 1ada215
@annegentle annegentle authored
View
10 doc/src/docbkx/openstack-compute-admin/computevncconsole.xml
@@ -57,12 +57,12 @@
<para> Both client proxies leverage a shared service to manage
token auth called nova-consoleauth. This service must be running
- in order for for either proxy to work. Many proxies of either
- type can be run against a single nova-consoleauth service in a
+ in order for either proxy to work. Many proxies of either type
+ can be run against a single nova-consoleauth service in a
cluster configuration. </para>
- <para> nova-consoleauth should not be confused with nova-console,
- which is a Xen-specific service that is not used by the most
- recent VNC proxy architecture. </para>
+ <para>The nova-consoleauth shared service should not be confused
+ with nova-console, which is a Xen-specific service that is not
+ used by the most recent VNC proxy architecture. </para>
</section>
<section xml:id="typical-deployment">
View
10 doc/src/docbkx/openstack-install/ch_externals.xml
@@ -19,16 +19,22 @@
Image service are not shown.</para>
<figure><title>Underlying technologies (Scenario 1)</title>
<mediaobject>
- <imageobject>
+ <imageobject role="fo">
<imagedata fileref="figures/nova-external-1.svg" scale="60" />
</imageobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/nova-external-1.png" scale="40" />
+ </imageobject>
</mediaobject>
</figure>
<figure><title>Underlying technologies (Scenario 2)</title>
<mediaobject>
- <imageobject>
+ <imageobject role="fo">
<imagedata fileref="figures/nova-external-2.svg" scale="60" />
</imageobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/nova-external-2.png" scale="40" />
+ </imageobject>
</mediaobject>
</figure>
View
9 doc/src/docbkx/openstack-install/ch_installdashboard.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ version="5.0"
xml:id="ch_install-dashboard">
-
<title>Installing the OpenStack Dashboard</title>
- <?dbhtml stop-chunking?>
<para>OpenStack has components that provide a view of the
OpenStack installation such as a Django-built website that
serves as a dashboard.</para>
@@ -21,13 +20,11 @@
>https://github.com/openstack/horizon/</link>. These
instructions are for an example deployment configured with
an Apache web server. </para>
- <xi:include href="dashboard-system-reqs.xml"/>
</section>
- <section xml:id="installing-openstack-dashboard-parent">
+ <xi:include href="dashboard-system-reqs.xml"/>
<xi:include href="dashboard-install.xml"/>
<xi:include href="dashboard-configure.xml"/>
<xi:include href="dashboard-verify.xml"/>
- </section>
<xi:include href="../common/dashboard_customizing.xml" />
<xi:include href="../common/dashboard_sessions.xml" />
<xi:include href="../openstack-compute-admin/computevncconsole.xml"/>
Please sign in to comment.
Something went wrong with that request. Please try again.