toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,265 Commits 3 Branches 295 Tags
c77458bef612cec6ea39edd117ba4a4e25972d3a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Rothfusz 1ca8702dce Merge pull request #7544 from metalivedev/fixmailmap 
Fix my email entry. FIxing email entry.
Upstream-commit: 31a9c97d7d1abeb8ef544c3a3da7e3307a96a323
Component: engine
 2014-08-13 20:05:56 -07:00
Andy Rothfusz 561c57e7b0 Updated AUTHORS file 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 10ec205b77b117cc63e9dc8fe8aedf400c933dcd
Component: engine
 2014-08-12 16:19:10 -07:00
Andy Rothfusz 48c24b480f Fix my email entry so that my current email is first and the old commit email second. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 88306539773fcd07a5bccf1c402139283a5a8db4
Component: engine
 2014-08-12 13:24:42 -07:00
Andy Rothfusz 567bf7e304 Add parent reference arrow. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 8c2cbfa0963e953cf75fe09ec688a6125689cc6d
Component: engine
 2014-03-14 14:48:13 -07:00
Andy Rothfusz 636cbb42ab Updating base svg to remove references to aufs and lxc. 
Exported new png's from layers.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 50b12708e35c300d93e8f8e8d21f79101fc185d3
Component: engine
 2014-03-14 14:37:09 -07:00
Andy Rothfusz 378360f31e Removing myself from doc maintainers due to other obligations eliminating time to maintain docs. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 3e4d0857bf560296801e68b1b218654954c952e9
Component: engine
 2014-03-10 12:55:26 -07:00
Andy Rothfusz 6f1e791920 Merge pull request #4475 from ubermuda/patch-1 
Added Docker-PHP to the list of client libs
Upstream-commit: 44fc1dfca25dbd873c9d99eda73eba317796ec53
Component: engine
 2014-03-06 14:54:33 -08:00
Andy Rothfusz 2eb4a2724e Merge pull request #4129 from proppy/patch-2 
hack/RELEASE: add step for updating doc branch
Upstream-commit: fb314c266b188de8aa0499c5314b01fd5d088475
Component: engine
 2014-03-05 16:08:37 -08:00
Andy Rothfusz e13d9e18a0 Merge pull request #4444 from SvenDowideit/update-host-integration-docs 
update to use --name, and add a little more detail to how docker start -a works
Upstream-commit: 34fe14f1746903e5775a2e34ebb1176a885dc380
Component: engine
 2014-03-05 12:30:55 -08:00
Andy Rothfusz 60c64fda87 Merge pull request #4392 from SvenDowideit/small-doc-fixes 
Small doc fixes
Upstream-commit: ac734f0d36542cef241226218fde2ab2b8c191e9
Component: engine
 2014-03-05 12:29:46 -08:00
Andy Rothfusz f1ce37be65 Merge pull request #4449 from jamtur01/readme 
Some fixes and 0.9.0 pre-req changes to the README.md
Upstream-commit: bb0211ff30aaaae21d6361eb24bc2f216883e1bf
Component: engine
 2014-03-05 12:28:32 -08:00
Andy Rothfusz 5207105b8e Merge pull request #4415 from iantruslove/patch-1 
Fix minor typo
Upstream-commit: fbc00df7a0cc500314bd9dd5fca2fe54d011033f
Component: engine
 2014-03-03 17:58:03 -08:00
Andy Rothfusz a28a17100c Merge pull request #4390 from SvenDowideit/spelling-1 
one ponted out by lukaspustina, and one that I bet I added
Upstream-commit: ba2a042aea3d8bb03b3e09e7eb7c6357c754bea0
Component: engine
 2014-02-28 13:39:40 -08:00
Andy Rothfusz d02adb2017 Merge pull request #4319 from jlhawn/docs-docker-io-api 
Added documentation for docker.io OAuth & Accounts
Upstream-commit: 70d2ca4ed39945fbef2337260b0123bdfabc9561
Component: engine
 2014-02-28 13:35:33 -08:00
