From dc0f163f4c1182a4988310e0c0eccbf97c0e4d17 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 5 Dec 2014 03:30:37 +0000 Subject: [PATCH] Workflow documentation is now in infra-manual Replace URLs for workflow documentation to appropriate parts of the OpenStack Project Infrastructure Manual. Change-Id: I7e589febbc12bd70c5d5f3c03fb33d5d5b182aa1 --- CONTRIBUTING.md | 12 +++++++----- doc/source/devref/development.environment.rst | 4 ++-- doc/source/devref/gerrit.rst | 8 +++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 691f6c62..919de39a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,10 +1,12 @@ If you would like to contribute to the development of OpenStack, -you must follow the steps in the "If you're a developer, start here" -section of this page: [http://wiki.openstack.org/HowToContribute](http://wiki.openstack.org/HowToContribute#If_you.27re_a_developer.2C_start_here:) +you must follow the steps in this page: +[http://docs.openstack.org/infra/manual/developers.html](http://docs.openstack.org/infra/manual/developers.html) -Once those steps have been completed, changes to OpenStack -should be submitted for review via the Gerrit tool, following -the workflow documented at [http://wiki.openstack.org/GerritWorkflow](http://wiki.openstack.org/GerritWorkflow). +If you already have a good understanding of how the system works and +your OpenStack accounts are set up, you can skip to the development +workflow section of this documentation to learn how changes to +OpenStack should be submitted for review via the Gerrit tool: +[http://docs.openstack.org/infra/manual/developers.html#development-workflow](http://docs.openstack.org/infra/manual/developers.html#development-workflow). Pull requests submitted through GitHub will be ignored. diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst index aa218d4c..dd2557ca 100644 --- a/doc/source/devref/development.environment.rst +++ b/doc/source/devref/development.environment.rst @@ -87,7 +87,7 @@ or Mac OS X 10.7 (OpenSSL 0.9.8r) works fine with Manila. Getting the code ---------------- -Grab the code from GitHub:: +Grab the code:: git clone https://github.com/openstack/manila.git cd manila @@ -146,4 +146,4 @@ into trunk unless you are listed in the Authors file. Manila uses the Gerrit code review system. For information on how to submit your branch to Gerrit, see GerritWorkflow_. -.. _GerritWorkflow: http://wiki.openstack.org/GerritWorkflow +.. _GerritWorkflow: http://docs.openstack.org/infra/manual/developers.html#development-workflow diff --git a/doc/source/devref/gerrit.rst b/doc/source/devref/gerrit.rst index 745417fc..1baeb852 100644 --- a/doc/source/devref/gerrit.rst +++ b/doc/source/devref/gerrit.rst @@ -7,10 +7,8 @@ is http://review.openstack.org. Gerrit is a complete replacement for Github pull requests. `All Github pull requests to the Manila repository will be ignored`. -See `Gerrit Workflow Quick Reference`_ for information about how to get -started using Gerrit. See `Gerrit, Jenkins and Github`_ for more detailed -documentation on how to work with Gerrit. +See the `Development Workflow`_ for more detailed documentation on how +to work with Gerrit. .. _Gerrit: http://code.google.com/p/gerrit -.. _Gerrit, Jenkins and Github: http://wiki.openstack.org/GerritJenkinsGithub -.. _Gerrit Workflow Quick Reference: http://wiki.openstack.org/GerritWorkflow +.. _Development Workflow: http://docs.openstack.org/infra/manual/developers.html#development-workflow