Thatcher Peskens 1ddca1948b Fixed remaining issues and conflicts created by last merge.

2013-04-23 12:04:53 -07:00

..

images/win

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/

2013-03-27 16:43:13 -07:00

amazon.rst

Merged changes

2013-04-22 18:38:42 -07:00

archlinux.rst

Fixed remaining issues and conflicts created by last merge.

2013-04-23 12:04:53 -07:00

binaries.rst

Fixed remaining issues and conflicts created by last merge.

2013-04-23 12:04:53 -07:00

index.rst

Fixed remaining issues and conflicts created by last merge.

2013-04-23 12:04:53 -07:00

ubuntulinux.rst

Fixed remaining issues and conflicts created by last merge.

2013-04-23 12:04:53 -07:00

upgrading.rst

Updated Vagrantfile and documentation to reflect new installation path using Ubuntu's PPA, also switched everything to use Ubuntu 12.04 by default.

2013-04-22 13:10:32 -07:00

vagrant.rst

Fixed remaining issues and conflicts created by last merge.

2013-04-23 12:04:53 -07:00

windows.rst

Updated documentation and fixed Vagrantfile

2013-04-19 20:57:50 -07:00