Skip to content

Commit c3ee0e2

Browse files
committed
[TASK] Pre-Patch: Update TYPO3 versions, spellchecking, syntax
This patch should only adress some minor details and wording fixes.
1 parent 38a5170 commit c3ee0e2

File tree

24 files changed

+76
-73
lines changed

24 files changed

+76
-73
lines changed

Documentation/AddingDocumentation/Index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ is maintained in the core.
3232
Changelog
3333
=========
3434

35-
Some patches require a .rst (reStructuredText) Changelog file describing the change.
35+
Some patches require a :file:`.rst` (reStructuredText) Changelog file describing the change.
3636
Not all patches
3737
need an entry in the Changelog. Check the list below. Also see the current
3838
`Changelog <https://docs.typo3.org/typo3cms/extensions/core/latest/>`__
3939
for some examples.
4040

4141
Every file may optionally contain tags, but it must contain at least a
42-
NotScanned, PartiallyScanned or FullyScanned tag for the extension scanner.
42+
`NotScanned`, `PartiallyScanned`` or `FullyScanned`` tag for the extension scanner.
4343
See :ref:`t3coreapi:extension-scanner` in TYPO3 Explained for more
4444
information.
4545

Documentation/Appendix/CommitHook.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This Change-Id will only be generated if it is not yet present in your commit me
3535
a Change-Id on your own, the result will be chaos.
3636

3737
Apart from that the hook will check your commit message for logical errors like missing keywords, Resolves lines etc.
38-
For detailed information on the format of a commit message, :ref:`click here<commitmessage>`.
38+
For detailed information on the format of a commit message, :ref:`click here <commitmessage>`.
3939

4040
If the commit-msg hook finds errors in your commit-msg, you can try again, by amending to the commit::
4141

Documentation/Appendix/CommitMessage.rst

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Since we strive to automate a lot of things the commit message plays an importan
1515
Git and related tools work best when following a certain guideline for commit messages. A deeper `introduction on git revision log conventions <http://tbaggery.com/2008/04/19/a-note-about-git-commit-
1616
messages.html>`_ is helpful to understand the scope.
1717

18-
Here is an example of a final commit message. The change-id will be generated by the commit-hook. Do not set the change-id on your first commit!
18+
Here is an example of a final commit message. The `Change-Id`` will be generated by the commit-hook. Do not set the `Change-Id`` on your first commit!
1919

2020
.. code-block:: none
2121
@@ -104,14 +104,18 @@ Additionally other flags **should be added** under certain circumstances:
104104
about security vulnerabilities in a public place such as Slack or push patches
105105
that disclose information about vulnerabilities.
106106

107-
- Keep the whole line below 52 characters if possible, but below 80 in any case
107+
- Keep the whole line below 52 characters if possible, but below 72 in any case
108108

109109
.. sidebar:: The seven rules of a great Git commit message
110110

111111
https://chris.beams.io/posts/git-commit/#seven-rules is an excellent guide about how to write good subject lines.
112112

113-
- It is *very important* that the message is written in **imperative mood**; that means that it must be written as if you are giving a command or an instruction, since a commit is a set of instructions for how to go from a previous state to the new state and the commit message should describe this process. This convention matches up with generated commit messages by commands like git merge and git revert.
114-
If in doubt, the *golden rule* to follow is very simple: Review your subject lines, and apply the following words in front of it:
113+
- It is *very important* that the message is written in **imperative mood**; that means that it must be written as
114+
if you are giving a command or an instruction, since a commit is a set of instructions for how to go from a previous
115+
state to the new state and the commit message should describe this process. This convention matches up with generated
116+
commit messages by commands like git merge and git revert.
117+
If in doubt, the *golden rule* to follow is very simple: Review your subject lines, and apply the following words in
118+
front of it:
115119

116120
``if applied, this commit will **"your subject line here"**``
117121

@@ -216,11 +220,11 @@ Relationships
216220
.. code-block:: text
217221
:caption: commit message
218222
219-
Releases: main, 10.4, 9.5
223+
Releases: main, 12.4, 11.5
220224
221225
Always make sure the target version does indeed exist, when in doubt, as in the coredev channel on Slack_.
222226

223-
4. `Depends`
227+
4. `Depends:`
224228
For TYPO3 **documentation patches**.
225229
Refer to the corresponding TYPO3 Core patch:
226230

@@ -309,7 +313,7 @@ should have been:
309313
310314
.. note::
311315

312-
Please note that in this case the subject of the commit to revert was poorly written,too! This required some additional adjustment..
316+
Please note that in this case the subject of the commit to revert was poorly written, too! This required some additional adjustment..
313317

314318

315319
**Example 4**

Documentation/Appendix/Composer.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ About Composer
1717
Composer is a dependency manager for PHP.
1818

1919
So what it basically does is find packages you have defined to be part of your application (in our case TYPO3). But what
20-
if these packages rely on other packages as well? This is where composer jumps in and takes care of keeping all these
20+
if these packages rely on other packages as well? This is where Composer jumps in and takes care of keeping all these
2121
packages in sync.
2222

