Merge "Remove links to grizzly and incubation pages"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
e553afc121
@ -82,6 +82,7 @@ redirect 301 /run/ /
|
|||||||
redirect 301 /api/index.html /
|
redirect 301 /api/index.html /
|
||||||
redirect 301 /developer/index.html /developer/openstack-projects.html
|
redirect 301 /developer/index.html /developer/openstack-projects.html
|
||||||
redirect 301 /cli/ /
|
redirect 301 /cli/ /
|
||||||
|
redirect 301 /incubation/ /
|
||||||
|
|
||||||
# Redirect old identity/api to api site
|
# Redirect old identity/api to api site
|
||||||
redirectmatch /identity/api/.*$ http://api.openstack.org/
|
redirectmatch /identity/api/.*$ http://api.openstack.org/
|
||||||
|
|||||||
@ -148,13 +148,6 @@
|
|||||||
<li class="link"><a href="/havana/"
|
<li class="link"><a href="/havana/"
|
||||||
title="Go to the "Havana release" page"
|
title="Go to the "Havana release" page"
|
||||||
>Havana</a></li>
|
>Havana</a></li>
|
||||||
<li class="link"><a href="/grizzly/"
|
|
||||||
title="Go to the "Grizzly" page"
|
|
||||||
>Grizzly</a></li>
|
|
||||||
<li class="link"><a
|
|
||||||
href="/incubation/"
|
|
||||||
title="Go to the "Incubation" page"
|
|
||||||
>Incubation</a></li>
|
|
||||||
<li>Languages</li>
|
<li>Languages</li>
|
||||||
<li class="link"><a href="/ja/"
|
<li class="link"><a href="/ja/"
|
||||||
title="Go to the Japanese documentation"
|
title="Go to the Japanese documentation"
|
||||||
|
|||||||
@ -149,10 +149,6 @@
|
|||||||
<li class="link"><a href="/havana/"
|
<li class="link"><a href="/havana/"
|
||||||
title="Go to the "Havana release" page"
|
title="Go to the "Havana release" page"
|
||||||
>Havana</a></li>
|
>Havana</a></li>
|
||||||
<li class="link"><a
|
|
||||||
href="/incubation/"
|
|
||||||
title="Go to the "Incubation" page"
|
|
||||||
>Incubation</a></li>
|
|
||||||
<li>Languages</li>
|
<li>Languages</li>
|
||||||
<li class="link"><a href="/ja/"
|
<li class="link"><a href="/ja/"
|
||||||
title="Go to the Japanese documentation"
|
title="Go to the Japanese documentation"
|
||||||
|
|||||||
@ -1,188 +0,0 @@
|
|||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta name="generator" content=
|
|
||||||
"HTML Tidy for Linux/x86 (vers 11 February 2007), see www.w3.org" />
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
|
|
||||||
<meta name="google-site-verification" content=
|
|
||||||
"Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
|
|
||||||
|
|
||||||
<title>OpenStack Docs: Current</title><!-- Google Fonts -->
|
|
||||||
<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin'
|
|
||||||
rel='stylesheet' type='text/css' /><!-- Framework CSS -->
|
|
||||||
<link rel="stylesheet" href=
|
|
||||||
"http://openstack.org/themes/openstack/css/blueprint/screen.css" type=
|
|
||||||
"text/css" media="screen, projection" />
|
|
||||||
<link rel="stylesheet" href=
|
|
||||||
"http://openstack.org/themes/openstack/css/blueprint/print.css" type=
|
|
||||||
"text/css" media="print" />
|
|
||||||
<!--[if lt IE 8]><link rel="stylesheet" href="http://openstack.org/themes/openstack/css/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
|
|
||||||
<!-- OpenStack Specific CSS -->
|
|
||||||
<link rel="stylesheet" href=
|
|
||||||
"http://openstack.org/themes/openstack/css/main.css" type="text/css" media=
|
|
||||||
"screen, projection, print" />
|
|
||||||
<link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/docblitz.css" />
|
|
||||||
<!--<script type="text/javascript">
|
|
||||||
|
|
||||||
var _gaq = _gaq || [];
|
|
||||||
_gaq.push(['_setAccount', 'UA-17511903-6']);
|
|
||||||
_gaq.push(['_setDomainName', '.openstack.org']);
|
|
||||||
_gaq.push(['_trackPageview']);
|
|
||||||
|
|
||||||
(function() {
|
|
||||||
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
|
|
||||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
|
||||||
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
|
|
||||||
})();
|
|
||||||
|
|
||||||
</script>-->
|
|
||||||
</head>
|
|
||||||
<body class="docshome" id="docshome">
|
|
||||||
<div class="container">
|
|
||||||
<div id="header">
|
|
||||||
<div class="span-5">
|
|
||||||
<h1 id="logo"><a href="http://www.openstack.org/">OpenStack</a></h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="span-19 last">
|
|
||||||
<div id="navigation">
|
|
||||||
<ul id="Menu1">
|
|
||||||
<li><a href="http://www.openstack.org/" title="Go to the Home page"
|
|
||||||
class="link">Home</a></li>
|
|
||||||
|
|
||||||
<li><a href="http://www.openstack.org/projects/" title=
|
|
||||||
"Go to the OpenStack Projects page">Projects</a></li>
|
|
||||||
|
|
||||||
<li><a href="http://www.openstack.org/user-stories/" title=
|
|
||||||
"Go to the User Stories page" class="link">User Stories</a></li>
|
|
||||||
|
|
||||||
<li><a href="http://www.openstack.org/community/" title=
|
|
||||||
"Go to the Community page" class="link">Community</a></li>
|
|
||||||
|
|
||||||
<li><a href="http://www.openstack.org/blog/" title=
|
|
||||||
"Go to the OpenStack Blog">Blog</a></li>
|
|
||||||
|
|
||||||
<li><a href="http://wiki.openstack.org/" title=
|
|
||||||
"Go to the OpenStack Wiki">Wiki</a></li>
|
|
||||||
|
|
||||||
<li><a href="http://docs.openstack.org/" title=
|
|
||||||
"Go to OpenStack Documentation" class=
|
|
||||||
"current">Documentation</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Page Content -->
|
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<div class="span-12">
|
|
||||||
<h3 class="subhead"><a href="http://docs.openstack.org/">Documentation</a> > Incubation</h3>
|
|
||||||
</div>
|
|
||||||
<div class="searchArea span-10 last">
|
|
||||||
<div id="cse" style="width: 100%;">
|
|
||||||
Loading
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script src="http://www.google.com/jsapi" type="text/javascript">
|
|
||||||
</script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
//<![CDATA[
|
|
||||||
|
|
||||||
google.load('search', '1', {language : 'en'});
|
|
||||||
var _gaq = _gaq || [];
|
|
||||||
_gaq.push(["_setAccount", "UA-17511903-6"]);
|
|
||||||
function _trackQuery(control, searcher, query) {
|
|
||||||
var gaQueryParamName = "q";
|
|
||||||
var loc = document.location;
|
|
||||||
var url = [
|
|
||||||
loc.pathname,
|
|
||||||
loc.search,
|
|
||||||
loc.search ? '&' : '?',
|
|
||||||
gaQueryParamName == '' ? 'q' : encodeURIComponent(gaQueryParamName),
|
|
||||||
'=',
|
|
||||||
encodeURIComponent(query)
|
|
||||||
].join('');
|
|
||||||
_gaq.push(["_trackPageview", url]);
|
|
||||||
}
|
|
||||||
google.setOnLoadCallback(function() {
|
|
||||||
var customSearchControl = new google.search.CustomSearchControl('011012898598057286222:elxsl505o0o');
|
|
||||||
customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
|
|
||||||
customSearchControl.setSearchStartingCallback(null, _trackQuery);
|
|
||||||
customSearchControl.draw('cse');
|
|
||||||
}, true);
|
|
||||||
//]]>
|
|
||||||
</script>
|
|
||||||
</div><!--
|
|
||||||
<link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" /> -->
|
|
||||||
<!-- <div id="cse" style="width: 100%;">Loading</div>
|
|
||||||
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
google.load('search', '1', {language : 'en'});
|
|
||||||
google.setOnLoadCallback(function() {
|
|
||||||
var customSearchControl = new google.search.CustomSearchControl('011012898598057286222:elxsl505o0o');
|
|
||||||
customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
|
|
||||||
customSearchControl.draw('cse');
|
|
||||||
}, true);
|
|
||||||
</script>
|
|
||||||
</div> -->
|
|
||||||
<div class="container">
|
|
||||||
|
|
||||||
<div class="span-12">
|
|
||||||
|
|
||||||
<p>These projects have graduated to integrated from incubation and will be part of the Havana release:
|
|
||||||
<a href="http://wiki.openstack.org/Ceilometer">Ceilometer</a>
|
|
||||||
<a href="http://wiki.openstack.org/Heat">Heat</a>
|
|
||||||
</p>
|
|
||||||
<p>Refer to the <a href="http://wiki.openstack.org">OpenStack wiki</a> for projects in the works.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="container">
|
|
||||||
<div id="footer">
|
|
||||||
<hr />
|
|
||||||
<p>Documentation treated like code, powered by the community - interested? Here's <a href="http://wiki.openstack.org/Documentation/HowTo">how to contribute</a>. </p>
|
|
||||||
<p>The OpenStack project is provided under the Apache 2.0 license.
|
|
||||||
Openstack.org is powered by <a href=
|
|
||||||
"http://www.rackspacecloud.com/">Rackspace Cloud Computing</a>.</p>
|
|
||||||
</div>
|
|
||||||
</div><script type="text/javascript" src=
|
|
||||||
"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js">
|
|
||||||
</script><script src="/common/jquery/jquery.hoverIntent.minified.js" type=
|
|
||||||
"text/javascript" charset="utf-8">
|
|
||||||
</script><script type="text/javascript" charset="utf-8">
|
|
||||||
//<![CDATA[
|
|
||||||
$(document).ready(function() {
|
|
||||||
|
|
||||||
function addMenu(){
|
|
||||||
$(".dropDown").addClass("menuHover");
|
|
||||||
}
|
|
||||||
|
|
||||||
function removeMenu(){
|
|
||||||
$(".dropDown").removeClass("menuHover");
|
|
||||||
}
|
|
||||||
|
|
||||||
var menuConfig = {
|
|
||||||
interval: 500,
|
|
||||||
sensitivity: 4,
|
|
||||||
over: addMenu,
|
|
||||||
timeout: 500,
|
|
||||||
out: removeMenu
|
|
||||||
};
|
|
||||||
|
|
||||||
$(".dropDownTrigger").hoverIntent(menuConfig);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//]]>
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -148,13 +148,6 @@
|
|||||||
<li class="link"><a href="/havana/"
|
<li class="link"><a href="/havana/"
|
||||||
title="Go to the "Havana release" page"
|
title="Go to the "Havana release" page"
|
||||||
>Havana</a></li>
|
>Havana</a></li>
|
||||||
<li class="link"><a href="/grizzly/"
|
|
||||||
title="Go to the "Grizzly" page"
|
|
||||||
>Grizzly</a></li>
|
|
||||||
<li class="link"><a
|
|
||||||
href="/incubation/"
|
|
||||||
title="Go to the "Incubation" page"
|
|
||||||
>Incubation</a></li>
|
|
||||||
<li>Languages</li>
|
<li>Languages</li>
|
||||||
<li class="link"><a href="/ja/"
|
<li class="link"><a href="/ja/"
|
||||||
title="Go to the Japanese documentation"
|
title="Go to the Japanese documentation"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user