-
Notifications
You must be signed in to change notification settings - Fork 173
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] Overhaul data / gettext chapter #1165
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
linawolf
commented
Apr 2, 2024
- Use confvals instead of aspects
- Correct indentation
- Give headlines to examples
- Some small changes where content didnt make sense
* Use confvals instead of aspects * Correct indentation * Give headlines to examples * Some small changes where content didnt make sense
brotkrueml
suggested changes
Apr 2, 2024
Co-authored-by: Chris Müller <[email protected]>
Co-authored-by: Chris Müller <[email protected]>
Co-authored-by: Chris Müller <[email protected]>
Co-authored-by: Chris Müller <[email protected]>
Co-authored-by: Chris Müller <[email protected]>
Co-authored-by: Chris Müller <[email protected]>
* Use confvals instead of tables * Correct indentation * Give headlines to examples * Introduce a toc for the properties
brotkrueml
approved these changes
Apr 3, 2024
The backport to
stderr
stdout
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-1165-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick dd82c27a291a77f833bd82b29a45cff25df8748c,36b750c9d64d7bbe2b24907b89be68b211b1e266,9449caaca3d8c09ab7fa9e02fef28d113c0df44c,d5507932bddfaf340eebaf8006cb12117599372d,0ea55fd6e2688a9e3bb775b24a7242a93616d0bd,28973c3019daa8575ef3e424a065c76ee4692a82,26b40b109ded0bf820ad55fc01efa3688fdf571b,5cac53af3c3ac53342b115c348d414bc1ee166c6
# Push it to GitHub
git push --set-upstream origin backport-1165-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 |
The backport to
stderr
stdout
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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-1165-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick dd82c27a291a77f833bd82b29a45cff25df8748c,36b750c9d64d7bbe2b24907b89be68b211b1e266,9449caaca3d8c09ab7fa9e02fef28d113c0df44c,d5507932bddfaf340eebaf8006cb12117599372d,0ea55fd6e2688a9e3bb775b24a7242a93616d0bd,28973c3019daa8575ef3e424a065c76ee4692a82,26b40b109ded0bf820ad55fc01efa3688fdf571b,5cac53af3c3ac53342b115c348d414bc1ee166c6
# Push it to GitHub
git push --set-upstream origin backport-1165-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4 Then, create a pull request where the |
linawolf
added a commit
that referenced
this pull request
Apr 3, 2024
* [TASK] Overhaul data / gettext chapter * Use confvals instead of aspects * Correct indentation * Give headlines to examples * Some small changes where content didnt make sense * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Apply suggestions from code review Co-authored-by: Chris Müller <[email protected]> * [TASK] Overhaul PAGE chapter * Use confvals instead of tables * Correct indentation * Give headlines to examples * Introduce a toc for the properties --------- Co-authored-by: Chris Müller <[email protected]> (cherry picked from commit a41daa7)
linawolf
added a commit
that referenced
this pull request
Apr 3, 2024
* [TASK] Overhaul data / gettext chapter * Use confvals instead of aspects * Correct indentation * Give headlines to examples * Some small changes where content didnt make sense * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Update Documentation/Functions/Data.rst Co-authored-by: Chris Müller <[email protected]> * Apply suggestions from code review Co-authored-by: Chris Müller <[email protected]> * [TASK] Overhaul PAGE chapter * Use confvals instead of tables * Correct indentation * Give headlines to examples * Introduce a toc for the properties --------- Co-authored-by: Chris Müller <[email protected]> (cherry picked from commit a41daa7)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.