Skip to content

Commit d37f794

Browse files
authored
Merge branch 'master' into 1320921-translate-speech
2 parents 92fae2d + 92bf55c commit d37f794

File tree

256 files changed

+2844
-2531
lines changed

Some content is hidden

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

256 files changed

+2844
-2531
lines changed

articles/active-directory/conditional-access/controls.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.devlang: na
1515
ms.topic: article
1616
ms.tgt_pltfrm: na
1717
ms.workload: identity
18-
ms.date: 06/13/2018
18+
ms.date: 08/28/2018
1919
ms.author: markvi
2020
ms.reviewer: calebb
2121

@@ -118,10 +118,13 @@ Providers currently offering a compatible service include:
118118

119119
- [Duo Security](https://duo.com/docs/azure-ca)
120120

121+
- [Entrust Datacard](https://www.entrustdatacard.com/products/authentication/intellitrust)
122+
121123
- RSA
122124

123125
- [Trusona](https://www.trusona.com/docs/azure-ad-integration-guide)
124126

127+
125128
For more information on those services, contact the providers directly.
126129

127130
### Creating custom controls

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ Beginning with version 1.1.819.0, Azure AD Connect provides you with a wizard to
128128

129129
- [Configure hybrid Azure Active Directory join for federated domains](hybrid-azuread-join-federated-domains.md)
130130

131+
131132
- [Configure hybrid Azure Active Directory join for managed domains](hybrid-azuread-join-managed-domains.md)
132133

133134

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: active-directory
1111
ms.workload: identity
1212
ms.component: users-groups-roles
1313
ms.topic: article
14-
ms.date: 08/21/2018
14+
ms.date: 08/27/2018
1515
ms.author: curtand
1616
ms.reviewer: vincesm
1717
ms.custom: it-pro
@@ -73,6 +73,9 @@ The following administrator roles are available:
7373

7474
* **[Intune Service Administrator](#intune-service-administrator)**: Users with this role have global permissions within Microsoft Intune Online, when the service is present. Additionally, this role contains the ability to manage users and devices in order to associate policy, as well as create and manage groups. More information at [Role-based administration control (RBAC) with Microsoft Intune](https://docs.microsoft.com/intune/role-based-access-control)
7575

76+
* **[License Administrator](#license-administrator)**:
77+
Users in this role can add, remove, and update license assignments on users, groups (using group-based licensing), and manage the usage location on users. The role does not grant the ability to purchase or manage subscriptions, create or manage groups, or create or manage users beyond the usage location.
78+
7679
* **[Message Center Reader](#message-center-reader)**: Users in this role can monitor notifications and advisory health updates in [Office 365 Message center](https://support.office.com/article/Message-center-in-Office-365-38FB3333-BFCC-4340-A37B-DEDA509C2093) for their organization on configured services such as Exchange, Intune and Microsoft Teams. Message Center Readers receive weekly email digests of posts, updates, and can share message center posts in Office 365. In Azure AD, users assigned to this role will only have read-only access on Azure AD services such as users and groups.
7780

7881
* **[Partner Tier1 Support](#partner-tier1-support)**: Do not use. This role has been deprecated and will be removed from Azure AD in the future. This role is intended for use by a small number of Microsoft resale partners, and is not intended for general use.
@@ -608,6 +611,17 @@ Can manage all aspects of the Intune product.
608611
| microsoft.aad.supporttickets/AllEntities/AllActions | Create and manage Office 365 support tickets. |
609612
| microsoft.intune/AllEntities/AllActions | Manage all aspects of Intune. |
610613

614+
### License Administrator
615+
Can assign licenses to users.
616+
617+
| **Actions** | **Description** |
618+
| --- | --- |
619+
| microsoft.aad.directory/users/assignLicense |   |
620+
| microsoft.aad.directory/users/usageLocation/update |   |
621+
| microsoft.azure.accessService/allEntities/allTasks |   |
622+
| microsoft.azure.serviceHealth/allEntities/allTasks |   |
623+
| microsoft.office365.serviceHealth/allEntities/allTasks |   |
624+
611625
### Lync Service Administrator
612626
Can manage all aspects of the Skype for Business product.
613627

articles/aks/create-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following options are available with the `az aks create` command. See the [A
4444
| `--enable-rbac` `-r` | Enable Kubernetes Role-Based Access Control. | no |
4545
| `--generate-ssh-keys` | Generate SSH public and private key files if missing. | no |
4646
| `--kubernetes-version` `-k` | The version of Kubernetes to use for creating the cluster, such as '1.7.9' or '1.9.6'. | no |
47-
| `--locaton` `-l` | Location for the auto-created resource group | no |
47+
| `--location` `-l` | Location for the auto-created resource group | no |
4848
| `--max-pods` `-m` | The maximum number of pods deployable to a node. | no |
4949
| `--network-plugin` | The Kubernetes network plugin to use. | no |
5050
| `--no-ssh-key` `-x` | Do not use or create a local SSH key. | no |

articles/aks/intro-kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ For more information, see [Upgrade an Azure Kubernetes Service (AKS) cluster][ak
5050

5151
## HTTP application routing
5252

53-
The HTTP Application Routing solution makes it easy to access applications deployed to your AKS cluster. When enabled, the HTTP application routing solution configures an ingress controller in your AKS cluster. As applications are deployed, publically accessible DNS names are auto configured.
53+
The HTTP Application Routing solution makes it easy to access applications deployed to your AKS cluster. When enabled, the HTTP application routing solution configures an ingress controller in your AKS cluster. As applications are deployed, publicly accessible DNS names are auto configured.
5454

5555
For more information, see [HTTP application routing][aks-http-routing].
5656

articles/aks/kubernetes-draft.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: iainfou
1212

1313
# Use Draft with Azure Kubernetes Service (AKS)
1414

15-
Draft is an open-source tool that helps package and deploy application containers in a Kubernetes cluster, leaving you free to concentrate on the dev cycle -- the "inner loop" of concentrated development. Draft works as the code is being developed, but before committing to version control. With Draft, you can quickly redeploy an application to Kubernetes as code changes occur. For more information on Draft, see the [Draft documentation on Github][draft-documentation].
15+
Draft is an open-source tool that helps package and deploy application containers in a Kubernetes cluster, leaving you free to concentrate on the dev cycle - the "inner loop" of concentrated development. Draft works as the code is being developed, but before committing to version control. With Draft, you can quickly redeploy an application to Kubernetes as code changes occur. For more information on Draft, see the [Draft documentation on Github][draft-documentation].
1616

1717
This article shows you how to use Draft with a Kubernetes cluster on AKS.
1818

articles/aks/tutorial-kubernetes-prepare-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ To see the running application, enter http://localhost:8080 in a local web brows
9494

9595
## Clean up resources
9696

97-
Now that application functionality has been validated, the running containers can be stopped and removed. Do not delete the container images - in the next tutorial, the *azure-vote-front* image is uploaded to an Azure Container Registry instance
97+
Now that the application's functionality has been validated, the running containers can be stopped and removed. Do not delete the container images - in the next tutorial, the *azure-vote-front* image is uploaded to an Azure Container Registry instance.
9898

9999
Stop and remove the container instances and resources with the [docker-compose down][docker-compose-down] command:
100100

@@ -130,4 +130,4 @@ Advance to the next tutorial to learn how to store container images in Azure Con
130130
[git]: https://git-scm.com/downloads
131131

132132
<!-- LINKS - internal -->
133-
[aks-tutorial-prepare-acr]: ./tutorial-kubernetes-prepare-acr.md
133+
[aks-tutorial-prepare-acr]: ./tutorial-kubernetes-prepare-acr.md

articles/analysis-services/analysis-services-overview.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: minewiskan
55
manager: kfile
66
ms.service: azure-analysis-services
77
ms.topic: overview
8-
ms.date: 06/21/2018
8+
ms.date: 08/27/2018
99
ms.author: owend
1010
ms.reviewer: minewiskan
1111
#Customer intent: As a BI developer, I want to determine if Azure Analysis Services is the best data modeling platform for our organization.
@@ -77,33 +77,31 @@ Azure Analysis Services is supported in regions throughout the world. Supported
7777
|Brazil South | B1, B2, S0, S1, S2, S4, D1 | 1 |
7878
|Canada Central | B1, B2, S0, S1, S2, S4, D1 | 1 |
7979
|East US | B1, B2, S0, S1, S2, S4, D1 | 1 |
80-
|East US 2 | B1, B2, S0, S1, S2, S4, S8\*, S9\*, D1 | 7 |
80+
|East US 2 | B1, B2, S0, S1, S2, S4, D1 <br>S8, S9 | 7<br>1 |
8181
|North Central US | B1, B2, S0, S1, S2, S4, D1 | 1 |
8282
|Central US | B1, B2, S0, S1, S2, S4, D1 | 1 |
8383
|South Central US | B1, B2, S0, S1, S2, S4, D1 | 1 |
8484
|West Central US | B1, B2, S0, S1, S2, S4, D1 | 3 |
85-
|West US | B1, B2, S0, S1, S2, S4, S8\*, S9\*, D1 | 7 |
86-
|West US2 | B1, B2, S0, S1, S2, S4, S8\*, S9\*, D1 | 3 |
85+
|West US | B1, B2, S0, S1, S2, S4, D1 <br>S8, S9 | 7<br>2 |
86+
|West US2 | B1, B2, S0, S1, S2, S4, D1 <br>S8, S9 | 3<br>1 |
8787

8888
### Europe
8989

9090
|Region | Supported plans | Query replicas (Standard plans only) |
9191
|---------|---------|:---------:|
9292
|North Europe | B1, B2, S0, S1, S2, S4, D1 | 7 |
9393
|UK South | B1, B2, S0, S1, S2, S4, D1 | 1 |
94-
|West Europe | B1, B2, S0, S1, S2, S4, S8\*, S9\*, D1 | 7 |
94+
|West Europe | B1, B2, S0, S1, S2, S4, D1 <br>S8, S9 | 7<br>1 |
9595

9696
### Asia Pacific
9797

9898
|Region | Supported plans | Query replicas (Standard plans only) |
9999
|---------|---------|:---------:|
100100
|Australia Southeast | B1, B2, S0, S1, S2, S4, D1 | 1 |
101101
|Japan East | B1, B2, S0, S1, S2, S4, D1 | 1 |
102-
|Southeast Asia | B1, B2, S0, S1, S2, S4, S8\*, S9\*, D1 | 1 |
102+
|Southeast Asia | B1, B2, S0, S1, S2, S4, S8, S9, D1 | 1 |
103103
|West India | B1, B2, S0, S1, S2, S4, D1 | 1 |
104104

105-
\* S8, S9 plans in the Standard tier support one query replica.
106-
107105
## Scale to your needs
108106

109107
### Scale up\down, pause, and resume

articles/analysis-services/analysis-services-scale-out.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: minewiskan
55
manager: kfile
66
ms.service: azure-analysis-services
77
ms.topic: conceptual
8-
ms.date: 07/03/2018
8+
ms.date: 08/27/2018
99
ms.author: owend
1010
ms.reviewer: minewiskan
1111

@@ -32,19 +32,7 @@ When processing operations are completed, a synchronization must be performed be
3232
3333
## Region limits
3434

35-
The number of query replicas you can configure are limited by the region your server is in. The following limits apply:
36-
37-
|Region |Max number of replicas |
38-
|---------|---------|
39-
|East US 2 | 7 |
40-
|West Central US | 7 |
41-
|West Europe | 7 |
42-
|West US | 7 |
43-
|Central US | 3 |
44-
|Southeast Asia | 3 |
45-
|All other regions | 1 |
46-
47-
35+
The number of query replicas you can configure are limited by the region your server is in. To learn more, see [Availability by region](analysis-services-overview.md#availability-by-region).
4836

4937
## Monitor QPU usage
5038

articles/ansible/ansible-manage-azure-dynamic-inventories.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to use Ansible to manage your Azure dynamic inventories
44
ms.service: ansible
55
keywords: ansible, azure, devops, bash, cloudshell, dynamic inventory
66
author: tomarcher
7-
manager: routlaw
7+
manager: jeconnoc
88
ms.author: tarcher
99
ms.date: 08/09/2018
1010
ms.topic: article

0 commit comments

Comments
 (0)