Skip to content

Commit 09ccf44

Browse files
authored
Merge pull request #110621 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 94cb8f2 + 7bc0d05 commit 09ccf44

26 files changed

+78
-43
lines changed

articles/active-directory/develop/tutorial-v2-javascript-spa.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,18 @@ Create a new .js file named `authPopup.js`, which will contain your authenticati
346346
function signOut() {
347347
myMSALObj.logout();
348348
}
349+
350+
function callMSGraph(theUrl, accessToken, callback) {
351+
var xmlHttp = new XMLHttpRequest();
352+
xmlHttp.onreadystatechange = function () {
353+
if (this.readyState == 4 && this.status == 200) {
354+
callback(JSON.parse(this.responseText));
355+
}
356+
}
357+
xmlHttp.open("GET", theUrl, true); // true for asynchronous
358+
xmlHttp.setRequestHeader('Authorization', 'Bearer ' + accessToken);
359+
xmlHttp.send();
360+
}
349361

350362
function getTokenPopup(request) {
351363
return myMSALObj.acquireTokenSilent(request)

articles/active-directory/hybrid/how-to-connect-sync-change-serviceacct-pass.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Abandon the existing encryption key so that new encryption key can be created:
7979

8080
2. Start a new PowerShell session.
8181

82-
3. Navigate to folder: `$env:Program Files\Microsoft Azure AD Sync\bin\`
82+
3. Navigate to folder: `'$env:ProgramFiles\Microsoft Azure AD Sync\bin\'`
8383

8484
4. Run the command: `./miiskmu.exe /a`
8585

articles/active-directory/hybrid/how-to-connect-sync-feature-preferreddatalocation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ The geos in Office 365 available for Multi-Geo are:
4646
| Japan | JPN |
4747
| Korea | KOR |
4848
| South Africa | ZAF |
49+
| Switzerland | CHE |
4950
| United Arab Emirates | ARE |
5051
| United Kingdom | GBR |
5152
| United States | NAM |

articles/active-directory/manage-apps/application-proxy-release-version-history.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.devlang: na
1212
ms.topic: reference
1313
ms.tgt_pltfrm: na
1414
ms.workload: identity
15-
ms.date: 04/05/2019
15+
ms.date: 04/07/2020
1616
ms.subservice: app-mgmt
1717
ms.author: mimart
1818

@@ -31,6 +31,22 @@ How to enable Application Proxy | Pre-requisites for enabling Application Proxy
3131
Understand Azure AD Application Proxy connectors | Find out more about [connector management](application-proxy-connectors.md) and how connectors [auto-upgrade](application-proxy-connectors.md#automatic-updates).
3232
Azure AD Application Proxy Connector Download | [Download the latest connector](https://download.msappproxy.net/subscription/d3c8b69d-6bf7-42be-a529-3fe9c2e70c90/connector/download).
3333

34+
## 1.5.1526.0
35+
36+
### Release status
37+
38+
April 07, 2020: Released for download
39+
40+
### New features and improvements
41+
- Connectors only use TLS 1.2 for all connections. See [Connector pre-requisites](application-proxy-add-on-premises-application.md#before-you-begin) for more details.
42+
- Improved signaling between the Connector and Azure services. This includes supporting reliable sessions for WCF communication between the Connector and Azure services and DNS caching improvements for WebSocket communications.
43+
- Support for configuring a proxy between the Connector and the backend application. For more information see [Work with existing on-premises proxy servers](application-proxy-configure-connectors-with-proxy-servers.md).
44+
45+
### Fixed issues
46+
- Removed falling back to port 8080 for communications from the Connector to Azure services.
47+
- Added debug traces for WebSocket communications.
48+
- Resolved preserving the SameSite attribute when set on backend application cookies.
49+
3450
## 1.5.612.0
3551

3652
### Release status

articles/aks/azure-ad-v2.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,10 @@ az extension update --name aks-preview
4444
az extension list
4545
```
4646

47-
To install kubectl, use the following
47+
To install kubectl, use the following:
48+
4849
```azurecli
49-
curl -LO "https://storage.googleapis.com/kubernetes-release/release/v1.18.0-beta.2/bin/linux/amd64/kubectl"
50-
chmod +x ./kubectl
51-
sudo mv ./kubectl /usr/local/bin/kubectl
50+
sudo az aks install-cli
5251
kubectl version --client
5352
```
5453

@@ -94,7 +93,7 @@ The above command creates a three node AKS cluster, but the user, who created th
9493
Once you've created a group and added yourself (and others) as a member, you can update the cluster with the Azure AD group using the following command
9594

9695
```azurecli-interactive
97-
az aks update -g MyResourceGroup -n MyManagedCluster --enable-aad [--aad-admin-group-object-ids <id1,id2>] [--aad-tenant-id <id>]
96+
az aks update -g MyResourceGroup -n MyManagedCluster [--aad-admin-group-object-ids <id1,id2>] [--aad-tenant-id <id>]
9897
```
9998
Alternatively, if you first create a group and add members, you can enable the Azure AD group at create time using the following command,
10099

articles/aks/virtual-nodes-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Virtual Nodes functionality is heavily dependent on ACI's feature set. The follo
6363
* [Host aliases](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/)
6464
* [Arguments](../container-instances/container-instances-exec.md#restrictions) for exec in ACI
6565
* [DaemonSets](concepts-clusters-workloads.md#statefulsets-and-daemonsets) will not deploy pods to the virtual node
66-
* [Windows Server nodes (currently in preview in AKS)](windows-container-cli.md) are not supported alongside virtual nodes. You can use virtual nodes to schedule Windows Server containers without the need for Windows Server nodes in an AKS cluster.
66+
* Virtual nodes support scheduling Linux pods. You can manually install the open source [Virtual Kubelet ACI](https://github.com/virtual-kubelet/azure-aci) provider to schedule Windows Server containers to ACI.
6767

6868
## Launch Azure Cloud Shell
6969

articles/app-service/environment/forced-tunnel-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ You can configure your ASE subnet to ignore all BGP routes. When configured to
5656
To configure your ASE subnet to ignore BGP routes:
5757

5858
* create a UDR and assign it to your ASE subnet if you did not have one already.
59-
* In the Azure portal, open the UI for the route table assigned to your ASE subnet. Select Configuration. Set BGP route propagation to Disabled. Click Save. The documentation on turning that off is in the [Create a route table][routetable] document.
59+
* In the Azure portal, open the UI for the route table assigned to your ASE subnet. Select Configuration. Set Virtual network gateway route propagation to Disabled. Click Save. The documentation on turning that off is in the [Create a route table][routetable] document.
6060

6161
After you configure the ASE subnet to ignore all BGP routes, your apps will no longer be able to reach on premises. To enable your apps to access resources on-premises, edit the UDR assigned to your ASE subnet and add routes for your on premises address ranges. The Next hop type should be set to Virtual network gateway.
6262

articles/azure-resource-manager/management/resource-name-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 03/27/2020
77

88
# Naming rules and restrictions for Azure resources
99

10-
This article summarizes naming rules and restrictions for Azure resources. For recommendations about how to name resources, see [Ready: Recommended naming and tagging conventions](/azure/cloud-adoption-framework/ready/azure-best-practices/naming-and-tagging).
10+
This article summarizes naming rules and restrictions for Azure resources. For recommendations about how to name resources, see [Recommended naming and tagging conventions](/azure/cloud-adoption-framework/ready/azure-best-practices/naming-and-tagging).
1111

1212
Resource names are case-insensitive unless specifically noted in the valid characters column.
1313

articles/cognitive-services/QnAMaker/includes/quickstart-sdk-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Create variables for your resource's Azure endpoint and key. If you created the
6060

6161
|Environment variable|variable|Example|
6262
|--|--|--|
63-
|`QNAMAKER_SUBSCRIPTION_KEY`|`subscription_key`|The key is a 32 character string and is available in the Azure portal, on the QnA Maker resource, on the Quickstart page. This is not the same as the prediction endpoint key.|
63+
|`QNAMAKER_KEY`|`subscription_key`|The key is a 32 character string and is available in the Azure portal, on the QnA Maker resource, on the Quickstart page. This is not the same as the prediction endpoint key.|
6464
|`QNAMAKER_HOST`|`host`| Your authoring endpoint, in the format of `https://YOUR-RESOURCE-NAME.cognitiveservices.azure.com`, includes your **resource name**. This is not the same URL used to query the prediction endpoint.|
6565

6666
[!code-python[Azure resource variables](~/samples-qnamaker-python/documentation-samples/quickstarts/knowledgebase_quickstart/knowledgebase_quickstart.py?name=resourcekeys)]

articles/dns/tutorial-alias-pip.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ In this tutorial, you learn how to:
1616

1717
> [!div class="checklist"]
1818
> * Create a network infrastructure.
19-
> * Create a web server virtual machine.
20-
> * Create an alias record.
19+
> * Create a web server virtual machine with a public IP.
20+
> * Create an alias record that points to the public IP.
2121
> * Test the alias record.
2222
2323

@@ -44,7 +44,7 @@ First, create a virtual network and a subnet to place your web servers in.
4444
4. For **Settings**, select the **VNet-Servers** virtual network and the **SN-Web** subnet. For public inbound ports, select **HTTP** > **HTTPS** > **RDP (3389)**, and then select **OK**.
4545
5. On the **Summary** page, select **Create**.
4646

47-
This procedure takes a few minutes to finish.
47+
This procedure takes a few minutes to finish. The virtual machine will have an attached NIC, which will have a basic dynamic public IP called Web-01-ip. The public IP will change every time the virtual machine is restarted.
4848

4949
### Install IIS
5050

0 commit comments

Comments
 (0)