Skip to content

Commit 64af125

Browse files
committed
Merge pull request #1640 from mboersma/fix-sphinx-links
fix(docs): silence header warnings and restore broken links
2 parents ddbf189 + 007240c commit 64af125

4 files changed

Lines changed: 11 additions & 15 deletions

File tree

controller/dev_requirements.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,19 @@ PyInstaller==2.1
99

1010
# Deis documentation requirements
1111
Sphinx>=1.2.2
12-
smartypants>=1.8.3
13-
sphinxcontrib-httpdomain>=1.2.1
12+
smartypants>=1.8.6
13+
sphinxcontrib-httpdomain>=1.3.0
1414

1515
# Run "make coverage" for the % of code exercised during tests
1616
coverage>=3.7.1
1717

1818
# Generates template documentation in the Django admin
19-
docutils>=0.11
19+
docutils>=0.12
2020

2121
# Run "make flake8" to check python syntax and style
2222
flake8==2.1.0
2323
pep8==1.4.6
2424
pyflakes==0.7.3
2525

26-
# Python expect is used to automate client-driven tests
27-
pexpect>=3.1
28-
2926
# Used for mocking endpoints
3027
mock==1.0.1

docs/docs_requirements.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ docopt==0.6.2
2828
python-dateutil==2.2
2929
#PyYAML==3.11
3030
requests==2.3.0
31-
urllib3==1.8.2
3231

3332
# Deis documentation requirements
3433
Sphinx>=1.2.2
35-
smartypants>=1.8.3
36-
sphinxcontrib-httpdomain>=1.2.1
34+
smartypants>=1.8.6
35+
sphinxcontrib-httpdomain>=1.3.0

docs/installing_deis/provision-controller.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Please see `contrib/rackspace`_ for details on using Deis on
3737
Rackspace cloud.
3838

3939
DigitalOcean
40-
---------
40+
------------
4141

4242
The `contrib/digitalocean` section of the Deis project includes shell
4343
scripts and documentation to make it easy to provision a multi-node
@@ -46,7 +46,7 @@ Deis cluster on DigitalOcean_.
4646
Please see `contrib/digitalocean`_ for details on using Deis on DigitalOcean.
4747

4848
Google Compute Engine
49-
----------
49+
---------------------
5050

5151
The `contrib/gce`_ folder of the Deis project includes a Python script and
5252
documentation to help get up and running with a multi-node Deis cluster on

docs/using_deis/deploy-application.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Select a Build Process
3030
----------------------
3131
Deis supports three different ways of building applications:
3232

33-
1. `Heroku Buildpack`_
34-
2. `Dockerfile`_
35-
3. `Docker Image`_
33+
1. `Heroku Buildpacks`_
34+
2. `Dockerfiles`_
35+
3. `Docker Images`_
3636

3737
Buildpacks
3838
^^^^^^^^^^
@@ -56,4 +56,4 @@ image in development or in your CI pipeline as you are in production.
5656
.. _`twelve-factor methodology`: http://12factor.net/
5757
.. _`Heroku Buildpacks`: https://devcenter.heroku.com/articles/buildpacks
5858
.. _`Dockerfiles`: http://docs.docker.io/en/latest/use/builder/
59-
.. _`Docker Image`: http://docs.docker.io/introduction/understanding-docker/
59+
.. _`Docker Images`: http://docs.docker.io/introduction/understanding-docker/

0 commit comments

Comments
 (0)