Skip to content

Commit 6ff13e1

Browse files
committed
docs: incorporate @jahn-junior's review
1 parent c20af94 commit 6ff13e1

File tree

3 files changed

+37
-41
lines changed

3 files changed

+37
-41
lines changed

docs/contribute/development.rst

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. meta::
2-
:description: How to make a code change in Snapcraft. Code, test, and review changes in the project within the standard workflow.
2+
:description: How to make a code change to Snapcraft. Code, test, and review changes in the project within the standard workflow.
33

44
:relatedlinks: [Pytest test pattern](https://docs.pytest.org/en/stable/explanation/anatomy.html), [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/), [Spread](https://github.com/canonical/spread/blob/master/README.md)
55

@@ -9,16 +9,17 @@
99
Contribute to development
1010
=========================
1111

12-
This guide describes how to contribute a code change in Snapcraft.
12+
This guide describes how to contribute a code change to Snapcraft.
1313

1414
It requires familiarity with Python, Git, and GitHub.
1515

1616

1717
Set up your work environment
1818
----------------------------
1919

20-
Snapcraft development and documentation use the same build and test environment. If you
21-
previously set up your local machine to document Snapcraft, skip to the next section.
20+
Snapcraft development and documentation use the same build and test environment. If
21+
you've already set up your local machine to document Snapcraft, skip to the next
22+
section.
2223

2324
For security, you must sign your commits. If you haven't already, `configure Git to sign
2425
with your GPG or SSH key
@@ -76,7 +77,7 @@ Every task must be tracked as a `GitHub issue
7677
`create one <https://github.com/canonical/snapcraft/issues/new/choose>`__ for it.
7778

7879
Tasks come in different sizes and complexity. It's important to choose a task that you
79-
have the capacity to finish. It's also important to check to see if the task is already
80+
have the capacity to finish. It's also important to check whether the task is already
8081
planned. You might save time and effort by checking for prior work.
8182

8283

@@ -166,13 +167,13 @@ be backward-compatible unless stated otherwise in the issue.
166167

167168
All nontrivial changes must be accompanied by new or updated tests. The Snapcraft test
168169
suite includes both pytest unit tests and Spread integration tests. When adding unit
169-
tests, follow the arrange-act-assert-cleanup pattern from Pytest. Tests are rarely
170+
tests, follow the arrange-act-assert-cleanup pattern from pytest. Tests are rarely
170171
perfect on the first try. Additional tests can always be added during the review
171172
process.
172173

173-
Snapcraft is amenable to code generated with LLM assistance. Generating code is a time
174-
saver, but like all code it needs testing and careful review. An LLM doesn't absolve you
175-
of responsibility -- you are ultimately responsible for the code in your work.
174+
Snapcraft is amenable to code generated with LLM assistance. Generated code takes less
175+
effort, but like all code it needs testing and careful review. An LLM doesn't absolve
176+
you of responsibility -- you are ultimately responsible for the code in your work.
176177

177178

178179
Commit
@@ -263,10 +264,6 @@ code. If that happens, delete your virtual environment and start over:
263264
make setup
264265
265266
266-
There are also special tests that are feature-specific. Run ``make help`` to view and
267-
select them.
268-
269-
270267
Document your work
271268
~~~~~~~~~~~~~~~~~~
272269

@@ -318,19 +315,19 @@ automatic checks will fail. To address these issues, review the logs in the fail
318315
checks. The error messages in the logs will have remedies and hints for what needs
319316
fixing.
320317

321-
When the maintainers review the PR, they may suggest improvements to your code. Address
322-
them in follow-up commits to your branch, the same way you committed and pushed changes
323-
while drafting. If you feel a particular point should go in a different direction than
324-
what they suggest, discuss it with the maintainer in the PR. They'll be happy to explore
318+
When the maintainers review the PR, they may suggest improvements. Address them in
319+
follow-up commits to your branch, the same way you committed and pushed changes while
320+
drafting. If you feel a particular point should go in a different direction than what
321+
they suggest, discuss it with the maintainer in the PR. They'll be happy to explore
325322
alternatives.
326323

327324

328325
Wrap up the review
329326
~~~~~~~~~~~~~~~~~~
330327

331-
Once all suggestions are addressed, both maintainers approve the PR, and merge it soon
332-
after. **After the PR is approved, there may be a delay before merge.** The maintainers
333-
might need time to coordinate the PR with other development on the project.
328+
Once all suggestions are addressed, both maintainers will approve the PR. **After the PR
329+
is approved, there may be a delay before merge.** The maintainers might need time to
330+
coordinate the PR with other active developments.
334331

335332
After approval, **don't** force-push to your branch. It's difficult for the maintainers
336333
to see whether any additional changes mixed into the push.
@@ -341,9 +338,9 @@ Once the PR is merged, your work is complete.
341338
Get help and support
342339
--------------------
343340

344-
Open source contribution can be difficult. Even the most experienced writers become
341+
Open source contribution can be difficult. Even the most experienced developers become
345342
tangled or have moments of uncertainty.
346343

347-
If you're stuck, or need more information about a task, ask the issue creator, the
348-
project's technical author, or a maintainer. If you need hands-on help, ask in the
349-
`Snapcraft Matrix channel <https://matrix.to/#/#snapcraft:ubuntu.com>`__.
344+
If you're stuck, or need more information about a task, ask the issue creator or a
345+
maintainer. If you need hands-on help, ask in the `Snapcraft Matrix channel
346+
<https://matrix.to/#/#snapcraft:ubuntu.com>`__.

docs/contribute/documentation.rst

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ experience in :ref:`contribute-coda`.
2626
Set up your work environment
2727
----------------------------
2828

29-
Snapcraft documentation and development use the same build and test environment. If you
30-
previously set up your local machine to develop Snapcraft, skip to the next section.
29+
Snapcraft documentation and development use the same build and test environment. If
30+
you've already set up your local machine to develop Snapcraft, skip to the next section.
3131

3232
For security, you must sign your commits. If you haven't already, `configure Git to sign
3333
with your GPG or SSH key
@@ -174,14 +174,13 @@ If successful, the terminal prints:
174174

175175
.. terminal::
176176

177-
The HTML pages are in _build.
178-
[sphinx-autobuild] Serving on http://127.0.0.1:8000
179-
[sphinx-autobuild] Waiting to detect changes...
177+
build succeeded.
178+
The HTML pages are in docs/_build.
180179

181180
Preview your changes in a web browser. Make sure the elements you've changed render as
182181
expected. Double-check nested elements, such as content inside tabs and admonitions.
183182

184-
If everything looks good, check for problems in your code:
183+
If everything looks good, check for problems in your document sources:
185184

186185
.. code-block:: bash
187186
@@ -243,19 +242,19 @@ automatic checks will fail. To address these issues, review the logs in the fail
243242
checks. The error messages in the logs will have remedies and hints for what needs
244243
fixing.
245244

246-
When the maintainers review the PR, they may suggest improvements to your code. Address
247-
them in follow-up commits to your branch, the same way you committed and pushed changes
248-
while drafting. If you feel a particular point should go in a different direction than
249-
what they suggest, discuss it with the maintainer in the PR. They'll be happy to explore
245+
When the maintainers review the PR, they may suggest improvements. Address them in
246+
follow-up commits to your branch, the same way you committed and pushed changes while
247+
drafting. If you feel a particular point should go in a different direction than what
248+
they suggest, discuss it with the maintainer in the PR. They'll be happy to explore
250249
alternatives.
251250

252251

253252
Wrap up the review
254253
~~~~~~~~~~~~~~~~~~
255254

256-
Once all suggestions are addressed, both maintainers approve the PR, and merge it soon
257-
after. **After the PR is approved, there may be a delay before merge.** The maintainers
258-
might need time to coordinate the PR with other development on the project.
255+
Once all suggestions are addressed, both maintainers will approve the PR. **After the PR
256+
is approved, there may be a delay before merge.** The maintainers might need time to
257+
coordinate the PR with other active developments.
259258

260259
After approval, **don't** force-push to your branch. It's difficult for the maintainers
261260
to see whether any additional changes mixed into the push.
@@ -269,6 +268,6 @@ Get help and support
269268
Open source contribution can be difficult. Even the most experienced writers become
270269
tangled or have moments of uncertainty.
271270

272-
If you're stuck, or need more information about a task, ask the issue creator, the
273-
project's technical author, or a maintainer. If you need hands-on help, ask in the
274-
`Snapcraft Matrix channel <https://matrix.to/#/#snapcraft:ubuntu.com>`__.
271+
If you're stuck, or need more information about a task, ask the issue creator or a
272+
maintainer. If you need hands-on help, ask in the `Snapcraft Matrix channel
273+
<https://matrix.to/#/#snapcraft:ubuntu.com>`__.

docs/contribute/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Ways to contribute
5757
There are multiple ways you can make a valuable contribution:
5858

5959
- :ref:`Develop <contribute-development>` features and fix problems
60-
- :ref:`Add to and improve <contribute-documentation>` the documentation
60+
- :ref:`Document <contribute-documentation>` Snapcraft
6161
- :ref:`Share feedback or report a problem <contribute-feedback>`
6262
- :ref:`Test upcoming features and fixes <contribute-test-builds>`
6363
- Work on Snapcraft tasks in :ref:`contribute-coda`

0 commit comments

Comments
 (0)