Merge "Add detailed info to instance and server name"

This commit is contained in:
Jenkins
2015-12-12 16:48:13 +00:00
committed by Gerrit Code Review

View File

@@ -1356,7 +1356,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>The server name.</para>
<para>
The server name. The user sets the server name.
</para>
</wadl:doc>
</param>'>
<!ENTITY diskConfigResponseParameter '
@@ -1365,8 +1367,10 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Disk configuration, which is <code>AUTO</code> or
<code>MANUAL</code>.</para>
<para>
Disk configuration, which is <code>AUTO</code> or
<code>MANUAL</code>.
</para>
</wadl:doc>
</param>'>
<!ENTITY availability_zoneResponseParameter '
@@ -1403,7 +1407,10 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>The instance name.</para>
<para>
The instance name. The Compute API generates the instance name from
the instance name template.
</para>
</wadl:doc>
</param>'>
<!ENTITY power_stateResponseParameter '
@@ -1450,7 +1457,7 @@
<param xmlns="http://wadl.dev.java.net/2009/02"
name="OS-SRV-USG:launched_at" style="plain" required="true"
type="xsd:dateTime">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
@@ -1471,7 +1478,7 @@
If the <code>deleted_at</code> date and time stamp is not set, its value is
<code>null</code>.
</para>
</wadl:doc>
</wadl:doc>
</param>'>
<!ENTITY terminated_at-ResponseParameter '
<param xmlns="http://wadl.dev.java.net/2009/02"