docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,445 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

18 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
Trapier Marshall a1de8bf85f typo in ucp ldap config (#6821) 2018-06-06 11:12:45 -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
Jim Galasyn f207a54260 Add LDAP description and example (#4581) 2017-09-11 11:53:49 -07:00
Jim Galasyn fbd515db0e Add explanation of default role for new users (#4515) 
* Add explanation of default role for new users

* Incorporate feedback
 2017-09-05 18:08:38 -07:00
Jim Galasyn e9101f07d2 Add topic on session settings (#4511) 
* Add topic on session settings

* Incorporated feedback
 2017-09-05 12:43:14 -07:00
Jim Galasyn c6d413a8c4 Update LDAP screenshot and UI descriptions (#4435) 2017-08-29 17:09:38 -07:00
Joao Fernandes 843d8ab430 Fix broken link (#4432) 2017-08-29 15:55:05 -07:00
Joao Fernandes 1fa5f5988d Refactor rbac topics (#4229) 
* Refactor rbac topics

* Make headings sentence case
 2017-08-17 08:36:18 -07:00
Jim Galasyn fa7b36c629 Update versions to GA; remove Beta admonitions (#232) 2017-08-15 23:31:15 -07:00
Jim Galasyn b8ffacac81 Update screenshots for Beta (#175) 2017-08-15 23:31:15 -07:00
Jim Galasyn 732dddce51 Add outline of steps for configuring LDAP (#171) 
* Add outline of steps for configuring LDAP

* Change title per feedback
 2017-08-15 23:31:15 -07:00
Jim Galasyn 4ebc5a04e5 Update UCP config topics (#114) 
* Update config topics

* Update config topics

* Incorporate feedback

* Add topics to TOC
 2017-08-15 23:31:15 -07:00
Jim Galasyn f30ac260b6 Refactor old and new rbac topics (#97) 
* Refactor old and new rbac topics

* Add grant topic to toc

* Incorporate feedback on new grant topic
 2017-08-15 23:31:15 -07:00
Joao Fernandes 5dc157d05d Introduce UCP 2.2 2017-08-15 23:31:15 -07:00