0ct0pu5/moby @ c20e46587d3fb09257e6ce7d085467da403210ee

Thatcher Peskens 1ddca1948b Fixed remaining issues and conflicts created by last merge.		12 anni fa
..
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 anni fa
amazon.rst	4031a01af1 Merged changes	12 anni fa
archlinux.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 anni fa
binaries.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 anni fa
index.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 anni fa
ubuntulinux.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 anni fa
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 anni fa
vagrant.rst	1ddca1948b Fixed remaining issues and conflicts created by last merge.	12 anni fa
windows.rst	8ecde8f9a5 Updated documentation and fixed Vagrantfile	12 anni fa