Skip to content

Commit 5f867d0

Browse files
authored
Merge pull request #843 from canonical/docs/accuracy
Doc: Improve accuracy
2 parents 29dcc5b + 6d1390c commit 5f867d0

7 files changed

Lines changed: 29 additions & 20 deletions

File tree

docs/explanation/workshops/projects.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ and run :command:`workshop launch`.
2626
Launching a workshop from a project
2727
establishes the relationship between the two
2828
that's required to actually start a workshop.
29-
This is achieved with a hidden :file:`.lock` file,
29+
This is achieved with a hidden :file:`.workshop.lock` file,
3030
which must remain in the project directory
3131
and must not be copied or stored externally, e.g., in a repository.
3232

docs/how-to/develop-with-workshops/use-git.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ From here, you can do whatever you like with your repo,
100100
because |ws_markup| handles
101101
:ref:`moving projects around <how_move_projects>` quite well.
102102

103-
Don't forget to add the :file:`.lock` file to your :file:`.gitignore` file:
103+
Don't forget to add the :file:`.workshop.lock` file to your :file:`.gitignore` file:
104104

105105
.. code-block:: console
106106

docs/how-to/develop-with-workshops/use-workshops-with-ai-agents.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,12 @@ Even with :samp:`--yolo` or :samp:`--dangerously-skip-permissions`,
189189
any changes done by an agent remain contained inside the workshop.
190190

191191
Save the definition and add it to :file:`.gitignore`,
192-
along with the :samp:`.lock` pattern:
192+
along with the :file:`.workshop.lock` file:
193193

194194
.. code-block:: console
195195
196196
$ cat >> .gitignore << EOF
197-
*.lock
197+
.workshop.lock
198198
.workshop.yaml
199199
EOF
200200

docs/lychee.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ exclude = [
4040
# gnu.org blocks bot User-Agents with 403; valid references
4141
"^https://www\\.gnu\\.org/",
4242

43+
# Intermittent "Connection reset by peer" (os error 104) on these hosts —
44+
# transient CI-side network failures, not broken links
45+
"^https://documentation\\.ubuntu\\.com/",
46+
"^https://snapcraft\\.io/",
47+
"^https://canonical\\.com/",
48+
4349
# Transient overrides before public release
4450
"^https://ubuntu\\.com/workshop/",
4551
"^https://github\\.com/canonical/sdkcraft",

docs/reference/cli/workshopctl.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ The arguments are as follows:
4949
- Can be :samp:`okay`, :samp:`waiting` or :samp:`error`.
5050

5151
* - :samp:`<MESSAGE>`
52-
- Required with :option:`!--code`
53-
- Arbitrary string explaining the context of the error code;
52+
- Required when :samp:`<STATUS>` is :samp:`waiting` or :samp:`error`;
53+
not allowed with :samp:`okay`.
54+
- Arbitrary string explaining the status;
5455
7–70 characters.
5556

5657

docs/tutorial/part-1-get-started.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ and the revision shown matches the one in :command:`workshop info`.
355355
.. @artefact workshop .lock
356356
357357
After launch, |ws_markup| tracks the project directory
358-
using a hidden :file:`.lock` file
358+
using a hidden :file:`.workshop.lock` file
359359
that must remain in the project directory
360360
and **not be copied or stored externally**, e.g., in a repository.
361361

@@ -407,7 +407,7 @@ In the next step, you'll refresh an existing workshop.
407407

408408
.. note::
409409

410-
Consider adding the :file:`.lock` file
410+
Consider adding the :file:`.workshop.lock` file
411411
to your :file:`.gitignore` or similar ignore files:
412412

413413
.. code-block:: console

internal/overlord/hookstate/ctlcmd/health.go

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,21 @@ import (
3030
var (
3131
shortHealthHelp = "Report the health status of an SDK"
3232
longHealthHelp = `
33-
The set-health command is called from within a workshop to inform the system of the
34-
SDK's overall health.
35-
36-
It can be called from any hook. An SDK can
37-
optionally provide a 'check-health' hook to manage these calls, which is
38-
then called periodically and with increased frequency while the SDK is
39-
"waiting". Any health regression will issue a warning to the user.
40-
41-
- status: One of okay, waiting, error.
42-
43-
- error-code: An optional note matching regex '[a-z](?:-?[a-z0-9])+', e.g. missing-cuda; up to 20 symbols.
33+
The set-health command is called from within a workshop
34+
to inform the system of the SDK's overall health.
35+
36+
It can only be called from the optional 'check-health' hook,
37+
which runs when SDK health is checked (e.g. during launch or refresh)
38+
and retried while the SDK reports as 'waiting'.
39+
If the SDK reports an 'error', the hook fails with the provided message.
40+
41+
- status: One of 'okay', 'waiting', 'error'.
42+
43+
- code: An optional note matching regex '[a-z](?:-?[a-z0-9])+', e.g. 'missing-cuda';
44+
3-30 characters. Must be empty if the status is 'okay'.
4445
45-
- message: A user-friendly message expanding the status, 7-70 lines long. Required if the status is 'waiting' or 'error'.
46+
- message: A user-friendly message expanding the status, 7-70 characters long.
47+
Must be empty if the status is 'okay'; required if the status is 'waiting' or 'error'.
4648
`
4749
)
4850

0 commit comments

Comments
 (0)