diff --git a/api-quick-start/src/docbkx/api-quick-start-intro.xml b/api-quick-start/src/docbkx/api-quick-start-intro.xml
index 42aa79a4a..cf692084c 100644
--- a/api-quick-start/src/docbkx/api-quick-start-intro.xml
+++ b/api-quick-start/src/docbkx/api-quick-start-intro.xml
@@ -18,7 +18,7 @@
         requests, you include the token in the
             <literal>X-Auth-Token</literal> header. You must generate
         another token if you interact with your cloud through API
-        endpoints rather than through a client. </para>
+        endpoints rather than through a client.</para>
 
     <orderedlist>
         <title>Authentication and API request workflow</title>
diff --git a/api-quick-start/src/docbkx/cli-uses.xml b/api-quick-start/src/docbkx/cli-uses.xml
index 336e80c93..787285c40 100644
--- a/api-quick-start/src/docbkx/cli-uses.xml
+++ b/api-quick-start/src/docbkx/cli-uses.xml
@@ -7,7 +7,7 @@
     <para>For scripting work, you can use a command-line client like
         the <systemitem role="client">python-novaclient</systemitem>
         client. This client enables you to use the Compute API through
-        a command-line interface. </para>
+        a command-line interface.</para>
     <para>For information about the command-line clients, see <link
             xlink:href="http://docs.openstack.org/user-guide/content/"
                 ><citetitle>OpenStack End User
@@ -62,7 +62,7 @@
     <section xml:id="list-images">
         <title>Launch an instance</title>
         <para>To launch instances, you must choose a name, an image,
-            and a flavor for your instance. </para>
+            and a flavor for your instance.</para>
         <para>To list available images, call the Compute API through
             the nova client, as follows:</para>
         <screen><?db-font-size 70%?><prompt>$</prompt> <userinput>nova image-list</userinput></screen>
@@ -87,7 +87,7 @@
 | 84 | m1.micro  | 128       | 0    | 0         |      | 1     | 1.0         | True      |
 +----+-----------+-----------+------+-----------+------+-------+-------------+-----------+</computeroutput>       </screen>
         <para>To launch an instance, note the IDs of your desired
-            image and flavor. </para>
+            image and flavor.</para>
         <para>To launch an instance named
                 <literal>my_instance</literal>, run the <command>nova
                 boot</command> command with the image and flavor IDs
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/all_extensions/server-action-rebuild.xml b/api-ref/src/wadls/compute-api/src/api_samples/all_extensions/server-action-rebuild.xml
index d39b9d8a3..344e81f45 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/all_extensions/server-action-rebuild.xml
+++ b/api-ref/src/wadls/compute-api/src/api_samples/all_extensions/server-action-rebuild.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild 
+<rebuild
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     name="foobar"
     imageRef="http://openstack.example.com/v1.1/32278/images/70a599e0-31e7-49b7-b260-868f441e862b"
@@ -22,4 +22,4 @@
         b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
     </file>
   </personality>
-</rebuild>
\ No newline at end of file
+</rebuild>
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/server-action-rebuild.xml b/api-ref/src/wadls/compute-api/src/api_samples/server-action-rebuild.xml
index d39b9d8a3..344e81f45 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/server-action-rebuild.xml
+++ b/api-ref/src/wadls/compute-api/src/api_samples/server-action-rebuild.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild 
+<rebuild
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     name="foobar"
     imageRef="http://openstack.example.com/v1.1/32278/images/70a599e0-31e7-49b7-b260-868f441e862b"
@@ -22,4 +22,4 @@
         b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
     </file>
   </personality>
