aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-24 18:05:05 +0000
committerGerrit Code Review <review@openstack.org>2015-08-24 18:05:05 +0000
commitf248eafdfda544ed2c9d6a6bcf9a54a53de33c5e (patch)
treec10965966110e5fed7a96e5eab806634ffd1e94d
parente22617538df583f3c260a2a5feafadcf775a4d23 (diff)
parent11d78626b5a3d2aa45d7788e8b3086493a77cb27 (diff)
downloadkolla-f248eafdfda544ed2c9d6a6bcf9a54a53de33c5e.tar.gz
kolla-f248eafdfda544ed2c9d6a6bcf9a54a53de33c5e.zip
Merge "Extension .md is changed to .rst"
-rw-r--r--README.rst2
-rw-r--r--demos/magnum/redis-kube/README.rst2
-rw-r--r--docs/dev-quickstart.rst2
3 files changed, 3 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index 727bde1f3..2d6ad79e7 100644
--- a/README.rst
+++ b/README.rst
@@ -31,7 +31,7 @@ Docker Images
The `Docker images <https://docs.docker.com/userguide/dockerimages/>`__
are built by the Kolla project maintainers. A detailed process for
contributing to the images can be found in the `image building
-guide <https://github.com/stackforge/kolla/blob/master/docs/image-building.md>`__.
+guide <https://github.com/stackforge/kolla/blob/master/docs/image-building.rst>`__.
Images reside in the Docker Hub `Kollaglue
repo <https://registry.hub.docker.com/repos/kollaglue/>`__.
diff --git a/demos/magnum/redis-kube/README.rst b/demos/magnum/redis-kube/README.rst
index 06a927f26..0a0ede6ab 100644
--- a/demos/magnum/redis-kube/README.rst
+++ b/demos/magnum/redis-kube/README.rst
@@ -25,7 +25,7 @@ Turning up an initial master/sentinel pod.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
is a
-`*Pod* <https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/pods.md>`__.
+`*Pod* <https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/user-guide/pods.md>`__.
A Pod is one or more containers that *must* be scheduled onto the same
host. All containers in a pod share a network namespace, and may
optionally share mounted volumes.
diff --git a/docs/dev-quickstart.rst b/docs/dev-quickstart.rst
index 57e38a700..89d8ee1a2 100644
--- a/docs/dev-quickstart.rst
+++ b/docs/dev-quickstart.rst
@@ -130,7 +130,7 @@ Starting Kolla
--------------
Configure Ansible by reading the
-`Kolla Ansible configuration Guide <https://github.com/stackforge/kolla/blob/master/docs/ansible-deployment.md>`__ documentation.
+`Kolla Ansible configuration Guide <https://github.com/stackforge/kolla/blob/master/docs/ansible-deployment.rst>`__ documentation.
Finally, run the deploy operation: