Merge pull request #3159 from SvenDowideit/make-docs-consistency

Makefile: make docs is more consistent
Upstream-commit: fb9ddc5de5477a88c236963e5ac4dc6f054115ff
Component: engine

components/engine/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

components/engine/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.
 

components/engine/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