Skip to content

Commit 25921d7

Browse files
authored
Merge pull request #88880 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 ccea893 + a798d95 commit 25921d7

File tree

10 files changed

+28
-24
lines changed

10 files changed

+28
-24
lines changed

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ Not all releases of Azure AD Connect will be made available for auto upgrade. Th
4040

4141
## 1.4.X.0
4242

43+
>[!IMPORTANT]
44+
>Previously, Windows down-level computers joined to on-prem AD were incorrectly getting synced to the cloud under some circumstances. As an example, the userCertificate attribute value for Windows down-level devices in AD is populated. But such devices in Azure AD always stayed in the “pending” state because these OS versions were not designed to be registered with Azure AD via AAD Sync. In this version of Azure AD Connect, AAD Sync will stop syncing Windows down-level computers to Azure AD and will also remove the previously incorrectly synced Windows down-level devices from Azure AD. Please note that this change will not delete any Windows down-level devices that were correctly registered with Azure AD by using the MSI package. Those devices will continue to work as expected for the purposes of device-based conditional access. Some customers may see some or all of their Windows down-level devices disappear from Azure AD. This is not a cause for concern, as these device identities were never actually used by Azure AD during conditional access authorization. Such customers may need to revisit https://docs.microsoft.com/azure/active-directory/devices/hybrid-azuread-join-plan and get their Windows down-level devices registered correctly to ensure that such devices can fully participate in device-based conditional access. Note that if you see these deletes of down-level Computer/Device objects in Azure AD exceeding the Export Deletion Threshold, it is advised that the customer allow these deletes to go through.
45+
4346
### Release status
4447
9/10/2019: Released for auto-upgrade only
4548

articles/active-directory/users-groups-roles/groups-self-service-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Groups created in | Security group default behavior | Office 365 group default b
3636
## Self-service group management scenarios
3737

3838
* **Delegated group management**
39-
An example is an administrator who is managing access to a SaaS application that the company is using. Managing these access rights is becoming cumbersome, so this administrator asks the business owner to create a new group. The administrator assigns access for the application to the new group, and adds to the group all people already accessing to the application. The business owner then can add more users, and those users are automatically provisioned to the application. The business owner doesn't need to wait for the administrator to manage access for users. If the administrator grants the same permission to a manager in a different business group, then that person can also manage access for their own group members. Neither the business owner nor the manager can view or manage each other’s group memberships. The administrator can still see all users who have access to the application and block access rights if needed.
39+
An example is an administrator who is managing access to a SaaS application that the company is using. Managing these access rights is becoming cumbersome, so this administrator asks the business owner to create a new group. The administrator assigns access for the application to the new group, and adds to the group all people already accessing the application. The business owner then can add more users, and those users are automatically provisioned to the application. The business owner doesn't need to wait for the administrator to manage access for users. If the administrator grants the same permission to a manager in a different business group, then that person can also manage access for their own group members. Neither the business owner nor the manager can view or manage each other’s group memberships. The administrator can still see all users who have access to the application and block access rights if needed.
4040
* **Self-service group management**
4141
An example of this scenario is two users who both have SharePoint Online sites that they set up independently. They want to give each other’s teams access to their sites. To accomplish this, they can create one group in Azure AD, and in SharePoint Online each of them selects that group to provide access to their sites. When someone wants access, they request it from the Access Panel, and after approval they get access to both SharePoint Online sites automatically. Later, one of them decides that all people accessing the site should also get access to a particular SaaS application. The administrator of the SaaS application can add access rights for the application to the SharePoint Online site. From then on, any requests that get approved gives access to the two SharePoint Online sites and also to this SaaS application.
4242

articles/aks/cluster-autoscaler.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: mlearned
1414

1515
To keep up with application demands in Azure Kubernetes Service (AKS), you may need to adjust the number of nodes that run your workloads. The cluster autoscaler component can watch for pods in your cluster that can't be scheduled because of resource constraints. When issues are detected, the number of nodes in a node pool is increased to meet the application demand. Nodes are also regularly checked for a lack of running pods, with the number of nodes then decreased as needed. This ability to automatically scale up or down the number of nodes in your AKS cluster lets you run an efficient, cost-effective cluster.
1616