23-
Since we use quite some packages (because why would we invent things ourselves that are already there?) composer is an
23+
Since we use quite some packages (because why would we invent things ourselves that are already there?) Composer is an
2424
extremely useful tool for us.
2525

2626
.. index::
@@ -62,7 +62,7 @@ in the correct order!
6262
Custom TYPO3 Composer Commands
6363
==============================
6464

65-
Some additional composer commands have been added for core development.
65+
Some additional Composer commands have been added for Core development.
6666

6767
Just run::
6868

Documentation/Appendix/ResourcesForEditors/Index.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ General information
1616
Resources for this guide
1717
========================
1818

19-
* `warnings.txt <https://docs.typo3.org/typo3cms/ContributionWorkflowGuide/_buildinfo/warnings.txt>`__
20-
(list of warnings)
2119
* `Issues on Github <https://github.com/TYPO3-Documentation/TYPO3CMS-Guide-ContributionWorkflow/issues>`__
2220

2321
Best practices for editing this guide

Documentation/CheatSheets/Git.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,19 +163,19 @@ Show all branches:
163163
164164
git branch -a
165165
166-
Checkout 10.4 branch:
166+
Checkout 12.4 branch:
167167

168168
.. code-block:: bash
169169
:caption: shell command
170170
171-
git checkout 10.4
171+
git checkout 12.4
172172
173-
Checkout 9.5 branch:
173+
Checkout 11.5 branch:
174174

175175
.. code-block:: bash
176176
:caption: shell command
177177
178-
git checkout 9.5
178+
git checkout 11.5
179179
180180
181181
.. important::
@@ -188,19 +188,19 @@ Checkout 9.5 branch:
188188
Long story short: In most cases, **push to main**. The rest is being taken
189189
care of by core team members!
190190

191-
Push 10.4 branch:
191+
Push 12.4 branch:
192192

193193
.. code-block:: bash
194194
:caption: shell command
195195
196-
git push origin HEAD:refs/for/10.4
196+
git push origin HEAD:refs/for/12.4
197197
198-
Push 9.5 branch:
198+
Push 11.5 branch:
199199

200200
.. code-block:: bash
201201
:caption: shell command
202202
203-
git push origin HEAD:refs/for/9.5
203+
git push origin HEAD:refs/for/11.5
204204
205205
206206
Workflow - commit msg
@@ -231,7 +231,7 @@ Other keywords:
231231
[!!!][FEATURE]
232232
[WIP][TASK]
233233
234-
* subject < 52 chars
234+
* subject < 52 chars (if possible, otherwise <= 72)
235235
* other lines <= 72 chars
236236

237237

Documentation/Community/Index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ any TYPO3 event in some way or another.
4848
Look for events like "Review Friday", "Code Sprints" and "Developer Days".
4949
Next, we will describe some events that are relevant for core
5050
contribution. They are not specifically targeted at providing support,
51-
but the event may be open to new core contributors and may give
51+
but the event may be open to new Core contributors and may give
5252
you the opportunity to ask questions and get help. In any case,
5353
read the event description and if in doubt, contact the person
5454
listed in the event description.
@@ -64,7 +64,7 @@ Code Sprints
6464
------------
6565

6666
For joining code sprints, it is recommended that you have at least a little experience
67-
with TYPO3 core contribution and are familiar with the workflow.
67+
with TYPO3 Core contribution and are familiar with the workflow.
6868

6969
Look for the next Code Sprints on the `Events page on typo3.org
7070
<https://typo3.org/community/events/>`__.

Documentation/CoreMergers/Backport.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Manual backport
7575
===============
7676

7777
If the automatic backport fails, you need to manually cherry-pick the patch to the target branch. (e.g. cherry-pick the
78-
main patch onto your local (up to date) 10.4 branch) You will most likely need to adjust the code for the older branch.
78+
main patch onto your local (up to date) 12.4 branch) You will most likely need to adjust the code for the older branch.
7979

8080
Edit the commit message to comply to the guidelines again. (e.g. remove the Reviewed-* and Tested-* lines added by Gerrit)
8181

Documentation/CoreMergers/Merge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The merging process
2828
vote from a Core Merger. A :guilabel:`+2` can be given by the second
2929
Core Merger to review the patch positively.
3030

31-
Merging gets blocked by a :guilabel:`-2` vote.
31+
Merging gets blocked by a single :guilabel:`-2` vote.
3232

3333
#. Submit the patch
3434

Documentation/HandlingAPatch/CherryPick.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ to cherry-pick it from the review system into your local git repository.
6969
git fetch https://review.typo3.org/Packages/TYPO3.CMS refs/changes/47/56947/11 && git cherry-pick FETCH_HEAD
7070

7171
Re-apply your local changes, if you had any.
72-
72+
7373
.. code-block:: bash
7474
7575
git stash pop 'comment-your-changes'

0 commit comments

Comments
 (0)