From 4bea68dfa6a9c68232ff7a5c36c85fc827dae938 Mon Sep 17 00:00:00 2001 From: Andy Rothfusz Date: Thu, 5 Dec 2013 17:16:31 -0800 Subject: [PATCH] Clean up quoting, wraps, and build error on code-block. --- docs/sources/commandline/cli.rst | 6 ++++-- docs/sources/use/ambassador_pattern_linking.rst | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/sources/commandline/cli.rst b/docs/sources/commandline/cli.rst index dd5339cce3..5cbd28c951 100644 --- a/docs/sources/commandline/cli.rst +++ b/docs/sources/commandline/cli.rst @@ -938,8 +938,10 @@ containers will not be deleted. -name="": Assign the specified name to the container. If no name is specific docker will generate a random name -P=false: Publish all exposed ports to the host interfaces -``docker run`` ``creates`` a writeable container layer over the specified image, and then -``start``s it using the specified command (ie. is equivalent to the API ``/containers/create`` then ``/containers/(id)/start``). +``'docker run'`` first ``'creates'`` a writeable container layer over +the specified image, and then ``'starts'`` it using the specified +command. That is, ``'docker run'`` is equivalent to the API +``/containers/create`` then ``/containers/(id)/start``. Known Issues (run -volumes-from) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/sources/use/ambassador_pattern_linking.rst b/docs/sources/use/ambassador_pattern_linking.rst index 98eb009d81..095324cb16 100644 --- a/docs/sources/use/ambassador_pattern_linking.rst +++ b/docs/sources/use/ambassador_pattern_linking.rst @@ -161,11 +161,12 @@ variable using the ``-e`` command line option. local ``1234`` port to the remote IP and port - in this case ``192.168.1.52:6379``. -.. code-block:: Dockerfile +:: # # - # first you need to build the docker-ut image using ./contrib/mkimage-unittest.sh + # first you need to build the docker-ut image + # using ./contrib/mkimage-unittest.sh # then # docker build -t SvenDowideit/ambassador . # docker tag SvenDowideit/ambassador ambassador