fix conflict

Author: greg-lindsay

articles/application-gateway/for-containers/session-affinity.md

@@ -5,7 +5,7 @@ services: application gateway
 author: greg-lindsay
 ms.service: azure-appgw-for-containers
 ms.topic: concept-article
-ms.date: 5/9/2025
+ms.date: 5/12/2025
 ms.author: greglin
 ---
 
@@ -78,7 +78,7 @@ EOF
 
 Session affinity can be defined in an [IngressExtension](api-specification-kubernetes.md#alb.networking.azure.io/v1.IngressExtensionSpec) resource. You must specify `sessionAffinity` with an `affinityType` of either `application-cookie` or `managed-cookie`. In this example, we use `application-cookie` as the affinityType and explicitly define a cookie name and lifetime.
 
-Example command to create a new IngressExtension with a defined cookie called `nomnom` with a lifetime of 3,600 seconds (1 hour).
+Example command to create a new IngressExtension with a defined cookie called `nomnom` with a lifetime of 3,600 seconds (1 hour) targetting a backend service called `echo`.
 
 ```bash
 kubectl apply -f - <<EOF
@@ -89,7 +89,7 @@ metadata:
   namespace: test-infra
 spec:
   backendSettings:
-    - service: echo
+    - service: echo # replace with your service name
       sessionAffinity:
         affinityType: "application-cookie"
         cookieName: "nomnom"

articles/backup/azure-kubernetes-service-backup-overview.md

@@ -101,11 +101,13 @@ You can create and test image definition files by using VS Code. In addition to
 
 ### System Tasks and User Tasks 
 
-All tasks in the userTasks section run as the user after the user's first sign-in to the Dev Box. Tasks in the tasks section run as LocalSystem during the Dev Box provisioning stage. Both sections share the same parameters based on the task definitions in your catalog.
+You can use both System and User tasks in your image definition file. The tasks section of the image definition file is divided into two sections: tasks and  userTasks. Both sections share the same parameters based on the task definitions in your catalog. 
+ 
+- **System tasks**: These tasks run as LocalSystem during the provisioning stage of the dev box. They are typically used for system-level configurations, such as installing software or configuring system settings that require administrative privileges. 
 
-### When should I use Run-as-user Tasks? 
+- **User tasks**: These tasks run as the user after the user's first sign-in to the dev box. They are typically used for user-level configurations, such as installing user-specific applications or configuring user settings under user context. For example, users often prefer to install Python and Visual Studio Code under user context instead of system-wide. Put WinGet tasks in the userTasks section for better results when they don't work under tasks. 
 
-Use run-as-user tasks to install software and packages under user context. For example, users often prefer to install Python and Visual Studio Code under user context instead of system-wide. Put WinGet tasks in the userTasks section for better results when they don't work under tasks. 
+Standard users configuring user customizations can only use user tasks, they cannot use system tasks.
 
 ## Optional: Customize your dev box by using existing Desired State Configuration files
 Desired State Configuration (DSC) is a management platform in PowerShell that enables you to manage your development environment with configuration as code. You can use DSC to define the desired state of your dev box, including software installations, configurations, and settings.

articles/dev-box/how-to-write-image-definition-file.md

@@ -1,5 +1,20 @@
 {
     "redirections": [                
+        {
+            "source_path_from_root": "/articles/stream-analytics/custom-deserializer-examples.md",
+            "redirect_url": "/azure/stream-analytics/stream-analytics-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/stream-analytics/custom-deserializer.md",
+            "redirect_url": "/azure/stream-analytics/stream-analytics-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/stream-analytics/visual-studio-code-custom-deserializer.md",
+            "redirect_url": "/azure/stream-analytics/stream-analytics-introduction",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/stream-analytics/stream-analytics-managed-identities-adls.md",
             "redirect_url": "/azure/stream-analytics/blob-output-managed-identity",

articles/stream-analytics/.openpublishing.redirection.stream-analytics.json

@@ -43,8 +43,6 @@
     href: stream-analytics-real-time-fraud-detection.md
   - name: Integrate third party services using Azure Functions
     href: stream-analytics-with-azure-functions.md
-  - name: Create a custom .NET deserializer
-    href: visual-studio-code-custom-deserializer.md
   - name: Create an IoT Edge job
     href: ../iot-edge/tutorial-deploy-stream-analytics.md
     maintainContext: true
@@ -99,8 +97,6 @@
       href: stream-analytics-define-kafka-input.md
     - name: Validate input schema
       href: input-validation.md
-    - name: Read inputs in any format using custom deserializers
-      href: custom-deserializer-examples.md
   - name: Output types for a job
     items:
     - name: Outputs overview
@@ -377,8 +373,6 @@
       href: visual-studio-code-local-run.md
     - name: Debug queries using job diagram
       href: debug-locally-using-job-diagram-vs-code.md
-    - name: Create and debug .NET custom deserializer
-      href: visual-studio-code-custom-deserializer.md
     - name: JobConfig.json fields
       href: job-config-json.md
   - name: Visual Studio
@@ -397,8 +391,6 @@
       href: stream-analytics-monitor-jobs-use-vs.md
     - name: Debug queries using job diagram
       href: debug-locally-using-job-diagram.md
-    - name: Create a custom .NET deserializer
-      href: custom-deserializer.md
     - name: Develop an edge job
       href: stream-analytics-tools-for-visual-studio-edge-jobs.md
     - name: Run a C# UDF