17-
This article shows you how to enable and manage the cluster autoscaler in an AKS cluster. Cluster autoscaler should only be tested in preview on AKS clusters.
17+
This article shows you how to enable and manage the cluster autoscaler in an AKS cluster. The cluster autoscaler should only be tested in preview on AKS clusters.
1818

1919
> [!IMPORTANT]
2020
> AKS preview features are self-service opt-in. Previews are provided "as-is" and "as available" and are excluded from the service level agreements and limited warranty. AKS Previews are partially covered by customer support on best effort basis. As such, these features are not meant for production use. For additional infromation, please see the following support articles:
@@ -48,12 +48,12 @@ The following limitations apply when you create and manage AKS clusters that use
4848

4949
To adjust to changing application demands, such as between the workday and evening or on a weekend, clusters often need a way to automatically scale. AKS clusters can scale in one of two ways:
5050

51-
* The **cluster autoscaler** watches for pods that can't be scheduled on nodes because of resource constraints. The cluster automatically then increases the number of nodes.
52-
* The **horizontal pod autoscaler** uses the Metrics Server in a Kubernetes cluster to monitor the resource demand of pods. If a service needs more resources, the number of pods is automatically increased to meet the demand.
51+
* The **cluster autoscaler** watches for pods that can't be scheduled on nodes because of resource constraints. The cluster then automatically increases the number of nodes.
52+
* The **horizontal pod autoscaler** uses the Metrics Server in a Kubernetes cluster to monitor the resource demand of pods. If an application needs more resources, the number of pods is automatically increased to meet the demand.
5353

5454
![The cluster autoscaler and horizontal pod autoscaler often work together to support the required application demands](media/autoscaler/cluster-autoscaler.png)
5555

56-
Both the horizontal pod autoscaler and cluster autoscaler can also then decrease the number of pods and nodes as needed. The cluster autoscaler decreases the number of nodes when there has been unused capacity for a period of time. Pods on a node to be removed by the cluster autoscaler are safely scheduled elsewhere in the cluster. The cluster autoscaler may be unable to scale down if pods can't move, such as in the following situations:
56+
Both the horizontal pod autoscaler and cluster autoscaler can also decrease the number of pods and nodes as needed. The cluster autoscaler decreases the number of nodes when there has been unused capacity for a period of time. Pods on a node to be removed by the cluster autoscaler are safely scheduled elsewhere in the cluster. The cluster autoscaler may be unable to scale down if pods can't move, such as in the following situations:
5757

5858
* A pod directly created and isn't backed by a controller object, such a deployment or replica set.
5959
* A pod disruption budget (PDB) is too restrictive and doesn't allow the number of pods to be fall below a certain threshold.
@@ -63,7 +63,7 @@ For more information about how the cluster autoscaler may be unable to scale dow
6363

6464
The cluster autoscaler uses startup parameters for things like time intervals between scale events and resource thresholds. These parameters are defined by the Azure platform, and aren't currently exposed for you to adjust. For more information on what parameters the cluster autoscaler uses, see [What are the cluster autoscaler parameters?][autoscaler-parameters].
6565

66-
The cluster and horizontal pod autoscalers can work together, and are often both deployed together in a cluster. When combined, the horizontal pod autoscaler is focused on running the number of pods required to meet application demand. The cluster autoscaler is focused on running the number of nodes required to support the scheduled pods.
66+
The cluster and horizontal pod autoscalers can work together, and are often both deployed in a cluster. When combined, the horizontal pod autoscaler is focused on running the number of pods required to meet application demand. The cluster autoscaler is focused on running the number of nodes required to support the scheduled pods.
6767

