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

Changing the order of the Content-supplying properties of stdWrap part #793

Merged
merged 2 commits into from
Sep 11, 2023

Conversation

FlorianT03
Copy link
Contributor

releases: main

Remark: In my opinion the "Example" and "Content-supplying properties" part, at the end of the site, should be moved back to the top, like in for example the 10.x version of the TYPO3 Documentation. Because if it is so far down, hardly anyone reads it, but especially the part with the order is very important. If you see this differently or have suggestions for improvement through mistakes, then let me know.

https://docs.typo3.org/m/typo3/reference-typoscript/main/en-us/Functions/Stdwrap.html

releases: main

Remark: In my opinion the "Example" and "Content-supplying properties" part, at the end of the site, should be moved back to the top, like in for example the 10.x version of TYPO3. Because if it is so far down, hardly anyone reads it, especially the part with the order is very important. If you see this differently or have suggestions for improvement through mistakes, then let me know.

https://docs.typo3.org/m/typo3/reference-typoscript/main/en-us/Functions/Stdwrap.html
@brotkrueml
Copy link
Contributor

IMHO, I agree with the content-supplying part (as the ordering may be important dependend on the use case) but not with the example. Mostly, the examples are at the end of the page and this example makes no difference to others, it is just a simple example. We should not move the TOC too far down.

@FlorianT03
Copy link
Contributor Author

@brotkrueml well thanks for your honest opinion! tbh at first I was not even switching the place of the example, should have left it like that. I will change it, when I have time again^^

@linawolf
Copy link
Member

linawolf commented Sep 8, 2023

@brotkrueml I actuallly think that a quick example on the top of this chapter might be a real plus. Expecially for devs who have never used typoscript/stdwrap before. I would leave extended examples on the bottom though.

@brotkrueml
Copy link
Contributor

@linawolf I disagree, but feel free to approve.

@linawolf
Copy link
Member

linawolf commented Sep 8, 2023

@brotkrueml ok, lets stick to status quo for now

releases: main

Remark: In my opinion the "Example" and "Content-supplying properties" part, at the end of the site, should be moved back to the top, like in for example the 10.x version of TYPO3. Because if it is so far down, hardly anyone reads it, especially the part with the order is very important. If you see this differently or have suggestions for improvement through mistakes, then let me know.

https://docs.typo3.org/m/typo3/reference-typoscript/main/en-us/Functions/Stdwrap.html
@github-actions
Copy link

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 9665090... Changing the order of the Content-supplying properties of stdWrap part
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/Functions/Stdwrap.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Stdwrap.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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-793-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 96650908a74a161d4bca247338e8a113fa169f15,5dd6423b2b67a26c5d1dea99ecfc3bef4dca579a
# Push it to GitHub
git push --set-upstream origin backport-793-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-793-to-11.5.

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