diff --git a/www/.htaccess b/www/.htaccess index 83c0009684..eb2c3e93c2 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -91,10 +91,12 @@ redirect 301 /api/api-specs.html https://docs.openstack.org/api-quick-start/inde redirectmatch 301 (.*)//(.*) $1/$2 # Redirect networking-guide since it is now versioned -{{ dir_to_page('/networking-guide', '/ocata/networking-guide/') }} +{{ dir_to_page('/networking-guide', '/neutron/latest/admin/') }} +redirect 301 /newton/networking-guide/intro-basic-networking.html /neutron/latest/admin/intro-basic-networking.html +redirect 301 /ocata/networking-guide/intro-basic-networking.html /neutron/latest/admin/intro-basic-networking.html # Redirect old releases content to new location -{{ deep_links('/releases', 'http://releases.openstack.org/$1') }} +{{ deep_links('/releases', 'https://releases.openstack.org/$1') }} # redirect all kuryr sub-repositories appropriately {{ deep_links('/developer/kuryr-(kubernetes|libnetwork|tempest-plugin)', '/kuryr-$1/latest/$2') }} @@ -165,8 +167,8 @@ redirect 301 /doc-contrib-guide/ui-text-guidelines /doc-contrib-guide/ux-ui-guid # Redirect old install guide list pages to their new home {{ path_to_page('/(havana|icehouse|juno|kilo|mitaka)/install-guide', '/$1/') }} -{{ dir_to_page('/project-install-guide/newton', '/newton/install/') }} -{{ deep_links('/project-install-guide/ocata', '/ocata/install/$1') }} +redirect 301 /project-install-guide/newton /latest/install/ +redirect 301 /project-install-guide/ocata /latest/install/ # Redirecting infra docs links to new location {{ deep_links('/infra/shade', '/shade/latest/$1') }} diff --git a/www/redirect-tests.txt b/www/redirect-tests.txt index fd8713014e..14cd275978 100644 --- a/www/redirect-tests.txt +++ b/www/redirect-tests.txt @@ -103,10 +103,12 @@ /a//b/ 301 /a/b/ # Redirect networking-guide since it is now versioned -{{ dir_to_page('/networking-guide', '/ocata/networking-guide/') }} +{{ dir_to_page('/networking-guide', '/neutron/latest/admin/') }} +/newton/networking-guide/intro-basic-networking.html 301 /neutron/latest/admin/intro-basic-networking.html +/ocata/networking-guide/intro-basic-networking.html 301 /neutron/latest/admin/intro-basic-networking.html # Redirect old releases content to new location -{{ deep_links('/releases', 'http://releases.openstack.org') }} +{{ deep_links('/releases', 'https://releases.openstack.org') }} # redirect all kuryr sub-repositories appropriately {{ deep_links('/developer/kuryr-kubernetes', '/kuryr-kubernetes/latest') }} @@ -194,8 +196,8 @@ {{ path_to_page('/juno/install-guide', '/juno/') }} {{ path_to_page('/kilo/install-guide', '/kilo/') }} {{ path_to_page('/mitaka/install-guide', '/mitaka/') }} -{{ dir_to_page('/project-install-guide/newton', '/newton/install/') }} -{{ deep_links('/project-install-guide/ocata', '/ocata/install') }} +/project-install-guide/newton 301 /latest/install/ +/project-install-guide/ocata 301 /latest/install/ # Redirecting infra docs links to new location {{ deep_links('/infra/shade', '/shade/latest') }}