Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 47 insertions, 12 deletions

diff --git a/docs/bug-mgmt/assets/icon_assignments.png b/docs/bug-mgmt/assets/icon_assignments.png
deleted file mode 100644
index 81b13703f0..0000000000
--- a/docs/bug-mgmt/assets/icon_assignments.png
+++ /dev/null
diff --git a/docs/bug-mgmt/assets/icon_engineering.png b/docs/bug-mgmt/assets/icon_engineering.png
new file mode 100644
index 0000000000..230d6fab7e
--- /dev/null
+++ b/docs/bug-mgmt/assets/icon_engineering.png
diff --git a/docs/bug-mgmt/policies/attention-dashboard.rst b/docs/bug-mgmt/policies/attention-dashboard.rst
index b3f79502e9..7d0ba8e645 100644
--- a/docs/bug-mgmt/policies/attention-dashboard.rst
+++ b/docs/bug-mgmt/policies/attention-dashboard.rst
@@ -1,14 +1,14 @@
 What Needs My Attention
 =======================
 
-Bugzilla’s `What needs my attention?`_ (a.k.a What Should I Work On Next) dashboard helps us to focus on the top-most important or urgent engineering tasks for releasing Firefox.
+Bugzilla’s `What needs my attention?`_ dashboard helps us to focus on the top-most important or urgent engineering tasks for releasing Firefox.
 
 The dashboard is not designed for including everything on a person’s plate. It doesn’t attempt to prioritize normal work - it is just for the things that are more important than the normal stuff. It’s about individual engineer prioritization rather than team prioritization and it doesn’t claim to include all sources of high priority work (e.g. triage, responding to requests from HR, etc).
 
 The dashboard is available to Mozilla engineers, using the icon
 
-	.. image:: ../assets/icon_assignments.png
-	  :alt: Notification Icon
+	.. image:: ../assets/icon_engineering.png
+	  :alt: Engineering Icon
 
 in the top right hand corner, after you log into Bugzilla.
 
