Commit Graph

42385 Commits

Author SHA1 Message Date
Benjamin R. Haskell 362e94b2bc Disable Liquid templating for blocks with `{{`
Instead of disabling templating for entire files, fix instances
individually by wrapping blocks in:

    ```{% raw %}
    ... content ...
    {% endraw %}```

Signed-off-by: Benjamin R. Haskell <docker@benizi.com>
2016-10-07 00:58:08 -04:00
Benjamin R. Haskell 65ec3a3763 Revert pull request #48
Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
2016-10-07 00:56:17 -04:00
John Mulhausen bdc4a3b934 Fix for Embedded DNS server 2016-10-06 17:12:47 -07:00
John Mulhausen fc85fcc0b9 Re-enabling redirects 2016-10-06 17:00:33 -07:00
John Mulhausen a2ff02a96a Fix for relative-path redirects causing infinite loops 2016-10-06 17:00:03 -07:00
John Mulhausen a01754c8e0 Fix for redirector 2016-10-06 15:13:12 -07:00
John Mulhausen 79695f49c9 Fix for char offset 2016-10-06 14:46:42 -07:00
John Mulhausen 6559df42aa Fix for versioned docs 2016-10-06 14:42:11 -07:00
John Mulhausen 1c85806569 Fix for archives 2016-10-06 14:36:24 -07:00
John Mulhausen 04e0a6fe28 Change to <meta refresh> redirects 2016-10-06 12:30:28 -07:00
John Mulhausen df9aff2877 Redirect logic 2016-10-06 12:28:33 -07:00
John Mulhausen cb3f6f04a1 Merge pull request #48 from benizi/fix/raw-variables
Fix formatting for Markdown files containing `{{`
2016-10-06 09:46:51 -07:00
John Mulhausen 32f3885686 Update log_tags.md 2016-10-06 09:39:32 -07:00
John Mulhausen 11dae327dc Update docs.html 2016-10-06 09:39:18 -07:00
John Mulhausen cf15de2784 Update docs.html 2016-10-06 09:33:45 -07:00
John Mulhausen 3d08488dc4 Update log_tags.md 2016-10-06 09:32:22 -07:00
John Mulhausen e6c88108e1 Merge pull request #106 from BSCheshir/patch-1
fix url
2016-10-06 09:26:19 -07:00
BSCheshir 7fd3d4e956 fix url 2016-10-06 18:05:44 +04:00
John Mulhausen 539fcb58b7 Part 4 draft, Dockerfiles for vnext compose/machine 2016-10-05 22:35:42 -07:00
John Mulhausen 0ac4bae36a Part 4 draft, Dockerfiles for vnext compose/machine 2016-10-05 22:35:12 -07:00
John Mulhausen fb21824a38 Update index.md 2016-10-05 22:17:47 -07:00
John Mulhausen 3d7caa4839 Update docker-compose.yml 2016-10-05 22:09:48 -07:00
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