5cff06982a
Fixed remaining issues and conflicts created by last merge.
...
Upstream-commit: 1ddca1948bbfd77ad3c4f0eeda640c39d315d9ae
Component: engine
2013-04-23 12:04:53 -07:00
7f9b606ce0
fixed typo in buildingblocks.rst
...
Upstream-commit: cbc4eccd50ac80ff6e21caeb386328f8a5fcfaff
Component: engine
2013-04-23 12:52:55 +04:00
28e13570bc
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Conflicts:
docker/docker.go
docs/sources/installation/archlinux.rst
docs/sources/installation/index.rst
docs/sources/installation/ubuntulinux.rst
runtime.go
utils.go
Upstream-commit: 5a5e417d46fe0bcac974e7180f50b0c59a8ec320
Component: engine
2013-04-22 18:44:50 -07:00
5e92f87f4e
Merged changes
...
Upstream-commit: 4031a01af1658225344af04be0dbd4225893c242
Component: engine
2013-04-22 18:38:42 -07:00
80a0321a4f
Updated gettingstarted with quicker install.
...
Upstream-commit: 690e1186704eff65ff72404eb2a686b2b205ee7c
Component: engine
2013-04-22 13:36:00 -07:00
469031c87e
Updated Vagrantfile and documentation to reflect new installation path using Ubuntu's PPA, also switched everything to use Ubuntu 12.04 by default.
...
Upstream-commit: 6c8dcd5cbbff2b33f878a32ae3b93abc0d7b9dae
Component: engine
2013-04-22 13:10:32 -07:00
53559b1043
Better title in ubuntu install doc
...
Upstream-commit: 52cedb8a05182c7d6f5e5918453cf356b1efafc8
Component: engine
2013-04-20 18:26:15 -07:00
28df0b2e7a
Merge pull request #422 from shawnsi/arch-docs
...
Arch docs
Upstream-commit: 6909f3911fce031adfcc71842ca71b5043e3e43b
Component: engine
2013-04-20 17:35:43 -07:00
4b4475fccb
Fix Ubuntu install doc
...
Upstream-commit: 1201c418cd6f02ca8c206cfdd4659b8ec2d2f856
Component: engine
2013-04-20 17:31:49 -07:00
3aa701de71
Formatting fix in ubuntu install doc
...
Upstream-commit: 4a9c3a92e1552fab5702eeddc0307f7f87f96496
Component: engine
2013-04-20 17:30:33 -07:00
a6f4f1acf8
Updated ubuntu install
...
Upstream-commit: 0731d1a582b44a18e9bfdf0764d232b46218346b
Component: engine
2013-04-19 20:59:43 -07:00
69774ce2e6
Updated documentation and fixed Vagrantfile
...
Upstream-commit: 8ecde8f9a5dcad23afea013a62d373cef303fa84
Component: engine
2013-04-19 20:57:50 -07:00
b79707c599
Fix examples in README to no longer rely on standalone mode
...
Upstream-commit: 3ae5c45d9a75befdd144d689a70c32180b0a16c6
Component: engine
2013-04-18 22:22:00 -07:00
73ddc6a114
Added redirect from old location of documentation (/documentation), these was the location when we were on github.
...
Upstream-commit: 6de5ca1e64407582debe01f17377cdb7bb8d70c5
Component: engine
2013-04-18 16:00:18 -07:00
15ab010e20
Updating the arch linux installation docs
...
New AUR package name
Adding systemd service unit info
Upstream-commit: 7eda9c64b80ff43af5e90b37a3830615034fefee
Component: engine
2013-04-18 09:20:23 -05:00
0a3b5be4e0
Issue #405 : Documentation for Arch Linux Install
...
Upstream-commit: 45809e9a055defd073bde794026aa611333b7023
Component: engine
2013-04-12 13:25:33 -05:00
aa4c6e3497
incorporate feedback for improving the PR
...
Upstream-commit: 4ab241c93080d8df6db4fd0c31b0c26008118422
Component: engine
2013-04-09 18:04:01 -04:00
bdbf282ee6
Merge github.com:dotcloud/docker into 333-redis-documentation
...
Upstream-commit: 418ef43fbb59d62dca20905bbc0753892ecb6c27
Component: engine
2013-04-09 16:07:40 -04:00
c0f86c8179
Merge pull request #363 from dhrp/docs
...
Added code and color for 'note' and updated the examples note.
Upstream-commit: 9043e4c75728059e63b7ab76701a838d6da06494
Component: engine
2013-04-09 10:36:44 -07:00
5cd0f30a95
add documentation for running a redis process with docker
...
Upstream-commit: 8f15c423e6049507908ec6e7b139f8bccbd6d3ba
Component: engine
2013-04-09 11:04:14 -04:00
7c684984e1
Merge pull request #346 from srid/patch-2
...
make the service example work
Upstream-commit: 0767916adedb01d61b01b91e7a0591ac7cb0f872
Component: engine
2013-04-08 22:12:34 -07:00
318f58e654
Added code and color for 'note' and updated the hello world note.
...
Upstream-commit: 2832ea0cfeb8eb69cf42db5ec0a115300e1383b9
Component: engine
2013-04-08 20:10:47 -07:00
0231b887bd
Merge pull request #347 from kencochrane/303_docs_fix
...
improved the example docs to help #303
Upstream-commit: b8f9803459bdc151593720cb6148d6eb14972bb4
Component: engine
2013-04-08 11:50:07 -07:00
4e538f07a8
Extend the documentation covering the web app example
...
Make it clear how to access the web app running inside of the container
from the host.
Upstream-commit: 72fdb4106997799df49faffb96de1d076e8ad755
Component: engine
2013-04-08 17:39:30 +02:00
36efc4e5a2
added headers to examples linking back to running the examples page
...
Upstream-commit: 6eb8a74ff9aee90fe488de151fab6ec234b61d2a
Component: engine
2013-04-07 10:23:00 -04:00
05821916a6
made a new running the examples page, and added a link to the top of each example to the page to show people how to run them.
...
Upstream-commit: 81ebf4fcf6fe3521c606b5abcbe151176c51aca9
Component: engine
2013-04-07 10:21:08 -04:00
44ca22c601
sync with README
...
Upstream-commit: 9875a9b1f1b59114356c129f42449e2d62427f65
Component: engine
2013-04-07 00:43:57 -07:00
33d69ebc2b
Merge pull request #331 from lynaghk/master
...
Fix broken link on documentation website between examples.
Upstream-commit: 349edf1beabb7d88254b3a7eafbb6528d2d954bf
Component: engine
2013-04-04 16:18:27 -07:00
908cac785f
Fix broken link in doc site.
...
Broken link was from python_web_app to nonexistent "base commands page"; updated to point to next item in examples menu, running_ssh_service screencast.
Upstream-commit: 92186d7cf71acbf4027e390b33590570cf4ff290
Component: engine
2013-04-03 22:23:17 -07:00
8ee2fa2877
move each command description into a separate document
...
Upstream-commit: cf8b8c1969daa423a1308561f3c1b2b863c64655
Component: engine
2013-04-03 15:55:18 +03:00
b539ba53c2
Merge remote-tracking branch 'sa2ajj/hostname-parameter'
...
Upstream-commit: d6fb2a0836de056d79f4887eabfc2d79e8518988
Component: engine
2013-04-02 18:41:14 -07:00
927b0fdedf
Merged dhrp/docs
...
Upstream-commit: 65aa3dda852115dae2501d65e2f4154c5a6ccf63
Component: engine
2013-04-02 18:39:39 -07:00
38ad5f3006
Fixed a lot of language and small things.
...
Upstream-commit: 81874ad4425ed1a3520944bfcced271041e7b0f4
Component: engine
2013-04-01 19:11:09 -07:00
e2d87791af
Merge pull request #288 from titanous/expand-contributing
...
Expand the contributing guidelines
Upstream-commit: 3478d6f7061e0d71c040fd8f7ba9b51bf00907c3
Component: engine
2013-04-01 18:45:18 -07:00
cadfddb770
fix code block formatting
...
Upstream-commit: 90db9e751750e62ea701843491774323ef20ab06
Component: engine
2013-04-02 04:35:54 +03:00
7a184f8e80
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Upstream-commit: f15889461d6aeebfb06835823ed67266a6d9042f
Component: engine
2013-04-01 18:11:46 -07:00
21d5e7b3d6
add host name parameter to "run" command
...
fixes #243
Upstream-commit: f65fc1e766cefed06131acf1ede6bb1f25f75fff
Component: engine
2013-04-02 01:26:17 +03:00
819ad2b9f0
Expand the contributing guidelines
...
Upstream-commit: 321d94b17e0b23754cb8c5858c11bef554ec8279
Component: engine
2013-04-01 12:35:04 -04:00
49ffe42eb3
Merge pull request #238 from johncosta/42-contribution-guidelines
...
Contribution guidelines
Upstream-commit: c9a13147fe98c8b5b55eb28deca8147f10906012
Component: engine
2013-03-31 22:14:18 -07:00
4e517cc302
Redundant message in basics.
...
Upstream-commit: e9d17b1f9155160d5601b756b6c9df3f60d02b00
Component: engine
2013-03-29 17:38:31 -07:00
996e1c5e82
Added a lot of basic instructions on various topics
...
Upstream-commit: 64376481767a6a4a1d2b90b225a6ac5bf6bc16f9
Component: engine
2013-03-29 17:30:10 -07:00
1a47c25086
Fixed some links in gettingstarted
...
Upstream-commit: 61cf09b2e7491295575195b616207059e7107f01
Component: engine
2013-03-28 19:03:06 -07:00
8ff2f8602f
move documentation changes to reStructuredText docs under website. https://github.com/dotcloud/docker/issues/42
...
Upstream-commit: a5054184a172da0b9abd2470946bb15ab5fb0516
Component: engine
2013-03-28 16:32:31 -04:00
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
a587e006db
Added the lego illustration to the docs.docker.io 'homepage'
...
Upstream-commit: da69df5f421ed49464254fb52dc222f98587345f
Component: engine
2013-03-28 12:27:37 -07:00
746cb02751
fixed some of the syntax in example
...
The example was broken, I updated it to work with latest version of code.
Upstream-commit: 5c639118d35c1c2048123e94fd4b9ff9b98c89dc
Component: engine
2013-03-28 15:51:10 -03:00
4f5f536f6e
Removed $'s from examples to make them easier to copy paste
...
Upstream-commit: 9bc7e71f16365f21c1b54ad1c16188eda668296e
Component: engine
2013-03-28 11:50:00 -07:00
934886e0bd
Fixed links on gettingstarted to point to the right places in docs
...
Upstream-commit: 172f746e4d80df0efd2b30ba6be540d7ec423db3
Component: engine
2013-03-28 11:44:33 -07:00
9de6b5992b
Merge remote-tracking branch 'origin/docs'
...
Upstream-commit: 47e5d2f5e1af88f75faa7391fb29644b3254a8ae
Component: engine
2013-03-28 11:12:00 -07:00
abc96f58d2
Merge remote-tracking branch 'dotcloud/master' into local/dotcloud/docs
...
Upstream-commit: 70594bdd166e41ffb26913749e83ba752f851ebd
Component: engine
2013-03-28 10:58:01 -07:00
