Skip to content

Commit 0288798

Browse files
committed
merge conflict
2 parents 5d01291 + 230b812 commit 0288798

File tree

192 files changed

+3743
-2377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+3743
-2377
lines changed

.openpublishing.redirection.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
{
109109
"source_path_from_root": "/articles/application-insights/app-insights-analytics-diagnostics.md",
110110
"redirect_url": "/azure/application-insights/app-insights-analytics",
111-
"redirect_document_id": true
111+
"redirect_document_id": false
112112
},
113113
{
114114
"source_path_from_root": "/articles/application-insights/app-insights-analytics-reference.md",
@@ -118,7 +118,7 @@
118118
{
119119
"source_path_from_root": "/articles/application-insights/app-insights-azure.md",
120120
"redirect_url": "/azure/application-insights/app-insights-overview",
121-
"redirect_document_id": true
121+
"redirect_document_id": false
122122
},
123123
{
124124
"source_path_from_root": "/articles/application-insights/app-insights-developer-analytics.md",
@@ -133,7 +133,7 @@
133133
{
134134
"source_path_from_root": "/articles/application-insights/app-insights-java-eclipse.md",
135135
"redirect_url": "/azure/application-insights/app-insights-java-quick-start",
136-
"redirect_document_id": true
136+
"redirect_document_id": false
137137
},
138138
{
139139
"source_path_from_root": "/articles/application-insights/app-insights-pricing-enterprise-details.md",
15.5 KB
Loading
7.8 KB
Loading

articles/api-management/redirect-content-urls-policy.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: danlep
1414

1515
[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
1616

17-
The `redirect-content-urls` policy rewrites (masks) links in the response body so that they point to the equivalent link via the gateway. Use in the outbound section to rewrite response body links to the backend service to make them point to the gateway. Use in the inbound section for an opposite effect.
17+
The `redirect-content-urls` policy rewrites (masks) links in the response body. Use in the outbound section to rewrite response body links to the backend service to make them point to the gateway instead. For example, you might do this to hide URLs of the original backend service when they appear in the response. Use in the inbound section for an opposite effect.
1818

1919
> [!NOTE]
2020
> This policy does not change any header values such as `Location` headers. To change header values, use the [set-header](set-header-policy.md) policy.
@@ -44,6 +44,14 @@ The `redirect-content-urls` policy rewrites (masks) links in the response body s
4444
<redirect-content-urls />
4545
```
4646

47+
For example, consider the following image, which shows an API response body that includes the original backend service URLs.
48+
49+
:::image type="content" source="media/redirect-content-urls-policy/original-response.png" alt-text="Screenshot showing original outbound response in test console in the portal.":::
50+
51+
After the `redirect-content-urls` policy is configured in the outbound section, the response body is rewritten to point to the gateway, in this case, `https://apim-hello-world.azure-api.net`.
52+
53+
:::image type="content" source="media/redirect-content-urls-policy/test-replaced-url.png" alt-text="Screenshot showing replaced URLs in test console in the portal.":::
54+
4755
## Related policies
4856

4957
* [Transformation](api-management-policies.md#transformation)

articles/avere-vfxt/avere-vfxt-add-storage.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ Follow these steps to add a NAS core filer:
4646

4747
1. Click **Create**.
4848

49-
![Screenshot of the Add new core filer page with a cursor over the Create button](media/avere-vfxt-add-core-filer-start.png)
50-
5149
1. Fill in the required information in the wizard:
5250

5351
* Name your core filer.

articles/avere-vfxt/avere-vfxt-cluster-gui.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ Depending on your browser, you might need to click **Advanced** and verify that
5656

5757
Enter the username `admin` and the administrative password you provided when creating the cluster.
5858

59-
![Screenshot of the Avere sign in page populated with the username 'admin' and a password](media/avere-vfxt-gui-login.png)
60-
6159
Click **Login** or press enter on your keyboard.
6260

6361
## Next steps

articles/avere-vfxt/avere-vfxt-enable-support.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ Follow these steps from the Avere Control Panel to activate support. (Read [Acce
1818

1919
1. Navigate to the **Settings** tab at the top.
2020
1. Click the **Support** link on the left and accept the privacy policy.
21-
22-
![Screenshot showing Avere Control Panel and pop-up window with Confirm button to accept the privacy policy](media/avere-vfxt-privacy-policy.png)
23-
2421
1. On the support configuration page, open the **Customer Info** section by clicking the triangle at the left.
2522
1. Click the **Revalidate upload information** button.
2623
1. Set the cluster's support name in **Unique Cluster Name**. Make sure this name uniquely identifies your cluster to support staff.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)