Skip to content

Commit a9afa12

Browse files
authored
Merge pull request #223819 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents a61df97 + 89b0920 commit a9afa12

File tree

8 files changed

+21
-11
lines changed

8 files changed

+21
-11
lines changed

articles/active-directory/develop/howto-configure-publisher-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ You're not required to maintain the resources that are used for verification aft
116116
If your tenant has verified domains, in the **Select a verified domain** dropdown, select one of the domains.
117117

118118
> [!NOTE]
119-
> The expected `Content-Type` header that should return is `application/json`. If you use any other header, like `application/json; charset=utf-8`, you might see this error message:
119+
> Content will be interpreted as UTF-8 JSON for deserialization. Supported `Content-Type` headers that should return are `application/json`, `application/json; charset=utf-8`, or ` `. If you use any other header, you might see this error message:
120120
>
121121
> `Verification of publisher domain failed. Error getting JSON file from https:///.well-known/microsoft-identity-association. The server returned an unexpected content type header value.`
122122
>

articles/active-directory/hybrid/how-to-connect-group-writeback-enable.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ Group writeback requires enabling both the original and new versions of the feat
2929
>
3030
>The enhanced group writeback feature is enabled on the tenant and not per Azure AD Connect client instance. Please be sure that all Azure AD Connect client instances are updated to a minimal build version of 1.6.4.0 or later.
3131
32+
> [!NOTE]
33+
> If you don't want to writeback all existing Microsoft 365 groups to Active Directory, you need to make changes to group writeback default behaviour before performing the steps in this article to enable the feature. See [Modify Azure AD Connect group writeback default behavior](how-to-connect-modify-group-writeback.md).
34+
> Also the new and original versions of the feature need to be enabled in the order documented. If the original feature is enabled first, all existing Microsoft 365 groups will be written back to Active Directory.
35+
3236
### Enable group writeback by using PowerShell
3337

3438
1. On your Azure AD Connect server, open a PowerShell prompt as an administrator.

articles/active-directory/hybrid/how-to-connect-group-writeback-v2.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ You can modify the default behavior as follows:
118118
- Microsoft 365 groups with up to 250,000 members can be written back to on-premises.
119119

120120
If you plan to make changes to the default behavior, we recommend that you do so before you enable group writeback. However, you can still modify the default behavior if group writeback is already enabled. For more information, see [Modify Azure AD Connect group writeback default behavior](how-to-connect-modify-group-writeback.md).
121-
121+
122+
> [!NOTE]
123+
> You need to make these changes before enabling group writeback; otherwise, all existing Microsoft 365 groups will be automatically written back to Active Directory. Also, the new and original versions of the feature need to be enabled in the order documented. If the original feature is enabled first, all existing Microsoft 365 groups will be written back to Active Directory.
124+
122125
## Understand limitations of public preview 
123126

124127
Although this release has undergone extensive testing, you might still encounter issues. One of the goals of this public preview release is to find and fix any issues before the feature moves to general availability. Please also note that any public preview functionality can still receive breaking changes which may require you to make changes to you configuration to continue using this feature. We may also decide to change or remove certain functionality without prior notice.
@@ -143,4 +146,4 @@ These limitations and known issues are specific to group writeback:
143146

144147
- [Modify Azure AD Connect group writeback default behavior](how-to-connect-modify-group-writeback.md)
145148
- [Enable Azure AD Connect group writeback](how-to-connect-group-writeback-enable.md)
146-
- [Disable Azure AD Connect group writeback](how-to-connect-group-writeback-disable.md)
149+
- [Disable Azure AD Connect group writeback](how-to-connect-group-writeback-disable.md)

articles/aks/node-updates-kured.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ helm repo update
6767
kubectl create namespace kured
6868

