Guillaume J. Charmes 18df81b8e1 Merge branch 'master' into builder_server-3 ...

Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine

2013-06-13 18:11:22 -07:00

..

basics.rst

Use title case for consistency

2013-06-01 22:03:12 -07:00

builder.rst

Merge branch 'master' into builder_server-3

2013-06-13 18:11:22 -07:00

index.rst

added/modifed tittle, description and keywords

2013-05-22 17:52:48 -07:00

puppet.rst

Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst

2013-05-24 14:42:00 -07:00

workingwithrepository.rst

Use code blocks

2013-06-01 22:03:41 -07:00