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

Author: LauraBrenner

.openpublishing.redirection.json

@@ -49205,6 +49205,16 @@
       "source_path": "articles/cognitive-services/Speech-Service/sapi-phoneset-usage.md",
       "redirect_url": "/azure/cognitive-services/speech-service/speech-ssml-phonetic-sets",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Speech-Service/how-to-use-codec-compressed-audio-input-streams-android.md",
+      "redirect_url": "/azure/cognitive-services/Speech-Service/how-to-use-codec-compressed-audio-input-streams?pivots=programming-language-java",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Speech-Service/how-to-use-codec-compressed-audio-input-streams-ios.md",
+      "redirect_url": "/azure/cognitive-services/Speech-Service/how-to-use-codec-compressed-audio-input-streams?pivots=programming-language-objectivec",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory/develop/TOC.yml

@@ -1,11 +1,11 @@
-- name: Microsoft identity platform (Azure Active Directory for developers)
+- name: Microsoft identity platform documentation
   href: index.yml
 - name: Overview
   items:
   - name: What is Microsoft identity platform?
     href: v2-overview.md
   - name: Evolution of Microsoft identity platform
-    href: about-microsoft-identity-platform.md  
+    href: about-microsoft-identity-platform.md
 - name: Quickstarts
   expanded: true
   items:
@@ -237,7 +237,7 @@
       - name: Calling a web API
         href: scenario-mobile-call-api.md
       - name: Move to production
-        href: scenario-mobile-production.md      
+        href: scenario-mobile-production.md
   - name: Microsoft Authentication Library (MSAL)
     items:
     - name: Overview
@@ -305,7 +305,7 @@
       - name: Initialize applications - JavaScript
         href: msal-js-initializing-client-applications.md
     - name: Handle errors and exceptions
-      href: msal-handling-exceptions.md        
+      href: msal-handling-exceptions.md
     - name: Logging
       href: msal-logging.md
     - name: Single sign-on
@@ -343,14 +343,14 @@
         - name: MSAL.NET
           items:
           - name: Web browsers
-            href: msal-net-web-browsers.md              
+            href: msal-net-web-browsers.md
         - name: MSAL.js
           items:
           - name: Considerations - IE
             href: msal-js-use-ie-browser.md
           - name: Known issues - IE and Microsoft Edge
             href: msal-js-known-issues-ie-edge-browsers.md
-          - name: Known issues - Safari 
+          - name: Known issues - Safari
             href: msal-js-known-issues-safari-browser.md
         - name: Troubleshoot SSL issues (MSAL iOS/macOS)
           href: ssl-issues.md
@@ -359,7 +359,7 @@
     items:
     - name: Application types and OAuth 2.0
       displayName: App types, OAuth
-      href: v2-app-types.md      
+      href: v2-app-types.md
     - name: OAuth 2.0 and OpenID Connect protocols
       items:
       - name: OAuth 2.0 and OpenID Connect
@@ -507,7 +507,7 @@
           - name: Pass custom state in authentication requests
             href: msal-js-pass-custom-state-authentication-request.md
           - name: Prompt behavior
-            href: msal-js-prompt-behavior.md 
+            href: msal-js-prompt-behavior.md
       - name: MSAL for iOS and macOS
         items:
           - name: MSAL for iOS and macOS differences

articles/active-directory/develop/index.yml

@@ -1,7 +1,7 @@
 ### YamlMime:Landing
 
-title: Microsoft identity platform (formerly Azure Active Directory for developers)
-summary: Microsoft identity platform is an evolution of the Azure Active Directory (Azure AD) developer platform. It allows developers to build applications that sign in all Microsoft identities and get tokens to call Microsoft APIs such as Microsoft Graph or APIs that developers have built. It’s a full-featured platform that consists of an OAuth 2.0 and OpenID Connect standard-compliant authentication service, open-source libraries, application registration and configuration, robust conceptual and reference documentation, quickstart samples, code samples, tutorials, and how-to guides.
+title: Microsoft identity platform documentation
+summary: Microsoft identity platform allows developers to build applications that sign in all Microsoft identities and get tokens to call Microsoft APIs like Microsoft Graph, or APIs you've built. This full-featured platform consists of an OAuth 2.0 and OpenID Connect standard-compliant authentication service, open-source libraries, application registration and configuration, robust conceptual and reference documentation, quickstarts, code samples, tutorials, and how-to guides.
 
 metadata:
    ms.topic: landing-page
