resolve merge conflict

Author: gewarren

.github/ISSUE_TEMPLATE/02-breaking-change.yml

@@ -1,5 +1,5 @@
 name: ".NET breaking change"
-description: Report a change in .NET that breaks something that worked in a previous version. Intended mostly for product-team use.
+description: This template is for .NET product team members to report breaking changes to documentation content developers. Please report user-discovered issues in the appropriate product repo.
 title: "[Breaking change]: "
 labels:
   - breaking-change

.openpublishing.redirection.csharp.json

@@ -4156,6 +4156,22 @@
             "source_path_from_root": "/docs/csharp/tour-of-csharp/types.md",
             "redirect_url": "/dotnet/csharp/tour-of-csharp"
         },
+        {
+            "source_path_from_root": "/docs/csharp/tour-of-csharp/tutorials/arrays-and-collections.md",
+            "redirect_url": "/dotnet/csharp/tour-of-csharp/tutorials/list-collection"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/tour-of-csharp/tutorials/local-environment.md",
+            "redirect_url": "/dotnet/csharp/tour-of-csharp/tutorials"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/tour-of-csharp/tutorials/branches-and-loops-local.md",
+            "redirect_url": "/dotnet/csharp/tour-of-csharp/tutorials/branches-and-loops"
+        },
+        {
+            "source_path_from_root": "/docs/csharp/tour-of-csharp/tutorials/numbers-in-csharp-local.md",
+            "redirect_url": "/dotnet/csharp/tour-of-csharp/tutorials/numbers-in-csharp"
+        },
         {
             "source_path_from_root": "/docs/csharp/tuples.md",
             "redirect_url": "/dotnet/csharp/language-reference/builtin-types/value-tuples"

.openpublishing.redirection.framework.json

@@ -3502,11 +3502,11 @@
         },
         {
             "source_path_from_root": "/docs/framework/network-programming/accessing-the-internet-through-a-proxy.md",
-            "redirect_url": "/dotnet/fundamentals/networking/http/httpclient#http-proxy"
+            "redirect_url": "/dotnet/fundamentals/networking/http/httpclient#configure-an-http-proxy"
         },
         {
             "source_path_from_root": "/docs/framework/network-programming/automatic-proxy-detection.md",
-            "redirect_url": "/dotnet/fundamentals/networking/http/httpclient#http-proxy"
+            "redirect_url": "/dotnet/fundamentals/networking/http/httpclient#configure-an-http-proxy"
         },
         {
             "source_path_from_root": "/docs/framework/network-programming/how-to-override-a-global-proxy-selection.md",
@@ -3522,7 +3522,7 @@
         },
         {
             "source_path_from_root": "/docs/framework/network-programming/proxy-configuration.md",
-            "redirect_url": "/dotnet/fundamentals/networking/http/httpclient#http-proxy"
+            "redirect_url": "/dotnet/fundamentals/networking/http/httpclient#configure-an-http-proxy"
         },
         {
             "source_path_from_root": "/docs/framework/network-programming/changes-to-the-system-uri-namespace-in-version-2-0.md",
@@ -3534,7 +3534,7 @@
         },
         {
             "source_path_from_root": "/docs/framework/network-programming/how-to-enable-a-webrequest-to-use-a-proxy-to-communicate-with-the-internet.md",
-            "redirect_url": "/dotnet/fundamentals/networking/http/httpclient#http-proxy"
+            "redirect_url": "/dotnet/fundamentals/networking/http/httpclient#configure-an-http-proxy"
         }
     ]
 }

docs/ai/quickstarts/includes/ai-templates-azure-openai.md

@@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
 1. Create a new app with the `dotnet new` command and the following parameters:
 
     ```dotnetcli
-    dotnet new aichatweb --framework "net9.0" --AIServiceProvider "azureopenai" --VectorStore "local"
+    dotnet new aichatweb --framework "net9.0" --AiServiceProvider "azureopenai" --VectorStore "local"
     ```
 
     The .NET CLI creates a new .NET 9.0 app with the configurations you specified.

docs/ai/quickstarts/includes/ai-templates-ollama.md

@@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
 1. Create a new app with the `dotnet new` command and the following parameters:
 
     ```dotnetcli
-    dotnet new aichatweb --framework "net9.0" --AIServiceProvider "ollama" --VectorStore "local"
+    dotnet new aichatweb --framework "net9.0" --AiServiceProvider "ollama" --VectorStore "local"
     ```
 
     The .NET CLI creates a new .NET 9.0 app with the configurations you specified.

docs/ai/quickstarts/includes/ai-templates-openai.md

@@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
 1. Create a new app with the `dotnet new` command and the following parameters:
 
     ```dotnetcli
-    dotnet new aichatweb --framework "net9.0" --AIServiceProvider "openai" --VectorStore "local"
+    dotnet new aichatweb --framework "net9.0" --AiServiceProvider "openai" --VectorStore "local"
     ```
 
     The .NET CLI creates a new .NET 9.0 app with the configurations you specified.