Skip to content

Commit fe0e061

Browse files
Merge pull request #547 from MetRonnie/cherry-pick
Cherry pick from master onto 8.0.x
2 parents bda41e6 + df07d33 commit fe0e061

File tree

5 files changed

+47
-23
lines changed

5 files changed

+47
-23
lines changed

README.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,20 @@ We use a few custom Sphinx extensions, for details see
8484

8585
### Installation
8686

87-
Note: you may need to install `graphviz` first (e.g. `conda install graphviz`).
87+
### Non Python Dependencies
88+
89+
There are two non-Python dependencies which must be installed:
90+
91+
* `graphviz`
92+
* `enchant`
93+
94+
E.G. with Conda/Mamba:
95+
96+
```console
97+
$ mamba install -c conda-forge graphviz enchant
98+
```
99+
100+
### Checkout & Install
88101

89102
```console
90103
$ git clone [email protected]:cylc/cylc-doc.git cylc-doc

src/tutorial/furthertopics/retries.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Re-install and run the workflow::
116116
cylc play retries-tutorial
117117

118118
What you should see is Cylc retrying the ``roll_doubles`` task. Hopefully,
119-
it will succeed (there is only about a about a 1 in 3 chance of every task
119+
it will succeed (there is only about a 1 in 3 chance of every task
120120
failing) and the workflow will continue.
121121

122122

src/tutorial/scheduling/datetime-cycling.rst

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -151,33 +151,27 @@ Recurrence Formats
151151
As with integer cycling, recurrences start at the :term:`initial cycle
152152
point` by default. We can override this in two ways:
153153

154-
By giving an arbitrary start cycle point (``datetime/recurrence``):
154+
.. rubric::
155+
By giving an arbitrary start cycle point (``datetime/recurrence``):
155156

156-
.. csv-table::
157-
:header: Example, Description
158-
:align: left
159-
:widths: 30, 70
160-
161-
``2000/P4Y``, "Every fourth year, starting with the year 2000"
162-
``2000-01-01T00/T00``, "Every day at midnight, starting on the 1st of January 2000"
163-
``2000-01-01T12/T00``, "Every day at midnight, starting on the first midnight
164-
after the 1st of January at 12:00 (i.e. ``2000-01-02T00``)."
157+
``2000/P4Y``
158+
Every fourth year, starting with the year 2000.
159+
``2000-01-01T00/P1D``
160+
Every day at midnight, starting on the 1st of January 2000.
165161

166162
.. nextslide::
167163

168164
.. _tutorial-cylc-datetime-offset-icp:
169165

170-
By offset, relative to the initial cycle point (``offset/recurrence``).
171-
The offset must be an ISO8601 duration preceded by a plus character:
166+
.. rubric::
167+
By offset, relative to the initial cycle point (``offset/recurrence``).
172168

173-
.. csv-table::
174-
:header: Example, Description
175-
:align: left
176-
:widths: 30, 70
169+
The offset must be an ISO8601 duration preceded by a plus character:
177170

178-
``+P1Y/P1Y``, every year starting one year after the initial cycle point.
179-
``+PT1H/T00``, "every day starting on the first midnight after the point one
180-
hour after the initial cycle point."
171+
``+PT1H/PT1H``
172+
Every hour starting one hour after the initial cycle point.
173+
``+P1Y/P1Y``
174+
Every year starting one year after the initial cycle point.
181175

182176
Durations and the Initial Cycle Point
183177
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/user-guide/sharing-access-to-workflows.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ another person, and that cannot be prevented by technical means. However, a
180180
workflow owner cannot unilaterally gain access to any other user's account or
181181
workflows by configuring their own UI Server.
182182

183-
``c.CylcUIServer.site-authorization``, which is loaded from
183+
``c.CylcUIServer.site_authorization``, which is loaded from
184184
``/etc/cylc/uiserver/jupyter_config.py``, or, alternatively, the environment variable
185185
``CYLC_SITE_CONF_PATH``, contains these site default and limit settings for
186186
users. This configuration should be entered as a Python dictionary.
@@ -193,7 +193,7 @@ Sites set both limits and defaults for users.
193193
- ``limit`` determines the maximum access users can grant to their workflows.
194194

195195
- ``default`` sets a default access level, which applies if the user does
196-
not appear in the user-authorization configuration (via explicit user name or group).
196+
not appear in the user_authorization configuration (via explicit user name or group).
197197

198198
Missing Configurations in Site Authorization
199199
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/user-guide/writing-workflows/scheduler.rst

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,3 +230,20 @@ Example:
230230
.. cylc-scope::
231231

232232
For more information see: :cylc:conf:`global.cylc[scheduler][run hosts]ranking`.
233+
234+
Platform Configuration
235+
^^^^^^^^^^^^^^^^^^^^^^
236+
237+
From the perspective of a running :term:`scheduler` ``localhost`` is the
238+
scheduler host.
239+
240+
The ``localhost`` platform is configured by
241+
:cylc:conf:`global.cylc[platforms][localhost]`.
242+
243+
It configures:
244+
245+
* Jobs that run on the ``localhost`` platform, i.e. any jobs which have
246+
:cylc:conf:`[runtime][<namespace>]platform=localhost` or which don't have a
247+
platform configured.
248+
* Connections to the scheduler hosts (e.g. the
249+
:cylc:conf:`ssh command <global.cylc[platforms][<platform name>]ssh command>`).

0 commit comments

Comments
 (0)