Sort merge conflicts

Author: chrisdavidmills

files/en-us/_redirects.txt

@@ -15528,9 +15528,14 @@
 /en-US/docs/Web/JavaScript/Reference/Symbols	/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol
 /en-US/docs/Web/JavaScript/Reference/arrow_functions	/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions
 /en-US/docs/Web/JavaScript/Reference/default_parameters	/en-US/docs/Web/JavaScript/Reference/Functions/Default_parameters
+/en-US/docs/Web/JavaScript/Reference/delete	/en-US/docs/Web/JavaScript/Reference/Operators/delete
 /en-US/docs/Web/JavaScript/Reference/eval	/en-US/docs/Web/JavaScript/Reference/Global_Objects/eval
+/en-US/docs/Web/JavaScript/Reference/instanceof	/en-US/docs/Web/JavaScript/Reference/Operators/instanceof
+/en-US/docs/Web/JavaScript/Reference/new	/en-US/docs/Web/JavaScript/Reference/Operators/new
+/en-US/docs/Web/JavaScript/Reference/null	/en-US/docs/Web/JavaScript/Reference/Operators/null
 /en-US/docs/Web/JavaScript/Reference/rest_parameters	/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters
 /en-US/docs/Web/JavaScript/Reference/template_strings	/en-US/docs/Web/JavaScript/Reference/Template_literals
+/en-US/docs/Web/JavaScript/Reference/this	/en-US/docs/Web/JavaScript/Reference/Operators/this
 /en-US/docs/Web/JavaScript/Same_origin_policy_for_JavaScript	/en-US/docs/Web/Security/Defenses/Same-origin_policy
 /en-US/docs/Web/JavaScript/Shells	/en-US/docs/Web/JavaScript/Reference/JavaScript_technologies_overview
 /en-US/docs/Web/JavaScript/The_performance_hazards_of__[[Prototype]]_mutation	/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/setPrototypeOf
@@ -16869,6 +16874,7 @@
 /en-US/docs/WebAssembly/JavaScript_interface/validate	/en-US/docs/WebAssembly/Reference/JavaScript_interface/validate_static
 /en-US/docs/WebAssembly/JavaScript_interface/validate_static	/en-US/docs/WebAssembly/Reference/JavaScript_interface/validate_static
 /en-US/docs/WebAssembly/Loading_and_running	/en-US/docs/WebAssembly/Guides/Loading_and_running
+/en-US/docs/WebAssembly/Reference/Definitions/func	/en-US/docs/WebAssembly/Reference/Definitions/types/func
 /en-US/docs/WebAssembly/Reference/Numeric/Absolute	/en-US/docs/WebAssembly/Reference/Numeric/abs
 /en-US/docs/WebAssembly/Reference/Numeric/Addition	/en-US/docs/WebAssembly/Reference/Numeric/add
 /en-US/docs/WebAssembly/Reference/Numeric/Copy_sign	/en-US/docs/WebAssembly/Reference/Numeric/copysign
@@ -16921,6 +16927,15 @@
 /en-US/docs/WebAssembly/Reference/SIMD/load/load8_splat	/en-US/docs/WebAssembly/Reference/SIMD/load_store/load8_splat
 /en-US/docs/WebAssembly/Reference/SIMD/load/load8x8_s	/en-US/docs/WebAssembly/Reference/SIMD/load_store/load8x8_s
 /en-US/docs/WebAssembly/Reference/SIMD/load/load8x8_u	/en-US/docs/WebAssembly/Reference/SIMD/load_store/load8x8_u
+/en-US/docs/WebAssembly/Reference/Types	/en-US/docs/WebAssembly/Reference/Value_types
+/en-US/docs/WebAssembly/Reference/Types/externref	/en-US/docs/WebAssembly/Reference/Value_types/externref
+/en-US/docs/WebAssembly/Reference/Types/f32	/en-US/docs/WebAssembly/Reference/Value_types/f32
+/en-US/docs/WebAssembly/Reference/Types/f64	/en-US/docs/WebAssembly/Reference/Value_types/f64
+/en-US/docs/WebAssembly/Reference/Types/func	/en-US/docs/WebAssembly/Reference/Definitions/types/func
+/en-US/docs/WebAssembly/Reference/Types/funcref	/en-US/docs/WebAssembly/Reference/Value_types/funcref
+/en-US/docs/WebAssembly/Reference/Types/i32	/en-US/docs/WebAssembly/Reference/Value_types/i32
+/en-US/docs/WebAssembly/Reference/Types/i64	/en-US/docs/WebAssembly/Reference/Value_types/i64
+/en-US/docs/WebAssembly/Reference/Types/v128	/en-US/docs/WebAssembly/Reference/Value_types/v128
 /en-US/docs/WebAssembly/Reference/Variables/Local_get	/en-US/docs/WebAssembly/Reference/Variables/local.get
 /en-US/docs/WebAssembly/Reference/Variables/Local_set	/en-US/docs/WebAssembly/Reference/Variables/local.set
 /en-US/docs/WebAssembly/Reference/Variables/Local_tee	/en-US/docs/WebAssembly/Reference/Variables/local.tee

