Merge pull request #4664 from tianon/fix-sphinx-warnings

Fix sphinx warnings
This commit is contained in:
James Turnbull 2014-03-14 09:21:44 -04:00
commit e1c54f6cb9
3 changed files with 5 additions and 5 deletions

View file

@ -25,6 +25,6 @@ before_script:
script:
- hack/travis/dco.py
- hack/travis/gofmt.py
- make -sC docs SPHINXOPTS=-q docs man
- make -sC docs SPHINXOPTS=-qW docs man
# vim:set sw=2 ts=2:

View file

@ -374,7 +374,7 @@ The me/bar image will now have port 22 exposed, MYVAR env var set to 'foobar', a
Note that this is currently a shallow merge. So, for example, if you had specified a new port spec in the --run= config above, that would have clobbered the 'EXPOSE 22' setting from the parent container.
Full --run example
.................
..................
The ``--run`` JSON hash changes the ``Config`` section when running ``docker inspect CONTAINERID``
or ``config`` when running ``docker inspect IMAGEID``. Existing configuration key-values that are
@ -1172,7 +1172,7 @@ See :ref:`port_redirection` for more detailed information about the ``--expose``
specific examples using ``--link``.
Known Issues (run --volumes-from)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* :issue:`2702`: "lxc-start: Permission denied - failed to mount"
could indicate a permissions problem with AppArmor. Please see the

View file

@ -113,7 +113,7 @@ Container Identification
------------------------
Name (--name)
............
.............
The operator can identify a container in three ways:
@ -157,7 +157,7 @@ Your container will use the same DNS servers as the host by default,
but you can override this with ``--dns``.
Clean Up (--rm)
--------------
---------------
By default a container's file system persists even after the container
exits. This makes debugging a lot easier (since you can inspect the