Victoria Bialas
b51bb39ee9
Merge pull request #69 from sixcorners/patch-1
...
Update compose-file.md
2016-10-05 19:09:10 -07:00
Victoria Bialas
903a27c7f2
Merge pull request #90 from londoncalling/d4win-github-issues-surface
...
linked info re: GitHub issues from troubleshooting
2016-10-05 18:46:29 -07:00
Victoria Bialas
3ff38eac3c
linked info re: GitHub issues from troubleshooting
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-05 18:44:49 -07:00
John Mulhausen
d3e70654fa
Merge branch 'master' of https://github.com/docker/docker.github.io
2016-10-05 17:33:22 -07:00
John Mulhausen
f9dc08d830
Fix for fwding
2016-10-05 17:33:14 -07:00
John Mulhausen
e3cb726706
Adding redirects.csv support
2016-10-05 17:31:48 -07:00
John Mulhausen
154bc45ab7
Merge pull request #87 from emcniece/fix-build-markdown
...
Adding fix for builder reference markdown
2016-10-05 17:02:40 -07:00
Eric McNiece
8c6c5a0e63
Adding fix for builder reference markdown
2016-10-05 16:50:29 -07:00
John Mulhausen
626d31eb07
Merge branch 'master' of https://github.com/docker/docker.github.io
2016-10-05 16:44:32 -07:00
John Mulhausen
77c010136b
Formatting fixes for Configure TLS page
2016-10-05 16:44:25 -07:00
Victoria Bialas
aa183f93fa
Merge pull request #85 from londoncalling/symlinks-more-info
...
expanded on symlinks explanation, cross-linked in troubleshooting
2016-10-05 16:22:38 -07:00
John Mulhausen
e0280abc9a
Update plugin_api.md
2016-10-05 16:12:47 -07:00
John Mulhausen
f6562cf92a
Update last_page.md
2016-10-05 16:10:52 -07:00
John Mulhausen
5389e6cb12
Update https.md
2016-10-05 16:07:08 -07:00
John Mulhausen
16ca0a1ed6
Update search.md
2016-10-05 16:04:13 -07:00
John Mulhausen
e41a76bf81
Fix for table in reference/run
2016-10-05 16:02:13 -07:00
John Mulhausen
790dbb4cf4
Update builder.md
2016-10-05 15:39:53 -07:00
John Mulhausen
6538eba35f
Update glossary.md
2016-10-05 15:39:27 -07:00
John Mulhausen
f913e2c573
Update index.md
2016-10-05 15:39:09 -07:00
John Mulhausen
e8ddc58189
Update run.md
2016-10-05 15:38:02 -07:00
John Mulhausen
b62fd51a29
Update Dockerfile
2016-10-05 15:31:14 -07:00
John Mulhausen
6e599e9d05
Update intro.md
2016-10-05 15:26:49 -07:00
Victoria Bialas
c5374e6135
expanded on symlinks explanation, cross-linked in troubleshooting
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-05 15:19:53 -07:00
John Mulhausen
a22178d994
Merge branch 'master' of https://github.com/docker/docker.github.io
2016-10-05 14:05:45 -07:00
John Mulhausen
9fd1c9ad27
Add forwarding for page aliases
2016-10-05 14:05:37 -07: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
sixcorners
9a2be62bf8
Update compose-file.md
...
Document that the journald logging driver allows docker-compose logs to work.
2016-10-05 11:40:42 -05: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