From 3abb0581e0b1aa38454de2ac3c7cf7ae3dc7a465 Mon Sep 17 00:00:00 2001
From: Endre Karlson <endre.karlson@hp.com>
Date: Wed, 9 Dec 2015 16:57:12 +0100
Subject: [PATCH] Update Devstack docs

Change-Id: Ifa62868d80fefdb02ae11ed8836f6fc377c16c47
Closes-Bug: #1522952
---
 doc/source/devstack.rst      | 19 +++++++++++--------
 doc/source/rest/v2/zones.rst |  3 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/doc/source/devstack.rst b/doc/source/devstack.rst
index 25f22fb1b..0ff66db62 100644
--- a/doc/source/devstack.rst
+++ b/doc/source/devstack.rst
@@ -24,21 +24,25 @@ The Designate team maintains a fork of devstack with Designate integration.
 Instructions
 ++++++++++++
 
-1. Get a clean Ubuntu 12.04 VM. DevStack "takes over". Don't use your desktop!
+.. note::
 
-2. Clone Designate and DevStack inside the VM::
+    If you want to use local sources for development then you should concider
+    using the contrib/vagrant folder in the
+    `repository <https://git.openstack.org/openstack/designate>`_.
+
+1. Get a clean Ubuntu 14.04 VM. DevStack "takes over". Don't use your desktop!
+
+2. Clone DevStack inside the VM::
 
-   $ git clone https://git.openstack.org/openstack/designate.git
    $ git clone https://git.openstack.org/openstack-dev/devstack.git
 
-3. Install the Designate extension for DevStack::
+3. Move to ``devstack`` directory::
 
    $ cd devstack
-   $ ../designate/contrib/devstack/install.sh
 
-4. Create a `localrc` config file:
+4. Create a `local.conf` config file:
 
-   .. literalinclude:: ../../contrib/vagrant/localrc
+   .. literalinclude:: ../../contrib/vagrant/local.conf
        :language: bash
 
 5. Run DevStack::
@@ -108,4 +112,3 @@ Instructions
        | type       | A                                    |
        | domain_id  | 1fb5d17c-efaf-4e3c-aac0-482875d24b3e |
        +------------+--------------------------------------+
-
diff --git a/doc/source/rest/v2/zones.rst b/doc/source/rest/v2/zones.rst
index 4cc07d117..1a188b15d 100644
--- a/doc/source/rest/v2/zones.rst
+++ b/doc/source/rest/v2/zones.rst
@@ -788,6 +788,7 @@ Create a Zone Export
             "project_id": "1",
             "id": "8ec17fe1-d1f9-41b4-aa98-4eeb4c27b720"
         }
+
     :statuscode 202: Accepted
 
 View a Zone Export Record
@@ -976,4 +977,4 @@ Delete Zone Export
 
         HTTP/1.1 204 No Content
 
-    :statuscode 204: No Content
\ No newline at end of file
+    :statuscode 204: No Content