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