Merge "changing paths from grizzly to trunk"

This commit is contained in:
Jenkins 2013-08-02 15:29:57 +00:00 committed by Gerrit Code Review
commit 06cd588129

View File

@ -165,45 +165,45 @@
<h4 class="special">Install OpenStack</h4>
<dl>
<dd><a
href="http://docs.openstack.org/grizzly/basic-install/apt/content"
href="http://docs.openstack.org/trunk/basic-install/apt/content"
>Basic Installation Guide for
Ubuntu 12.04 (LTS) and Debian
Wheezy</a></dd>
<dd>
<a
href="http://docs.openstack.org/grizzly/basic-install/yum/content"
href="http://docs.openstack.org/trunk/basic-install/yum/content"
>Basic Installation Guide for
Fedora 18</a></dd>
<dd>
<a
href="http://docs.openstack.org/grizzly/openstack-compute/install/yum/content/"
href="http://docs.openstack.org/trunk/openstack-compute/install/yum/content/"
>Installation Guide for Red Hat
Enterprise Linux, CentOS, and
Fedora</a></dd>
<dd><a
href="http://docs.openstack.org/grizzly/openstack-compute/install/apt/content/"
href="http://docs.openstack.org/trunk/openstack-compute/install/apt/content/"
>Installation Guide for Ubuntu
12.04 (LTS)</a></dd>
</dl>
<h4 class="special">Configure and run an OpenStack cloud</h4>
<dl>
<dd><a
href="http://docs.openstack.org/grizzly/openstack-block-storage/admin/content/"
href="http://docs.openstack.org/trunk/openstack-block-storage/admin/content/"
>Block Storage Service
Administration Guide</a>
</dd>
<dd><a
href="http://docs.openstack.org/grizzly/openstack-compute/admin/content/"
href="http://docs.openstack.org/trunk/openstack-compute/admin/content/"
>Compute Administration
Guide</a>
</dd>
<dd><a
href="http://docs.openstack.org/grizzly/openstack-network/admin/content/"
href="http://docs.openstack.org/trunk/openstack-network/admin/content/"
>Networking Administration
Guide</a>
</dd>
<dd><a
href="http://docs.openstack.org/grizzly/openstack-object-storage/admin/content/"
href="http://docs.openstack.org/trunk/openstack-object-storage/admin/content/"
>Object Storage Administration
Guide</a>
</dd>