-</rebuild>
\ No newline at end of file
+</rebuild>
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/server-put-resp-ad.xml b/api-ref/src/wadls/compute-api/src/api_samples/server-put-resp-ad.xml
index e9662e730..88f47cf1a 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/server-put-resp-ad.xml
+++ b/api-ref/src/wadls/compute-api/src/api_samples/server-put-resp-ad.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom"
-        id="52415800-8b69-11e0-9b19-734f565bc83b" 
+        id="52415800-8b69-11e0-9b19-734f565bc83b"
         tenant_id="1234" user_id="5678"
         name="new-server-test"
         hostId="e4d909c290d0fb1ca068ffaddf22cbd0" progress="0"
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/server-put-resp.xml b/api-ref/src/wadls/compute-api/src/api_samples/server-put-resp.xml
index 52633e48d..6521818b5 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/server-put-resp.xml
+++ b/api-ref/src/wadls/compute-api/src/api_samples/server-put-resp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom"
-        id="52415800-8b69-11e0-9b19-734f565bc83b" 
+        id="52415800-8b69-11e0-9b19-734f565bc83b"
         tenant_id="1234" user_id="5678"
         name="new-server-test"
         hostId="e4d909c290d0fb1ca068ffaddf22cbd0" progress="0"
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/RAX-KSQA-secretQA.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/RAX-KSQA-secretQA.xml
index c6570af6e..5fcd0eafb 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/RAX-KSQA-secretQA.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/RAX-KSQA-secretQA.xml
@@ -3,5 +3,3 @@
 <secretQA xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSQA/v1.0"
           question="What is the color of my eyes?"
           answer="Leonardo Da Vinci" />
-    
-
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/authwithgroups.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/authwithgroups.xml
index f8c6981b4..b41cc6f60 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/authwithgroups.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/authwithgroups.xml
@@ -59,12 +59,12 @@
 	<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
 	  <role id="123" name="Admin" tenantId="1234" description="All Access" />
 	  <role id="234" name="object-store:admin" tenantId="1"/>
-	  
+
 	</roles>
 	<groups xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
 	    <group id="test_global_group_add">
 			<description>A Description of the group</description>
 	    </group>
-	</groups>	
+	</groups>
     </user>
 </auth>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoint.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoint.xml
index cd09b24a7..76dc98e35 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoint.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoint.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <endpoint
-            id="1" 
+            id="1"
             tenantId="1"
             type="compute"
             name="Compute"
@@ -15,4 +15,4 @@
                         info="https://compute.north.public.com/v1/"
                         list="https://compute.north.public.com/"
             />
-</endpoint>
\ No newline at end of file
+</endpoint>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpointTemplate.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpointTemplate.xml
index b6222c598..b20c44a83 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpointTemplate.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpointTemplate.xml
@@ -2,17 +2,17 @@
 
 <endpointTemplate
   xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
-  id="1" 
-  region="North" 
+  id="1"
+  region="North"
   global="true"
   type="compute"
   name="Compute"
   publicURL="https://service-public.com/v1"
-  internalURL="https://service-internal.com/v1" 
+  internalURL="https://service-internal.com/v1"
   enabled="true">
   <version
     id="1"
     info="https://compute.north.public.com/v1/"
     list="https://compute.north.public.com/"
   />
-</endpointTemplate>
\ No newline at end of file
+</endpointTemplate>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpointTemplates.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpointTemplates.xml
index 965be9be3..94771bef2 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpointTemplates.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpointTemplates.xml
@@ -8,7 +8,7 @@
    type="compute"
    name="Compute"
    publicURL="https://compute.north.public.com/v1"
-   internalURL="https://compute.north.internal.com/v1" 
+   internalURL="https://compute.north.internal.com/v1"
    enabled="true">
    <version
      id="1"
@@ -16,12 +16,12 @@
      info="https://compute.north.public.com/v1"/>
   </endpointTemplate>
   <endpointTemplate
-   id="2" 
+   id="2"
    region="south"
    type="compute"
    name="Compute"
    publicURL="https://service2.public.com/v1"
-   internalURL="https://service2.internal.public.com/v1" 
+   internalURL="https://service2.internal.public.com/v1"
    enabled="false">
    <version
     id="1"
@@ -29,12 +29,12 @@
     info="https://service1.public.com/v1"/>
   </endpointTemplate>
   <endpointTemplate
-   id="3" 
-   region="DFW" 
+   id="3"
+   region="DFW"
    global="true"
    type="ext1:service1"
    name="Compute"
-   publicURL="https://service1.public.com/v1" 
+   publicURL="https://service1.public.com/v1"
    enabled="true">
    <version
     id="1"
@@ -42,11 +42,11 @@
     info="https://service1.public.com/v1"/>
   </endpointTemplate>
   <endpointTemplate
-   id="4" 
+   id="4"
    region="ORD"
    type="compute"
    name="Compute"
-   publicURL="https://service2.public.com/v1" 
+   publicURL="https://service2.public.com/v1"
    enabled="true">
    <version
     id="1"
