From 37f3a8ad54bcb214658de4dbf0d803975571c500 Mon Sep 17 00:00:00 2001 From: liu-sheng Date: Wed, 6 May 2015 11:19:06 +0800 Subject: [PATCH] Replace github reference by git.openstack.org and change a doc link * Replace the github by openstack's official home git.openstack.org * Also update the like of developer documentation of keystone Change-Id: I60e8e914d9fa3be2cdfffe029e4c2432c07962e2 --- README.rst | 6 +++--- doc/source/community.rst | 4 ++-- doc/source/configuration.rst | 4 ++-- doc/source/developing.rst | 4 ++-- doc/source/http-api.rst | 8 ++++---- doc/source/installing.rst | 2 +- doc/source/man/keystone-all.rst | 2 +- doc/source/man/keystone-manage.rst | 2 +- doc/source/setup.rst | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.rst b/README.rst index 853873ced8..65ba7ccbee 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ such as LDAP. Developer documentation, the source of which is in ``doc/source/``, is published at: - http://keystone.openstack.org/ + http://docs.openstack.org/developer/keystone/ The API specification and documentation are available at: @@ -18,7 +18,7 @@ The API specification and documentation are available at: The canonical client library is available at: - https://github.com/openstack/python-keystoneclient + https://git.openstack.org/cgit/openstack/python-keystoneclient Documentation for cloud administrators is available at: @@ -26,7 +26,7 @@ Documentation for cloud administrators is available at: The source of documentation for cloud administrators is available at: - https://github.com/openstack/openstack-manuals + https://git.openstack.org/cgit/openstack/openstack-manuals Information about our team meeting is available at: diff --git a/doc/source/community.rst b/doc/source/community.rst index e1df0b8977..dfb0870fb6 100644 --- a/doc/source/community.rst +++ b/doc/source/community.rst @@ -65,10 +65,10 @@ Keystone on Launchpad Launchpad is a code hosting that OpenStack is using to track bugs, feature work, and releases of OpenStack. Like other OpenStack projects, Keystone source -code is hosted on GitHub +code is hosted on git.openstack.org * `Keystone Project Page on Launchpad `_ -* `Keystone Source Repository on GitHub `_ +* `Keystone Source Repository `_ Within launchpad, we use `blueprints `_, to track feature diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 5eff8a9cdc..2584fd5e78 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -867,7 +867,7 @@ To build your service catalog using this driver, see the built-in help: $ openstack help endpoint create You can also refer to `an example in Keystone (tools/sample_data.sh) -`_. +`_. File-based Service Catalog (``templated.Catalog``) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -897,7 +897,7 @@ Keystone, however you should create your own to reflect your deployment. Another such example is `available in devstack (files/default_catalog.templates) -`_. +`_. Logging ------- diff --git a/doc/source/developing.rst b/doc/source/developing.rst index 7e6854b130..dd6cc98fa1 100644 --- a/doc/source/developing.rst +++ b/doc/source/developing.rst @@ -74,7 +74,7 @@ place: $ bin/keystone-manage db_sync -.. _`python-keystoneclient`: https://github.com/openstack/python-keystoneclient +.. _`python-keystoneclient`: https://git.openstack.org/cgit/openstack/python-keystoneclient If the above commands result in a ``KeyError``, or they fail on a ``.pyc`` file with the message, ``You can only have one Python script per @@ -398,7 +398,7 @@ You may also be interested in either the .. _devstack: http://devstack.org/ .. _OpenStack Continuous Integration Infrastructure: http://ci.openstack.org -.. _OpenStack Integration Testing Project: https://github.com/openstack/tempest +.. _OpenStack Integration Testing Project: https://git.openstack.org/cgit/openstack/tempest LDAP Tests diff --git a/doc/source/http-api.rst b/doc/source/http-api.rst index a104ce3f9f..9b2ab69734 100644 --- a/doc/source/http-api.rst +++ b/doc/source/http-api.rst @@ -26,8 +26,8 @@ The original source of truth for the v2.0 API is defined by a set of WADL and XSD files. The original source of truth for the v3 API is defined by documentation. -.. _`Identity API v2.0`: https://github.com/openstack/identity-api/tree/master/v2.0/src -.. _`Identity API v3`: https://github.com/openstack/identity-api/tree/master/v3/src/markdown +.. _`Identity API v2.0`: https://git.openstack.org/cgit/openstack-attic/identity-api/tree/v2.0/src +.. _`Identity API v3`: https://git.openstack.org/cgit/openstack-attic/identity-api/tree/v3/src/markdown History ======= @@ -125,7 +125,7 @@ Keystone clients can use to automatically detect available API versions. With unversioned ``identity`` endpoints in the service catalog, you should be able to `authenticate with keystoneclient`_ successfully. -.. _`latest sample configuration`: https://github.com/openstack/keystone/blob/master/etc/keystone-paste.ini +.. _`latest sample configuration`: https://git.openstack.org/cgit/openstack/keystone/tree/etc/keystone-paste.ini .. _`authenticate with keystoneclient`: http://docs.openstack.org/developer/python-keystoneclient/using-api-v3.html#authenticating I have a Python client @@ -148,7 +148,7 @@ I have a non-Python client You'll likely need to heavily reference our `API documentation`_ to port your application to Identity API v3. -.. _`API documentation`: https://github.com/openstack/identity-api/blob/master/v3/src/markdown/identity-api-v3.md +.. _`API documentation`: https://git.openstack.org/cgit/openstack-attic/identity-api/tree/v3/src/markdown/identity-api-v3.md The most common operation would be password-based authentication including a tenant name (i.e. project name) to specify an authorization scope. In Identity diff --git a/doc/source/installing.rst b/doc/source/installing.rst index 6471fe906a..d4d0b27d20 100644 --- a/doc/source/installing.rst +++ b/doc/source/installing.rst @@ -42,7 +42,7 @@ Clone the Keystone repository: .. code-block:: bash - $ git clone http://github.com/openstack/keystone.git + $ git clone https://git.openstack.org/openstack/keystone.git $ cd keystone Install the Keystone web service: diff --git a/doc/source/man/keystone-all.rst b/doc/source/man/keystone-all.rst index 328b0c4e57..ea958fe0ec 100644 --- a/doc/source/man/keystone-all.rst +++ b/doc/source/man/keystone-all.rst @@ -108,5 +108,5 @@ SEE ALSO SOURCE ====== -* Keystone source is managed in GitHub `Keystone `__ +* Keystone source is managed in Gerrit git `Keystone `__ * Keystone bugs are managed at Launchpad `Keystone `__ diff --git a/doc/source/man/keystone-manage.rst b/doc/source/man/keystone-manage.rst index feeeb142c2..ff045f23e4 100644 --- a/doc/source/man/keystone-manage.rst +++ b/doc/source/man/keystone-manage.rst @@ -124,5 +124,5 @@ SEE ALSO SOURCE ====== -* Keystone is sourced in GitHub `Keystone `__ +* Keystone is sourced in Gerrit git `Keystone `__ * Keystone bugs are managed at Launchpad `Keystone `__ diff --git a/doc/source/setup.rst b/doc/source/setup.rst index ed1b13b525..9302f4d5e4 100644 --- a/doc/source/setup.rst +++ b/doc/source/setup.rst @@ -18,13 +18,13 @@ Setting up a Keystone development environment ============================================= -This document describes getting the source from keystone's `GitHub repository`_ +This document describes getting the source from keystone's `Git repository`_ for development purposes. To install Keystone from packaging, refer instead to Keystone's `User Documentation`_. -.. _`GitHub Repository`: http://github.com/openstack/keystone +.. _`Git Repository`: http://git.openstack.org/cgit/openstack/keystone .. _`User Documentation`: http://docs.openstack.org/ Prerequisites @@ -54,11 +54,11 @@ different version of the above, please document your configuration here! Getting the latest code ======================= -Make a clone of the code from our `Github repository`: +Make a clone of the code from our `Git repository`: .. code-block:: bash - $ git clone https://github.com/openstack/keystone.git + $ git clone https://git.openstack.org/openstack/keystone.git When that is complete, you can: