From 27646c445951b47a728675764d7ef2b198436156 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 11 Dec 2013 10:14:56 +1000 Subject: [PATCH] make docs is more consistent --- Makefile | 4 ++-- docs/README.md | 2 +- docs/sources/contributing/devenvironment.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1518fb1331..b9f7158dbd 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all binary build default doc shell test +.PHONY: all binary build default docs shell test DOCKER_RUN_DOCKER := docker run -rm -i -t -privileged -e TESTFLAGS -v $(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles docker @@ -10,7 +10,7 @@ all: build binary: build $(DOCKER_RUN_DOCKER) hack/make.sh binary -doc: +docs: docker build -t docker-docs docs && docker run -p 8000:8000 docker-docs test: build diff --git a/docs/README.md b/docs/README.md index 3f4725a583..768cabdbb1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -57,7 +57,7 @@ docs inside the container, even starting a simple HTTP server on port 8000 so that you can connect and see your changes. In the ``docker`` source directory, run: - ```make doc``` + ```make docs``` This is the equivalent to ``make clean server`` since each container starts clean. diff --git a/docs/sources/contributing/devenvironment.rst b/docs/sources/contributing/devenvironment.rst index c152ff9ce5..1c2ea1a35d 100644 --- a/docs/sources/contributing/devenvironment.rst +++ b/docs/sources/contributing/devenvironment.rst @@ -129,7 +129,7 @@ to it, you can build the documentation and then serve it by: .. code-block:: bash - sudo make doc + sudo make docs # when its done, you can point your browser to http://yourdockerhost:8000 # type Ctrl-C to exit