6868
> [!NOTE]
6969
> Manual scaling is disabled when you use the cluster autoscaler. Let the cluster autoscaler determine the required number of nodes. If you want to manually scale your cluster, [disable the cluster autoscaler](#disable-the-cluster-autoscaler).

articles/aks/configure-azure-cni.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ First, get the subnet resource ID for the existing subnet into which the AKS clu
114114
$ az network vnet subnet list \
115115
--resource-group myVnet \
116116
--vnet-name myVnet \
117-
--query [].id --output tsv
117+
--query "[0].id" --output tsv
118118
119119
/subscriptions/<guid>/resourceGroups/myVnet/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/default
120120
```

articles/aks/ingress-own-tls.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Both applications are now running on your Kubernetes cluster, however they're co
129129
In the following example, traffic to the address `https://demo.azure.com/` is routed to the service named `aks-helloworld`. Traffic to the address `https://demo.azure.com/hello-world-two` is routed to the `ingress-demo` service. For this article, you don't need to change those demo host names. For production use, provide the names specified as part of the certificate request and generation process.
130130

131131
> [!TIP]
132-
> If the host name specified during the certificate request process, the CN name, doesn't match the host defined in your ingress route, you ingress controller displays a *Kubernetes Ingress Controller Fake Certificate*. Make sure your certificate and ingress route host names match.
132+
> If the host name specified during the certificate request process, the CN name, doesn't match the host defined in your ingress route, you ingress controller displays a *Kubernetes Ingress Controller Fake Certificate* warning. Make sure your certificate and ingress route host names match.
133133
134134
The *tls* section tells the ingress route to use the Secret named *aks-ingress-tls* for the host *demo.azure.com*. Again, for production use, specify your own host address.
135135

@@ -314,4 +314,4 @@ You can also:
314314
[aks-ingress-basic]: ingress-basic.md
315315
[aks-http-app-routing]: http-application-routing.md
316316
[aks-ingress-tls]: ingress-tls.md
317-
[client-source-ip]: concepts-network.md#ingress-controllers
317+
[client-source-ip]: concepts-network.md#ingress-controllers

articles/azure-functions/tutorial-vs-code-serverless-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ If you don't have an Azure subscription, [sign up now](https://azure.microsoft.c
4040

4141
Install the following software:
4242

43-
- Python 3.6.x as required by Azure Functions. [Python 3.6.8](https://www.python.org/downloads/release/python-368/) is the latest 3.6.x version.
43+
- Python 3.6.x as required by Azure Functions. [Python 3.6.9](https://www.python.org/downloads/release/python-369/) is the latest 3.6.x version.
4444
- [Visual Studio Code](https://code.visualstudio.com/).
4545
- The [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) as described on [Visual Studio Code Python Tutorial - Prerequisites](https://code.visualstudio.com/docs/python/python-tutorial).
4646
- The [Azure Functions extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions). For general information, visit the [vscode-azurefunctions GitHub repository](https://github.com/Microsoft/vscode-azurefunctions).

articles/cognitive-services/text-analytics/language-support.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,17 @@ Language support is initially rolled out in preview, graduating to generally ava
4242
|:----------- |:-------------:|:---------:|:-----------:|:-----------:|:-----------:
4343
| Arabic | `ar` | | |\* | |
4444
| Czech | `cs` | | |\* | |
45-
| Chinese-Simplified | `zh-CN`|\*** | || |
45+
| Chinese-Simplified | `zh-hans`|\*** | || |
46+
| Chinese-Traditional | `zh-hant`|\*** | || |
4647
| Danish | `da` |\* ||\* | |
4748
| Dutch | `nl` |\* ||\* | |
48-
| English | `en` |||\*\* | |
49+
| English | `en` |\*** ||\*\* | |
4950
| Finnish | `fi` |\* ||\* | |
50-
| French | `fr` |||| |
51+
| French | `fr` |\*** ||| |
5152
| German | `de` |\* ||| |
5253
| Greek | `el` |\* | | | |
5354
| Hungarian | `hu` | | |\* | |
54-
| Italian | `it` |\* ||\* | |
55+
| Italian | `it` |\*** ||\* | |
5556
| Japanese | `ja` |\*** ||\* | |
5657
| Korean | `ko` | ||\* | |
5758
| Norwegian (Bokmål) | `no` |\* ||\* | |

articles/cognitive-services/text-analytics/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The next version of Sentiment Analysis is now available for public preview, and
2323
* Automatic labeling for different sentiments in text.
2424
* Sentiment analysis and output on a document and sentence level.
2525

26-
It supports English, Japanese, and Simplified Chinese and is available in the following regions: `Australia East`, `Central Canada`, `Central US`, `East Asia`, `East US`, `East US 2`, `North Europe`, `Southeast Asia`, `South Central US`, `UK South`, `West Europe`, and `West US 2`.
26+
It supports English, French, Italian, Japanese, Simplified-Chinese, and Traditional-Chinese and is available in the following regions: `Australia East`, `Central Canada`, `Central US`, `East Asia`, `East US`, `East US 2`, `North Europe`, `Southeast Asia`, `South Central US`, `UK South`, `West Europe`, and `West US 2`.
2727

2828
> [!div class="nextstepaction"]
2929
> [Learn more about Sentiment Analysis v3](how-tos/text-analytics-how-to-sentiment-analysis.md#sentiment-analysis-v3-public-preview)

articles/service-health/resource-health-alert-arm-template-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Note that it is possible for the currentHealthStatus and previousHealthStatus pr
286286

287287
### Adjusting the alert to avoid User Initiated events
288288

289-
Resource Health events can be trigger by platform initiated and user initiated events. It may make sense to only send a notification when the health event is caused by the Azure platform.
289+
Resource Health events can be triggered by platform initiated and user initiated events. It may make sense to only send a notification when the health event is caused by the Azure platform.
290290

291291
It's easy to configure your alert to filter for only these kinds of events:
292292

articles/storage/files/storage-sync-cloud-tiering.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ The easiest way to recall a file to disk is to open the file. The Azure File Syn
9595
9696
You also can use PowerShell to force a file to be recalled. This option might be useful if you want to recall multiple files at once, such as all the files in a folder. Open a PowerShell session to the server node where Azure File Sync is installed, and then run the following PowerShell commands:
9797
98-
```powershell
99-
Import-Module "C:\Program Files\Azure\StorageSyncAgent\StorageSync.Management.ServerCmdlets.dll"
100-
Invoke-StorageSyncFileRecall -Path <file-or-directory-to-be-recalled>
101-
```
98+
```powershell
99+
Import-Module "C:\Program Files\Azure\StorageSyncAgent\StorageSync.Management.ServerCmdlets.dll"
100+
Invoke-StorageSyncFileRecall -Path <file-or-directory-to-be-recalled>
101+
```
102102

103103
<a id="sizeondisk-versus-size"></a>
104104
### Why doesn't the *Size on disk* property for a file match the *Size* property after using Azure File Sync?
@@ -108,10 +108,10 @@ Windows File Explorer exposes two properties to represent the size of a file: **
108108
### How do I force a file or directory to be tiered?
109109
When the cloud tiering feature is enabled, cloud tiering automatically tiers files based on last access and modify times to achieve the volume free space percentage specified on the cloud endpoint. Sometimes, though, you might want to manually force a file to tier. This might be useful if you save a large file that you don't intend to use again for a long time, and you want the free space on your volume now to use for other files and folders. You can force tiering by using the following PowerShell commands:
110110

111-
```powershell
112-
Import-Module "C:\Program Files\Azure\StorageSyncAgent\StorageSync.Management.ServerCmdlets.dll"
113-
Invoke-StorageSyncCloudTiering -Path <file-or-directory-to-be-tiered>
114-
```
111+
```powershell
112+
Import-Module "C:\Program Files\Azure\StorageSyncAgent\StorageSync.Management.ServerCmdlets.dll"
113+
Invoke-StorageSyncCloudTiering -Path <file-or-directory-to-be-tiered>
114+
```
115115

116116
## Next Steps
117117
* [Planning for an Azure File Sync Deployment](storage-sync-files-planning.md)

0 commit comments

Comments
 (0)