Merge "Get rid of bad links to stuff that's moved to the attic"

This commit is contained in:
Jenkins 2015-04-16 17:11:27 +00:00 committed by Gerrit Code Review
commit 19a11c6035
2 changed files with 38 additions and 29 deletions

View File

@ -289,12 +289,12 @@
</itemizedlist> </itemizedlist>
<para>You can also use the &PATCH; method to add or remove <para>You can also use the &PATCH; method to add or remove
image properties.</para> image properties.</para>
<para>For information about the &PATCH; method and the <para>
available media types, see <link For information about the &PATCH; method and the available
xlink:href="http://docs.openstack.org/api/openstack-image-service/2.0/content/appendix-b-http-patch-media-types.html" media types, see <link
>Appendix B: HTTP PATCH media types</link> in the xlink:href="http://specs.openstack.org/openstack/glance-specs/specs/api/v2/http-patch-image-api-v2.html">Image
<citetitle>OpenStack Image Service API v2 API v2 HTTP PATCH media types</link>.
Reference</citetitle>.</para> </para>
<para>Preconditions</para> <para>Preconditions</para>
<itemizedlist> <itemizedlist>
<listitem><para>When adding or replacing a new location <listitem><para>When adding or replacing a new location

View File

@ -99,12 +99,14 @@
<para role="shortdesc">Shows details for a specified <para role="shortdesc">Shows details for a specified
account and lists containers, sorted by name, in the account and lists containers, sorted by name, in the
account.</para> account.</para>
<para>The sort order for the name is based on a <link <para>
xlink:href="http://www.sqlite.org/datatype3.html#collation" The sort order for the name is based on a binary comparison, a
>binary comparison</link>, a single built-in single built-in collating sequence that compares string data
collating sequence that compares string data by using by using the SQLite <literal>memcmp()</literal> function,
the SQLite <literal>memcmp()</literal> function, regardless of text encoding. See <link
regardless of text encoding.</para> xlink:href="http://www.sqlite.org/datatype3.html#collation"
>Collating Sequences</link>.
</para>
<para>This operation does not accept a request <para>This operation does not accept a request
body.</para> body.</para>
<para>Example requests and responses:</para><itemizedlist> <para>Example requests and responses:</para><itemizedlist>
@ -1041,28 +1043,35 @@ Date: Thu, 16 Jan 2014 21:13:19 GMT</programlisting></para>
objects. For more information about form &POST; see objects. For more information about form &POST; see
<link <link
xlink:href="http://docs.openstack.org/api/openstack-object-storage/1.0/content/" xlink:href="http://docs.openstack.org/api/openstack-object-storage/1.0/content/"
><citetitle>OpenStack Object Storage API v1 ><citetitle>Object Storage API v1 (SUPPORTED)</citetitle></link>.</para>
Reference</citetitle></link>.</para> <para>
<para>Example requests and Example requests and responses:
responses:</para><itemizedlist><listitem><para>Create </para>
object metadata:</para><para><code>curl -i <itemizedlist>
$publicURL/marktwain/goodbye -X POST -H <listitem>
"X-Auth-Token: $token" -H <para>
"X-Object-Meta-Book: Create object metadata:
GoodbyeColumbus"</code></para> </para>
<para><programlisting>HTTP/1.1 202 Accepted <para>
<programlisting>curl -i $publicURL/marktwain/goodbye -X POST -H "X
-Auth-Token: $token" -H "X-Object-Meta-Book: GoodbyeColumbus"</programlisting>
</para>
<para>
<programlisting>HTTP/1.1 202 Accepted
Content-Length: 76 Content-Length: 76
Content-Type: text/html; charset=UTF-8 Content-Type: text/html; charset=UTF-8
X-Trans-Id: txb5fb5c91ba1f4f37bb648-0052d84b3f X-Trans-Id: txb5fb5c91ba1f4f37bb648-0052d84b3f
Date: Thu, 16 Jan 2014 21:12:31 GMT Date: Thu, 16 Jan 2014 21:12:31 GMT
&lt;html>&lt;h1>Accepted&lt;/h1>&lt;p>The request is accepted for processing.&lt;/p>&lt;/html></programlisting></para></listitem> &lt;html>&lt;h1>Accepted&lt;/h1>&lt;p>The request is accepted for processing.&lt;/p>&lt;/html></programlisting>
<listitem><para>Update object </para>
metadata:</para><para><code>curl -i </listitem>
$publicURL/marktwain/goodbye -X POST -H <listitem>
"X-Auth-Token: $token" -H <para>
"X-Object-Meta-Book: Update object metadata:
GoodbyeOldFriend"</code></para> </para>
<para><programlisting>curl -i $publicURL/marktwain/goodbye -X POST -H "X-Auth-Token: $token" H "X-Object-Meta-Book: GoodbyeOldFriend"</programlisting>
</para>
<para><programlisting>HTTP/1.1 202 Accepted <para><programlisting>HTTP/1.1 202 Accepted
Content-Length: 76 Content-Length: 76
Content-Type: text/html; charset=UTF-8 Content-Type: text/html; charset=UTF-8