Matt Bentley
73fac8acb7
Fixed jekyll formatting for dm docs; fixed #112
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-10-06 22:33:41 -04:00
Victoria Bialas
16b570d779
Merge pull request #81 from londoncalling/machine-back-out-aws-changes
...
Revert "Merge pull request #36 from mrburrito/aws-iam-roles"
2016-10-05 13:30:23 -07:00
John Mulhausen
2cd9cbdfe6
Update docsarchive.md
2016-10-05 13:19:19 -07:00
John Mulhausen
a3850c18d2
Merge pull request #76 from bfirsh/add-compose-file
...
Add Compose file for development
2016-10-05 12:57:36 -07:00
Victoria Bialas
2ab7fa3aff
Revert "Merge pull request #36 from mrburrito/aws-iam-roles"
...
This reverts commit 82d9ab91b2
, reversing
changes made to c1188953ba
.
2016-10-05 12:52:04 -07:00
Ben Firshman
7da61ffa50
Add Compose file for development
...
Also fix regeneration. The starefossen/github-pages image had
--force_polling set to poll the filesystem, but this didn't
seem to work. Docker for Mac/Windows supports filesystem events,
so it now uses this instead.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-05 19:34:31 +01:00
Victoria Bialas
5fcc2f5445
Merge pull request #75 from lack3r/patch-3
...
Deleted (or right here ☺) from windows guide
2016-10-05 11:31:02 -07:00
Andreas Loizou (LACK3R)
2d87f30b7e
Deleted (or right here ☺) from windows guide
...
Deleted (or right here ☺) from windows guide
2016-10-05 21:16:49 +03:00
John Mulhausen
40f16b311e
Merge pull request #49 from benizi/fix/missing-code-fence
...
Add missing close tag for fenced code block
2016-10-05 10:32:31 -07:00
John Mulhausen
d785f0cf21
Merge pull request #68 from rutsky/patch-1
...
don't split verbatim text over few lines
2016-10-05 10:32:10 -07:00
John Mulhausen
886fd7c822
Merge pull request #72 from lack3r/patch-1
...
Deleted an extra /tr
2016-10-05 10:30:55 -07:00
Andreas Loizou (LACK3R)
57594630b3
Deleted an extra /tr
...
Deleted an extra /tr
2016-10-05 20:18:11 +03:00
Vladimir Rutsky
210d261bb4
don't split verbatim text over few lines
...
Should fix improperly formatted documentation page.
2016-10-05 20:38:15 +04:00
John Mulhausen
8936e1b88c
Merge pull request #46 from marcaurele/fix-exoscale
...
Exoscale: fix letter casing
2016-10-04 23:54:02 -07:00
Benjamin R. Haskell
57542590b3
Add missing close tag for fenced code block
2016-10-05 02:17:41 -04:00
Marc-Aurèle Brothier
3fe070e848
Exoscale: fix letter casing
...
Following change a059edd949
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
2016-10-05 07:35:42 +02:00
John Mulhausen
a0e7eb56d0
Update docs.html
2016-10-04 18:40:58 -07:00
Victoria Bialas
dca5b45750
Merge pull request #42 from londoncalling/d4mac-d4win-prs
...
PRs on shared drives and CAs, HTML fixes
2016-10-04 18:22:31 -07:00
John Mulhausen
a059edd949
Matching PR #3753 @ Machine
...
A PR slipped in post-migration at https://github.com/docker/machine/pull/3753/files
2016-10-04 18:06:30 -07:00
Victoria Bialas
063003dadf
PRs on shared drives and CAs, HTML fixes
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-04 18:01:54 -07:00
John Mulhausen
c4f548e8e1
Update install.md
2016-10-04 17:02:58 -07:00
John Mulhausen
c03bb7f90c
Update services.md
2016-10-04 16:59:05 -07:00
LRubin
38c8a6c703
Merge pull request #40 from sanscontext/api-2
...
More cloud API docs fixes
2016-10-04 16:47:39 -07:00
LRubin
9039fe6f82
remove file that was causing a path conflict
...
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-04 16:10:49 -07:00
LRubin
925e28bdc8
and change TOC back to point to old path
...
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-04 16:02:38 -07:00
LRubin
d02565028c
checking in source to better diff
...
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-04 15:56:03 -07:00
LRubin
55be806bd7
check in apidocs move
...
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-04 15:53:07 -07:00
Victoria Bialas
51f0aa2a19
Merge pull request #30 from holtkamp/patch-1
...
Extend applications which suffer from poor performance
2016-10-04 15:44:06 -07:00
Victoria Bialas
82d9ab91b2
Merge pull request #36 from mrburrito/aws-iam-roles
...
Doc update to support standard AWS credential loading.
2016-10-04 15:41:45 -07:00
Victoria Bialas
c1188953ba
Merge pull request #39 from londoncalling/fix-machine-drivers-menu-position
...
repositioned Drivers menu item directly under Machine topic
2016-10-04 15:40:53 -07:00
John Mulhausen
d2cc9fe885
Merge branch 'master' of https://github.com/docker/docker.github.io
2016-10-04 15:38:45 -07:00
John Mulhausen
55e31bb0f6
Staging container fixes
2016-10-04 15:38:40 -07:00
Victoria Bialas
bdbde3fb18
repositioned Drivers menu item directly under Machine topic
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-04 15:32:37 -07:00
Victoria Bialas
7480dc4e2a
Merge pull request #37 from mrburrito/aws-userdata
...
Doc change to support custom userdata option for docker-machine AWS driver
2016-10-04 15:24:16 -07:00
John Mulhausen
bb83c5f605
Update rhel.md
2016-10-04 15:24:14 -07:00
Gordon Shankman
a9b79591cf
Migrating docs changes from machine PR https://github.com/docker/machine/pull/3779
...
Signed-off-by: Gordon Shankman <gshankman@gmail.com>
2016-10-04 17:05:20 -04:00
Gordon Shankman
f590974263
Docs changes from machine PR https://github.com/docker/machine/pull/3799
...
Signed-off-by: Gordon Shankman <gshankman@gmail.com>
2016-10-04 16:59:58 -04:00
Victoria Bialas
f6f3fdbfb7
Merge pull request #35 from londoncalling/rem-ubuntu-wily-werewolf-build-deb-targets
...
removed ubuntu wily 15.10 references in install docs
2016-10-04 12:51:42 -07:00
Victoria Bialas
300486bd77
removed ubuntu wily 15.10 references in install docs
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-04 12:37:39 -07:00
Victoria Bialas
3d20fab706
Merge pull request #34 from londoncalling/d4mwin-symlinks-note
...
added note re: symlinks
2016-10-04 12:28:01 -07:00
John Mulhausen
83991d6998
Merge pull request #32 from sanscontext/test-api
...
fixes up cloud api docs
2016-10-04 12:14:08 -07:00
LRubin
cf150d8a50
point the TOC to the right serve dir
...
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-04 12:00:05 -07:00
Victoria Bialas
dde1ef8bb5
added note re: symlinks
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-04 11:44:20 -07:00
Victoria Bialas
655034098d
Merge pull request #31 from londoncalling/fix-kitematic-html-issues
...
fixing HTML on Kitematic, Mac, Windows, Toolbox docs
2016-10-04 11:30:07 -07:00
LRubin
32d7713d8f
Merge pull request #27 from johndmulhausen/master
...
Move Cloud API Docs source into repo
2016-10-04 11:20:28 -07:00
Victoria Bialas
432f9af1d3
fixing HTML on Kitematic, Mac, Windows, Toolbox docs for github.io rendering, plus copyedits
...
copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-04 11:18:17 -07:00
LRubin
5248490972
fixes up cloud api docs
...
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-04 11:11:14 -07:00
Menno Holtkamp
8ea8f5a20e
Extend applications which suffer from poor performance
2016-10-04 17:03:28 +02:00
John Mulhausen
f759b96301
Update docker_elevator_pitch.md
2016-10-04 00:55:23 -07:00
John Mulhausen
8fc96d838f
Update README.md
2016-10-04 00:44:49 -07:00