6969
# Install kured in that namespace with Helm 3 (only on Linux nodes, kured is not working on Windows nodes)
70-
helm install my-release kubereboot/kured --namespace kured --set nodeSelector."kubernetes.io/os"=linux
70+
helm install my-release kubereboot/kured --namespace kured --set nodeSelector."kubernetes\.io/os"=linux
7171
```
7272

7373
You can also configure additional parameters for `kured`, such as integration with Prometheus or Slack. For more information about additional configuration parameters, see the [kured Helm chart][kured-install].

articles/cognitive-services/Bing-Web-Search/use-display-requirements.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: bing-web-search
1010
ms.topic: conceptual
11-
ms.date: 03/02/2022
12-
ms.author: aahi
11+
ms.date: 01/12/2023
12+
ms.author: v-apunnamara
1313
---
1414

1515
# Bing Search API use and display requirements
@@ -32,7 +32,7 @@ These use and display requirements apply to any implementation of the content an
3232

3333
|Term |Description |
3434
|---------|---------|
35-
|Answer | A category of results returned in a response. For example, a response from the Bing Web Search API can include answers in the categories of webpage results, image, video, visual, and news. |
35+
|Answer | A category of results returned in a response. For example, a response from the Bing Web Search API can include answers in the categories of webpage results, image, video, and news. |
3636
|Response | Any and all answers and associated data received in response to a single call to a Search API. |
3737
|Result | An item of information in an answer. For example, the set of data connected with a single news article is a result in a news answer. |
3838
|Search APIs | collectively, the Bing Custom Search, Entity Search, Image Search, News Search, Video Search, Visual Search, Local Business Search, and Web Search APIs. |
@@ -43,6 +43,7 @@ Do not:
4343

4444
- Copy, store, or cache any data you receive from the Bing Spell Check or Bing Autosuggest APIs.
4545
- Use data you receive from Bing Spell Check or Bing Autosuggest APIs as part of any machine learning or similar algorithmic activity. Do not use this data to train, evaluate, or improve new or existing services that you or third parties might offer.
46+
- Display data received from the Bing Spell Check or Bing Autosuggest APIs on the same page as content from any general web search engine, large language models or advertising network.
4647

4748
## Bing Search APIs
4849

@@ -75,6 +76,8 @@ Do not:
7576

7677
- Use data received from the Search APIs as part of any machine learning or similar algorithmic activity. Do not use this data to train, evaluate, or improve new or existing services that you or third parties might offer.
7778

79+
- Display data received from the Search APIs on the same page as content from any general web search engine, large language models or advertising network.
80+
7881
- Modify the content of results (other than to reformat them in a way that does not violate any other requirement), unless required by law or agreed to by Microsoft.
7982

8083
- Omit attribution information and URLs associated with result content.

articles/logic-apps/workflow-definition-language-functions-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ addProperty(<object>, '<property>', <value>)
761761
To add a parent property to an existing property, use the `setProperty()` function, not the `addProperty()` function. Otherwise, the function returns only the child object as output.
762762

763763
```
764-
setProperty(<object>['<parent-property>'], '<parent-property>', addProperty(<object>['<parent-property>'], '<child-property>', <value>)
764+
setProperty(<object>, '<parent-property>', addProperty(<object>['<parent-property>'], '<child-property>', <value>)
765765
```
766766

767767
| Parameter | Required | Type | Description |
@@ -4050,7 +4050,7 @@ setProperty(<object>, '<property>', <value>)
40504050
To set the child property in a child object, use a nested `setProperty()` call instead. Otherwise, the function returns only the child object as output.
40514051

40524052
```
4053-
setProperty(<object>['<parent-property>'], '<parent-property>', setProperty(<object>['parentProperty'], '<child-property>', <value>))
4053+
setProperty(<object>, '<parent-property>', setProperty(<object>['parentProperty'], '<child-property>', <value>))
40544054
```
40554055

40564056
| Parameter | Required | Type | Description |

articles/orbital/license-spacecraft.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Once the licenses are in place, the spacecraft object will be updated by Azure O
6363
## FAQ
6464

6565
Q. Are third party ground stations such as KSAT included in this process?
66-
A. No, the process on this page applies to Microsoft sites only. For more information, see (to add link to third party page).
66+
A. No, the process on this page applies to Microsoft sites only. For more information, see [Integrate partner network ground stations](./partner-network-integration.md).
6767

6868
## Next steps
6969
- [Integrate partner network ground stations](./partner-network-integration.md)

articles/orbital/prepare-network.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Ensure the objects comply with the recommendations in this article. Note, these
1818
## Prepare subnet for VNET injection
1919

2020
Prerequisites:
21-
- An entire subnet with no existing IPs allocated or in use that can be dedicated to Orbital GSaaS in your virtual network in your resource group.
21+
- An entire subnet with no existing IPs allocated or in use that can be dedicated to the Azure Orbital Ground Station service in your virtual network in your resource group.
2222

2323
Steps:
2424
1. Delegate a subnet to service named: Microsoft.Orbital/orbitalGateways. Follow instructions here: [Add or remove a subnet delegation in an Azure virtual network](../virtual-network/manage-subnet-delegation.md).

0 commit comments

Comments
 (0)