Andy Rothfusz e36ff12382 Merge pull request #4318 from robpc/patch-1 
Fixed typo in Dockerfile example
Upstream-commit: ce8a7352488ede9e78ab0dde642577b506bf28a1
Component: engine
 2014-02-27 10:19:09 -08:00
Andy Rothfusz 7c7e0318a0 Merge pull request #4323 from timruffles/patch-2 
help contributors be more productive
Upstream-commit: d373cb8c89f40a6d293cbb01b094c4e947057343
Component: engine
 2014-02-25 15:03:30 -08:00
Andy Rothfusz dd7ff4fc5b Merge pull request #4280 from dpb587/bugfix-mtu-typo 
Fix argument usage typo for docker --mtu
Upstream-commit: 36fd9f3c53621f27ee5346ef52a6dde6d8e1d580
Component: engine
 2014-02-21 10:59:42 -08:00
Andy Rothfusz 5cecf0201f Merge pull request #4277 from SvenDowideit/tianon-made-me-doit 
small update to API docs to go with #4276
Upstream-commit: 0c8c87d9ff8a4dcc794c137d69ef3fd91527035e
Component: engine
 2014-02-21 10:57:51 -08:00
Andy Rothfusz 5c958f0de4 Merge pull request #4233 from deedubs/patch-1 
FIX: Linux mint troubleshooting tip
Upstream-commit: a5515d27e5da9c4442fa9800b8995236d4b5ef2f
Component: engine
 2014-02-20 18:07:39 -08:00
Andy Rothfusz deed4c0865 Merge pull request #4251 from tianon/add-back-grub-info 
Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
Upstream-commit: 2018d4f9cd1c201d9cb3991b4223cd107daffc63
Component: engine
 2014-02-20 18:04:50 -08:00
Andy Rothfusz ed09089e1d Merge pull request #4261 from amouat/patch-1 
Fix misspelling
Upstream-commit: bb368b0563e1c7c2055cc49455ce9a7ba126c713
Component: engine
 2014-02-20 17:13:54 -08:00
Andy Rothfusz bfeed894f7 Merge pull request #4252 from SvenDowideit/mention-scratch-image 
lets talk about the other way to make base images
Upstream-commit: 93b98c9fe33a86f7ab8add97a6a6de3769cef65b
Component: engine
 2014-02-20 17:12:36 -08:00
Andy Rothfusz 97d9349a9d Merge pull request #4225 from cpuguy83/4208-update_docs_to_better_explain_docker_run 
Doc: Add basics for controlling a container's lifecycle
Upstream-commit: 16c2031137c5619a67130aa7d4a4f97289d8e808
Component: engine
 2014-02-19 13:31:31 -08:00
Andy Rothfusz f154030fbe Merge pull request #4226 from metalivedev/updatedocdoc 
Update Docs doc
Upstream-commit: f1167096ca053e44a478a0cfc760f9fdf951a2c1
Component: engine
 2014-02-19 10:36:34 -08:00
Andy Rothfusz 98d4bbe0f6 update links 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 196702fbf9905426e590c0dbcb6101e72c62aac6
Component: engine
 2014-02-19 10:32:43 -08:00
Andy Rothfusz 83c5ea4b47 Update the documentation docs with new branch information. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 05c692d64ec9cabe6c16385300405406ebe63f40
Component: engine
 2014-02-18 19:21:12 -08:00
Andy Rothfusz 407406c3e2 Merge pull request #4223 from SvenDowideit/update-boot2docker-repo 
we moved the boot2docker repo
Upstream-commit: d0f4bc7ccac7a7802c46b7be6ffd3bd3a2d45454
Component: engine
 2014-02-18 17:42:59 -08:00
Andy Rothfusz 983d302f63 Merge pull request #4173 from SvenDowideit/add-most-spacing-to-headers 
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
Upstream-commit: ba3cbeb86bafbb6d7553f8954b0bf8d1e2d3f97f
Component: engine
 2014-02-18 16:55:10 -08:00
Andy Rothfusz a4ead08188 Merge pull request #4210 from cpuguy83/4208-update_docs_to_better_explain_docker_run 
Add extra info regarding docker run funcationality
Upstream-commit: 13086739656d7866ac5da76aef4fa4d5fa378df0
Component: engine
 2014-02-18 15:44:26 -08:00
