diff --git a/www/static/.htaccess b/www/static/.htaccess
index 0104595602..f5a77818e5 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -10,28 +10,24 @@ redirectmatch 301 /icehouse/.*$ /index.html
 redirectmatch 301 /juno/.*$ /index.html
 
 # Redirect for the original version of compute
-redirect 301 /openstack-compute/ /
+redirectmatch 301 /openstack-compute/.*$ /index.html
+redirectmatch 301 /trunk/openstack-compute/starter/.*$ /index.html
 
 # Redirect for the original version of storage
-redirect 301 /openstack-object-storage/ /
-
-# Redirect for the 1.1 version of the Compute API going to v2
-redirect 301 /api/openstack-compute/1.1/ /api/openstack-compute/2/
+redirectmatch 301 /openstack-object-storage/.*$ /index.html
 
 # Redirect image metadata and format reference
-redirect 301 /trunk/openstack-compute/admin/content/adding-images.html /cli-reference/content/chapter_cli-glance-property.html
+redirect 301 /trunk/openstack-compute/admin/content/adding-images.html /cli-reference/glance-property-keys.html
 
 # Redirect config reference precisely
 redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /newton/config-reference/compute/nova-conf.html
 
-redirect 301 /trunk/openstack-compute/starter/ /trunk/
-
 # Redirecting incubation quantum
-redirect 301 /incubation/openstack-network/admin/content/ /trunk/openstack-network/admin/content
-redirect 301 /incubation/openstack-network/developer/quantum-api-1.0/content/ /api/openstack-network/1.0/content/
+redirectmatch 301 /incubation/openstack-network/admin/content/ /admin-guide/networking.html
+redirectmatch 301 /incubation/openstack-network/developer/quantum-api-1.0/content/ https://developer.openstack.org/api-guide/quick-start/
 
 # Redirecting old install guide to apt (could be yum, analytics show more seek apt)
-redirect 301 /trunk/openstack-compute/install/content /trunk/openstack-compute/install/yum/content
+redirectmatch 301 /trunk/openstack-compute/install/content/.*$ /index.html
 
 # Redirecting trunk basic install to install guide
 redirect 301 /trunk/basic-install/apt/content /newton/install-guide-ubuntu/
@@ -95,35 +91,31 @@ redirect 301 /developer/ironic/install/ironic-install.html /developer/ironic/dep
 redirect 301 /developer/ironic/dev/api-spec-v1.html /developer/ironic/webapi/v1.html
 
 # Redirect API docs that have been put in openstack-attic
-redirectmatch 301 /api/openstack-block-storage/1.0/content/.*$ http://developer.openstack.org/api-ref-blockstorage-v1.html
-redirectmatch 301 /api/openstack-block-storage/2.0/content/.*$ http://developer.openstack.org/api-ref-blockstorage-v2.html
-redirectmatch 301 /api/openstack-compute/2/content/.*$ http://developer.openstack.org/api-ref-compute-v2.html
-redirectmatch 301 /api/openstack-databases/content/.*$ http://developer.openstack.org/api-ref-databases-v1.html
-redirectmatch 301 /api/openstack-identity-service/2.0/content/.*$ http://developer.openstack.org/api-ref-identity-v2.html
-redirectmatch 301 /api/openstack-identity-service/3/content/.*$ http://developer.openstack.org/api-ref-identity-v3.html
-redirectmatch 301 /api/openstack-image-service/1.0/content/.*$ http://developer.openstack.org/api-ref-image-v1.html
-redirectmatch 301 /api/openstack-image-service/1.1/content/.*$ http://developer.openstack.org/api-ref-image-v1.html
-redirectmatch 301 /api/openstack-image-service/2.0/content/.*$ http://developer.openstack.org/api-ref-image-v2.html
-redirectmatch 301 /api/openstack-network/2.0/content/.*$ http://developer.openstack.org/api-ref-networking-v2.html
-redirectmatch 301 /api/openstack-object-storage/1.0/content/.*$ http://developer.openstack.org/api-ref-objectstorage-v1.html
-redirectmatch 301 /api/openstack-objectstorage/1.0/content/.*$ http://developer.openstack.org/api-ref-objectstorage-v1.html
-redirect 301 /api/openstack-image-service/2.0/content/appendix-b-http-patch-media-types.html http://specs.openstack.org/openstack/glance-specs/specs/api/v2/http-patch-image-api-v2.html
+redirectmatch 301 /api/openstack-block-storage/1.0/content/.*$ https://developer.openstack.org/api-ref-blockstorage-v1.html
+redirectmatch 301 /api/openstack-block-storage/2.0/content/.*$ https://developer.openstack.org/api-ref-blockstorage-v2.html
+redirectmatch 301 /api/openstack-compute/2/content/.*$ https://developer.openstack.org/api-ref-compute-v2.html
+redirectmatch 301 /api/openstack-databases/content/.*$ https://developer.openstack.org/api-ref-databases-v1.html
+redirectmatch 301 /api/openstack-identity-service/2.0/content/.*$ https://developer.openstack.org/api-ref-identity-v2.html
+redirectmatch 301 /api/openstack-identity-service/3/content/.*$ https://developer.openstack.org/api-ref-identity-v3.html
+redirectmatch 301 /api/openstack-image-service/1.0/content/.*$ https://developer.openstack.org/api-ref-image-v1.html
+redirectmatch 301 /api/openstack-image-service/1.1/content/.*$ https://developer.openstack.org/api-ref-image-v1.html
+redirectmatch 301 /api/openstack-image-service/2.0/content/.*$ https://developer.openstack.org/api-ref-image-v2.html
+redirectmatch 301 /api/openstack-network/2.0/content/.*$ https://developer.openstack.org/api-ref-networking-v2.html
+redirectmatch 301 /api/openstack-object-storage/1.0/content/.*$ https://developer.openstack.org/api-ref-objectstorage-v1.html
+redirectmatch 301 /api/openstack-objectstorage/1.0/content/.*$ https://developer.openstack.org/api-ref-objectstorage-v1.html
+redirect 301 /api/openstack-image-service/2.0/content/appendix-b-http-patch-media-types.html https://specs.openstack.org/openstack/glance-specs/specs/api/v2/http-patch-image-api-v2.html
 
 # Redirect /trunk/index.html to /index.html
 redirect 301 /trunk/index.html /index.html
 
 # Redirect trunk/config-reference to newton/config-reference
-redirectmatch 301 /trunk/config-reference/content/(.*) /newton/config-reference/index.html
+redirectmatch 301 /trunk/config-reference/content/.*$ /newton/config-reference/index.html
 
 # Redirect trove install guide
-redirectmatch 301 "^/juno/install-guide/install/.*/ch_trove.html$" /
-redirectmatch 301 "^/juno/install-guide/install/.*/trove.*$" /
 redirectmatch 301 "^/kilo/install-guide/install/.*/ch_trove.html$" /
 redirectmatch 301 "^/kilo/install-guide/install/.*/trove.*$" /
 
 # Redirect sahara install guide
-redirectmatch 301 "^/juno/install-guide/install/.*/ch_sahara.html$" /
-redirectmatch 301 "^/juno/install-guide/install/.*/sahara.*$" /
 redirectmatch 301 "^/kilo/install-guide/install/.*/ch_sahara.html$" /
 redirectmatch 301 "^/kilo/install-guide/install/.*/sahara.*$" /