Skip to content

Commit 7e19d76

Browse files
authored
Merge pull request #291408 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 33af2a2 + 570b923 commit 7e19d76

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

articles/data-factory/connector-rest.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ The backend will automatically get the next URL based on the RFC 5988 style link
928928
>
929929
> :::image type="content" source="media/connector-rest/pagination-rule-example-7-disable-rfc5988.png" alt-text="Screenshot showing how to disable R F C 5988 setting for Example 7.":::
930930
931-
#### Example 8: The next request URL is from the response body when use pagination in mapping data flows
931+
#### Example 8a: The next request URL is in the response body when using pagination in mapping data flows
932932

933933
This example states how to set the pagination rule and the end condition rule in mapping data flows when the next request URL is from the response body.
934934

@@ -952,6 +952,18 @@ But if the value of **@odata.nextLink** in the last response body is equal to th
952952

953953
:::image type="content" source="media/connector-rest/pagination-rule-example-8-end-condition-2.png" alt-text="Screenshot showing setting the end condition rule when the complete key in the response header equals to true indicates the end of pagination.":::
954954

955+
#### Example 8b: The next request URL is in the response body when using pagination in copy activity
956+
957+
This example demonstrates how to set the pagination rule in a copy activity when the next request URL is contained within the response body.
958+
959+
The response schema is shown below:
960+
961+
:::image type="content" source="media/connector-rest/pagination-rule-example-8-response-schema.png" alt-text="Screenshot showing the response schema of Example 8b.":::
962+
963+
The pagination rules should be set as shown in the following screenshot:
964+
965+
:::image type="content" source="media/connector-rest/pagination-rule-example-8b.png" alt-text="Screenshot showing how to set the pagination rule for Example 8b.":::
966+
955967
#### Example 9: The response format is XML and the next request URL is from the response body when use pagination in mapping data flows
956968

957969
This example states how to set the pagination rule in mapping data flows when the response format is XML and the next request URL is from the response body. As shown in the following screenshot, the first URL is *https://\<user\>.dfs.core.windows.NET/bugfix/test/movie_1.xml*
13.9 KB
Loading

articles/security/fundamentals/azure-CA-details.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ To determine if the **Microsoft ECC Root Certificate Authority 2017** and **Micr
238238
1. To add a root certificate to the trusted root certificate store in Java, you can use the `keytool` utility. The following example adds the **Microsoft RSA Root Certificate Authority 2017** root certificate:
239239
240240
```bash
241-
keytool -import -file microsoft-ecc-root-ca.crt -alias microsoft-rsa-root-ca -keystore $JAVA_HOME/jre/lib/security/cacerts
241+
keytool -import -file microsoft-ecc-root-ca.crt -alias microsoft-ecc-root-ca -keystore $JAVA_HOME/jre/lib/security/cacerts
242242
keytool -import -file microsoft-rsa-root-ca.crt -alias microsoft-rsa-root-ca -keystore $JAVA_HOME/jre/lib/security/cacerts
243243
```
244244

0 commit comments

Comments
 (0)