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

Corrected typo's #9694

Merged
merged 17 commits into from
Mar 3, 2025
Merged

Corrected typo's #9694

merged 17 commits into from
Mar 3, 2025

Conversation

DiGro
Copy link
Contributor

@DiGro DiGro commented Mar 3, 2025

Goal: Making good documentation

Ticket(s): #

  • Backport to LTR documentation is requested

DiGro added 17 commits June 5, 2023 11:25
paramteter  -->  should be 'parameter'
Line  : html>`_ or documentation.  ---> should be 'html>`_ for documentation.' adde 'f'  to 'or'

Line 473 :   A test on will ensure that this file --->  the word 'on' removed
Line 290 : A :guilabel:`Run as Single Process...` helps --> should have the word 'button' behind :guilabel:`Run as Single Process...`
Line 822 : one of your current project  --> should be plural 'projects'
                because of "one of your"
Line 162 : installs the same stable version  --> should probably be:              
                ' installs the same experimental version' because the 
                paragraph is named "Reinstal Eperimental Plugin"
Line 43 : Shorcut --> should be Shortcut
and only target languages

should be

and only mention target languages
@DelazJ DelazJ added the backport release_3.40 On merge create a backported pull request to 3.40 label Mar 3, 2025
@DelazJ DelazJ merged commit 09d002b into qgis:master Mar 3, 2025
4 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Mar 3, 2025

The backport to release_3.40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
On branch backport-9694-to-release_3.40
You are currently cherry-picking commit e6464f91c9.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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-release_3.40 release_3.40
# Navigate to the new working tree
cd .worktrees/backport-release_3.40
# Create a new branch
git switch --create backport-9694-to-release_3.40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e6464f91c983c8539eefcb664b2ae954618235d9,cd4efd55f0d775a5d60aa3fcc8d8ca70c7772890,7b504592d4aa86edb4c20923f23c8c6f474ae800,936d2330d164b7a1504ce04efd3d88474d4b2f1d,37a9917ba7ebe9d61a6ae37e6564aabf4a04a468,4901d160335af4c6ab4e5fe80e809dc3a43a4f5e,b6254852e1f49f8d226743d2cb444a0fb67f901c,e6b692208b74d2886d059fa8a2699f802e23ff5e,bcbf4e42f6333967e7c94c232cd7f8719f61bfdb,61805d9135aa0b27898d2f7ae233bc21638b12a2,aa6c85efb09b6634a22edaf2d179630f67c05d7d,bf48a73811b1880b6856c87865e1f6c0077a7e08,88dfe7040beb8e605f0248d0ba2bb69f2e907c98,d076429da15e34cb25559c9dbd7b2a06f52c39d7,661357bdd9338608be1543e05224caa1179c11cf,3ee43f79fdb7014b15790165a7e9456818ca7f97,d64d5375a563ac5c722f43c62bbf7feee467cd88
# Push it to GitHub
git push --set-upstream origin backport-9694-to-release_3.40
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3.40

Then, create a pull request where the base branch is release_3.40 and the compare/head branch is backport-9694-to-release_3.40.

@DiGro DiGro deleted the DiGro-patch-1-1 branch March 3, 2025 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3.40 On merge create a backported pull request to 3.40
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants