Casey Bisson 7cd85af5c7 Merge branch 'master' of github.com:docker/docker into joyentinstall ...

Reolved conflict in:
	docs/mkdocs.yml

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine

2015-03-22 18:19:27 -07:00

..

images

Adding Kitematic link to Mac OS X install instructions

2015-03-18 16:32:59 -07:00

amazon.md

add Scott's link checker script, and fix what it finds

2014-12-16 14:46:25 +10:00

archlinux.md

Extract the systemd docs from various places and add a little more

2014-11-27 10:17:46 +10:00

azure.md

docs: Add Azure installation instructions

2015-03-19 21:28:29 -07:00

binaries.md

updates from review

2015-02-10 11:02:05 +10:00

centos.md

Fix minor typo

2015-03-16 19:50:52 +09:00

cruxlinux.md

Updated installation docs for CRUX as a Docker Host.

2014-11-22 17:18:11 +10:00

debian.md

improve Debian installation instructions

2015-03-11 20:14:32 +01:00

fedora.md

Do some major rearranging of the fedora/centos/rhel installation docs

2015-02-06 19:48:19 +10:00

frugalware.md

Extract the systemd docs from various places and add a little more

2014-11-27 10:17:46 +10:00

gentoolinux.md

Extract the systemd docs from various places and add a little more

2014-11-27 10:17:46 +10:00

google.md

Using container-vm image alias instead of specific name with version.

2014-12-12 11:28:54 -08:00

joyent.md

updated text

2015-03-20 14:44:24 -07:00

mac.md

Adding Kitematic link to Mac OS X install instructions

2015-03-18 16:32:59 -07:00

oracle.md

Fix dead link in oracle.md

2014-12-01 19:07:04 +05:30

rackspace.md

blindly make all uses of e\.?g\.? into e.g.,

2014-07-01 09:55:19 +10:00

rhel.md

updates from review

2015-02-10 11:02:05 +10:00

softlayer.md

Updating to reflect changes in the SoftLayer portal and product naming conventions.

2014-07-22 10:39:40 -05:00

SUSE.md

Cover openSUSE and SUSE Linux Enterprise on the same page

2014-12-01 01:23:38 +01:00

ubuntulinux.md

# This is a combination of 2 commits.

2015-03-17 10:15:46 -07:00

windows.md

Add a note that remote and Boot2Docker users should not type sudo

2015-01-13 21:40:14 -05:00