@@ -54,7 +54,7 @@
     info="https://service1.public.com/v1"/>
   </endpointTemplate>
   <endpointTemplate
-   id="5" 
+   id="5"
    global="true"
    type="compute"
    name="Compute"
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml
index b09819a16..4cf91e098 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/endpoints.xml
@@ -3,7 +3,7 @@
 <endpoints
     xmlns="http://docs.openstack.org/identity/api/v2.0">
   <endpoint
-      id="1" 
+      id="1"
       tenantId="1"
       type="compute"
       name="Compute"
@@ -18,7 +18,7 @@
       />
   </endpoint>
   <endpoint
-      id="2" 
+      id="2"
       tenantId="2"
       type="compute"
       name="Compute"
@@ -33,7 +33,7 @@
       />
   </endpoint>
   <endpoint
-      id="3" 
+      id="3"
       tenantId="1"
       type="compute"
       name="Compute"
@@ -44,7 +44,7 @@
       tenantId="1"
   />
   <endpoint
-      id="4" 
+      id="4"
       tenantId="1"
       type="compute"
       name="Compute"
@@ -59,7 +59,7 @@
       />
   </endpoint>
   <endpoint
-      id="5" 
+      id="5"
       tenantId="1"
       type="compute"
       name="Compute"
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.xml
index 056d7e960..97eac737d 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/extension.xml
@@ -19,5 +19,3 @@
                href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"/>
 
 </extension>
-    
-
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithenabledonly.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithenabledonly.xml
index 0176b9eb3..cf290ceb5 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithenabledonly.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithenabledonly.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <user xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="UserWithOnlyEnabled" 
+ xsi:type="UserWithOnlyEnabled"
  enabled="true"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.xml
index caa9801b3..7e14e1c41 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.xml
@@ -3,7 +3,7 @@
 <versions xmlns="http://docs.openstack.org/common/api/v1.0"
           xmlns:atom="http://www.w3.org/2005/Atom">
 
-  <version id="v1.0" status="DEPRECATED" 
+  <version id="v1.0" status="DEPRECATED"
           updated="2009-10-09T11:30:00Z">
      <atom:link rel="self"
                 href="http://identity.api.openstack.org/v1.0/"/>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-res.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-res.xml
index 507f23c78..d0dbce84e 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-res.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-res.xml
@@ -1,6 +1,6 @@
 <port
     id="98017ddc-efc8-4c25-a915-774b2a633855"
     state="DOWN">
-    <attachment 
-    	id="test_interface_identifier"/>
-</port>
\ No newline at end of file
+    <attachment
+        id="test_interface_identifier"/>
+</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.xml
index 79f989028..4f8c1f618 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.xml
@@ -1,2 +1,2 @@
-<port 
-	state="ACTIVE"/>
\ No newline at end of file
+<port
+        state="ACTIVE"/>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-res.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-res.xml
index c710d9c4b..f1564b85b 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-res.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-res.xml
@@ -1,2 +1,2 @@
-<port 
-	id="98017ddc-efc8-4c25-a915-774b2a633855"/>
\ No newline at end of file
+<port
+        id="98017ddc-efc8-4c25-a915-774b2a633855"/>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-res.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-res.xml
index ddb79232a..605b98db9 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-res.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-res.xml
@@ -1,8 +1,8 @@
 <ports>
-    <port 
-    	id="98017ddc-efc8-4c25-a915-774b2a633855"
+    <port
+        id="98017ddc-efc8-4c25-a915-774b2a633855"
         state="ACTIVE"/>
-    <port 
-    	id="b832be00-6553-4f69-af33-acd554e36d08"
+    <port
+        id="b832be00-6553-4f69-af33-acd554e36d08"
         state="ACTIVE"/>
-</ports>
\ No newline at end of file
+</ports>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-res.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-res.xml
index 1e9e0b354..73ac5a3a8 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-res.xml
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-res.xml
@@ -1,6 +1,6 @@
 <ports>
-    <port 
-    	id="98017ddc-efc8-4c25-a915-774b2a633855"/>
-    <port 
-    	id="b832be00-6553-4f69-af33-acd554e36d08"/>
-</ports>
\ No newline at end of file
+    <port
+        id="98017ddc-efc8-4c25-a915-774b2a633855"/>
+    <port
+        id="b832be00-6553-4f69-af33-acd554e36d08"/>
+</ports>