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

[TASK] Remove license information #394

Merged
merged 1 commit into from
Jan 31, 2024
Merged

[TASK] Remove license information #394

merged 1 commit into from
Jan 31, 2024

Conversation

linawolf
Copy link
Member

And link to https://typo3.org/project/licenses where licenses are mentioned.

Mathias Bolt Lesniak, will add information about Licenses for Documentation here.

And link to https://typo3.org/project/licenses where licenses are mentioned.

Mathias Bolt Lesniak, will add information about Licenses for Documentation here.
@linawolf linawolf merged commit 5075755 into main Jan 31, 2024
1 check passed
@linawolf linawolf deleted the task/remove-license branch January 31, 2024 04:23
Copy link
Contributor

The backport to documentation-draft failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2b27ed9... [TASK] Remove license information
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging Documentation/GeneralConventions/FileStructure.rst
CONFLICT (content): Merge conflict in Documentation/GeneralConventions/FileStructure.rst
Auto-merging Documentation/GeneralConventions/Index.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-documentation-draft documentation-draft
# Navigate to the new working tree
cd .worktrees/backport-documentation-draft
# Create a new branch
git switch --create backport-394-to-documentation-draft
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 2b27ed98876cffafd428c51f68153bc13e636f8b
# Push it to GitHub
git push --set-upstream origin backport-394-to-documentation-draft
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-documentation-draft

Then, create a pull request where the base branch is documentation-draft and the compare/head branch is backport-394-to-documentation-draft.

@@ -229,6 +229,9 @@ document title. This way you can link to a documents start page by:

See :ref:`TYPO3 Explained <t3coreapi:start>`.

.. hint::
Refer to https://typo3.org/project/licenses if you have questions about

Choose a reason for hiding this comment

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

Attribute as link?

Copy link
Member Author

Choose a reason for hiding this comment

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

URIs are automatically detected, you only need to do that if you want to give a different title

@@ -229,6 +229,9 @@ document title. This way you can link to a documents start page by:

See :ref:`TYPO3 Explained <t3coreapi:start>`.

.. hint::
Refer to https://typo3.org/project/licenses if you have questions about
what license to use for your documentation and or extension.

Choose a reason for hiding this comment

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

"and/or"?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants