Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Git
# global ignore file
########################
# ignoring temporary files (left by e.g. vim)
# ignoring temporary files (left by e.g. vim)
# ignoring by common IDE's used directories/files
# dont ignore .rej and .orig as we want to see/clean files after conflict resolution
#
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## Create Issues

* If you find something missing or something is wrong in this manual, you are welcome to write an issue describing the problem.
* If you can, please try to fix the problem yourself.
* For minor changes, it is not necessary to create an issue first.
* If you find something missing or something is wrong in this manual, you are welcome to write an issue describing the problem.
* If you can, please try to fix the problem yourself.
* For minor changes, it is not necessary to create an issue first.

## Make changes (create pull requests)

Expand Down
2 changes: 1 addition & 1 deletion Documentation/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
_logs/*
_logs/*
6 changes: 3 additions & 3 deletions Documentation/Appendix/Cgl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ Xliff files
===========

Language files are usually stored in a Folder Resources/Private/Language
in files with the ending *.xlf*. Xliff files are indented using 2 spaces.
in files with the ending *.xlf*. Xliff files are indented using 2 spaces.
The following command normalizes your XLIFF files:

.. code-block:: bash

Build/Scripts/runTests.sh -s normalizeXliff

Please also check :ref:`common-review-checks-xlf` for Xliff-specific things
to pay attention to.

Expand Down Expand Up @@ -122,7 +122,7 @@ shortened:
.. code-block:: php

$languageService->sL('backend.toolbar:save');

This syntax is preferred and should be utilized for any new code committed
to TYPO3 v14+ because of these reasons:

Expand Down
1 change: 0 additions & 1 deletion Documentation/Appendix/Composer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,3 @@ to list them. You will see something like:
gerrit:setup:commitMessageHook:enable Enable the commit message hook needed for gerrit
gerrit:setup:preCommitHook:disable Disable pre commit hook to run some checks locally
gerrit:setup:preCommitHook:enable Enable pre commit hook to run some checks locally

2 changes: 1 addition & 1 deletion Documentation/Appendix/HowToDeprecateThings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ and mark it as deprecated with an `x-unused-since` attribute for XLIFF 1.2 or th
.. group-tab:: XLIFF 1.2

.. code-block:: xml

<trans-unit id="CType_formlabel" x-unused-since="14.0">
<source>Type</source>
</trans-unit>
Expand Down
1 change: 0 additions & 1 deletion Documentation/Appendix/Windows/Troubleshooting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ Checklist for SSH problems
.. code-block:: bash

C:\Users\<username>\.ssh\

3 changes: 0 additions & 3 deletions Documentation/HandlingAPatch/Rebase.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,3 @@ using the upstream branch (latest main branch).

* `StackOverflow: Difference between git pull and git pull --rebase
<https://stackoverflow.com/questions/18930527/difference-between-git-pull-and-git-pull-rebase>`__



1 change: 0 additions & 1 deletion Documentation/Quickstart/2-Accounts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ Quick Start: Accounts needed

You need to register an account for Slack, see `https://typo3.org/community/meet/chat-slack/`__
and :ref:`slack-account`.

1 change: 0 additions & 1 deletion Documentation/Quickstart/5-TYPO3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,3 @@ Quick Start: Set up TYPO3
:caption: **Open up the TYPO3 Backend for the ddev instance**

ddev launch typo3

1 change: 0 additions & 1 deletion Documentation/Quickstart/6-Patch-Intermezzo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,3 @@ re-execute the test, you will see it will properly report a failure.

This concludes stating an intent for contributing a patch and you have a modified
file plus a test to contribute. Continue on :ref:`quickstart-patch`!

1 change: 0 additions & 1 deletion Documentation/Quickstart/6-Patch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,3 @@ Now with this example in mind, we have two modified files that we want to commit
The TYPO3 community is thankful for you following this guide, and we
hope once you have set up your development environment for it
you can enjoy being an active contributor!

2 changes: 1 addition & 1 deletion Documentation/Quickstart/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Quick Start: Get ready to contribute to TYPO3 in under 30 minutes!
.. hint::

The TYPO3 contribution workflow is a bit **different compared to
Gitlab Merge Requests (MR) or GitHub Pull Requests (PR)**.
Gitlab Merge Requests (MR) or GitHub Pull Requests (PR)**.
Once you set up Git with your credentials (explained in these chapters),
you can directly push code to the `main` branch of TYPO3's own Git.
Don't be afraid! You don't directly push "live code", but instead this
Expand Down
1 change: 0 additions & 1 deletion Documentation/Testing/CoreTesting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,3 @@ You can also run a watch task thanks to the full integration of npm command exec
.. code-block:: shell

Build/Scripts/runTests.sh -s npm -- run watch:build

2 changes: 1 addition & 1 deletion Documentation/guides.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
interlink-shortcode="t3contribute"
/>
<project title="TYPO3 Core Contribution Guide"
release="main"
release="main"
version="main"
copyright="since 2015 by the TYPO3 contributors"/>
</guides>