Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor fix to docs about exit-script #3066

Merged
merged 2 commits into from
Apr 4, 2019

Conversation

ColemanTom
Copy link
Contributor

I noticed that the exit-script section in the docs referred to itself rather than err-script, so this just adjusts that.

I did contemplate another adjustment. In the order of the docs, it has exit-script above err-script. But in the See also ... parts for these script sections, it lists err-script before exit-script. I'm not sure what the ordering in here is meant to be, but I would suggest that it should be order of execution really for both - it makes the documentation more intuitive.

@kinow kinow added the doc Documentation label Apr 3, 2019
@hjoliver
Copy link
Member

hjoliver commented Apr 3, 2019

@ColemanTom - thanks, good spotting.

These sections (and the "See also" lists) are more or less un-ordered (probably due to organic evolution of the docs over time). But you are right, they should be in the right order.

The right order is as shown in this diagram: #2962 (comment)

(only one of exit-script or err-script gets run, depending on exit status)

Would you like to amend this PR with changes to order these correctly?

@hjoliver
Copy link
Member

hjoliver commented Apr 3, 2019

(Also, when you're done, could you cherry-pick your changes to another new PR for the 7.8.x branch - thanks)

@ColemanTom
Copy link
Contributor Author

K. One clarification first though, https://github.com/cylc/cylc/pull/3066/files#diff-8838fd940264b809b57525f23c2137deR1370

There is a .. _ScriptItem just above the script section. I can't see that used anywhere, so is it ok for me to delete it, or is there a missing ref somewhere else in the documentation?

@hjoliver
Copy link
Member

hjoliver commented Apr 3, 2019

I'm guessing that's some kind of typo (seems to be the only occurrence) but should maybe let @sadielbartholomew comment (I'm not too familiar with the new documentation format yet).

@kinow
Copy link
Member

kinow commented Apr 3, 2019

There is a .. _ScriptItem just above the script section. I can't see that used anywhere, so is it ok for me to delete it, or is there a missing ref somewhere else in the documentation?

Chiming in. I did a grep in the docs folder, and found no other references for that link. But then in gcylc-config-ref.rst there's also _GcylcRCReference, and greping for grep -r -H -i gcylcrcreference doesn't find anything 😕

Probably safe to remove IMO, if you need to.

Just saw @hjoliver 's comment. +1 for passing to @sadielbartholomew

init, env, pre, post, err, exit, and script have been adjusted
to be displayed in the docs in chronological order.
@ColemanTom ColemanTom force-pushed the minor_exit-script_doc_update branch from 88dbf73 to ffb19cc Compare April 3, 2019 04:10
@ColemanTom
Copy link
Contributor Author

I've updated the orders, and removed that ScriptItem line. I can easily add it back in if @sadielbartholomew wants me to.

I'll cherry-pick once this has been approved in case more changes are required..

@hjoliver
Copy link
Member

hjoliver commented Apr 3, 2019

Thanks @ColemanTom 🎉

@hjoliver hjoliver added this to the cylc-8.0a1 milestone Apr 3, 2019
Copy link
Member

@hjoliver hjoliver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM; will approve when the back-port PR goes up.

@hjoliver hjoliver self-requested a review April 3, 2019 21:36
@matthewrmshin
Copy link
Contributor

Back port PR is #3070?

Copy link
Collaborator

@sadielbartholomew sadielbartholomew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea behind the change is good, the documentation still builds & is still formatted correctly, &:

There is a .. _ScriptItem just above the script section. I can't see that used anywhere, so is it ok for me to delete it, or is there a missing ref somewhere else in the documentation?

I'm guessing that's some kind of typo (seems to be the only occurrence) but should maybe let @sadielbartholomew comment

no that is not meant to be there & should rightly be removed. Well spotted.

Copy link
Member

@hjoliver hjoliver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(ToDo comment deleted here too, as for the 7.8.x branch)

@hjoliver hjoliver merged commit 41023f3 into cylc:master Apr 4, 2019
@ColemanTom ColemanTom deleted the minor_exit-script_doc_update branch April 14, 2019 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc Documentation small
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants