Skip to content

Commit e656264

Browse files
authored
Merge pull request #105090 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 7191656 + 499363e commit e656264

File tree

16 files changed

+53
-17
lines changed

16 files changed

+53
-17
lines changed

articles/active-directory/conditional-access/howto-conditional-access-policy-compliant-device.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ The following steps will help create a Conditional Access policy to require devi
4646
1. Confirm your settings and set **Enable policy** to **On**.
4747
1. Select **Create** to create to enable your policy.
4848

49+
> [!NOTE]
50+
> You can enroll your new devices to Intune even if you select **Require device to be marked as compliant** for **All users** and **All cloud apps** using the steps above. **Require device to be marked as compliant** control does not block Intune enrollment.
51+
4952
### Known behavior
5053

5154
On Windows 7, iOS, Android, macOS, and some third-party web browsers Azure AD identifies the device using a client certificate that is provisioned when the device is registered with Azure AD. When a user first signs in through the browser the user is prompted to select the certificate. The end user must select this certificate before they can continue to use the browser.

articles/active-directory/conditional-access/terms-of-use.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Once you have finalized your terms of use document, use the following procedure
8282
1. For **Terms of use document**, browse to your finalized terms of use PDF and select it.
8383
1. Select the language for your terms of use document. The language option allows you to upload multiple terms of use, each with a different language. The version of the terms of use that an end user will see will be based on their browser preferences.
8484
1. To require end users to view the terms of use prior to accepting them, set **Require users to expand the terms of use** to **On**.
85-
1. To require end users to accept your terms of use on every device they are accessing from, set **Require users to consent on every device** to **On**. For more information, see [Per-device terms of use](#per-device-terms-of-use).
85+
1. To require end users to accept your terms of use on every device they are accessing from, set **Require users to consent on every device** to **On**. Users may be required to install additional applications if this option is enabled. For more information, see [Per-device terms of use](#per-device-terms-of-use).
8686
1. If you want to expire terms of use consents on a schedule, set **Expire consents** to **On**. When set to On, two additional schedule settings are displayed.
8787

8888
![Expire consents settings to set start date, frequency, and duration](./media/terms-of-use/expire-consents.png)
@@ -274,6 +274,10 @@ If a user is using Windows 10 and Microsoft Edge, they will receive a message si
274274

275275
If they are using Chrome, they will be prompted to install the [Windows 10 Accounts extension](https://chrome.google.com/webstore/detail/windows-10-accounts/ppnbnpeolgkicgegkbkbjmhlideopiji).
276276

277+
### Join an Android device
278+
279+
If a user is using an Android device, they will be prompted to install the [Microsoft Authenticator app](https://play.google.com/store/apps/details?id=com.azure.authenticator).
280+
277281
### Browsers
278282

279283
If a user is using browser that is not supported, they will be asked to use a different browser.

articles/active-directory/develop/quickstart-v2-ios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ In a terminal window, navigate to the folder with the downloaded code sample and
114114
> 1. Build & run the app!
115115
> [!div class="sxs-lookup" renderon="portal"]
116116
> > [!NOTE]
117-
> > This quickstart supports Enter_the_Supported_Account_Info_Here.
117+
> > Enter_the_Supported_Account_Info_Here
118118
> [!div renderon="docs"]
119119
>
120120
> 1. Extract the zip file and open the project in XCode.

articles/aks/static-ip.md

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use a static IP address with the Azure Kubernetes Service (AKS) load balancer
2+
title: Use a static IP address and DNS label with the Azure Kubernetes Service (AKS) load balancer
33
description: Learn how to create and use a static IP address with the Azure Kubernetes Service (AKS) load balancer.
44
services: container-service
55
author: mlearned
@@ -12,7 +12,7 @@ ms.author: mlearned
1212
#Customer intent: As a cluster operator or developer, I want to create and manage static IP address resources in Azure that I can use beyond the lifecycle of an individual Kubernetes service deployed in an AKS cluster.
1313
---
1414

15-
# Use a static public IP address with the Azure Kubernetes Service (AKS) load balancer
15+
# Use a static public IP address and DNS label with the Azure Kubernetes Service (AKS) load balancer
1616

1717
By default, the public IP address assigned to a load balancer resource created by an AKS cluster is only valid for the lifespan of that resource. If you delete the Kubernetes service, the associated load balancer and IP address are also deleted. If you want to assign a specific IP address or retain an IP address for redeployed Kubernetes services, you can create and use a static public IP address.
1818

@@ -96,6 +96,30 @@ Create the service and deployment with the `kubectl apply` command.
9696
kubectl apply -f load-balancer-service.yaml
9797
```
9898

99+
## Apply a DNS label to the service
100+
101+
If your service is using a dynamic or static public IP address, you can use the service annotation `service.beta.kubernetes.io/azure-dns-label-name` to set a public-facing DNS label. This publishes a fully qualified domain name for your service using Azure's public DNS servers and top-level domain. The annotation value must be unique within the Azure location, so its recommended to use a sufficiently qualified label.
102+
103+
Azure will then automatically append a default subnet, such as `<location>.cloudapp.azure.com` (where location is the region you selected), to the name you provide, to create the fully qualified DNS name. For example:
104+
105+
```yaml
106+
apiVersion: v1
107+
kind: Service
108+
metadata:
109+
annotations:
110+
service.beta.kubernetes.io/azure-dns-label-name: myserviceuniquelabel
111+
name: azure-load-balancer
112+
spec:
113+
type: LoadBalancer
114+
ports:
115+
- port: 80
116+
selector:
117+
app: azure-load-balancer
118+
```
119+
120+
> [!NOTE]
121+
> To publish the service on your own domain, see [Azure DNS][azure-dns-zone] and the [external-dns][external-dns] project.
122+
99123
## Troubleshoot
100124

101125
If the static IP address defined in the *loadBalancerIP* property of the Kubernetes service manifest does not exist, or has not been created in the node resource group and no additional delegations configured, the load balancer service creation fails. To troubleshoot, review the service creation events with the [kubectl describe][kubectl-describe] command. Provide the name of the service as specified in the YAML manifest, as shown in the following example:
@@ -134,6 +158,8 @@ For additional control over the network traffic to your applications, you may wa
134158
135159
<!-- LINKS - External -->
136160
[kubectl-describe]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#describe
161+
[azure-dns-zone]: https://azure.microsoft.com/services/dns/
162+
[external-dns]: https://github.com/kubernetes-sigs/external-dns
137163
138164
<!-- LINKS - Internal -->
139165
[aks-faq-resource-group]: faq.md#why-are-two-resource-groups-created-with-aks

articles/app-service/containers/deploy-container-github-action.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
runs-on: ubuntu-latest
9797
steps:
9898
# checkout the repo
99-
- name: 'Checkout Github Action'
99+
- name: 'Checkout GitHub Action'
100100
uses: actions/checkout@master
101101
102102
- name: 'Login via Azure CLI'
@@ -139,7 +139,7 @@ jobs:
139139
runs-on: ubuntu-latest
140140
steps:
141141
# checkout the repo
142-
- name: 'Checkout Github Action'
142+
- name: 'Checkout GitHub Action'
143143
uses: actions/checkout@master
144144

145145
- name: 'Login via Azure CLI'

articles/app-service/deploy-github-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ jobs:
201201
runs-on: ubuntu-latest
202202
steps:
203203
# checkout the repo
204-
- name: 'Checkout Github Action'
204+
- name: 'Checkout GitHub Action'
205205
uses: actions/checkout@master
206206
207207
- name: Setup Node 10.x
@@ -235,7 +235,7 @@ jobs:
235235
runs-on: ubuntu-latest
236236
steps:
237237
# checkout the repo
238-
- name: 'Checkout Github Action'
238+
- name: 'Checkout GitHub Action'
239239
uses: actions/checkout@master
240240
241241
- uses: azure/login@v1

articles/azure-monitor/platform/view-designer-conversion-tiles.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Original query
5959
```KQL
6060
search *
6161
| summarize AggregatedValue = count() by Type
62+
```
6263

6364
Updated query
6465
```KQL

articles/azure-resource-manager/templates/template-tutorial-create-linked-templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ The linked template creates a storage account. The linked template can be used a
160160
161161
## Upload the linked template
162162
163-
The main template and the linked template need to be accessible from where you run the deployment. In this tutorial, you use the Cloud shell deployment method as you used in [Tutorial: Create Azure Resource Manager templates with dependent resources](./template-tutorial-create-templates-with-dependent-resources.md). The main template (azuredeploy.json) is uploaded to the shell. The linked template (linkedTemplate.json) must be shared somewhere securely. The following PowerShell script creates an Azure Storage account, uploads the template to the Storage account, and then generates a SAS token to grant limited access to the template file. To simplify the tutorial, the script downloads a completed linked template from a Github repository. If you want to use the linked template you created, you can use the [Cloud shell](https://shell.azure.com) to upload your linked template, and then modify the script to use your own linked template.
163+
The main template and the linked template need to be accessible from where you run the deployment. In this tutorial, you use the Cloud shell deployment method as you used in [Tutorial: Create Azure Resource Manager templates with dependent resources](./template-tutorial-create-templates-with-dependent-resources.md). The main template (azuredeploy.json) is uploaded to the shell. The linked template (linkedTemplate.json) must be shared somewhere securely. The following PowerShell script creates an Azure Storage account, uploads the template to the Storage account, and then generates a SAS token to grant limited access to the template file. To simplify the tutorial, the script downloads a completed linked template from a GitHub repository. If you want to use the linked template you created, you can use the [Cloud shell](https://shell.azure.com) to upload your linked template, and then modify the script to use your own linked template.
164164
165165
> [!NOTE]
166166
> The script limits the SAS token to be used within eight hours. If you need more time to complete this tutorial, increase the expiry time.

articles/azure-resource-manager/templates/template-tutorial-deploy-vm-extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To complete this article, you need:
3737
3838
## Prepare a PowerShell script
3939
40-
A PowerShell script with the following content is shared from [Github](https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-vm-extension/installWebServer.ps1):
40+
A PowerShell script with the following content is shared from [GitHub](https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-vm-extension/installWebServer.ps1):
4141
4242
```azurepowershell
4343
Install-WindowsFeature -name Web-Server -IncludeManagementTools

articles/cognitive-services/text-analytics/quickstarts/go-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: aahi
1414

1515
# Quickstart: Use the Text Analytics client library for Go
1616

17-
[Reference documentation](https://docs.microsoft.com/python/api/overview/azure/cognitiveservices/textanalytics?view=azure-python) | [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics) | [Package (Github)](https://github.com/Azure/azure-sdk-for-go/tree/master/services/cognitiveservices/v2.1/textanalytics) | [Samples](https://github.com/Azure-Samples/cognitive-services-quickstart-code)
17+
[Reference documentation](https://docs.microsoft.com/python/api/overview/azure/cognitiveservices/textanalytics?view=azure-python) | [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics) | [Package (GitHub)](https://github.com/Azure/azure-sdk-for-go/tree/master/services/cognitiveservices/v2.1/textanalytics) | [Samples](https://github.com/Azure-Samples/cognitive-services-quickstart-code)
1818

1919
> [!NOTE]
2020
> This quickstart only applies to Text Analytics version 2.1. Currently, a v3 client library for Go is unavailable.

0 commit comments

Comments
 (0)