0ct0pu5/moby @ c7fd84b8a0bcfe70c3897e6611e6c59fd514d28f

Thatcher Peskens 1ddca1948b Fixed remaining issues and conflicts created by last merge.		12 vuotta sitten
..
images	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/	12 vuotta sitten
amazon.rst	4031a01af1 Merged changes	12 vuotta sitten
archlinux.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 vuotta sitten
binaries.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 vuotta sitten
index.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 vuotta sitten
ubuntulinux.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 vuotta sitten
upgrading.rst	6c8dcd5cbb Updated Vagrantfile and documentation to reflect new installation path using Ubuntu's PPA, also switched everything to use Ubuntu 12.04 by default.	12 vuotta sitten
vagrant.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 vuotta sitten
windows.rst	8ecde8f9a5 Updated documentation and fixed Vagrantfile	12 vuotta sitten