Thatcher Peskens 52aecd4a56 Merge remote-tracking branch 'dotcloud/master' into dhrp/docs ...

Conflicts:
	docs/sources/examples/python_web_app.rst
Upstream-commit: 09910785c80822fad71127db4ec30b3de8c27f08
Component: engine

2013-03-28 12:48:32 -07:00

..

hello_world_daemon.rst

Removed $'s from examples to make them easier to copy paste

2013-03-28 11:50:00 -07:00

hello_world.rst

Made changes to incorporate extermal docs.docker.io. Also took out /documentation/ dir so sources are easier accessible and the folder is not redundant on docs.docker.io/documentation/

2013-03-27 16:43:13 -07:00

index.rst

Made changes to incorporate extermal docs.docker.io. Also took out /documentation/ dir so sources are easier accessible and the folder is not redundant on docs.docker.io/documentation/

2013-03-27 16:43:13 -07:00

python_web_app.rst

Merge remote-tracking branch 'dotcloud/master' into dhrp/docs

2013-03-28 12:48:32 -07:00