Andy Rothfusz f1f31be89b Merge pull request #4114 from SvenDowideit/update-sshd-example 
update the sshd example to use just a Dockerfile
Upstream-commit: 836a49a46e6ff51a0ef73eb170935f0d138b932e
Component: engine
 2014-02-18 12:12:52 -08:00
Andy Rothfusz b1aa1c1a6a Merge pull request #4147 from float64/patch-1 
Env Clarification
Upstream-commit: 3a2fa54857d23e0070c7818eb9752ef263e0a9fe
Component: engine
 2014-02-18 12:07:39 -08:00
Andy Rothfusz 18d6994efa Merge pull request #2980 from SvenDowideit/1439-add-registry-repository-terms 
my attempt to disentagle repository and registry 
Upstream-commit: 57c4f7185d18db964f90b10c494eaf271f4d8aa9
Component: engine
 2014-02-18 11:26:45 -08:00
Andy Rothfusz c7021aec80 Merge pull request #4145 from SvenDowideit/redo-python-example 
touch up the examples
Upstream-commit: c14c539c6c16e604817ea0b4bf8bd7dc58e2a5ac
Component: engine
 2014-02-18 11:08:45 -08:00
Andy Rothfusz 51cf4f7bfe Merge pull request #4171 from SvenDowideit/4061-remote-api-warning 
change the -H TCP / docker group warning to not reference a resolved issue
Upstream-commit: c7c825d9a5f53be6f868ff401b1d61cda14e83fe
Component: engine
 2014-02-17 14:36:05 -08:00
Andy Rothfusz 8326694294 Merge pull request #4120 from apocas/master 
Image tag endpoint HTTP code typo
Upstream-commit: a4d1da709eae456888a3bdc35cd7a04a06ead7cb
Component: engine
 2014-02-13 15:49:45 -08:00
