Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace readthedocs.org with readthedocs.io #2242

Merged
merged 1 commit into from
Jun 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions master/docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
# modindex_common_prefix = []

intersphinx_mapping = {
'python': ('http://python.readthedocs.org/en/latest/', None),
'sqlalchemy': ('http://sqlalchemy.readthedocs.org/en/latest/', None),
'python': ('https://python.readthedocs.io/en/latest/', None),
'sqlalchemy': ('https://sqlalchemy.readthedocs.io/en/latest/', None),
}

extlinks = {
Expand Down
4 changes: 2 additions & 2 deletions master/docs/manual/cfg-workers-docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ In addition to the arguments available for any :ref:`Latent-Workers`, :class:`Do
(optional)
This allow to use TLS when connecting with the Docker socket.
This should be a ``docker.tls.TLSConfig`` object.
See `docker-py's own documentation <http://docker-py.readthedocs.org/en/latest/tls/>`_ for more details on how to initialise this object.
See `docker-py's own documentation <https://docker-py.readthedocs.io/en/latest/tls/>`_ for more details on how to initialise this object.

``followStartupLogs``
(optional, defaults to false)
Expand All @@ -218,7 +218,7 @@ In addition to the arguments available for any :ref:`Latent-Workers`, :class:`Do

``hostconfig``
(optional)
Extra host configuration parameters passed as a dictionary used to create HostConfig object. See `docker-py's HostConfig documentation <http://docker-py.readthedocs.org/en/latest/hostconfig/>`_ for all the supported options.
Extra host configuration parameters passed as a dictionary used to create HostConfig object. See `docker-py's HostConfig documentation <https://docker-py.readthedocs.io/en/latest/hostconfig/>`_ for all the supported options.

``networking_config``
Set the network configuration for the docker container. It can be one the following: 'bridge', 'host', container:<NAME or ID>, none. The default is bridge. This option is equivalent to using the ``--net=`` command line parameter in docker.
Expand Down
2 changes: 1 addition & 1 deletion master/docs/manual/installation/requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ SQLAlchemy: http://www.sqlalchemy.org/
Buildbot requires SQLAlchemy version 0.8.0 or higher.
SQLAlchemy allows Buildbot to build database schemas and queries for a wide variety of database systems.

SQLAlchemy-Migrate: https://sqlalchemy-migrate.readthedocs.org/en/latest/
SQLAlchemy-Migrate: https://sqlalchemy-migrate.readthedocs.io/en/latest/

Buildbot requires SQLAlchemy-Migrate version 0.9.0 or higher.
Buildbot uses SQLAlchemy-Migrate to manage schema upgrades from version to version.
Expand Down