Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into fixT

Author: roygara

.openpublishing.redirection.json

@@ -48941,6 +48941,11 @@
       "source_path": "articles/storage/common/storage-java-jenkins-continuous-integration-solution.md",
       "redirect_url": "/azure/jenkins/storage-java-jenkins-continuous-integration-solution",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/aks/acs-aks-migration.md",
+      "redirect_url": "/azure/aks/aks-migration",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/phone-number-claims-transformations.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 02/14/2020
+ms.date: 02/26/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -22,9 +22,39 @@ This article provides reference and examples for using the phone number claims t
 
 [!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
 
+## ConvertPhoneNumberClaimToString
+
+Converts a `phoneNumber` data type into a `string` data type.
+
+| Item | TransformationClaimType | Data Type | Notes |
+| ---- | ----------------------- | --------- | ----- |
+| InputClaim | phoneNumber | phoneNumber |  The ClaimType to convert to a string. |
+| OutputClaim | phoneNumberString | string | The ClaimType that is produced after this claims transformation has been invoked. |
+
+In this example, the cellPhoneNumber claim with a value type of `phoneNumber` is converted to a cellPhone claim with a value type of `string`.
+
+```XML
+<ClaimsTransformation Id="PhoneNumberToString" TransformationMethod="ConvertPhoneNumberClaimToString">
+  <InputClaims>
+    <InputClaim ClaimTypeReferenceId="cellPhoneNumber" TransformationClaimType="phoneNumber" />
+  </InputClaims>
+  <OutputClaims>
+    <OutputClaim ClaimTypeReferenceId="cellPhone" TransformationClaimType="phoneNumberString" />
+  </OutputClaims>
+</ClaimsTransformation>
+```
+
+### Example
+
+- Input claims:
+  - **phoneNumber**: +11234567890 (phoneNumber)
+- Output claims:
+  - **phoneNumberString**: +11234567890 (string)
+
+
 ## ConvertStringToPhoneNumberClaim
 
-This claim validates the format of the phone number. If it is in a valid format, change it to a standard format used by Azure AD B2C. If the provided phone number is not in a valid format, an error message is returned.
+This claim transformation validates the format of the phone number. If it is in a valid format, change it to a standard format used by Azure AD B2C. If the provided phone number is not in a valid format, an error message is returned.
 
 | Item | TransformationClaimType | Data Type | Notes |
 | ---- | ----------------------- | --------- | ----- |
@@ -64,10 +94,10 @@ The self-asserted technical profile that calls the validation technical profile
 ### Example 1
 
 - Input claims:
-  - **phoneNumberString**: 045 456-7890
+  - **phoneNumberString**: 033 456-7890
   - **country**: DK
 - Output claims:
-  - **outputClaim**: +450546148120
+  - **outputClaim**: +450334567890
 
 ### Example 2
 
@@ -76,6 +106,7 @@ The self-asserted technical profile that calls the validation technical profile
 - Output claims: 
   - **outputClaim**: +11234567890
 
+
 ## GetNationalNumberAndCountryCodeFromPhoneNumberString
 
 This extracts the country code and the national number from the input claim, and optionally throws an exception if the supplied phone number is not valid.

articles/aks/TOC.yml

@@ -105,8 +105,8 @@
         href: developer-best-practices-pod-security.md
   - name: Quotas and regional limits
     href: quotas-skus-regions.md
-  - name: Migrate from ACS to AKS
-    href: acs-aks-migration.md
+  - name: Migrate to AKS
+    href: aks-migration.md
   - name: Supported Kubernetes version
     href: supported-kubernetes-versions.md
   - name: Security Hardening in host OS

articles/aks/acs-aks-migration.md renamed to articles/aks/aks-migration.md

@@ -3,7 +3,7 @@ title: Migrate to Azure Kubernetes Service (AKS)
 description: Migrate to Azure Kubernetes Service (AKS).
 services: container-service
 ms.topic: article
-ms.date: 11/07/2018
+ms.date: 02/25/2020
 ms.custom: mvc
 ---
 
@@ -44,7 +44,7 @@ In this article we will summarize migration details for:
 
 AKS is a managed service offering unique capabilities with lower management overhead. As a result of being a managed service, you must select from a set of [regions](https://docs.microsoft.com/azure/aks/quotas-skus-regions) which AKS supports. The transition from your existing cluster to AKS may require modifying your existing applications so they remain healthy on the AKS managed control plane.
 
-We recommend using AKS clusters backed by [Virtual Machine Scale Sets](https://docs.microsoft.com/azure/virtual-machine-scale-sets) and the [Azure Standard Load Balancer](https://docs.microsoft.com/azure/aks/load-balancer-standard) to ensure you get features such as [multiple node pools](https://docs.microsoft.com/azure/aks/use-multiple-node-pools), [Availability Zones](https://docs.microsoft.com/azure/availability-zones/az-overview), [Authorized IP ranges](https://docs.microsoft.com/azure/aks/api-server-authorized-ip-ranges), [Cluster Autoscaler](https://docs.microsoft.com/azure/aks/cluster-autoscaler), [Azure Policy for AKS](https://docs.microsoft.com/azure/governance/policy/concepts/rego-for-aks), and other new features as they are released.   
+We recommend using AKS clusters backed by [Virtual Machine Scale Sets](https://docs.microsoft.com/azure/virtual-machine-scale-sets) and the [Azure Standard Load Balancer](https://docs.microsoft.com/azure/aks/load-balancer-standard) to ensure you get features such as [multiple node pools](https://docs.microsoft.com/azure/aks/use-multiple-node-pools), [Availability Zones](https://docs.microsoft.com/azure/availability-zones/az-overview), [Authorized IP ranges](https://docs.microsoft.com/azure/aks/api-server-authorized-ip-ranges), [Cluster Autoscaler](https://docs.microsoft.com/azure/aks/cluster-autoscaler), [Azure Policy for AKS](https://docs.microsoft.com/azure/governance/policy/concepts/rego-for-aks), and other new features as they are released.
 
 AKS clusters backed by [Virtual Machine Availability Sets](https://docs.microsoft.com/azure/virtual-machine-scale-sets/availability#availability-sets) lack support for many of these features.
 
@@ -99,7 +99,7 @@ To complete the migration, you'll want to point clients to the new services that
 
 [Azure Front Door Service](https://docs.microsoft.com/azure/frontdoor/front-door-overview) is another option for routing traffic for AKS clusters.  Azure Front Door Service enables you to define, manage, and monitor the global routing for your web traffic by optimizing for best performance and instant global failover for high availability. 
 
-### Considerations for stateless applications 
+### Considerations for stateless applications
 
 Stateless application migration is the most straightforward case. Apply your resource definitions (YAML or Helm) to the new cluster, make sure everything works as expected, and redirect traffic to activate your new cluster.
 
@@ -161,6 +161,11 @@ If that's not possible, export resource definitions from your existing Kubernete
 kubectl get deployment -o=yaml --export > deployments.yaml
 ```
 
+### Moving existing resources to another region
+
+You may want to move your AKS cluster to a [different region supported by AKS][region-availability]. We recommend that you create a new cluster in the other region then deploy your resources and applications to your new cluster. In addition, if you have any services such as [Azure Dev Spaces][azure-dev-spaces] running on your AKS cluster, you will also need to install and configure those services on your cluster in the new region.
+
+
 In this article we summarized migration details for:
 
 > [!div class="checklist"]
@@ -171,3 +176,7 @@ In this article we summarized migration details for:
 > * Considerations for stateless applications
 > * Considerations for stateful applications
 > * Deployment of your cluster configuration
+
+
+[region-availability]: https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service
+[azure-dev-spaces]: https://docs.microsoft.com/azure/dev-spaces/

articles/aks/load-balancer-standard.md

@@ -36,7 +36,7 @@ If you have an existing cluster with the Basic SKU Load Balancer, there are impo
 
 For example, making blue/green deployments to migrate clusters is a common practice given the `load-balancer-sku` type of a cluster can only be defined at cluster create time. However, *Basic SKU* Load Balancers use *Basic SKU* IP Addresses which are not compatible with *Standard SKU* Load Balancers as they require *Standard SKU* IP Addresses. When migrating clusters to upgrade Load Balancer SKUs, a new IP address with a compatible IP Address SKU will be required.
 
-For more considerations on how to migrate clusters, visit [our documentation on migration considerations](acs-aks-migration.md) to view a list of important topics to consider when migrating. The below limitations are also important behavioral differences to note when using Standard SKU Load Balancers in AKS.
+For more considerations on how to migrate clusters, visit [our documentation on migration considerations](aks-migration.md) to view a list of important topics to consider when migrating. The below limitations are also important behavioral differences to note when using Standard SKU Load Balancers in AKS.
 
 ### Limitations
 

includes/container-service-kubernetes-deprecation.md

@@ -9,6 +9,6 @@ ms.author: iainfou
 > [!WARNING]
 >  **The Azure Container Service (ACS) is being deprecated. No new features or functionality are being added to ACS. All of the APIs, portal experience, CLI commands and documentation are marked as deprecated.**
 >
-> In 2017, we introduced Azure Kubernetes Service (AKS) for simplifying Kubernetes management, deployment, and operations. If you use the Kubernetes orchestrator, please migrate to AKS by January 31, 2020. To get started, see [migrate to Azure Kubernetes Service](../articles/aks/acs-aks-migration.md).
+> In 2017, we introduced Azure Kubernetes Service (AKS) for simplifying Kubernetes management, deployment, and operations. If you use the Kubernetes orchestrator, please migrate to AKS by January 31, 2020. To get started, see [migrate to Azure Kubernetes Service](../articles/aks/aks-migration.md).
 >
 > For more information, see the [Azure Container Service deprecation announcement on Azure.com](https://azure.microsoft.com/updates/azure-container-service-will-retire-on-january-31-2020/).