Commit Graph

13 Commits

Author SHA1 Message Date
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d161ca.
2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 14080c18bd.
2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 14:47:31 -07:00
Emiliano 'AlberT' Gabrielli b04bb8be45 fix nginx logs links
the log file is linked to the device, not viceversa :)
2018-06-15 14:51:45 -07:00
Joao Fernandes b381efa359 Revert "TCP is not valid option for GELF log driver"
This reverts commit c750d9d5b4.
2018-05-01 15:34:38 -07:00
ada c750d9d5b4 TCP is not valid option for GELF log driver 2018-05-01 14:57:49 -07:00
Filipe Corrêa 9a3a4e5a4b Fix misspelling (#6384) 2018-04-06 10:44:40 -07:00
Akim Demaille 14b53b68c3 Jekyll: don't put {% raw %} directives in pre blocks
Replace all occurrences of

    ```foo
    {% raw %}
    bar
    {% endraw %}
    ```

(which generates spurious empty lines in the rendered pre block) with

    {% raw %}
    ```foo
    bar
    ```
    {% endraw %}

Also, fix some occurrences where the raw section is too large and
prevented interpretation of Jekyll directives.

This is the syntax used in the documentation of Jekyll itself:

https://raw.githubusercontent.com/jekyll/jekyll/master/docs/_docs/templates.md

FTR, done with two perl substitutions:

    '^([\t ]*```[^\n]*
    )([ \t]*\{% raw %\}[^\n]*
    )' '$2$1'

and

    '^([ \t]*\{% endraw %\}[^\n]*
    )([\t ]*```[^\n]*
    )' '$2$1'

and manually tweaks.  A mechanical check would be most useful.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-03-13 10:28:29 -07:00
Lydell Manganti 66f9839296 Update json-file.md (#6085) 2018-02-26 22:50:13 -08:00
Vlastimil Zeman bd33e9ea08 Document journald tag as SYSLOG_IDENTIFIER (#5989) 2018-02-15 02:38:36 -08:00
Misty Stanley-Jones a17a47dd77
Favor docker <object> <verb> format of commands (#5914)
Remove instances of:
- docker rmi
- docker images
- docker stop
- docker rm
- docker create
- docker exec
- docker attach
2018-02-05 09:33:47 -08:00
Misty Stanley-Jones 1b343beca4
Clean up information architecture (#5893)
- Move /engine/admin/ and /engine/userguide/ topics to /config/ and /develop/
- Get rid of some stub topics that are no longer needed
- Rename /engine/article-img/ to /engine/images/
- Mark ambassador linking topic as obsolete
- Flesh out multistage build topic
- Reorganize some terribly obsolete content in other files
2018-02-01 15:25:43 -08:00