librewolf/website
14
55
Fork
You've already forked website
39

Update multiple FAQ links #103

Open
itsarticunover wants to merge 9 commits from itsarticunover/website:doc/fix-faq-typos into master
pull from: itsarticunover/website:doc/fix-faq-typos
merge into: librewolf:master
librewolf:master
librewolf:rel
librewolf:webgl
librewolf:changelog
librewolf:astro
First-time contributor
Copy link

The link to a Firefox troubleshooting guide on Mozilla has been changed.

The link to a Firefox troubleshooting guide on Mozilla has been changed.
Author
First-time contributor
Copy link
https://librewolf.net/docs/faq/#why-do-you-disable-google-safe-browsing archived version of second link: https://web.archive.org/web/20240706052942/ + https:// + codeberg.org/librewolf/issues/issues/1427 (needs to be manually appended) https://librewolf.net/docs/faq/#should-i-disable-accessibility-services seems obsolete, the mozilla article has been archived https://web.archive.org/web/20240529065342/https://support.mozilla.org/en-US/kb/accessibility-services#w_should-i-disable-firefox-accessibility-service
itsarticunover changed title from (削除) Update link to firefox guide and correct a typo (削除ここまで) to Update multiple FAQ links 2025年05月11日 08:09:47 +02:00

Thanks, and sorry about the delay. I just merged another conflicting PR, could you rebase your PR?

@itsarticunover wrote in #103 (comment):

https://librewolf.net/docs/faq/#why-do-you-disable-google-safe-browsing archived version of second link: https://web.archive.org/web/20240706052942/ + https:// + codeberg.org/librewolf/issues/issues/1427 (needs to be manually appended)

Huh, I have no idea why that shows 404. You may just want to use a link to the original GitLab issue then instead of a web archive version (there seem to have been no changes made after the Codeberg migration): https://gitlab.com/librewolf-community/settings/-/issues/126

https://librewolf.net/docs/faq/#should-i-disable-accessibility-services seems obsolete, the mozilla article has been archived https://web.archive.org/web/20240529065342/https://support.mozilla.org/en-US/kb/accessibility-services#w_should-i-disable-firefox-accessibility-service

Ah right, I guess you can remove that entirely if you'd like.

Thanks, and sorry about the delay. I just merged another conflicting PR, could you rebase your PR? @itsarticunover wrote in https://codeberg.org/librewolf/website/pulls/103#issuecomment-4436201: > https://librewolf.net/docs/faq/#why-do-you-disable-google-safe-browsing archived version of second link: https://web.archive.org/web/20240706052942/ + https:// + codeberg.org/librewolf/issues/issues/1427 (needs to be manually appended) Huh, I have no idea why that shows 404. You may just want to use a link to the original GitLab issue then instead of a web archive version (there seem to have been no changes made after the Codeberg migration): https://gitlab.com/librewolf-community/settings/-/issues/126 > https://librewolf.net/docs/faq/#should-i-disable-accessibility-services seems obsolete, the mozilla article has been archived https://web.archive.org/web/20240529065342/https://support.mozilla.org/en-US/kb/accessibility-services#w_should-i-disable-firefox-accessibility-service Ah right, I guess you can remove that entirely if you'd like.
Signed-off-by: itsarticunover <itsarticunover@noreply.codeberg.org>
Signed-off-by: itsarticunover <itsarticunover@noreply.codeberg.org>
Author
First-time contributor
Copy link

Sorry for the PR being messy, I don't know much about rebasing, so I took a lot of extra steps.

Sorry for the PR being messy, I don't know much about rebasing, so I took a lot of extra steps.
Signed-off-by: itsarticunover <itsarticunover@noreply.codeberg.org>
Signed-off-by: itsarticunover <itsarticunover@noreply.codeberg.org>
This pull request has changes conflicting with the target branch.
  • pages/docs/faq.md
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u doc/fix-faq-typos:itsarticunover-doc/fix-faq-typos
git switch itsarticunover-doc/fix-faq-typos

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff itsarticunover-doc/fix-faq-typos
git switch itsarticunover-doc/fix-faq-typos
git rebase master
git switch master
git merge --ff-only itsarticunover-doc/fix-faq-typos
git switch itsarticunover-doc/fix-faq-typos
git rebase master
git switch master
git merge --no-ff itsarticunover-doc/fix-faq-typos
git switch master
git merge --squash itsarticunover-doc/fix-faq-typos
git switch master
git merge --ff-only itsarticunover-doc/fix-faq-typos
git switch master
git merge itsarticunover-doc/fix-faq-typos
git push origin master
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
librewolf/website!103
Reference in a new issue
librewolf/website
No description provided.
Delete branch "itsarticunover/website:doc/fix-faq-typos"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?