Andy Rothfusz 93967c393a Merge pull request #4111 from merriam/patch-4 
Minor error in example code (resubmit #4109)
Upstream-commit: cddea301ab4a4d5ba32c1d1bb22f029fcf1a8edd
Component: engine
 2014-02-12 18:34:17 -08:00
Andy Rothfusz 52f3c9ec6e Merge pull request #4112 from merriam/patch-3 
(resubmit #4110) Add notes about OS/X and remote daemons 
Upstream-commit: 9d7515545944b294daae3883eceb75c53fc1b783
Component: engine
 2014-02-12 18:33:11 -08:00
Andy Rothfusz 9cd54a87e2 Merge pull request #4090 from SvenDowideit/add-install-make-git-to-devenv 
tell the reader that they need git and make for this tutorial
Upstream-commit: 989fee2490b0d4ed6fd76e668ace6769f7d908ee
Component: engine
 2014-02-12 15:48:39 -08:00
Andy Rothfusz 1cb1e79554 fix underline/heading 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 6fd8e5d976e872447447d8c25d20d525305f281d
Component: engine
 2014-02-11 16:53:08 -08:00
Andy Rothfusz c691ff08d3 Merge pull request #4034 from SvenDowideit/postgres-example 
rewrite the PostgreSQL example using a Dockerfile, and add details to it
Upstream-commit: e9e4b8dc15fcf01fb793cd65ebfa822420d56fe8
Component: engine
 2014-02-11 16:49:22 -08:00
Andy Rothfusz da8055c21a Merge pull request #3988 from dafyddcrosby/fix_formatting 
Fix RST formatting
Upstream-commit: 73967417579a44a4597e8d3e818248f8c98a1c97
Component: engine
 2014-02-11 16:30:21 -08:00
Andy Rothfusz 04ccad7a77 Merge pull request #4057 from SvenDowideit/add-P-docs 
add a little more information about the docker run -P option
Upstream-commit: 7fe8b50e2ee9ba0b237827f95980dcf6e1a41fb4
Component: engine
 2014-02-11 16:27:25 -08:00
Andy Rothfusz ba35f17949 Merge pull request #4054 from SvenDowideit/boot2docker-upgrade-doc 
add a little info on upgrading b2d
Upstream-commit: ff2260099ab8669241e3cedd2edd3afe0fb34f4d
Component: engine
 2014-02-11 16:23:11 -08:00
Andy Rothfusz deaadc8b56 fix underline/heading 
Upstream-commit: c76a4e34896fd0785cf982372a3713c4ef70754b
Component: engine
 2014-02-11 16:19:42 -08:00
Andy Rothfusz c649008597 Merge pull request #4020 from cameronboehmer/patch-1 
add vm port forwarding note/example in osx install docs
Upstream-commit: 3122b4b470168ead70a84ff2594aa32c0619e08c
Component: engine
 2014-02-11 16:18:54 -08:00
Andy Rothfusz 7abeabe543 Merge pull request #4072 from 13W/patch-1 
Update remote_api_client_libraries.rst
Upstream-commit: 0bcabdbdc79472d7e6c56498c8ae06413730d270
Component: engine
 2014-02-11 16:14:22 -08:00
Andy Rothfusz 27e1a5f0fd Merge pull request #4035 from SvenDowideit/dont-env-debian-frontend 
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
Upstream-commit: 9176b6fd883158e3420777e6e2d463ddcf2005ab
Component: engine
 2014-02-11 15:59:10 -08:00
Andy Rothfusz 22eab6c016 Merge pull request #4019 from ostezer/fix-installation-windows-doc-title 
docs: Installation Instruction Title & Description Fixes
Upstream-commit: 2975ba6f7315bc4f1e41f6523ab927572d3aafd0
Component: engine
 2014-02-10 15:26:32 -08:00
Andy Rothfusz 60784e353c Merge pull request #3987 from SvenDowideit/warn-against-symlinks 
please, for the love of Docker, do. not. use. symlinks
Upstream-commit: 8228e50581faadfb1626fa18b50cc7a6309d6b43
Component: engine
 2014-02-07 18:48:19 -08:00
Andy Rothfusz 25d86837fc Merge pull request #3984 from jamtur01/secfaw 
Added Security FAQ question
Upstream-commit: 31a1a815c4f3a9a651c3c87bebaead252c147874
Component: engine
 2014-02-06 17:40:59 -08:00
Andy Rothfusz 720e1e3427 Merge pull request #3944 from joeshaw/patch-1 
Always download things over https
Upstream-commit: 9dd92a9823d7021c20a8c3f596fe2c68129bf6a6
Component: engine
 2014-02-05 13:56:41 -08:00
Andy Rothfusz 246155a392 Merge pull request #3938 from SvenDowideit/workdir-doc-tweak 
be a little more explicit about what WORKDIR does
Upstream-commit: f9f30f1ced0c9dfe5756433ef8240f3f8c8e6d71
Component: engine
 2014-02-05 13:54:49 -08:00
Andy Rothfusz 0e2fa63561 Merge pull request #3933 from proppy/patch-1 
docs/installation/google: remove -mtu flag
Upstream-commit: 880dc34c0e353c5749c87666f27f2e4794dd3270
Component: engine
 2014-02-04 17:24:18 -08:00
Andy Rothfusz 2ec14b9b9e Merge pull request #3928 from metalivedev/fixheadings 
Fixes headings in Table of Contents, link from FAQ.
Upstream-commit: 501d0499f89f3d775d39552141e002ad139222d2
Component: engine
 2014-02-04 14:59:24 -08:00
Andy Rothfusz 8f864d043a Merge pull request #3929 from ostezer/master 
mac-installation-docs: Update the installation dir.
Upstream-commit: fa0afe89aded86b99a992e567b3e3f0c0320eb45
Component: engine
 2014-02-04 14:51:05 -08:00
Andy Rothfusz ce01d33e55 Fixes headings in Table of Contents, link from FAQ. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 18b896e0f032b6ec71fc7c5e56b2acd470c0fe50
Component: engine
 2014-02-04 14:16:27 -08:00
Andy Rothfusz 9b110c40d9 Merge pull request #3918 from ostezer/master 
docs: Requirements And Installation on Mac OS X 10.6 Snow Leopard
Upstream-commit: 3455c6f47085cfdc519db1b8fbd0955528c2e630
Component: engine
 2014-02-04 12:38:51 -08:00
Andy Rothfusz 36c86dc9b0 Merge pull request #3919 from SvenDowideit/missing-quote 
missing quote quota
Upstream-commit: 23959e6cf8a002c6607b692c7bd89035f59b2c39
Component: engine
 2014-02-04 10:03:26 -08:00
Andy Rothfusz a5869c9f8d Merge pull request #3883 from metalivedev/fix-3879 
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
Upstream-commit: 8beca66741c74fa385fe7b8f91e7a73f4342cf90
Component: engine
 2014-02-03 16:09:54 -08:00
Andy Rothfusz 2e2c23075e Updated width to 815 per comment. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: fca2f3e742d699688c9891ccf9dd8e58591aed08
Component: engine
 2014-02-03 16:06:29 -08:00
Andy Rothfusz 7b2e0fd00d Fixes #3879 by updating embedding of ascii.io (now asciinema.io) 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: b0f4ad431d79869111cfbf506a783a275c274c68
Component: engine
 2014-01-31 18:02:45 -08:00
Andy Rothfusz 4ae61a560f Merge pull request #3864 from SvenDowideit/lxc-kill-script-workaround-doc 
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kil...
Upstream-commit: 70ab72ff32fdfd91e8ba8c2c294c649ec5e2d84a
Component: engine
 2014-01-31 10:27:04 -08:00
Andy Rothfusz 90c3a9efe5 Merge pull request #3861 from metalivedev/fixkerneldeps 
Fixed link to kernel dependencies. 
Upstream-commit: feea1dda41ea33533f358329348333236f587874
Component: engine
 2014-01-31 10:25:25 -08:00
Andy Rothfusz cc8be8350a Merge pull request #3758 from metalivedev/2720-running 
Fixes 2720
Upstream-commit: e64a9a3bada4864a9358cffdf09aed0290c52a33
Component: engine
 2014-01-30 16:09:19 -08:00
Andy Rothfusz cdd32376a9 Fixed link to kernel dependencies. Wrapped long lines. Removed old tar dependency from list. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 98518bbcad85217ac36112f6a18a275816b38287
Component: engine
 2014-01-30 16:03:13 -08:00
Andy Rothfusz 41e844d181 Merge pull request #3836 from SvenDowideit/mint-cgroups-lite-docs 
Add troubleshooting for missing cgroups on mint 16
Upstream-commit: 43b7667dccc4a08cf12a17548df359e0ba118ae1
Component: engine
 2014-01-30 10:58:26 -08:00
Andy Rothfusz ea8660fa0f Merge pull request #3813 from jpoimboe/update-ip_forward-docs 
docs: remove ip_forward enabling step
Upstream-commit: c82a2d1adfb2b2a838a12e0c3baea1d42fe7f3ad
Component: engine
 2014-01-28 18:08:22 -08:00
Andy Rothfusz ec0c7b9842 Address feedback from @jamtur01. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: f3a032f27b80e8194cb7f14df848f063a56c5f26
Component: engine
 2014-01-28 17:32:05 -08:00
Andy Rothfusz 5ca9f4270c Fix 2720 -- Expanded documentation for docker run. 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 07c4eda46a6a1af82b4b519d9186b9bf7881d7cc
Component: engine
 2014-01-27 14:44:24 -08:00
Andy Rothfusz 254ce5fef5 Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg 
move the contributing hook into contrib, and use curl in the same way as the gofmt above
Upstream-commit: bbfc531b51cb17e97022ff0e904f91faac48713f
Component: engine
 2014-01-27 12:09:03 -08:00
Andy Rothfusz d680ae54b5 Merge pull request #3781 from mattymo/patch-1 
Clean up grammar on puppet.rst
Upstream-commit: 093531ddb7f4ee53cd166bfd9316af0c1de7424c
Component: engine
 2014-01-27 12:06:43 -08:00
Andy Rothfusz 8e2497b678 Merge pull request #3773 from mnaberez/supervisord-apache2-example 
Use exec to replace bash with apache2 after environment is set up
Upstream-commit: adae0b248d6f6732f15ef96f856ac097d038a181
Component: engine
 2014-01-27 12:01:59 -08:00
Andy Rothfusz 0e5f62a6b2 Merge pull request #3770 from aaronfeng/fix-image-name-pos 
move image name into correct position
Upstream-commit: ef37fdd1a853fbef8cbabe1a34c527d278589067
Component: engine
 2014-01-27 11:56:36 -08:00
Andy Rothfusz 0badcc35ea Fix TOC for Articles 
Upstream-commit: 6cae33ca0f78ce8b7f1250e1f85828cfb242b12f
Component: engine
 2014-01-23 18:55:26 -08:00
Andy Rothfusz 5ee57b9d0c Merge pull request #3730 from SvenDowideit/JSON-RUN-format-docs 
talk about the new exec form of RUN (Closes #3723) implemented by #3558
Upstream-commit: a71e7fe8ab0fdee28b4cf062d17082568b383002
Component: engine
 2014-01-23 15:54:00 -08:00
Andy Rothfusz a01f048b9e Merge pull request #3716 from johngmyers/patch-1 
Grammar fixes and wording improvements
Upstream-commit: 700db10c850f4721ab890c1d4f0fa22a2fbaa29d
Component: engine
 2014-01-22 12:01:13 -08:00
Andy Rothfusz b2fe863a63 Merge pull request #3713 from SvenDowideit/document-bind-mount-file 
bind mounts work for files - give an example, as its very very useful.
Upstream-commit: 9a2e673f4f5999c5b3a282c7f6ffe87793dfd5e5
Component: engine
 2014-01-22 11:54:41 -08:00
Andy Rothfusz a633d7a05c Merge pull request #3688 from shykes/docs-simplify-basic-usage 
Simplify basic usage docs
Upstream-commit: 62c456398767b3e8155ec6d0df265cb5fb464438
Component: engine
 2014-01-21 11:41:32 -08:00
Andy Rothfusz 1b8b44e502 Merge pull request #3690 from shykes/cleanup-maintainers 
Cleanup maintainers
Upstream-commit: ba4ae40445d40545a83b5dc9040c1c4942bb51ce
Component: engine
 2014-01-21 11:18:23 -08:00
Andy Rothfusz 8a428ead43 Merge pull request #3687 from shykes/docs-intro 
docs: harmonize intro paragraph with website
Upstream-commit: fb919137bec47bb4922a2571a0f9410a5887c670
Component: engine
 2014-01-21 11:02:55 -08:00
Andy Rothfusz 08877d190e Merge pull request #3700 from jamtur01/fixedtoc 
Fixed commandline/index warning in TOC
Upstream-commit: 31274ffccb954bde88c973719c949894cc02d314
Component: engine
 2014-01-21 10:52:13 -08:00
Andy Rothfusz 1f774297a3 Reordering to make FAQ last 
Upstream-commit: 90b52b7e0623271ec0351ffb6dc7a7586bbe6e4d
Component: engine
 2014-01-20 17:11:03 -08:00
Andy Rothfusz 1665fbf899 Merge pull request #3618 from shykes/docs-cleanup-install 
Docs cleanup install
Upstream-commit: acf43b4da7c7f81f5774f341828b8b862f204c04
Component: engine
 2014-01-20 17:10:02 -08:00
Andy Rothfusz 59aa210c0d Merge pull request #3600 from SvenDowideit/ghost-status-doc 
Ghost status doc
Upstream-commit: b38d3154c85bf66db7c84df58ce5c24696a841b5
Component: engine
 2014-01-20 16:51:47 -08:00
Andy Rothfusz 28e9f7be0b Merge pull request #3650 from tianon/fix-doc-man-generation 
Fix docs man page generation and add Dockerfile man page
Upstream-commit: 6dfbbaa4ffa91764ad4c332808d3cc9f76aa37b4
Component: engine
 2014-01-20 13:44:01 -08:00
Andy Rothfusz 31ec62f475 Merge pull request #3620 from jamtur01/refman 
Added Reference Manual
Upstream-commit: ebaa92b20879339e66bfd995a340a235cfb25046
Component: engine
 2014-01-17 13:42:22 -08:00
Andy Rothfusz f6132defa4 Merge pull request #3583 from metalivedev/3497-copyright 
Update docs/NOTICE copyrights to 2014
Upstream-commit: 2cdbc719c58978bc9d23098b45b473d17956dae0
Component: engine
 2014-01-16 12:18:34 -08:00
Andy Rothfusz b04df34a21 Merge pull request #3598 from tianon/fix-vieux-docs-errors-again 
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
Upstream-commit: cdea7d3b5f64b8d255bab657a79082ec282da96a
Component: engine
 2014-01-15 13:42:28 -08:00
Andy Rothfusz 403789e5fb Merge pull request #3593 from dotcloud/fix_doc 
fix doc, load and get
Upstream-commit: 0113c087b22c7ffe03c4745bc9d05a0523ecbe5c
Component: engine
 2014-01-15 13:33:00 -08:00
Andy Rothfusz 07247c041c Merge pull request #3585 from tianon/remove-uid-ns-reference 
Remove reference to nonexistent CONFIG_UID_NS
Upstream-commit: be44bf81704bd06c5665759d24612c0b1e205a81
Component: engine
 2014-01-14 11:37:00 -08:00
Andy Rothfusz aa714b58c1 Merge pull request #3586 from flavio/add_openSUSE_installation_docs 
Added document explaining openSUSE installation
Upstream-commit: da78dd0eb82419f7f7438649ca95fbe6741dd5d1
Component: engine
 2014-01-14 11:36:15 -08:00
Andy Rothfusz 197d847462 Merge pull request #3584 from tianon/fix-docs-dockerfile 
Fix docs Dockerfile to install correctly again
Upstream-commit: fe6c9e8fd7cef9bae224dd66a59696dcb025db49
Component: engine
 2014-01-13 17:42:20 -08:00
Andy Rothfusz 7cecb31982 Fixes 3497 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: @metalivedev)
Upstream-commit: a92699ab6c0f93ee155b44145790dfeaf54cf1c8
Component: engine
 2014-01-13 17:12:53 -08:00
Andy Rothfusz e42df33e3b Merge pull request #3544 from SvenDowideit/build-image-cache 
add info and example of image cache in use when building
Upstream-commit: 6652416f4c18bd59575c7788747335eab7b4d304
Component: engine
 2014-01-13 11:10:29 -08:00
Andy Rothfusz 5f6e6869ed Merge pull request #3460 from tsaavik/patch-1 
Fixed error in group add example
Upstream-commit: c45cd9174ebc0c7dbc9f245166152ffd35cc72f4
Component: engine
 2014-01-08 15:45:23 -08:00
Andy Rothfusz ac3896d23f Merge pull request #3503 from gertvv/patch-1 
Hello World: fix detach behavior
Upstream-commit: 9a6333466bd97ea7903cefaa1e2348f3053483b8
Component: engine
 2014-01-08 11:44:26 -08:00
Andy Rothfusz 78d6110233 Merge pull request #3501 from proppy/patch-1 
google-compute-engine: fix typos
Upstream-commit: 187eed7da57104e1bda256b2ec18e098558c902d
Component: engine
 2014-01-08 11:40:30 -08:00
Andy Rothfusz ec9c950a6c Merge pull request #3430 from lsm5/fedora-official-image 
install instructions use unprefixed fedora image
Upstream-commit: b3addb5fb8814c0e76e2115404caef8a4efb393c
Component: engine
 2014-01-07 15:12:37 -08:00
Andy Rothfusz 5b404255d5 Merge pull request #3483 from lukaspustina/patch-1 
Missing redirect in line 85
Upstream-commit: 00ee6d1925688bda77d5055d7e4be1cbd8b64a07
Component: engine
 2014-01-07 15:11:02 -08:00
Andy Rothfusz dffdf1a269 Merge pull request #3462 from tsaavik/patch-2 
Simplified and streamlined Amazon Quickstart
Upstream-commit: 6f8a79c23c7ae80a18fb291c7dd65e12b8a6c037
Component: engine
 2014-01-07 15:09:35 -08:00