summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-04 19:08:19 +0000
committerGerrit Code Review <review@openstack.org>2012-06-04 19:08:19 +0000
commitb1cfea8b974875b83fdacdbb7bd1ff32c6d28cc6 (patch)
treebac2db5fd5e7650d181967197e297010c3206001
parentc4987ef9a20cb79993f6651e507c6fb80af00f7e (diff)
parent664723bde931c7c7e5ff2cd4ed3bb7411faf4136 (diff)
downloadnova-b1cfea8b974875b83fdacdbb7bd1ff32c6d28cc6.tar.gz
nova-b1cfea8b974875b83fdacdbb7bd1ff32c6d28cc6.tar.xz
nova-b1cfea8b974875b83fdacdbb7bd1ff32c6d28cc6.zip
Merge "bug #1006094 correct typo in addmethod.openstackapi.rst"
-rw-r--r--Authors1
-rw-r--r--doc/source/devref/addmethod.openstackapi.rst4
2 files changed, 3 insertions, 2 deletions
diff --git a/Authors b/Authors
index 527c760f0..0dc98da95 100644
--- a/Authors
+++ b/Authors
@@ -207,6 +207,7 @@ William Henry <whenry@redhat.com>
William Kelly <william.kelly@rackspace.com>
William Wolf <throughnothing@gmail.com>
Yaguang Tang <heut2008@gmail.com>
+Ying Chun Guo <daisy.ycguo@gmail.com>
Yoshiaki Tamura <yoshi@midokura.jp>
Youcef Laribi <Youcef.Laribi@eu.citrix.com>
Yun Mao <yunmao@gmail.com>
diff --git a/doc/source/devref/addmethod.openstackapi.rst b/doc/source/devref/addmethod.openstackapi.rst
index f19d79d31..18123f8cc 100644
--- a/doc/source/devref/addmethod.openstackapi.rst
+++ b/doc/source/devref/addmethod.openstackapi.rst
@@ -35,7 +35,7 @@ Controllers and actions
Controllers live in ``nova/api/openstack``, and inherit from nova.wsgi.Controller.
-See ``nova/api/openstack/servers.py`` for an example.
+See ``nova/api/openstack/compute/servers.py`` for an example.
Action methods take parameters that are sucked out of the URL by mapper.connect() or .resource(). The first two parameters are self and the WebOb request, from which you can get the req.environ, req.body, req.headers, etc.
@@ -46,7 +46,7 @@ Actions return a dictionary, and wsgi.Controller serializes that to JSON or XML
If you define a new controller, you'll need to define a ``_serialization_metadata`` attribute on the class, to tell wsgi.Controller how to convert your dictionary to XML. It needs to know the singular form of any list tag (e.g. ``<servers>`` list contains ``<server>`` tags) and which dictionary keys are to be XML attributes as opposed to subtags (e.g. ``<server id="4"/>`` instead of ``<server><id>4</id></server>``).
-See `nova/api/openstack/servers.py` for an example.
+See `nova/api/openstack/compute/servers.py` for an example.
Faults
------