diff --git a/doc/src/docbkx/openstack-api-programming/pom.xml b/doc/src/docbkx/openstack-api-programming/pom.xml
index be1807c83e..5cb23c8a01 100644
--- a/doc/src/docbkx/openstack-api-programming/pom.xml
+++ b/doc/src/docbkx/openstack-api-programming/pom.xml
@@ -132,6 +132,7 @@
                     <includes>
                         openstackapi-programming.xml
                     </includes>
+                    <canonicalUrlBase>http://docs.openstack.org/api/openstack-compute/programmer/content/</canonicalUrlBase>
                     <profileSecurity>reviewer</profileSecurity>
                     <branding>openstack</branding>
                 </configuration>
diff --git a/doc/src/docbkx/openstack-install/compute-sys-requirements.xml b/doc/src/docbkx/openstack-install/compute-sys-requirements.xml
index b8096cd9e6..59c72bedb6 100644
--- a/doc/src/docbkx/openstack-install/compute-sys-requirements.xml
+++ b/doc/src/docbkx/openstack-install/compute-sys-requirements.xml
@@ -81,13 +81,18 @@
             
         </tbody>
     </table>
+    <note>
+        <para>While certain parts of OpenStack are known to work on
+            various operating systems, currently the only
+            feature-complete, production-supported host environment is
+            Linux.</para></note>
     <para><emphasis role="bold">Operating System</emphasis>: OpenStack
         currently has packages for the following distributions:
         CentOS, Debian, Fedora, RHEL, Debian, and Ubuntu. These
         packages are maintained by community members, refer to <link
             xlink:href="http://wiki.openstack.org/Packaging"
             >http://wiki.openstack.org/Packaging</link> for additional
-        links.</para>
+            links.</para>
     <para><emphasis role="bold">Database</emphasis>: For
         OpenStack Compute, you need access to either a PostgreSQL
         or MySQL database, or you can install it as part of the