Merge "Redirect infra-manual"
This commit is contained in:
Zuul
Gerrit Code Review
commit
72d791b49f
|
|
@ -21,14 +21,14 @@ If you would like to contribute to the documents, please see the
|
|||
If you would like to contribute to the development of OpenStack, you must
|
||||
follow the steps in this page:
|
||||
|
||||
https://docs.openstack.org/infra/manual/developers.html
|
||||
https://docs.opendev.org/opendev/infra-manual/latest/developers.html
|
||||
|
||||
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:
|
||||
|
||||
https://docs.openstack.org/infra/manual/developers.html#development-workflow
|
||||
https://docs.opendev.org/opendev/infra-manual/latest/developers.html#development-workflow
|
||||
|
||||
Pull requests submitted through GitHub will be ignored.
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ To contribute to the development of ``openstack-doc-tools``, proceed with
|
|||
the following steps:
|
||||
|
||||
#. Complete the procedures described
|
||||
in the `Developers Guide <https://docs.openstack.org/infra/manual/developers.html>`_.
|
||||
in the `Developers Guide <https://docs.opendev.org/opendev/infra-manual/latest/developers.html>`_.
|
||||
|
||||
#. Follow `OpenStack Style Commandments <https://docs.openstack.org/hacking/latest/>`_
|
||||
while developing improvements for the tool.
|
||||
|
|
@ -23,7 +23,7 @@ the following steps:
|
|||
and ``bashate`` tests. A test suite would be welcome.
|
||||
|
||||
#. Submit your change for review through the Gerrit tool as described
|
||||
in the `gerrit workflow <https://docs.openstack.org/infra/manual/developers.html#development-workflow>`_.
|
||||
in the `gerrit workflow <https://docs.opendev.org/opendev/infra-manual/latest/developers.html#development-workflow>`_.
|
||||
|
||||
.. warning::
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ files reside.
|
|||
|
||||
For the instructions on how to clone a repository so that you can work
|
||||
on it locally, refer to the `Starting Work on a New Project
|
||||
<https://docs.openstack.org/infra/manual/developers.html#starting-work-on-a-new-project>`_
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/developers.html#starting-work-on-a-new-project>`_
|
||||
of the Infrastructure manual.
|
||||
|
||||
See :ref:`troubleshoot_setup` if you have difficulty with a repository
|
||||
|
|
@ -51,7 +51,7 @@ in the repository.
|
|||
clone if you want to build the documentation.
|
||||
|
||||
For more information on ``bindep`` and packages, see `Package Requirements
|
||||
<https://docs.openstack.org/infra/manual/drivers.html#package-requirements>`_.
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/drivers.html#package-requirements>`_.
|
||||
|
||||
* On Ubuntu or Debian:
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ To see current proposed changes, make sure you register and log into
|
|||
`review.openstack Code Review
|
||||
<https://review.opendev.org>`_. For more details on the review process in
|
||||
OpenStack, see `Code Review
|
||||
<https://docs.openstack.org/infra/manual/developers.html#code-review>`_.
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/developers.html#code-review>`_.
|
||||
|
||||
Review guidelines
|
||||
~~~~~~~~~~~~~~~~~
|
||||
|
|
@ -44,7 +44,7 @@ Reviewing a documentation patch
|
|||
Before you proceed with reviewing patches, make sure to read carefully
|
||||
the :doc:`Review Guidelines <docs-review-guidelines>` for documentation
|
||||
and `Code Review Guidelines
|
||||
<https://docs.openstack.org/infra/manual/developers.html#code-review>`_.
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/developers.html#code-review>`_.
|
||||
Once done, follow the steps below to submit a patch review.
|
||||
|
||||
#. If you want to review patches for the repositories managed by the
|
||||
|
|
@ -75,12 +75,12 @@ Once done, follow the steps below to submit a patch review.
|
|||
A patch with WorkInProgress (WIP) status needs additional work
|
||||
before review and possible approval. Therefore, you may skip such a patch
|
||||
and review once it is ready. For more information, see `Work In Progress
|
||||
<https://docs.openstack.org/infra/manual/core.html#work-in-progress>`_.
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/core.html#work-in-progress>`_.
|
||||
|
||||
.. seealso::
|
||||
|
||||
`Peer Review
|
||||
<https://docs.openstack.org/infra/manual/developers.html#peer-review>`_
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/developers.html#peer-review>`_
|
||||
|
||||
.. note::
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ unfavorable gets through, without discouraging contributions.
|
|||
|
||||
General instructions for being a core reviewer are located in the
|
||||
`Core Reviewer's Guide
|
||||
<https://docs.openstack.org/infra/manual/developers.html#code-review>`_.
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/developers.html#code-review>`_.
|
||||
This section is for openstack-manuals core reviewers.
|
||||
|
||||
In almost all cases, patches can be merged with at least one +1 vote, and
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ git and git review
|
|||
state of the repository. In many cases, this can be achieved by pressing
|
||||
the ``Rebase`` button in the gerrit interface. If this fails, you must
|
||||
`rebase manually
|
||||
<https://docs.openstack.org/infra/manual/developers.html#understanding-changes-and-patch-sets>`_.
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/developers.html#understanding-changes-and-patch-sets>`_.
|
||||
|
||||
For a basic introduction to solving merge conflicts, see the GitHub article
|
||||
`Resolving merge conflicts after a git rebase
|
||||
|
|
@ -303,7 +303,7 @@ git and git review
|
|||
leaving the word *recheck* in the comments section of your
|
||||
Gerrit review.
|
||||
|
||||
.. seealso:: * `Automated Testing <https://docs.openstack.org/infra/manual/developers.html#automated-testing>`_
|
||||
.. seealso:: * `Automated Testing <https://docs.opendev.org/opendev/infra-manual/latest/developers.html#automated-testing>`_
|
||||
* :ref:`build_jobs`
|
||||
|
||||
Network
|
||||
|
|
@ -322,7 +322,7 @@ Try again when your network connection improves.
|
|||
If you suspect that SSH over non-standards ports might be blocked or need to
|
||||
access the web using http/https, you can configure git-review to
|
||||
`use an https endpoint instead of ssh
|
||||
<https://docs.openstack.org/infra/manual/developers.html#accessing-gerrit-over-https>`_
|
||||
<https://docs.opendev.org/opendev/infra-manual/latest/developers.html#accessing-gerrit-over-https>`_
|
||||
as explained in the Infrastructure Manual.
|
||||
|
||||
Python
|
||||
|
|
@ -363,11 +363,11 @@ instead:
|
|||
|
||||
.. Links
|
||||
|
||||
.. _`Sign the appropriate Individual Contributor License Agreement`: https://docs.openstack.org/infra/manual/developers.html#sign-the-appropriate-individual-contributor-license-agreement
|
||||
.. _`Installing git-review`: https://docs.openstack.org/infra/manual/developers.html#install-the-git-review-utility
|
||||
.. _`Sign the appropriate Individual Contributor License Agreement`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#sign-the-appropriate-individual-contributor-license-agreement
|
||||
.. _`Installing git-review`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#install-the-git-review-utility
|
||||
.. _`OpenStack Documentation Bug Team`: https://launchpad.net/~openstack-doc-bugs
|
||||
.. _`OpenStack Foundation`: https://www.openstack.org/join
|
||||
.. _`Development Workflow`: https://docs.openstack.org/infra/manual/developers.html#development-workflow
|
||||
.. _`Development Workflow`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#development-workflow
|
||||
.. _`git`: http://msysgit.github.io
|
||||
.. _`curl`: http://curl.haxx.se/
|
||||
.. _`tar`: http://gnuwin32.sourceforge.net/packages/gtar.htm
|
||||
|
|
@ -377,9 +377,9 @@ instead:
|
|||
.. _`GitHub help`: https://help.github.com/articles/set-up-git
|
||||
.. _`Settings page on gerrit`: https://review.opendev.org/#/settings/
|
||||
.. _`Settings > SSH Public Keys`: https://review.opendev.org/#/settings/ssh-keys
|
||||
.. _`Starting Work on a New Project`: https://docs.openstack.org/infra/manual/developers.html#starting-work-on-a-new-project
|
||||
.. _`Starting a Change`: https://docs.openstack.org/infra/manual/developers.html#starting-a-change
|
||||
.. _`Committing a change`: https://docs.openstack.org/infra/manual/developers.html#committing-a-change
|
||||
.. _`Submitting a Change for Review`: https://docs.openstack.org/infra/manual/developers.html#submitting-a-change-for-review
|
||||
.. _`Updating a Change`: https://docs.openstack.org/infra/manual/developers.html#updating-a-change
|
||||
.. _`Starting Work on a New Project`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#starting-work-on-a-new-project
|
||||
.. _`Starting a Change`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#starting-a-change
|
||||
.. _`Committing a change`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#committing-a-change
|
||||
.. _`Submitting a Change for Review`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#submitting-a-change-for-review
|
||||
.. _`Updating a Change`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#updating-a-change
|
||||
|
||||
|
|
|
|||
|
|
@ -259,3 +259,8 @@ redirectmatch 301 /infra/nodepool/feature/zuulv3(.*)$ https://zuul-ci.org/docs/n
|
|||
# Redirect outdated bare metal installation guide
|
||||
{{ deep_links('/project-install-guide/baremetal/draft', '/ironic/latest/install/$1') }}
|
||||
# End redirect outdated bare metal installation guide
|
||||
|
||||
# Redirect https://docs.openstack.org/infra/manual to
|
||||
# https://docs.opendev.org/infra-manual
|
||||
{{ deep_links('/infra/manual', 'https://docs.opendev.org/opendev/infra-manual/latest/$1') }}
|
||||
# End redirect infra-manual
|
||||
|
|
|
|||
|
|
@ -285,3 +285,8 @@
|
|||
# Redirect outdated bare metal installation guide
|
||||
{{ deep_links('/project-install-guide/baremetal/draft', '/ironic/latest/install') }}
|
||||
# End redirect outdated bare metal installation guide
|
||||
|
||||
# Redirect https://docs.openstack.org/infra/manual to
|
||||
# https://docs.opendev.org/infra-manual
|
||||
{{ deep_links('/infra/manual', 'https://docs.opendev.org/opendev/infra-manual/latest') }}
|
||||
# End redirect infra-manual
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ href="https://www.openstack.org/community/jobs/">Jobs</a></li>
|
|||
<li><a
|
||||
href="https://www.openstack.org/foundation/companies/">Companies</a></li>
|
||||
<li><a
|
||||
href="/infra/manual/developers.html">Contribute</a></li>
|
||||
href="/contributors">Contribute</a></li>
|
||||
<li><a
|
||||
href="https://www.openstack.org/store">Get Swag!</a></li>
|
||||
</ul>
|
||||
|
|
|
|||
Loading…
Reference in New Issue