Merge "Emdash fixes"

This commit is contained in:
Jenkins 2014-09-27 10:48:28 +00:00 committed by Gerrit Code Review
commit 4cbfe9902b
4 changed files with 38 additions and 16 deletions

View File

@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE section [
<!ENTITY % openstack SYSTEM "entities/openstack.ent">
%openstack;
]>
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
@ -62,14 +58,32 @@
<filename>/var/log/nova/nova-api-err.log</filename>.</para> <filename>/var/log/nova/nova-api-err.log</filename>.</para>
<para>The report has the following sections: <para>The report has the following sections:
<itemizedlist> <itemizedlist>
<listitem><para>Package &mdash; Displays information about the package to which <listitem>
the process belongs, including version information.</para></listitem> <para>
<listitem><para>Threads &mdash; Displays stack traces and thread IDs for each of the threads within the Package: Displays information about the package to
process.</para></listitem> which the process belongs, including version
<listitem><para>Green Threads &mdash; Displays stack traces for each of the green information.
threads within the process (green threads do not have thread IDs).</para></listitem> </para>
<listitem><para>Configuration &mdash; Lists all configuration options currently accessible through the CONF </listitem>
object for the current process.</para></listitem> <listitem>
<para>
Threads: Displays stack traces and thread IDs for
each of the threads within the process.</para>
</listitem>
<listitem>
<para>
Green Threads: Displays stack traces for each of
the green threads within the process (green
threads do not have thread IDs).
</para>
</listitem>
<listitem>
<para>
Configuration: Lists all configuration options
currently accessible through the CONF object for
the current process.
</para>
</listitem>
</itemizedlist></para> </itemizedlist></para>
<para>For more information, see <link <para>For more information, see <link
xlink:href="http://docs.openstack.org/developer/nova/devref/gmr.html" xlink:href="http://docs.openstack.org/developer/nova/devref/gmr.html"

View File

@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE section [
<!ENTITY % openstack SYSTEM "../../../common/entities/openstack.ent">
%openstack;
]>
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
@ -249,7 +253,7 @@
from the SAN is greater than that specified in reserved from the SAN is greater than that specified in reserved
space.</para> space.</para>
</note> </note>
<para><emphasis role="bold">Unlimited</emphasis>Unlimited <para><emphasis role="bold">Unlimited</emphasis>&mdash;Unlimited
means that the amount of space allocated to the repository means that the amount of space allocated to the repository
is unlimited and additional space is allocated to the is unlimited and additional space is allocated to the
repository automatically when space is required and repository automatically when space is required and

View File

@ -437,8 +437,8 @@ cinder type-key platinum set volume_backend_name=hnas-2</programlisting>
<td> <td>
<para>Service labels: these four predefined <para>Service labels: these four predefined
names help four different sets of names help four different sets of
configuration options -- each can specify configuration options. Each can specify
HDP and an unique volume type.</para> HDP and a unique volume type.</para>
</td> </td>
</tr> </tr>
<tr> <tr>

View File

@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE section [
<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
%openstack;
]>
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
@ -127,7 +131,7 @@
<listitem> <listitem>
<para>You cannot launch instances for a disabled <para>You cannot launch instances for a disabled
project. Instances that are already running are project. Instances that are already running are
not automatically terminated thoughyou must stop not automatically terminated though&mdash;you must stop
them manually.</para> them manually.</para>
</listitem> </listitem>
<listitem> <listitem>