Skip to content

Commit

Permalink
Fix bug 1009018, PDF table scrumbled
Browse files Browse the repository at this point in the history
Fix bug 1009170, images not rendering properly

Change-Id: I91dbe6d2637d1adda66c7a990efcc8a03a2d4f02
  • Loading branch information
annegentle committed Jun 5, 2012
1 parent 760b716 commit 2b29a81
Show file tree
Hide file tree
Showing 29 changed files with 1,906 additions and 1,840 deletions.
2 changes: 1 addition & 1 deletion doc/src/docbkx/common/getstart.xml
Expand Up @@ -232,7 +232,7 @@ xml:id="ch_getting-started-with-openstack">
<informalfigure>
<mediaobject>
<imageobject>
<imagedata scale="30"
<imagedata scale="20"
fileref="figures/nova-logical-arch-essex.jpg"/>
</imageobject>
</mediaobject>
Expand Down
1,815 changes: 21 additions & 1,794 deletions doc/src/docbkx/openstack-compute-admin/compute-options-reference.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-compute-admin/pom.xml
Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>com.rackspace.cloud.api</groupId>
<artifactId>clouddocs-maven-plugin</artifactId>
<version>1.2.0</version>
<version>1.3.1</version>
<executions>
<execution>
<id>goal1</id>
Expand Down
Expand Up @@ -3,8 +3,8 @@
<table rules="all">
<caption>Description of nova.conf configuration options for
authentication</caption>
<col width="30%"/>
<col width="70%"/>
<col width="50%"/>
<col width="50%"/>
<thead>
<tr>
<td>Configuration option=Default value</td>
Expand Down
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<para xmlns= "http://docbook.org/ns/docbook" version= "5.0">
<table rules= "all">
<caption>Description of nova.conf file configuration options
for bare metal deployment</caption>
<col width= "50%"/>
<col width= "50%"/>
<thead>
<tr>
<td><para>Configuration option=Default value</para></td>
<td><para>(Type) Description</para></td>
</tr>
</thead>
<tbody>
<tr>
<td><para> baremetal_driver= "tilera" </para></td>
<td><para> (StrOpt) Bare-metal driver runs on </para></td>
</tr>
<tr>
<td><para>
tile_monitor= "/usr/local/TileraMDE/bin/tile-monitor" </para></td>
<td><para> (StrOpt) Tilera command line program for
Bare-metal driver </para></td>
</tr>
<tr>
<td><para> baremetal_type= "baremetal" </para></td>
<td><para> (StrOpt) baremetal domain type </para></td>
</tr>
<tr>
<td><para> force_raw_images=true </para></td>
<td><para> (BoolOpt) Force backing images to raw format
</para></td>
</tr>
<tr>
<td><para> img_handlers= "loop,nbd,guestfs" </para></td>
<td><para> (ListOpt) Order of methods used to mount disk
images </para></td>
</tr>
<tr>
<td><para>
injected_network_template= "$pybasedir/nova/virt/interfaces.template" </para></td>
<td><para> (StrOpt) Template file for injected network </para></td>
</tr>
<tr>
<td><para> max_nbd_devices=16 </para></td>
<td><para> (IntOpt) maximum number of possible nbd devices
</para></td>
</tr>
<tr>
<td><para> timeout_nbd=10 </para></td>
<td><para> (IntOpt) time to wait for a NBD device coming up
</para></td>
</tr>
<tr>
<td>
<para>virt_mkfs= "default=mkfs.ext3 -L %(fs_label)s
-F %(target)s"</para>
<para>virt_mkfs= "linux=mkfs.ext3 -L %(fs_label)s
-F %(target)s"</para>
<para>virt_mkfs= "windows=mkfs.ntfs --force --fast
--label %(fs_label)s %(target)s"</para>
</td>
<td><para> (MultiStrOpt) mkfs commands for ephemeral device.
The format is &lt;os_type&gt;=&lt;mkfs command&gt;
</para></td>
</tr>
</tbody>
</table>
</para>
Expand Up @@ -3,8 +3,8 @@
<table rules="all" >
<caption>Description of nova.conf file configuration options
for credentials (crypto) </caption>
<col width="30%"/>
<col width="70%"/>
<col width="50%"/>
<col width="50%"/>
<thead>
<tr>
<td>Configuration option=Default value</td>
Expand Down Expand Up @@ -37,7 +37,7 @@
</tr>
<tr>
<td>
project_cert_subject="/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=project-ca-%.16s-%s" </td>
project_cert_subject=<?sbr?>"/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=project-ca-%.16s-%s" </td>
<td> (StrOpt) Subject for certificate for projects, %s
for project, timestamp </td>
</tr>
Expand All @@ -48,7 +48,7 @@
</tr>
<tr>
<td>
user_cert_subject="/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=%.16s-%.16s-%s" </td>
user_cert_subject=<?sbr?>"/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=%.16s-%.16s-%s" </td>
<td> (StrOpt) Subject for certificate for users, %s
for project, user, timestamp </td>
</tr>
Expand Down

0 comments on commit 2b29a81

Please sign in to comment.