openstack/api-site
Code Issues Proposed changes

Merge "Change neutron -> OpenStack Networking"

Browse Source
This commit is contained in:
Jenkins 2015-05-26 14:27:32 +00:00 committed by Gerrit Code Review
commit 3de97c46af
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api-ref/src/docbkx/ch_compute-v2.1.xml
View File

@ -88,8 +88,8 @@
Shows server usage for a specified server.
</para>
<para>
Shows <code>os-server-usage:launched_at</code> and <code>os-server-
usage:terminated_at</code> attributes in server responses.
Shows <code>os-server-usage:launched_at</code> and
<code>os-server-usage:terminated_at</code> attributes in server responses.
</para>
<wadl:resources
href="../wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl"
@ -249,8 +249,9 @@
(servers, os-extended-availability-zones)
</title>
<para>
Shows the instance availability zone for compute nodes (nova-compute).
Internal services appear in their own internal availability zone.
Shows the instance availability zone for compute nodes (nova-
compute). Internal services appear in their own internal availability
zone.
</para>
<wadl:resources
href="../wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl"
@ -462,9 +463,8 @@
<section xml:id="os-floating-ips-bulk-v2.1">
<title>Floating IPs bulk (os-floating-ips-bulk)</title>
<para>
Bulk-creates, deletes, and lists floating IPs. By default, the pool
is named nova. Use the <code>os-floating-ip- pools</code> extension
to view available pools.
Bulk-creates, deletes, and lists floating IPs. Default pool name is
<code>nova</code>. To view available pools, use the <code>os-floating-ip-pools</code> extension.
</para>
<wadl:resources
href="../wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl"

4
api-ref/src/wadls/compute-api/src/v2/ext/os-interface.wadl
View File

@ -84,7 +84,7 @@
</para>
<para>
If you do not specify the <code>port_id</code>
parameter, the Networking (neutron) API v2.0
parameter, the OpenStack Networking API v2.0
allocates a port on the specified network.
</para>
</wadl:doc>
@ -101,7 +101,7 @@
</para>
<para>
If you do not specify the <code>net_id</code>
parameter, the Networking (neutron) API v2.0 uses
parameter, the OpenStack Networking API v2.0 uses
the network information cache that is associated
with the instance.
</para>

2
api-ref/src/wadls/netconn-api/src/metering-labels.wadl
View File

@ -5,7 +5,7 @@
<!ENTITY % common_project SYSTEM "../../common_project.ent">
%common_project;
]>
<!-- (C) 2013-2014 OpenStack Foundation, All Rights Reserved -->
<!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
<application xmlns="http://wadl.dev.java.net/2009/02"
xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
xmlns:wadl="http://wadl.dev.java.net/2009/02"