Skip to content

Commit e1de65e

Browse files
authored
Merge pull request #103867 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 d5f3a3e + 9b9f4ea commit e1de65e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

articles/cognitive-services/Bing-Custom-Search/sdk-python-quickstart.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ from msrest.authentication import CognitiveServicesCredentials
4646

4747
```python
4848
subscription_key = 'your-subscription-key'
49+
endpoint = 'your-custom-endpoint'
4950
```
5051

5152
2. Create an instance of `CustomSearchClient`, using a `CognitiveServicesCredentials` object with the subscription key.
5253

5354
```python
54-
client = CustomSearchClient(CognitiveServicesCredentials(subscription_key))
55+
client = CustomSearchClient(endpoint, CognitiveServicesCredentials(subscription_key))
5556
```
5657

5758
3. Send a search request with `client.custom_instance.search()`. Append your search term to the `query` parameter, and set `custom_config` to your Custom Configuration ID to use your search instance. You can get your ID from the [Bing Custom Search portal](https://www.customsearch.ai/), by clicking the **Production** tab.

articles/security/fundamentals/paas-deployments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This article provides information that helps you:
3232
## Cloud security advantages
3333
It’s important to understand the [division of responsibility](shared-responsibility.md) between you and Microsoft. On-premises, you own the whole stack but as you move to the cloud some responsibilities transfer to Microsoft.
3434

35-
There are [security advantages to being in the cloud](shared-responsibility.md#cloud security advantages). In an on-premises environment, organizations likely have unmet responsibilities and limited resources available to invest in security, which creates an environment where attackers are able to exploit vulnerabilities at all layers.
35+
There are [security advantages to being in the cloud](shared-responsibility.md#cloud-security-advantages). In an on-premises environment, organizations likely have unmet responsibilities and limited resources available to invest in security, which creates an environment where attackers are able to exploit vulnerabilities at all layers.
3636

3737
Organizations are able to improve their threat detection and response times by using a provider’s cloud-based security capabilities and cloud intelligence. By shifting responsibilities to the cloud provider, organizations can get more security coverage, which enables them to reallocate security resources and budget to other business priorities.
3838

articles/vpn-gateway/openvpn-azure-ad-tenant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Use the steps in [this article](../active-directory/fundamentals/add-users-azure
7171
Azure China 21Vianet
7272
7373
```
74-
https://https://login.chinacloudapi.cn/common/oauth2/authorize?client_id=49f817b6-84ae-4cc0-928c-73f27289b3aa&response_type=code&redirect_uri=https://portal.azure.cn&nonce=1234&prompt=admin_consent
74+
https://login.chinacloudapi.cn/common/oauth2/authorize?client_id=49f817b6-84ae-4cc0-928c-73f27289b3aa&response_type=code&redirect_uri=https://portal.azure.cn&nonce=1234&prompt=admin_consent
7575
```
7676
7777
5. Select the **Global Admin** account if prompted.

0 commit comments

Comments
 (0)