16 commits

Author	SHA1	Message	Date
Thatcher Peskens	1ddca1948b	Fixed remaining issues and conflicts created by last merge.	2013-04-23 12:04:53 -07:00
Thatcher Peskens	5a5e417d46	Merge remote-tracking branch 'dotcloud/master' into dhrp/docs ... Conflicts: docker/docker.go docs/sources/installation/archlinux.rst docs/sources/installation/index.rst docs/sources/installation/ubuntulinux.rst runtime.go utils.go	2013-04-22 18:44:50 -07:00
Thatcher Peskens	4031a01af1	Merged changes	2013-04-22 18:38:42 -07:00
Thatcher Peskens	6c8dcd5cbb	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
Solomon Hykes	52cedb8a05	Better title in ubuntu install doc	2013-04-20 18:26:15 -07:00
Solomon Hykes	6909f3911f	Merge pull request #422 from shawnsi/arch-docs ... Arch docs	2013-04-20 17:35:43 -07:00
Solomon Hykes	1201c418cd	Fix Ubuntu install doc	2013-04-20 17:31:49 -07:00
Solomon Hykes	4a9c3a92e1	Formatting fix in ubuntu install doc	2013-04-20 17:30:33 -07:00
Thatcher Peskens	0731d1a582	Updated ubuntu install	2013-04-19 20:59:43 -07:00
Thatcher Peskens	8ecde8f9a5	Updated documentation and fixed Vagrantfile	2013-04-19 20:57:50 -07:00
Shawn Siefkas	7eda9c64b8	Updating the arch linux installation docs ... New AUR package name Adding systemd service unit info	2013-04-18 09:20:23 -05:00
Shawn Siefkas	45809e9a05	Issue #405: Documentation for Arch Linux Install	2013-04-12 13:25:33 -05:00
Thatcher Peskens	81874ad442	Fixed a lot of language and small things.	2013-04-01 19:11:09 -07:00
Thatcher Peskens	6437648176	Added a lot of basic instructions on various topics	2013-03-29 17:30:10 -07:00
Solomon Hykes	47e5d2f5e1	Merge remote-tracking branch 'origin/docs'	2013-03-28 11:12:00 -07:00
Thatcher Peskens	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/	2013-03-27 16:43:13 -07:00