Merging upstream version 127.0.

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

2 files changed, 4 insertions, 4 deletions

diff --git a/dom/docs/ipc/process_model.rst b/dom/docs/ipc/process_model.rst
index b405566a1d..2a6e17d4d8 100644
--- a/dom/docs/ipc/process_model.rst
+++ b/dom/docs/ipc/process_model.rst
@@ -101,7 +101,7 @@ Content Process
 
 Content processes are used to load web content, and are the only process type (other than the parent process) which can load and execute JS code. These processes are further subdivided into specific "remote types", which specify the type of content loaded within them, their sandboxing behavior, and can gate access to certain privileged IPC methods.
 
-The specific remote type and isolation behaviour used for a specific resource is currently controlled in 2 major places. When performing a document navigation, the final process to load the document in is selected by the logic in `ProcessIsolation.cpp <https://searchfox.org/mozilla-central/source/dom/ipc/ProcessIsolation.cpp>`_. This will combine information about the specific response, such as the site and headers, with other state to select which process and other isolating actions should be taken. When selecting which process to create the initial process for a new tab in, and when selecting processes for serviceworkers and shared workers, the logic in :searchfox:`E10SUtils.sys.mjs <toolkit/modules/E10SUtils.sys.mjs>`_ is used to select a process. The logic in ``E10SUtils.sys.mjs`` will likely be removed and replaced with ``ProcessIsolation.cpp`` in the future.
+The specific remote type and isolation behaviour used for a specific resource is currently controlled in 2 major places. When performing a document navigation, the final process to load the document in is selected by the logic in `ProcessIsolation.cpp <https://searchfox.org/mozilla-central/source/dom/ipc/ProcessIsolation.cpp>`_. This will combine information about the specific response, such as the site and headers, with other state to select which process and other isolating actions should be taken. When selecting which process to create the initial process for a new tab in, and when selecting processes for serviceworkers and shared workers, the logic in :searchfox:`E10SUtils.sys.mjs <toolkit/modules/E10SUtils.sys.mjs>` is used to select a process. The logic in ``E10SUtils.sys.mjs`` will likely be removed and replaced with ``ProcessIsolation.cpp`` in the future.
 
 .. note::
 
diff --git a/dom/docs/workersAndStorage/PerformanceTesting.rst b/dom/docs/workersAndStorage/PerformanceTesting.rst
index 8e464b8116..fc196ad677 100644
--- a/dom/docs/workersAndStorage/PerformanceTesting.rst
+++ b/dom/docs/workersAndStorage/PerformanceTesting.rst
@@ -27,8 +27,8 @@ Add files to `perftest.toml
 <https://searchfox.org/mozilla-central/source/dom/serviceworkers/test/performance/perftest.toml>`_
 as usual for mochitests.
 
-Modify linux.yml, macosx.yml, and windows.yml under `taskcluster/ci/perftest
-<https://searchfox.org/mozilla-central/source/taskcluster/ci/perftest>`_.
+Modify linux.yml, macosx.yml, and windows.yml under `taskcluster/kinds/perftest
+<https://searchfox.org/mozilla-central/source/taskcluster/kinds/perftest>`_.
 Currently, each test needs to be added individually to the run command (`here
 <https://searchfox.org/mozilla-central/rev/91cc8848427fdbbeb324e6ca56a0d08d32d3c308/taskcluster/ci/perftest/linux.yml#121-149>`_,
 for example).  kind.yml can be ignored–it provides some defaults.
@@ -62,7 +62,7 @@ and `autoland
 <https://treeherder.mozilla.org/jobs?repo=autoland&searchStr=perftest>`_.  Look
 for linux-sw, macosx-sw, and win-sw (`example
 <https://treeherder.mozilla.org/perfherder/graphs?series=mozilla-central,4967140,1,15&selected=4967140,1814245176>`_).
-These symbol names are defined in the .yml files under taskcluster/ci/perftest.
+These symbol names are defined in the .yml files under taskcluster/kinds/perftest.
 
 Contacts
 ========