Skip to content

Commit 17dafd2

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ipv6gamarch-batch1
2 parents 19cb44f + 5abe1a5 commit 17dafd2

File tree

61 files changed

+204
-468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+204
-468
lines changed

articles/active-directory/authentication/concept-registration-mfa-sspr-combined.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 11/21/2019
9+
ms.date: 03/06/2020
1010

1111
ms.author: iainfou
1212
author: iainfoulds
@@ -55,6 +55,7 @@ Combined registration supports the following authentication methods and actions:
5555
| Email | Yes | Yes | Yes |
5656
| Security questions | Yes | No | Yes |
5757
| App passwords | Yes | No | Yes |
58+
| FIDO2 security keys<br />*Managed mode only from the [Security info](https://mysignins.microsoft.com/security-info) page*| Yes | Yes | Yes |
5859

5960
> [!NOTE]
6061
> App passwords are available only to users who have been enforced for Multi-Factor Authentication. App passwords are not available to users who are enabled for Multi-Factor Authentication via a Conditional Access policy.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1432,8 +1432,9 @@ The following table explains the binding configuration properties that you set i
14321432
|**collectionName** |**CollectionName** | The name of the collection that contains the document. |
14331433
|**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. |
14341434
|**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.|
1435-
|**connectionStringSetting** |**ConnectionStringSetting**|The name of the app setting containing your Azure Cosmos DB connection string. |
1435+
|**connectionStringSetting** |**ConnectionStringSetting**|The name of the app setting containing your Azure Cosmos DB connection string. |
14361436
|**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.|
1437+
|**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". |
14371438

14381439
[!INCLUDE [app settings to local.settings.json](../../includes/functions-app-settings-local.md)]
14391440

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,8 @@ The following table explains the binding configuration properties that you set i
569569
|**partitionKey**|**PartitionKey** |When `CreateIfNotExists` is true, it defines the partition key path for the created collection.|
570570
|**collectionThroughput**|**CollectionThroughput**| When `CreateIfNotExists` is true, it defines the [throughput](../cosmos-db/set-throughput.md) of the created collection.|
571571
|**connectionStringSetting** |**ConnectionStringSetting** |The name of the app setting containing your Azure Cosmos DB connection string. |
572+
|**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". |
573+
|**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. |
572574

573575
[!INCLUDE [app settings to local.settings.json](../../includes/functions-app-settings-local.md)]
574576

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ The following table explains the binding configuration properties that you set i
231231
|**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).
232232
|**checkpointFrequency**| **CheckpointFrequency**| (Optional) When set, it defines, in milliseconds, the interval between lease checkpoints. Default is always after each Function call.
233233
|**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.
234-
|**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.
234+
|**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. |
235+
|**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". |
235236

236237
[!INCLUDE [app settings to local.settings.json](../../includes/functions-app-settings-local.md)]
237238

articles/cloud-services/index.md

Lines changed: 0 additions & 131 deletions
This file was deleted.

articles/cloud-services/index.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
### YamlMime:Landing
2+
3+
title: Azure Cloud Services documentation
4+
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.
5+
6+
metadata:
7+
title: Azure Cloud Services documentation
8+
description: Describes how to use Cloud Services to host and run highly available and scalable cloud applications and APIs.
9+
ms.service: cloud-services
10+
service: cloud-services
11+
ms.topic: landing-page
12+
author: tgore03
13+
ms.author: tagore
14+
ms.date: 03/06/2020
15+
16+
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
17+
18+
landingContent:
19+
# Card
20+
- title: About Cloud Services
21+
linkLists:
22+
- linkListType: overview
23+
links:
24+
- text: What is Cloud Services?
25+
url: cloud-services-choose-me.md
26+
- linkListType: video
27+
links:
28+
- text: Cloud Services video library
29+
url: https://azure.microsoft.com/documentation/videos/index/?services=cloud-services
30+
31+
# Card
32+
- title: Get started
33+
linkLists:
34+
- linkListType: how-to-guide
35+
links:
36+
- text: ASP.NET
37+
url: cloud-services-dotnet-get-started.md
38+
- text: Python for Visual Studio
39+
url: cloud-services-python-ptvs.md
40+
41+
# Card
42+
- title: Develop
43+
linkLists:
44+
- linkListType: how-to-guide
45+
links:
46+
- text: Create PHP web and worker roles
47+
url: ../cloud-services-php-create-web-role.md
48+
- text: Build and deploy a Node.js application
49+
url: cloud-services-nodejs-develop-deploy-app.md
50+
- text: Build and deploy a Node.js web application using Express
51+
url: cloud-services-nodejs-develop-deploy-express-app.md
52+
53+
# Card
54+
- title: Deploy
55+
linkLists:
56+
- linkListType: how-to-guide
57+
links:
58+
- text: Create and deploy a cloud service in portal
59+
url: cloud-services-how-to-create-deploy-portal.md
60+
- text: Create an empty cloud service container in PowerShell
61+
url: cloud-services-powershell-create-cloud-container.md
62+
63+
# Card
64+
- title: Manage
65+
linkLists:
66+
- linkListType: how-to-guide
67+
links:
68+
- text: Common management tasks
69+
url: cloud-services-how-to-manage-portal.md
70+
- text: Configure Cloud Service
71+
url: cloud-services-how-to-configure-portal.md

articles/cloud-services/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
- name: Cloud Services Documentation
2-
href: index.md
1+
- name: Cloud Services documentation
2+
href: index.yml
33
- name: Overview
44
items:
55
- name: What is Cloud Services?

articles/cosmos-db/create-sql-api-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: cosmos-db
66
ms.subservice: cosmosdb-sql
77
ms.devlang: python
88
ms.topic: quickstart
9-
ms.date: 11/03/2019
9+
ms.date: 03/09/2020
1010
ms.author: sngun
1111
ms.custom: [seodec18, seo-javascript-september2019, seo-python-october2019]
1212
---

articles/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ productDirectory:
529529
imageSrc: https://static.docs.com/ui/media/product/azure/cloud-services.svg
530530
azureCategories:
531531
- compute
532-
url: cloud-services/index.md
532+
url: cloud-services/index.yml
533533
# Card
534534
- title: Container Instances
535535
summary: Easily run containers on Azure without managing servers

articles/machine-learning/overview-what-happened-to-workbench.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn about what's possible without Workbench application and what
55
services: machine-learning
66
ms.service: machine-learning
77
ms.subservice: core
8-
ms.topic: overview
8+
ms.topic: conceptual
99
ms.reviewer: jmartens
1010
author: j-martens
1111
ms.author: jmartens
@@ -96,4 +96,4 @@ Create your first experiment with your preferred method:
9696
+ [Use R Markdown](tutorial-1st-r-experiment.md)
9797
+ [Use automated machine learning](tutorial-designer-automobile-price-train-score.md)
9898
+ [Use the designer's drag & drop capabilities](tutorial-first-experiment-automated-ml.md)
99-
+ [Use the ML extension to the CLI](tutorial-train-deploy-model-cli.md)
99+
+ [Use the ML extension to the CLI](tutorial-train-deploy-model-cli.md)

0 commit comments

Comments
 (0)