diff --git a/www/.htaccess b/www/.htaccess index 637b75b5ce..e38878b804 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -1,6 +1,14 @@ {% set series = 'latest' %} +{% set released_series = 'ocata' %}{# The most recently released series #} {% set projects = PROJECT_DATA[series] %} +# Redirect old top-level HTML pages to the version under most recent +# full release. +redirectmatch 301 /$ /{{released_series}}/ +redirectmatch 301 /index.html$ /{{released_series}}/ +redirectmatch 301 /openstack-projects.html$ /{{released_series}}/projects.html +redirectmatch 301 /language-bindings.html$ /{{released_series}}/language-bindings.html + # Redirecting End-of-Life (EOL) versions, see https://wiki.openstack.org/wiki/Releases: redirectmatch 301 /bexar/.*$ /index.html redirectmatch 301 /cactus/.*$ /index.html diff --git a/www/index.html b/www/index.html deleted file mode 100644 index d7006d4678..0000000000 --- a/www/index.html +++ /dev/null @@ -1,101 +0,0 @@ -{% extends "templates/indexbase.tmpl" %} -{% block pagetitle %}Ocata{% endblock %} -{% block title %}{% endblock %} -{% block header %} -{% endblock header %} -{% block content %} - -
-
-
-
-

Welcome to OpenStack Documentation

-

- What is OpenStack? 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. -

-

Warning: Major rework in progress

-

Note that on July 3rd of 2017, all projects have been - moved to a new location on this server. Each project - is required to merge any single change in order to be - published. Keep in mind that bookmarks saved before - the changes may no longer function. - - See the specification - for more information. -

- -
-

What are the next steps?

- View The Docs - Get OpenStack - Get Training - {% include 'templates/swiftype_search.tmpl' %} -
-
-
-
-
-
-
-
-
-
-

Documentation for Ocata (February 2017)

-

This is the latest release. Use the menu to select a prior release if needed.

-
- {% include 'templates/dropdown_releases_and_languages.tmpl' %} -
-
-
-
-
-
-
-
-
-
- - - - - - {% include 'templates/api_guides.tmpl' %} -
-
- {% include 'templates/user_guides.tmpl' %} - {% include 'templates/project_guides.tmpl' %} - {% include 'templates/contributor_guides.tmpl' %} - {% include 'templates/training_guides.tmpl' %} -
-
-
-
-

Documentation treated like code, powered by the community - interested?

- How To Contribute -
-
-
-
- -{% endblock content %} diff --git a/www/language-bindings.html b/www/language-bindings.html deleted file mode 100644 index fa43a2d187..0000000000 --- a/www/language-bindings.html +++ /dev/null @@ -1,64 +0,0 @@ -{% set series = 'latest' %} -{% set projects = PROJECT_DATA[series] %} -{% extends "templates/base.tmpl" %} -{% block pagetitle %}Language bindings{% endblock %} -{% block title %} -Documentation > Language Bindings and Python Clients -{% endblock %} -{% block content %} - -
-
-
-
-

OpenStack API Bindings

-

- This page contains documentation about the Python bindings provided by OpenStack and how to use them. -

-
-
-
-
-
-
-
- -
-
- -
-
-
-
-

Documentation treated like code, powered by the community - interested?

- How To Contribute -
-
-
-
- -{% endblock content %} diff --git a/www/ocata/index.html b/www/ocata/index.html index 318c57b39d..550f2ce604 100644 --- a/www/ocata/index.html +++ b/www/ocata/index.html @@ -70,7 +70,19 @@ Deployment Guides
@@ -79,13 +91,53 @@ Configuration Reference

Installation and configuration options for OpenStack

- {% include 'templates/api_guides.tmpl' %} +
- {% include 'templates/user_guides.tmpl' %} - {% include 'templates/project_guides.tmpl' %} - {% include 'templates/contributor_guides.tmpl' %} - {% include 'templates/training_guides.tmpl' %} + + + +
diff --git a/www/ocata/language-bindings.html b/www/ocata/language-bindings.html new file mode 100644 index 0000000000..c2e6fcab2b --- /dev/null +++ b/www/ocata/language-bindings.html @@ -0,0 +1,126 @@ +{% extends "templates/base.tmpl" %} +{% block pagetitle %}Language bindings{% endblock %} +{% block title %} +Documentation > Language Bindings and Python Clients +{% endblock %} +{% block content %} + +
+
+
+
+

OpenStack API Bindings

+

+ This page contains documentation about the Python bindings provided by OpenStack and how to use them. +

+
+
+
+
+
+
+ +
+ +
+
+
+
+

Documentation treated like code, powered by the community - interested?

+ How To Contribute +
+
+
+
+ +{% endblock content %} diff --git a/www/ocata/projects.html b/www/ocata/projects.html new file mode 100644 index 0000000000..bc0b48d6e7 --- /dev/null +++ b/www/ocata/projects.html @@ -0,0 +1,246 @@ +{% extends "templates/base.tmpl" %} +{% block pagetitle %}Services and Libraries{% endblock %} +{% block title %} +Documentation > Services and Libraries +{% endblock %} +{% block content %} + +
+
+
+
+

OpenStack Projects

+

+ This page contains project-specific documentation for + OpenStack services and libraries. +

+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + +
+
+ + + +
+
+
+
+

Documentation treated like code, powered by the community - interested?

+ How To Contribute +
+
+
+
+ +{% endblock content %} diff --git a/www/openstack-projects.html b/www/openstack-projects.html deleted file mode 100644 index 733a2f30f8..0000000000 --- a/www/openstack-projects.html +++ /dev/null @@ -1,105 +0,0 @@ -{% set series = 'latest' %} -{% set projects = PROJECT_DATA[series] %} -{% extends "templates/base.tmpl" %} -{% block pagetitle %}Services and Libraries{% endblock %} -{% block title %} -Documentation > Services and Libraries -{% endblock %} -{% block content %} - -
-
-
-
-

OpenStack Projects

-

- This page contains project-specific documentation for - OpenStack services and libraries. -

-
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
-
- - - -
-
-
-
-

Documentation treated like code, powered by the community - interested?

- How To Contribute -
-
-
-
- -{% endblock content %}