diff --git a/docs/conf.py b/docs/conf.py
index 30c341e531..72c25f464b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -42,6 +42,7 @@ extensions = [
     "sphinx.ext.todo",
     "mozbuild.sphinx",
     "sphinx_js",
+    "sphinxcontrib.jquery",
     "sphinxcontrib.mermaid",
     "sphinx_copybutton",
     "sphinx_markdown_tables",
@@ -55,6 +56,7 @@ extensions = [
 # excluded from valid-jsdoc in the top-level .eslintrc.js.
 js_source_path = [
     "../browser/components/backup",
+    "../browser/components/backup/resources",
     "../browser/components/extensions",
     "../browser/components/migration",
     "../browser/components/migration/content",
diff --git a/docs/config.yml b/docs/config.yml
index 0a4ed464d0..cf3cea87e9 100644
--- a/docs/config.yml
+++ b/docs/config.yml
@@ -25,6 +25,8 @@ categories:
         - toolkit
         - js
         - mobile/android/geckoview
+        - mobile/android/fenix
+        - mobile/android/focus-android
         - dom/bindings/webidl
         - modules/libpref
         - networking
@@ -121,4 +123,4 @@ fatal warnings:
     - "WARNING: '([^']*)' reference target not found:((?!.rst).)*$"
     - "WARNING: Include file '([^']*)' not found or reading it failed"
 
-max_num_warnings: 759
+max_num_warnings: 837
diff --git a/docs/contributing/contribution_quickref.rst b/docs/contributing/contribution_quickref.rst
index 981198e566..f6f80e0cdf 100644
--- a/docs/contributing/contribution_quickref.rst
+++ b/docs/contributing/contribution_quickref.rst
@@ -42,7 +42,7 @@ You can download the source code and have Firefox automatically download and ins
 
 Downloading can take from 40 minutes to two hours (depending on your connection) and the repository should be less than 5GB (~ 20GB after the build).
 
-The default options are recommended.
+The **default options are recommended**.
 If you're not planning to write C++ or Rust code, select :ref:`Artifact Mode <Understanding Artifact Builds>`
 and follow the instructions at the end of the bootstrap for creating a mozconfig file.
 
@@ -69,6 +69,16 @@ To Setup Firefox On macOS and Linux
 
 More information on :ref:`building Firefox for Linux <Building Firefox On Linux>` and :ref:`building Firefox for MacOS <Building Firefox On MacOS>`.
 
+To Setup Firefox for Android
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: shell
+
+    $ curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py -O
+    $ python3 bootstrap.py
+
+More information on :ref:`building Firefox for Android <fenix-contributor-guide>`
+
 To set up your editor
 ---------------------
 
@@ -399,6 +409,8 @@ GeckoView setup and contribution docs live in `geckoview.dev <https://geckoview.
 More documentation about contribution
 -------------------------------------
 
+:ref:`How to Contribute Code to Firefox`
+
 :ref:`Contributing to Mozilla projects`
 
 https://mozilla-version-control-tools.readthedocs.io/en/latest/devguide/contributing.html
diff --git a/docs/contributing/reviews.rst b/docs/contributing/reviews.rst
index 8cd968ced3..386872819c 100644
--- a/docs/contributing/reviews.rst
+++ b/docs/contributing/reviews.rst
@@ -68,6 +68,9 @@ Review groups
    * - #firefox-svg-reviewers
      - SVG-related changes
      - `Member list <https://phabricator.services.mozilla.com/project/members/97/>`__
+   * - #frontend-codestyle-reviewers
+     - Changes to ESLint, Prettier or Stylelint configurations.
+     - `Member list <https://phabricator.services.mozilla.com/project/members/208/>`__
    * - #android-reviewers
      - Changes to Fenix, Focus and Android Components.
      - `Member list <https://phabricator.services.mozilla.com/project/members/200/>`__
diff --git a/docs/setup/contributing_code.rst b/docs/setup/contributing_code.rst
index 2d3520e363..40b1beb2fb 100644
--- a/docs/setup/contributing_code.rst
+++ b/docs/setup/contributing_code.rst
@@ -4,6 +4,20 @@ How To Contribute Code To Firefox
 The whole process can be a bit long, and it might take time to get things right.
 If at any point you are stuck, please don't hesitate to ask at `https://chat.mozilla.org <https://chat.mozilla.org>`_
 in the `#introduction <https://chat.mozilla.org/#/room/#introduction:mozilla.org>`_ channel.
+Additionally, here are some etiquette tips to help when reaching out:
+
+* Please don't ask to ask a question, post your question with the relevant context and someone will be able to help when they have time.
+* Use public facing channels to ask your questions instead of direct messaging folks.
+
+  * Other people get to learn from your question and there's a higher chance your question will get answered quickly since there are many people in the #introduction room.
+
+* Your question may not be answered immediately, this is expected! If you are not getting feedback after an hour or so, feel free to repost the question.
+
+  * Sometimes messages get skimmed over or notifications are lost in the sea of other things, so it's normal to repost your question in this case.
+
+* Please search through the recent scrollback of your relevant channels to see if your question has been asked and/or answered already.
+
+  * Most issues with setup have been experienced before, so there's a good possibility that your question has already been answered recently.
 
 We make changes to Firefox by writing patches, testing them and pushing them into "the tree", the
 term we use for all the code in Mozilla-Central. Let's get started.
diff --git a/docs/writing-rust-code/update-policy.md b/docs/writing-rust-code/update-policy.md
index f0d27a3b7d..b23e7b6e22 100644
--- a/docs/writing-rust-code/update-policy.md
+++ b/docs/writing-rust-code/update-policy.md
@@ -150,11 +150,13 @@ Here are the Rust versions for each Firefox version.
 | Firefox 121 | Rust 1.73.0 | 1.70.0 | 2023 October 4 | 2023 November 16 | 2023 December 19
 | Firefox 122 | Rust 1.74.0 | 1.70.0 | 2023 November 16 | 2023 December 14 | 2024 January 23
 | Firefox 123 | Rust 1.75.0 | 1.70.0 | 2023 December 28 | 2024 January 11 | 2024 February 20
+| Firefox 124 | Rust 1.76.0 | 1.70.0 | 2024 February 8 | 2024 February 15 | 2024 March 19
+| Firefox 125 | Rust 1.76.0 | 1.74.0 | 2024 February 8 | 2024 March 14 | 2024 April 16
 | **Estimated** |
-| Firefox 124 | Rust 1.76.0 | ? | 2023 February 8 | 2024 February 15 | 2024 March 19
-| Firefox 125 | Rust 1.76.0 | ? | 2023 February 8 | 2024 March 14 | 2024 April 16
-| Firefox 126 | Rust 1.77.0 | ? | 2023 March 21 | 2024 April 19 | 2024 May 14
-| Firefox 127 | Rust 1.78.0 | ? | 2023 May 2 | 2024 May 9 | 2024 June 11
-| Firefox 128 | Rust 1.78.0 | ? | 2023 May 2 | 2024 June 6 | 2024 July 9
-| Firefox 129 | Rust 1.79.0 | ? | 2023 June 13 | 2024 July 4 | 2024 August 6
-| Firefox 130 | Rust 1.80.0 | ? | 2023 July 25 | 2024 August 1 | 2024 September 3
+| Firefox 126 | Rust 1.77.2 | ? | 2024 March 28 | 2024 April 11 | 2024 May 14
+| Firefox 127 | Rust 1.78.0 | ? | 2024 May 2 | 2024 May 9 | 2024 June 11
+| Firefox 128 | Rust 1.78.0 | ? | 2024 May 2 | 2024 June 6 | 2024 July 9
+| Firefox 129 | Rust 1.79.0 | ? | 2024 June 13 | 2024 July 4 | 2024 August 6
+| Firefox 130 | Rust 1.80.0 | ? | 2024 July 25 | 2024 August 1 | 2024 September 3
+| Firefox 131 | Rust 1.80.0 | ? | 2024 July 25 | 2024 August 29 | 2024 October 1
+| Firefox 132 | Rust 1.81.0 | ? | 2024 September 5 | 2024 September 26 | 2024 October 29