Commit Graph

15 Commits

Author SHA1 Message Date
Oscar Caballero 269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
Joao Fernandes d3e24a2807
Update UCP config file reference (#6222)
Update UCP config file reference
2018-03-20 15:39:35 -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
Trapier Marshall 6211d325e8 indicate units on ucp metrics intervals
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2018-03-12 14:17:54 -07:00
Alex Seymour 738d87c1bf Correct sync_schedule in ucp-description-file.md (#5274)
* Correct sync_schedule in ucp-description-file.md

The sync_schedule parameter in the auth.ldap section of the UCP Configuration file contains a seconds field, whilst the existing documentation claims this is omitted. Should explicitly call out inclusion of seconds field here, as this is usually omitted in a standard CRON entry.

* Update UCP config

Make explicit that the `sync_schedule` needs to include the seconds field, but it always needs to be zero.
2017-11-10 13:12:18 -08:00
Wang Jie 7eb41aa0c0 Update ucp-configuration-file.md (#4767) 2017-10-02 10:46:29 -07:00
Trapier Marshall 102684b047 UCP: operationalize config file editing (#4605)
Made instructions for editing UCP config copy-pastable with in-line
comments. This removes the need to copy-part-of-a-line,
paste-some-output-from-another-command, copy-next-part-of-a-line,
repeat, until a command is complete.

Also moved the "Example config" below "Inspect and modify" to improve
readability as "Inspect and modify" is a more common workflow.

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-09-15 15:44:03 -07:00
Trapier Marshall f42f2a9858 ucp: correct agent config change command (#4595)
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-09-13 15:55:21 -07:00
Trapier Marshall b6137ace7c indicate how to modify ucp config file (#4508)
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-09-11 17:01:17 -07:00
Trapier Marshall 5fe6bc542a syntax: docker config create for ucp (#4494)
`--name` is not a valid argument on `docker config create`

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-09-11 16:37:20 -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 aa7af0642f Tweak protocol values per feedback (#70) 2017-08-15 23:31:15 -07:00
Jim Galasyn b413254887 Add new topic for UCP config file (#67) 2017-08-15 23:31:15 -07:00