From 19fa888a54e57ef95bc3674382f57775ef3d3efa Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 23 Jun 2014 22:08:58 +0200 Subject: [PATCH] Publish OPS Guide to /openstack-ops This depends on https://review.openstack.org/101993: Publish OPS Guide to /openstack-ops and not anymore to /trunk/openstack-ops. Add redirects as needed and change all links. Change-Id: Ib52bbbb1ec6e90ad3222ea6685039fd4d3fb366d --- doc/admin-guide-cloud/ch_blockstorage.xml | 2 +- .../compute/section_compute-images-instances.xml | 2 +- .../compute/section_compute-networking-nova.xml | 2 +- doc/common/section_cli_nova_images.xml | 2 +- doc/common/section_cli_nova_manage_images.xml | 2 +- doc/security-guide/ch012_configuration-management.xml | 2 +- doc/user-guide-admin/section_cli_nova_manage_flavors.xml | 4 ++-- www/.htaccess | 5 ++++- www/ops/index.html | 6 +++--- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/doc/admin-guide-cloud/ch_blockstorage.xml b/doc/admin-guide-cloud/ch_blockstorage.xml index 11ad8497fc..cf6f11c649 100644 --- a/doc/admin-guide-cloud/ch_blockstorage.xml +++ b/doc/admin-guide-cloud/ch_blockstorage.xml @@ -23,7 +23,7 @@ service in OpenStack. The bulk of the options come down to two choices, single node or multi-node install. You can read a longer discussion about storage decisions in Storage Decisions in the OpenStack Operations Guide. OpenStack Block Storage enables you to add extra diff --git a/doc/admin-guide-cloud/compute/section_compute-images-instances.xml b/doc/admin-guide-cloud/compute/section_compute-images-instances.xml index f52c22f9b4..ec9118f262 100644 --- a/doc/admin-guide-cloud/compute/section_compute-images-instances.xml +++ b/doc/admin-guide-cloud/compute/section_compute-images-instances.xml @@ -37,7 +37,7 @@ For more information about flavors, see or the Flavors section in the OpenStack Operations Guide. diff --git a/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml b/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml index e66a86739e..4a35eae662 100644 --- a/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml +++ b/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml @@ -128,7 +128,7 @@ cases, all traffic between VMs and the outer world flows through nova-network. Each mode has its pros and cons (see the Network Topology section in the OpenStack Operations Guide. All networking options require network connectivity to be already set up diff --git a/doc/common/section_cli_nova_images.xml b/doc/common/section_cli_nova_images.xml index 2df96d2f0c..3b8d96018a 100644 --- a/doc/common/section_cli_nova_images.xml +++ b/doc/common/section_cli_nova_images.xml @@ -17,7 +17,7 @@ Write any buffered data to disk. For more information, see the Taking Snapshots in the OpenStack Operations Guide. diff --git a/doc/common/section_cli_nova_manage_images.xml b/doc/common/section_cli_nova_manage_images.xml index aa7191b1d1..55d719bde0 100644 --- a/doc/common/section_cli_nova_manage_images.xml +++ b/doc/common/section_cli_nova_manage_images.xml @@ -15,7 +15,7 @@ Write any buffered data to disk. - For more information, see For more information, see Taking Snapshots in the OpenStack Operations Guide. diff --git a/doc/security-guide/ch012_configuration-management.xml b/doc/security-guide/ch012_configuration-management.xml index 61ac50d912..d528584e98 100644 --- a/doc/security-guide/ch012_configuration-management.xml +++ b/doc/security-guide/ch012_configuration-management.xml @@ -278,7 +278,7 @@ OpenStack Operations Guide on backup and recovery diff --git a/doc/user-guide-admin/section_cli_nova_manage_flavors.xml b/doc/user-guide-admin/section_cli_nova_manage_flavors.xml index cc484605e8..2c8d7d284d 100644 --- a/doc/user-guide-admin/section_cli_nova_manage_flavors.xml +++ b/doc/user-guide-admin/section_cli_nova_manage_flavors.xml @@ -1,4 +1,4 @@ - +
+ xlink:href="http://docs.openstack.org/openstack-ops/content/private-flavors.html"> Private Flavors in the OpenStack Operations Guide . For a list of optional parameters, run this diff --git a/www/.htaccess b/www/.htaccess index 7c970d7081..eaa5340d9c 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -109,7 +109,10 @@ redirect 301 /trunk/install-guide/install/zypper/content/object-storage-post-ins redirect 301 /trunk/install-guide/install/yum/content/object-storage-post-install.html /trunk/install-guide/install/yum/content/verify-object-storage-installation.html # Redirect O'Reilly Operations Guide PDF to trunk version -redirect 301 /trunk/openstack-ops/oreilly-openstack-ops-guide.pdf /trunk/openstack-ops/openstack-ops-manual-trunk.pdf +redirect 301 /trunk/openstack-ops/oreilly-openstack-ops-guide.pdf /openstack-ops/openstack-ops-manual.pdf + +# Redirect Operations Guide to /openstack-ops +redirect 301 /trunk/openstack-ops/ /openstack-ops/ # A doc generation bug resulted in Google indexing links containing "//", which cause # problems with linked content (images/css/etc). This rule generates a 301 redirect diff --git a/www/ops/index.html b/www/ops/index.html index 2509f4092f..74c6da88ce 100644 --- a/www/ops/index.html +++ b/www/ops/index.html @@ -159,16 +159,16 @@ function recordOutboundLink(link, category, action) { in production for six months or longer. They've gathered their notes, shared their stories, and learned from each other in the room. We invite you to join in the quest for best practices in OpenStack cloud operations. You can read the - + latest updates or download the new O'Reilly published versions below.

- + Current .html - + Current .pdf