@@ -17,10 +17,10 @@ landingContent:
     linkLists:
       - linkListType: overview
         links:
-          - text: Evolution of Microsoft identity platform
-            url: about-microsoft-identity-platform.md
           - text: Microsoft identity platform (v2.0)
             url: v2-overview.md
+          - text: Evolution of Microsoft identity platform
+            url: about-microsoft-identity-platform.md
           - text: Azure Active Directory for developers (v1.0)
             url: ../azuread-dev/v1-overview.md
       - linkListType: concept

articles/app-service/containers/app-service-linux-faq.md

@@ -176,6 +176,10 @@ You are charged the normal Azure App Service pricing for the number of hours tha
 
 ## Other questions
 
+**What does "Requested feature is not available in resource group" mean?**
+
+You may see this message when creating web app using Azure Resource Manager (ARM). Based on a current limitation, for the same resource group, you cannot mix Windows and Linux apps in the same region.
+
 **What are the supported characters in application settings names?**
 
 You can use only letters (A-Z, a-z), numbers (0-9), and the underscore character (_) for application settings.

articles/azure-functions/functions-bindings-cosmosdb-v2-input.md

@@ -1432,8 +1432,9 @@ The following table explains the binding configuration properties that you set i
 |**collectionName** |**CollectionName** | The name of the collection that contains the document. |
 |**id**    | **Id** | The ID of the document to retrieve. This property supports [binding expressions](./functions-bindings-expressions-patterns.md). Don't set both the `id` and **sqlQuery** properties. If you don't set either one, the entire collection is retrieved. |
 |**sqlQuery**  |**SqlQuery**  | An Azure Cosmos DB SQL query used for retrieving multiple documents. The property supports runtime bindings, as in this example: `SELECT * FROM c where c.departmentId = {departmentId}`. Don't set both the `id` and `sqlQuery` properties. If you don't set either one, the entire collection is retrieved.|