files/en-us/glossary/binding/index.md

@@ -5,7 +5,7 @@ page-type: glossary-definition
 sidebar: glossarysidebar
 ---
 
-In programming, a **binding** is an association of an {{glossary("identifier")}} with a value. Not all bindings are {{glossary("variable", "variables")}} — for example, function {{glossary("parameter", "parameters")}} and the binding created by the {{jsxref("Statements/try...catch", "catch (e)")}} block are not "variables" in the strict sense. In addition, some bindings are implicitly created by the language — for example, {{jsxref("Operators/this", "this")}} and [`new.target`](/en-US/docs/Web/JavaScript/Reference/Operators/new.target) in JavaScript.
+In programming, a **binding** is an association of an {{glossary("identifier")}} with a value. Not all bindings are {{glossary("variable", "variables")}} — for example, function {{glossary("parameter", "parameters")}} and the binding created by the {{jsxref("Statements/try...catch", "catch (e)")}} block are not "variables" in the strict sense. In addition, some bindings are implicitly created by the language — for example, {{jsxref("this")}} and [`new.target`](/en-US/docs/Web/JavaScript/Reference/Operators/new.target) in JavaScript.
 
 A binding is {{glossary("mutable")}} if it can be re-assigned, and {{glossary("immutable")}} otherwise; this does _not_ mean that the value it holds is immutable.
 

files/en-us/learn_web_development/core/accessibility/html/index.md

@@ -63,7 +63,7 @@ We've already talked about the importance of proper semantics, and why we should
 
 Out there on the web, the truth is that people do some very strange things with HTML markup. Often, misuse of HTML is because of legacy practices that haven't gone away yet, but sometimes it occurs because authors don't know any better. Whatever the case, you should replace bad code with good semantic markup wherever possible, in both static HTML pages and dynamically-generated HTML from [server-side](/en-US/docs/Learn_web_development/Extensions/Server-side) code or [client-side JavaScript frameworks](/en-US/docs/Learn_web_development/Core/Frameworks_libraries) such as React.
 
-Sometimes you are not in a position to get rid of lousy markup — your pages might be dependant on server-side code or web/framework components that you have no control over, or you might have third-party content on your page (such as ad banners).
+Sometimes you are not in a position to get rid of lousy markup — your pages might be dependent on server-side code or web/framework components that you have no control over, or you might have third-party content on your page (such as ad banners).
 
 The goal isn't "all or nothing"; every improvement you can make will help the cause of accessibility.
 

files/en-us/learn_web_development/core/frameworks_libraries/angular_building/index.md

@@ -7,6 +7,9 @@ sidebar: learnsidebar
 
 {{PreviousMenu("Learn_web_development/Core/Frameworks_libraries/Angular_filtering", "Learn_web_development/Core/Frameworks_libraries")}}
 
