summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-01-16 23:55:25 +0000
committerGerrit Code Review <review@openstack.org>2018-01-16 23:55:25 +0000
commit521d067a00c9852a5e3a4b2ae7cf1d6d6c459f7e (patch)
tree59fedba7df41d22650471546f92406b63a8d5301
parent83ff3615c1bb43d944d7720da6a8d9f6b92c5ab1 (diff)
parentf491d06843e7e689674af06e5314f95d94b4ebc5 (diff)
downloadzuul-521d067a00c9852a5e3a4b2ae7cf1d6d6c459f7e.tar.gz
Merge "Disambiguate with Netflix and Javascript zuul" into feature/zuulv3
-rw-r--r--README.rst8
-rw-r--r--doc/source/index.rst8
2 files changed, 16 insertions, 0 deletions
diff --git a/README.rst b/README.rst
index 52b89dfb6..8d0066530 100644
--- a/README.rst
+++ b/README.rst
@@ -10,6 +10,14 @@ preparation for the third major version of Zuul. We call this effort
The latest documentation for Zuul v3 is published at:
https://docs.openstack.org/infra/zuul/feature/zuulv3/
+If you are looking for the Edge routing service named Zuul that is
+related to Netflix, it can be found here:
+https://github.com/Netflix/zuul
+
+If you are looking for the Javascript testing tool named Zuul, it
+can be found here:
+https://github.com/defunctzombie/zuul
+
Contributing
------------
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 677e9584c..6e1b52e21 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -12,6 +12,14 @@ are installing or operating a Zuul system, you will also find the
:doc:`admin/index` useful. If you want help make Zuul itself better,
take a look at the :doc:`developer/index`.
+If you are looking for the Edge routing service named Zuul that is
+related to Netflix, it can be found here:
+https://github.com/Netflix/zuul
+
+If you are looking for the Javascript testing tool named Zuul, it
+can be found here:
+https://github.com/defunctzombie/zuul
+
Contents:
.. toctree::