 Thatcher Peskens
|
09910785c8
|
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
Conflicts:
docs/sources/examples/python_web_app.rst
|
2013-03-28 12:48:32 -07:00 |
|
|
Ken Cochrane
|
5c639118d3
|
fixed some of the syntax in example
The example was broken, I updated it to work with latest version of code.
|
2013-03-28 15:51:10 -03:00 |
|
|
Thatcher Peskens
|
9bc7e71f16
|
Removed $'s from examples to make them easier to copy paste
|
2013-03-28 11:50:00 -07:00 |
|
|
Solomon Hykes
|
47e5d2f5e1
|
Merge remote-tracking branch 'origin/docs'
|
2013-03-28 11:12:00 -07:00 |
|
|
Thatcher Peskens
|
70594bdd16
|
Merge remote-tracking branch 'dotcloud/master' into local/dotcloud/docs
|
2013-03-28 10:58:01 -07:00 |
|
|
Thatcher Peskens
|
3b71336edc
|
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 |
|