+> [!NOTE]
+> The MDN Angular articles are no longer being maintained and will be removed from the website in 3 months (by August 20, 2026). The content will be archived in the [MDN Museum](https://github.com/mdn/museum). See [this discussion](https://github.com/orgs/mdn/discussions/827) for further information.
+
 This final Angular article covers how to build an app ready for production, and provides further resources for you to continue your learning journey.
 
 <table>

files/en-us/learn_web_development/core/frameworks_libraries/angular_filtering/index.md

@@ -7,6 +7,9 @@ sidebar: learnsidebar
 
 {{PreviousMenuNext("Learn_web_development/Core/Frameworks_libraries/Angular_item_component","Learn_web_development/Core/Frameworks_libraries/Angular_building", "Learn_web_development/Core/Frameworks_libraries")}}
 
+> [!NOTE]
+> The MDN Angular articles are no longer being maintained and will be removed from the website in 3 months (by August 20, 2026). The content will be archived in the [MDN Museum](https://github.com/mdn/museum). See [this discussion](https://github.com/orgs/mdn/discussions/827) for further information.
+
 Now let's move on to adding functionality to allow users to filter their to-do items, so they can view active, completed, or all items.
 
 <table>

files/en-us/learn_web_development/core/frameworks_libraries/angular_getting_started/index.md

@@ -7,6 +7,9 @@ sidebar: learnsidebar
 
 {{NextMenu("Learn_web_development/Core/Frameworks_libraries/Angular_todo_list_beginning", "Learn_web_development/Core/Frameworks_libraries")}}
 
+> [!NOTE]
+> The MDN Angular articles are no longer being maintained and will be removed from the website in 3 months (by August 20, 2026). The content will be archived in the [MDN Museum](https://github.com/mdn/museum). See [this discussion](https://github.com/orgs/mdn/discussions/827) for further information.
+
 It is now time to look at Google's Angular framework, another popular option that you'll come across often. In this article we look at what Angular has to offer, install the prerequisites and set up a sample app, and look at Angular's basic architecture.
 
 > [!NOTE]

files/en-us/learn_web_development/core/frameworks_libraries/angular_item_component/index.md

@@ -7,6 +7,9 @@ sidebar: learnsidebar
 
 {{PreviousMenuNext("Learn_web_development/Core/Frameworks_libraries/Angular_styling","Learn_web_development/Core/Frameworks_libraries/Angular_filtering", "Learn_web_development/Core/Frameworks_libraries")}}
 
+> [!NOTE]
+> The MDN Angular articles are no longer being maintained and will be removed from the website in 3 months (by August 20, 2026). The content will be archived in the [MDN Museum](https://github.com/mdn/museum). See [this discussion](https://github.com/orgs/mdn/discussions/827) for further information.
+
 Components provide a way for you to organize your application. This article walks you through creating a component to handle the individual items in the list, and adding check, edit, and delete functionality. The Angular event model is covered here.
 
 <table>

files/en-us/learn_web_development/core/frameworks_libraries/angular_styling/index.md

@@ -7,6 +7,9 @@ sidebar: learnsidebar
 
 {{PreviousMenuNext("Learn_web_development/Core/Frameworks_libraries/Angular_todo_list_beginning","Learn_web_development/Core/Frameworks_libraries/Angular_item_component", "Learn_web_development/Core/Frameworks_libraries")}}
 
+> [!NOTE]
+> The MDN Angular articles are no longer being maintained and will be removed from the website in 3 months (by August 20, 2026). The content will be archived in the [MDN Museum](https://github.com/mdn/museum). See [this discussion](https://github.com/orgs/mdn/discussions/827) for further information.
+
 Now that we've got our basic application structure set up and started displaying something useful, let's switch gears and spend an article looking at how Angular handles styling of applications.
 
 <table>

files/en-us/learn_web_development/core/frameworks_libraries/angular_todo_list_beginning/index.md

@@ -7,6 +7,9 @@ sidebar: learnsidebar
 
 {{PreviousMenuNext("Learn_web_development/Core/Frameworks_libraries/Angular_getting_started","Learn_web_development/Core/Frameworks_libraries/Angular_styling", "Learn_web_development/Core/Frameworks_libraries")}}
 
+> [!NOTE]
+> The MDN Angular articles are no longer being maintained and will be removed from the website in 3 months (by August 20, 2026). The content will be archived in the [MDN Museum](https://github.com/mdn/museum). See [this discussion](https://github.com/orgs/mdn/discussions/827) for further information.
+
 At this point, we are ready to start creating our to-do list application using Angular. The finished application will display a list of to-do items and includes editing, deleting, and adding features. In this article you will get to know your application structure, and work up to displaying a basic list of to-do items.
 
 <table>

files/en-us/learn_web_development/core/frameworks_libraries/ember_conditional_footer/index.md

@@ -7,6 +7,9 @@ sidebar: learnsidebar
 
 {{PreviousMenuNext("Learn_web_development/Core/Frameworks_libraries/Ember_interactivity_events_state","Learn_web_development/Core/Frameworks_libraries/Ember_routing", "Learn_web_development/Core/Frameworks_libraries")}}
 
+> [!NOTE]
+> The MDN Ember articles are no longer being maintained and will be removed from the website in 3 months (by August 20, 2026). The content will be archived in the [MDN Museum](https://github.com/mdn/museum). See [this discussion](https://github.com/orgs/mdn/discussions/827) for further information.
+
 Now it's time to start tackling the footer functionality in our app. Here we'll get the todo counter to update to show the correct number of todos still to complete, and correctly apply styling to completed todos (i.e., where the checkbox has been checked). We'll also wire up our "Clear completed" button. Along the way, we'll learn about using conditional rendering in our templates.
 
 <table>