diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-04-08 10:04:38 -0300 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-04-08 10:04:38 -0300 |
| commit | 845d32660eb18b8a402519d382392232f79f2990 (patch) | |
| tree | 59f4571dbf77c02c45d399abcca5f5921b59cc8c /doc/source | |
| parent | d7f0c23b0a398b35442be7e053539d7d7e230122 (diff) | |
merge prop tweaks
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/devref/zone.rst | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/source/devref/zone.rst b/doc/source/devref/zone.rst index c3d04a405..acc7398bf 100644 --- a/doc/source/devref/zone.rst +++ b/doc/source/devref/zone.rst @@ -28,7 +28,7 @@ Zones share nothing. They communicate via the public OpenStack API only. No data Capabilities ------------ -Routing between Zones is based on the Capabilities of that Zone. Capabilities are nothing more than key/value pairs. When expressed as a string they take the form: +Routing between Zones is based on the Capabilities of that Zone. Capabilities are nothing more than key/value pairs. Values are multi-value, with each value separated with a semicolon (`;`). When expressed as a string they take the form: :: @@ -123,6 +123,4 @@ Removing a child Zone nova zone-delete <N> -This equates to a DELETE call to `.../zones/N`. The Zone with ID=N will be removed. - - +This equates to a DELETE call to `.../zones/N`. The Zone with ID=N will be removed. This will only remove the zone entry from the current (parent) Zone, no child Zones are affected. |