Remove /trunk/index.html
Redirect /trunk/index.html to /. Also fix some redirects that should not go to /trunk Also add /draft to robots.txt. Partially implements bp draft-publishing Change-Id: I70ed40908fa40f6d59d1aa2230cc86a77c6ee2cb
This commit is contained in:
Andreas Jaeger
parent
9b0740f098
commit
ae4383bdd2
@ -11,7 +11,7 @@ redirect 301 /api/openstack-compute/1.1/ /api/openstack-compute/2/
|
||||
redirect 301 /trunk/openstack-compute/admin/content/adding-images.html /cli-reference/content/chapter_cli-glance-property.html
|
||||
|
||||
# Redirect config reference precisely
|
||||
redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /trunk/config-reference/content/list-of-compute-config-options.html
|
||||
redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /juno/config-reference/content/list-of-compute-config-options.html
|
||||
|
||||
# Redirect the Clients Guide to new End User Guide
|
||||
redirect 301 /cli/quick-start/content/keystone_client.html /user-guide/content/keystone_commands.html
|
||||
@ -42,8 +42,8 @@ redirect 301 /incubation/openstack-network/developer/quantum-api-1.0/content/ /a
|
||||
redirect 301 /trunk/openstack-compute/install/content /trunk/openstack-compute/install/yum/content
|
||||
|
||||
# Redirecting trunk basic install to install guide
|
||||
redirect 301 /trunk/basic-install/apt/content /trunk/install-guide/apt/content/
|
||||
redirect 301 /trunk/basic-install/yum/content /trunk/install-guide/yum/content/
|
||||
redirect 301 /trunk/basic-install/apt/content /juno/install-guide/apt/content/
|
||||
redirect 301 /trunk/basic-install/yum/content /juno/install-guide/yum/content/
|
||||
|
||||
# Redirecting trunk admin guides to admin-guide-cloud
|
||||
redirect 301 /trunk/openstack-block-storage/admin/content/ /admin-guide-cloud/content/
|
||||
@ -136,9 +136,11 @@ redirectmatch 301 /api/openstack-network/2.0/content/.*$ http://developer.openst
|
||||
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
|
||||
# Redirect /trunk/index.html to /index.html
|
||||
redirect 301 /trunk/index.html /index.html
|
||||
|
||||
# Redirect apt-debian install guide for Icehouse
|
||||
redirectmatch 301 /icehouse/install-guide/install/apt-debian/.*$ /
|
||||
|
||||
# Redirect old networking content to root for now
|
||||
redirectmatch 301 /openstack-network/.*$ /index.html
|
||||
redirectmatch 301 /openstack-network/.*$ /index.html
|
||||
|
||||
@ -5,3 +5,4 @@ Disallow: /*.pdf$
|
||||
# Keep OpenStack users from accidentally using docs for the upcoming release
|
||||
User-agent: *
|
||||
Disallow: /trunk/
|
||||
Disallow: /draft/
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<a data-toggle="dropdown" href="#">More Releases & Languages <i class="fa fa-caret-down fa-3"></i></a>
|
||||
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
|
||||
<li role="presentation" class="dropdown-header">Releases</li>
|
||||
<li role="presentation"><a role="menuitem" tabindex="-1" href="/trunk">In progress (master branch)</a></li>
|
||||
<li role="presentation"><a role="menuitem" tabindex="-1" href="/juno">Juno (current release)</a></li>
|
||||
<li role="presentation"><a role="menuitem" tabindex="-1" href="/icehouse">Icehouse</a></li>
|
||||
<li role="presentation" class="dropdown-header">Languages</li>
|
||||
|
||||
@ -1,143 +0,0 @@
|
||||
{% set scriptdir = '../common/js/' %}
|
||||
{% set cssdir = '../common/css/' %}
|
||||
{% extends "templates/base.tmpl" %}
|
||||
{% block pagetitle %}Current{% endblock %}
|
||||
{% block title %}{% endblock %}
|
||||
{% block header %}
|
||||
{% endblock header %}
|
||||
{% block content %}
|
||||
<!-- Begin Page Content -->
|
||||
<div class="top-docs-wrapper">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-8 col-md-8 col-sm-8">
|
||||
<h1>Welcome to OpenStack Documentation</h1>
|
||||
<p>
|
||||
<strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
|
||||
</p>
|
||||
<hr>
|
||||
<h3>What are the next steps?</h3>
|
||||
<a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
|
||||
<a href="http://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
|
||||
<a href="http://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
|
||||
<form class="docs-main-search-form">
|
||||
<script type="text/javascript">
|
||||
(function() {
|
||||
var cx = '000108871792296872333:noj9nikm74i';
|
||||
var gcse = document.createElement('script');
|
||||
gcse.type = 'text/javascript';
|
||||
gcse.async = true;
|
||||
gcse.src = (document.location.protocol == 'https:' ? 'https:' :
|
||||
'http:') +
|
||||
'//www.google.com/cse/cse.js?cx=' + cx;
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(gcse, s);
|
||||
})();
|
||||
</script>
|
||||
<gcse:search gname="standard" as_sitesearch="docs.openstack.org">
|
||||
</gcse:search>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
|
||||
<div id="superuser-img"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mid-docs-wrapper" id="docs-main-body">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-9 col-md-9 col-sm-9">
|
||||
<h2>Documentation preview for Kilo (April 2015)</h2>
|
||||
<p>This is documentation in progress for the next release. You can use the menu to select a prior release.</p>
|
||||
</div>
|
||||
{% include 'templates/dropdown_releases_and_languages.tmpl' %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row docs-toc">
|
||||
<div class="col-lg-6 col-md-6 col-sm-6">
|
||||
<div class="docs-link-sections">
|
||||
<h3><i class="fa fa-cogs"></i> Install Guides</h3>
|
||||
<a href="/juno/install-guide/install/zypper/content/">Juno only: Installation Guide for openSUSE 13.1 and SUSE Linux Enterprise Server 11</a>
|
||||
<a href="/juno/install-guide/install/yum/content/">Juno only: Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 20</a>
|
||||
<a href="/juno/install-guide/install/apt/content/">Juno only: Installation Guide for Ubuntu 14.04 (LTS)</a>
|
||||
</div>
|
||||
<div class="docs-link-sections">
|
||||
<h3 id="api-guides"><i class="fa fa-book"></i> API References</h3>
|
||||
<a href="http://developer.openstack.org/api-ref.html">API Complete Reference (HTML)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-guides/bk-api-ref.pdf">API Complete Reference (PDF)</a>
|
||||
|
||||
<a href="http://developer.openstack.org/api-ref-blockstorage-v2.html">Block Storage API v2 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-blockstorage-v1.html">Block Storage API v1 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-compute-v2.1.html">Compute API v2.1 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-compute-v2.html">Compute API v2 (SUPPORTED)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-compute-v2-ext.html">Compute API v2 extensions (SUPPORTED)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-data-processing-v1.1.html">Data Processing v1.1 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-database-v1.html">Database Service API v1.0 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-identity-v3.html">Identity API v3 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-identity-v2.html">Identity API v2.0 (SUPPORTED)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-image-v2.html">Image Service API v2 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-image-v1.html">Image Service API v1 (SUPPORTED)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-networking-v2.html">Networking API v2.0 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-objectstorage-v1.html">Object Storage API v1 (SUPPORTED)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-orchestration-v1.html">Orchestration API v1 (CURRENT)</a>
|
||||
<a href="http://developer.openstack.org/api-ref-telemetry-v2.html">Telemetry API v2 (CURRENT)</a>
|
||||
</div>
|
||||
<div class="docs-link-sections">
|
||||
<h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
|
||||
<a href="/arch-design/content/">Architecture Design Guide</a>
|
||||
<a href="/draft/config-reference/content/">Configuration Reference</a>
|
||||
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
|
||||
<a href="/high-availability-guide/content/index.html">High Availability Guide</a>
|
||||
<a href="/ops/">Operations Guide</a>
|
||||
<a href="/security-guide/content/">Security Guide</a>
|
||||
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6 col-md-6 col-sm-6">
|
||||
<div class="docs-link-sections">
|
||||
<h3><i class="fa fa-users"></i> Operations and Administration Guides</h3>
|
||||
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
|
||||
<a href="/high-availability-guide/content/">High Availability Guide</a>
|
||||
<a href="/ops/">Operations Guide</a>
|
||||
<a href="/security-guide/content/">Security Guide</a>
|
||||
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
|
||||
<a href="/arch-design/content/">Architecture Design Guide</a>
|
||||
</div>
|
||||
<div class="docs-link-sections">
|
||||
<h3><i class="fa fa-cloud"></i> User Guides</h3>
|
||||
<a href="/api/quick-start/content/">API Quick Start</a>
|
||||
<a href="/user-guide/">End User Guide (includes Python SDK)</a>
|
||||
<a href="/user-guide-admin/">Admin User Guide</a>
|
||||
<a href="/cli-reference/content/">Command-Line Interface Reference</a>
|
||||
<a href="http://developer.openstack.org">Open source software for application development</a>
|
||||
</div>
|
||||
<div class="docs-link-sections">
|
||||
<h3><i class="fa fa-pencil"></i> Contributor Guides</h3>
|
||||
<a href="http://wiki.openstack.org/Documentation/HowTo">OpenStack Documentation</a>
|
||||
<a href="/developer/openstack-projects.html">Python Developer Documentation</a>
|
||||
<a href="/developer/language-bindings.html">Language Bindings and Python Clients</a>
|
||||
<a href="http://ci.openstack.org">OpenStack Project Infrastructure</a>
|
||||
<a href="/infra/manual/">OpenStack Infrastructure User Manual</a>
|
||||
<a href="/developer/tempest">Tempest Test Suite for OpenStack</a>
|
||||
<a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
|
||||
<a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row docs-contribute-wrapper">
|
||||
<div class="col-lg-12">
|
||||
<p>Documentation treated like code, powered by the community - interested?</p>
|
||||
<a href="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- End Page Content -->
|
||||
{% endblock content %}
|
||||
Loading…
x
Reference in New Issue
Block a user