From 3e5128da3ad809bd3a086159fc78bcc39d5d73a3 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Mon, 8 Apr 2013 11:54:23 -0500
Subject: [PATCH] Fixed misspelling of ephemeral (was ephermeral)

bug: #1158943

Change-Id: Ie6099c5b8e43e012b848429fd9c1fc9b2bff342f
author: Diane Fleming
---
 api-ref/.htaccess                                         | 0
 api-ref/pom.xml                                           | 3 +--
 api-ref/src/docbkx/api-ref.xml                            | 8 ++------
 .../src/wadls/compute-api/src/ext/os-flavorextradata.wadl | 6 +++---
 4 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 api-ref/.htaccess

diff --git a/api-ref/.htaccess b/api-ref/.htaccess
new file mode 100644
index 000000000..e69de29bb
diff --git a/api-ref/pom.xml b/api-ref/pom.xml
index c034a98bc..b058acb72 100644
--- a/api-ref/pom.xml
+++ b/api-ref/pom.xml
@@ -3,7 +3,6 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!-- POM Build file for the Keystone Developer Guide -->
   <modelVersion>4.0.0</modelVersion>
-  
   <groupId>org.openstack.identity</groupId>
   <artifactId>docs</artifactId>
   <version>1.0</version>
@@ -36,7 +35,7 @@
   </profiles>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <doctools.version>1.5.2</doctools.version>
+    <doctools.version>1.7.2</doctools.version>
   </properties>
   <build>
     <plugins>
diff --git a/api-ref/src/docbkx/api-ref.xml b/api-ref/src/docbkx/api-ref.xml
index 8d877e289..39e2bc841 100644
--- a/api-ref/src/docbkx/api-ref.xml
+++ b/api-ref/src/docbkx/api-ref.xml
@@ -15,7 +15,6 @@
   </info>
   <preface xml:id="Overview">
     <title>OpenStack API Reference</title>
-
     <para>Use the OpenStack APIs in your OpenStack cloud: Identity
       service, Compute and Compute extensions, Image service, Volumes,
       and Object Storage. You must install the packages for each API
@@ -127,14 +126,12 @@
         </para>
       <wadl:resources
         href="../wadls/compute-api/src/ext/os-instance-actions.wadl"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-      
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"/>    
     </section>
     <section xml:id="ext-os-admin-actions">
       <title>Server Actions (Admin)</title>
       <para>Permits administrators to perform actions on a
         server.</para>
-
       <wadl:resources
         href="../wadls/compute-api/src/ext/os-admin-actions.wadl"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
@@ -294,7 +291,7 @@
       <para>Creates a flavor, gets details for a flavor, and
         lists details for available flavors. Includes the
           <literal>rxtx_factor</literal>,
-          <literal>OS-FLV-EXT-DATA:ephermeral</literal>, and
+          <literal>OS-FLV-EXT-DATA:ephemeral</literal>, and
           <literal>swap</literal> extended attributes.</para>
       <wadl:resources
         href="../wadls/compute-api/src/ext/os-flavorextradata.wadl"
@@ -433,5 +430,4 @@
       href="../wadls/object-api/src/os-object-api-1.0.wadl"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
   </chapter>
-
 </book>
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-flavorextradata.wadl b/api-ref/src/wadls/compute-api/src/ext/os-flavorextradata.wadl
index 75802db28..ea6d1a2e4 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-flavorextradata.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-flavorextradata.wadl
@@ -44,7 +44,7 @@
     <method name="POST" id="createFlavor">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN">
             <p xmlns="http://www.w3.org/1999/xhtml">Creates a flavor.
-                Includes the rxtx_factor, OS-FLV-EXT-DATA:ephermeral,
+                Includes the rxtx_factor, OS-FLV-EXT-DATA:ephemeral,
                 and swap extended attributes.</p>
         </wadl:doc>
 
@@ -137,7 +137,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN">
             <p xmlns="http://www.w3.org/1999/xhtml">Gets details for a
                 specified flavor. Includes the rxtx_factor,
-                OS-FLV-EXT-DATA:ephermeral, and swap extended
+                OS-FLV-EXT-DATA:ephemeral, and swap extended
                 attributes.</p>
         </wadl:doc>
         <response status="200">
@@ -164,7 +164,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN">
             <p xmlns="http://www.w3.org/1999/xhtml">Lists details for
                 available flavors. Includes the rxtx_factor,
-                OS-FLV-EXT-DATA:ephermeral, and swap extended
+                OS-FLV-EXT-DATA:ephemeral, and swap extended
                 attributes.</p>
         </wadl:doc>
         <response status="200">