-|**connectionStringSetting**     |**ConnectionStringSetting**|The name of the app setting containing your Azure Cosmos DB connection string.        |
+|**connectionStringSetting**     |**ConnectionStringSetting**|The name of the app setting containing your Azure Cosmos DB connection string. |
 |**partitionKey**|**PartitionKey**|Specifies the partition key value for the lookup. May include binding parameters. It is required for lookups in [partitioned](../cosmos-db/partition-data.md#logical-partitions) collections.|
+|**preferredLocations**| **PreferredLocations**| (Optional) Defines preferred locations (regions) for geo-replicated database accounts in the Azure Cosmos DB service. Values should be comma-separated. For example, "East US,South Central US,North Europe". |
 
 [!INCLUDE [app settings to local.settings.json](../../includes/functions-app-settings-local.md)]
 

articles/azure-functions/functions-bindings-cosmosdb-v2-output.md

@@ -569,6 +569,8 @@ The following table explains the binding configuration properties that you set i
 |**partitionKey**|**PartitionKey** |When `CreateIfNotExists` is true, it defines the partition key path for the created collection.|
 |**collectionThroughput**|**CollectionThroughput**| When `CreateIfNotExists` is true, it defines the [throughput](../cosmos-db/set-throughput.md) of the created collection.|
 |**connectionStringSetting**    |**ConnectionStringSetting** |The name of the app setting containing your Azure Cosmos DB connection string.        |
+|**preferredLocations**| **PreferredLocations**| (Optional) Defines preferred locations (regions) for geo-replicated database accounts in the Azure Cosmos DB service. Values should be comma-separated. For example, "East US,South Central US,North Europe". |
+|**useMultipleWriteLocations**| **UseMultipleWriteLocations**| (Optional) When set to `true` along with `PreferredLocations`, it can leverage [multi-region writes](../cosmos-db/how-to-manage-database-account.md#configure-multiple-write-regions) in the Azure Cosmos DB service. |
 
 [!INCLUDE [app settings to local.settings.json](../../includes/functions-app-settings-local.md)]
 

articles/azure-functions/functions-bindings-cosmosdb-v2-trigger.md

@@ -231,7 +231,8 @@ The following table explains the binding configuration properties that you set i
 |**leaseRenewInterval**| **LeaseRenewInterval**| (Optional) When set, it defines, in milliseconds, the renew interval for all leases for partitions currently held by an instance. Default is 17000 (17 seconds).
 |**checkpointFrequency**| **CheckpointFrequency**| (Optional) When set, it defines, in milliseconds, the interval between lease checkpoints. Default is always after each Function call.
 |**maxItemsPerInvocation**| **MaxItemsPerInvocation**| (Optional) When set, this property sets the maximum number of items received per Function call. If operations in the monitored collection are performed through stored procedures, [transaction scope](../cosmos-db/stored-procedures-triggers-udfs.md#transactions) is preserved when reading items from the Change Feed. As a result, the number of items received could be higher than the specified value so that the items changed by the same transaction are returned as part of one atomic batch.
-|**startFromBeginning**| **StartFromBeginning**| (Optional) This option tells the Trigger to read changes from the beginning of the collection's change history instead of starting at the current time. Reading from the beginning only works the first time the Trigger starts, as in subsequent runs, the checkpoints are already stored. Setting this option to `true` when there are leases already created has no effect.
+|**startFromBeginning**| **StartFromBeginning**| (Optional) This option tells the Trigger to read changes from the beginning of the collection's change history instead of starting at the current time. Reading from the beginning only works the first time the Trigger starts, as in subsequent runs, the checkpoints are already stored. Setting this option to `true` when there are leases already created has no effect. |
+|**preferredLocations**| **PreferredLocations**| (Optional) Defines preferred locations (regions) for geo-replicated database accounts in the Azure Cosmos DB service. Values should be comma-separated. For example, "East US,South Central US,North Europe". |
 
 [!INCLUDE [app settings to local.settings.json](../../includes/functions-app-settings-local.md)]
 

articles/cloud-services/index.md

@@ -0,0 +1,71 @@
+### YamlMime:Landing
+
+title: Azure Cloud Services documentation
+summary: Learn how to use Cloud Services to host and run highly available, scalable cloud applications and APIs. Shows how to manage virtual machine hosts and configure, patch, and install software.
+
+metadata:
+  title: Azure Cloud Services documentation
+  description: Describes how to use Cloud Services to host and run highly available and scalable cloud applications and APIs.
+  ms.service: cloud-services
+  service: cloud-services
+  ms.topic: landing-page
+  author: tgore03
+  ms.author: tagore
+  ms.date: 03/06/2020
+
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
+
+landingContent:
+  # Card
+  - title: About Cloud Services
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: What is Cloud Services?
+            url: cloud-services-choose-me.md
+      - linkListType: video
+        links:
+          - text: Cloud Services video library
+            url: https://azure.microsoft.com/documentation/videos/index/?services=cloud-services
+
+  # Card
+  - title: Get started
+    linkLists:
+      - linkListType: how-to-guide
+        links:
+          - text: ASP.NET
+            url: cloud-services-dotnet-get-started.md
+          - text: Python for Visual Studio
+            url: cloud-services-python-ptvs.md
+
+  # Card
+  - title: Develop
+    linkLists:
+      - linkListType: how-to-guide
+        links:
+          - text: Create PHP web and worker roles
+            url: ../cloud-services-php-create-web-role.md
+          - text: Build and deploy a Node.js application
+            url: cloud-services-nodejs-develop-deploy-app.md
+          - text: Build and deploy a Node.js web application using Express
+            url: cloud-services-nodejs-develop-deploy-express-app.md
+
+  # Card
+  - title: Deploy
+    linkLists:
+      - linkListType: how-to-guide
+        links:
+          - text: Create and deploy a cloud service in portal
+            url: cloud-services-how-to-create-deploy-portal.md
+          - text: Create an empty cloud service container in PowerShell
+            url: cloud-services-powershell-create-cloud-container.md
+
+  # Card
+  - title: Manage
+    linkLists:
+      - linkListType: how-to-guide
+        links:
+          - text: Common management tasks
+            url: cloud-services-how-to-manage-portal.md
+          - text: Configure Cloud Service
+            url: cloud-services-how-to-configure-portal.md

articles/cloud-services/index.yml

@@ -1,5 +1,5 @@
-- name: Cloud Services Documentation
-  href: index.md
+- name: Cloud Services documentation
+  href: index.yml
 - name: Overview
   items:
   - name: What is Cloud Services?