|
|
5cff06982a
|
Fixed remaining issues and conflicts created by last merge.
Upstream-commit: 1ddca1948bbfd77ad3c4f0eeda640c39d315d9ae
Component: engine
|
2013-04-23 12:04:53 -07: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
38ad5f3006
|
Fixed a lot of language and small things.
Upstream-commit: 81874ad4425ed1a3520944bfcced271041e7b0f4
Component: engine
|
2013-04-01 19:11:09 -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 |
|
|
|
9de6b5992b
|
Merge remote-tracking branch 'origin/docs'
Upstream-commit: 47e5d2f5e1af88f75faa7391fb29644b3254a8ae
Component: engine
|
2013-03-28 11:12:00 -07:00 |
|
|
|
33c9b9eb1f
|
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/
Upstream-commit: 3b71336edcd3798a11ea8a2f9c94b012357b32c3
Component: engine
|
2013-03-27 16:43:13 -07:00 |
|
