Skip to content

Commit e8273b7

Browse files
MicrosoftGuyJFloMicrosoftGuyJFlo
committed
FixMergeConflict
2 parents 10ea70b + c2dd76f commit e8273b7

9 files changed

+295
-83
lines changed

‎.openpublishing.redirection.active-directory.json

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,176 @@
1010
"redirect_url": "/azure/active-directory/develop/enterprise-app-role-management",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/global-secure-access/concept-global-secure-access-logs-monitoring.md",
15+
"redirect_url": "/entra/global-secure-access/concept-global-secure-access-logs-monitoring",
16+
"redirect_document_id": true
17+
},
18+
{
19+
"source_path_from_root": "/articles/global-secure-access/concept-private-access.md",
20+
"redirect_url": "/entra/global-secure-access/concept-private-access",
21+
"redirect_document_id": true
22+
},
23+
{
24+
"source_path_from_root": "/articles/global-secure-access/concept-remote-network-connectivity.md",
25+
"redirect_url": "/entra/global-secure-access/concept-remote-network-connectivity",
26+
"redirect_document_id": true
27+
},
28+
{
29+
"source_path_from_root": "/articles/global-secure-access/concept-traffic-dashboard.md",
30+
"redirect_url": "/entra/global-secure-access/concept-traffic-dashboard",
31+
"redirect_document_id": true
32+
},
33+
{
34+
"source_path_from_root": "/articles/global-secure-access/concept-traffic-forwarding.md",
35+
"redirect_url": "/entra/global-secure-access/concept-traffic-forwarding",
36+
"redirect_document_id": true
37+
},
38+
{
39+
"source_path_from_root": "/articles/global-secure-access/concept-universal-conditional-access.md",
40+
"redirect_url": "/entra/global-secure-access/concept-universal-conditional-access",
41+
"redirect_document_id": true
42+
},
43+
{
44+
"source_path_from_root": "/articles/global-secure-access/how-to-access-audit-logs.md",
45+
"redirect_url": "/entra/global-secure-access/how-to-access-audit-logs",
46+
"redirect_document_id": true
47+
},
48+
{
49+
"source_path_from_root": "/articles/global-secure-access/how-to-assign-traffic-profile-to-remote-network.md",
50+
"redirect_url": "/entra/global-secure-access/how-to-assign-traffic-profile-to-remote-network",
51+
"redirect_document_id": true
52+
},
53+
{
54+
"source_path_from_root": "/articles/global-secure-access/how-to-compliant-network.md",
55+
"redirect_url": "/entra/global-secure-access/how-to-compliant-network",
56+
"redirect_document_id": true
57+
},
58+
{
59+
"source_path_from_root": "/articles/global-secure-access/how-to-configure-connectors.md",
60+
"redirect_url": "/entra/global-secure-access/how-to-configure-connectors",
61+
"redirect_document_id": true
62+
},
63+
{
64+
"source_path_from_root": "/articles/global-secure-access/how-to-configure-customer-premises-equipment.md",
65+
"redirect_url": "/entra/global-secure-access/how-to-configure-customer-premises-equipment",
66+
"redirect_document_id": true
67+
},
68+
{
69+
"source_path_from_root": "/articles/global-secure-access/how-to-configure-per-app-access.md",
70+
"redirect_url": "/entra/global-secure-access/how-to-configure-per-app-access",
71+
"redirect_document_id": true
72+
},
73+
{
74+
"source_path_from_root": "/articles/global-secure-access/how-to-configure-quick-access.md",
75+
"redirect_url": "/entra/global-secure-access/how-to-configure-quick-access",
76+
"redirect_document_id": true
77+
},
78+
{
79+
"source_path_from_root": "/articles/global-secure-access/how-to-create-remote-network-custom-ike-policy.md",
80+
"redirect_url": "/entra/global-secure-access/how-to-create-remote-network-custom-ike-policy",
81+
"redirect_document_id": true
82+
},
83+
{
84+
"source_path_from_root": "/articles/global-secure-access/how-to-create-remote-networks.md",
85+
"redirect_url": "/entra/global-secure-access/how-to-create-remote-networks",
86+
"redirect_document_id": true
87+
},
88+
{
89+
"source_path_from_root": "/articles/global-secure-access/how-to-get-started-with-global-secure-access.md",
90+
"redirect_url": "/entra/global-secure-access/how-to-get-started-with-global-secure-access",
91+
"redirect_document_id": true
92+
},
93+
{
94+
"source_path_from_root": "/articles/global-secure-access/how-to-install-windows-client.md",
95+
"redirect_url": "/entra/global-secure-access/how-to-install-windows-client",
96+
"redirect_document_id": true
97+
},
98+
{
99+
"source_path_from_root": "/articles/global-secure-access/how-to-list-remote-networks.md",
100+
"redirect_url": "/entra/global-secure-access/how-to-list-remote-networks",
101+
"redirect_document_id": true
102+
},
103+
{
104+
"source_path_from_root": "/articles/global-secure-access/how-to-manage-microsoft-365-profile.md",
105+
"redirect_url": "/entra/global-secure-access/how-to-manage-microsoft-365-profile",
106+
"redirect_document_id": true
107+
},
108+
{
109+
"source_path_from_root": "/articles/global-secure-access/how-to-manage-private-access-profile.md",
110+
"redirect_url": "/entra/global-secure-access/how-to-manage-private-access-profile",
111+
"redirect_document_id": true
112+
},
113+
{
114+
"source_path_from_root": "/articles/global-secure-access/how-to-manage-remote-network-device-links.md",
115+
"redirect_url": "/entra/global-secure-access/how-to-manage-remote-network-device-links",
116+
"redirect_document_id": true
117+
},
118+
{
119+
"source_path_from_root": "/articles/global-secure-access/how-to-manage-remote-networks.md",
120+
"redirect_url": "/entra/global-secure-access/how-to-manage-remote-networks",
121+
"redirect_document_id": true
122+
},
123+
{
124+
"source_path_from_root": "/articles/global-secure-access/how-to-simulate-remote-network.md",
125+
"redirect_url": "/entra/global-secure-access/how-to-simulate-remote-network",
126+
"redirect_document_id": true
127+
},
128+
{
129+
"source_path_from_root": "/articles/global-secure-access/how-to-source-ip-restoration.md",
130+
"redirect_url": "/entra/global-secure-access/how-to-source-ip-restoration",
131+
"redirect_document_id": true
132+
},
133+
{
134+
"source_path_from_root": "/articles/global-secure-access/how-to-target-resource-microsoft-365-profile.md",
135+
"redirect_url": "/entra/global-secure-access/how-to-target-resource-microsoft-365-profile",
136+
"redirect_document_id": true
137+
},
138+
{
139+
"source_path_from_root": "/articles/global-secure-access/how-to-target-resource-private-access-apps.md",
140+
"redirect_url": "/entra/global-secure-access/how-to-target-resource-private-access-apps",
141+
"redirect_document_id": true
142+
},
143+
{
144+
"source_path_from_root": "/articles/global-secure-access/how-to-universal-tenant-restrictions.md",
145+
"redirect_url": "/entra/global-secure-access/how-to-universal-tenant-restrictions",
146+
"redirect_document_id": true
147+
},
148+
{
149+
"source_path_from_root": "/articles/global-secure-access/how-to-view-enriched-logs.md",
150+
"redirect_url": "/entra/global-secure-access/how-to-view-enriched-logs",
151+
"redirect_document_id": true
152+
},
153+
{
154+
"source_path_from_root": "/articles/global-secure-access/how-to-view-traffic-logs.md",
155+
"redirect_url": "/entra/global-secure-access/how-to-view-traffic-logs",
156+
"redirect_document_id": true
157+
},
158+
{
159+
"source_path_from_root": "/articles/global-secure-access/index.yml",
160+
"redirect_url": "/entra/global-secure-access/index",
161+
"redirect_document_id": true
162+
},
163+
{
164+
"source_path_from_root": "/articles/global-secure-access/overview-what-is-global-secure-access.md",
165+
"redirect_url": "/entra/global-secure-access/overview-what-is-global-secure-access",
166+
"redirect_document_id": true
167+
},
168+
{
169+
"source_path_from_root": "/articles/global-secure-access/reference-points-of-presence.md",
170+
"redirect_url": "/entra/global-secure-access/reference-points-of-presence",
171+
"redirect_document_id": true
172+
},
173+
{
174+
"source_path_from_root": "/articles/global-secure-access/reference-remote-network-configurations.md",
175+
"redirect_url": "/entra/global-secure-access/reference-remote-network-configurations",
176+
"redirect_document_id": true
177+
},
178+
{
179+
"source_path_from_root": "/articles/global-secure-access/resource-faq.yml",
180+
"redirect_url": "/entra/global-secure-access/resource-faq",
181+
"redirect_document_id": true
182+
},
13183
{
14184
"source_path_from_root": "/articles/active-directory/governance/tutorial-prepare-azure-ad-user-accounts.md",
15185
"redirect_url": "/azure/active-directory/governance/tutorial-prepare-user-accounts",

‎articles/azure-maps/migrate-from-bing-maps-web-services.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ In Azure Maps, pushpins can also be added to a static map image by specifying th
386386
387387
More styles can be used by adding more `pins` parameters to the URL with a different style and set of locations.
388388

389-
Regarding pin locations, Azure Maps requires the coordinates to be in `longitude latitude` format whereas Bing Maps uses `latitude,longitude` format. Also note that **there is a space, not a comma** separating longitude and latitude in Azure Maps.
389+
Regarding pin locations, Azure Maps requires the coordinates to be in `longitude,latitude` format whereas Bing Maps uses `latitude,longitude` format. Also note that **there is a space, not a comma** separating longitude and latitude in Azure Maps.
390390

391391
The `iconType` value specifies the type of pin to create and can have the following values:
392392

@@ -445,7 +445,7 @@ In Azure Maps, lines and polygons can also be added to a static map image by spe
445445

446446
> `&path=pathStyles||pathLocation1|pathLocation2|...`
447447
448-
When it comes to path locations, Azure Maps requires the coordinates to be in `longitude latitude` format whereas Bing Maps uses `latitude,longitude` format. Also note that **there is a space, not a comma separating** longitude and latitude in Azure Maps. Azure Maps doesn't support encoded paths currently.
448+
When it comes to path locations, Azure Maps requires the coordinates to be in `longitude,latitude` format whereas Bing Maps uses `latitude,longitude` format. Also note that **there is a space, not a comma separating** longitude and latitude in Azure Maps. Azure Maps doesn't support encoded paths currently.
449449

450450
Path styles in Azure Maps are added with the format `optionNameValue`, with multiple styles separated by pipe (`|`) characters like this `optionName1Value1|optionName2Value2`. Note the option names and values aren't separated. The following style option names can be used to style paths in Azure Maps:
451451

‎articles/azure-maps/migrate-from-google-maps-web-services.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ Add markers to a static map image by specifying the `pins` parameter in the URL.
322322

323323
To use other styles, add extra `pins` parameters to the URL with a different style and set of locations.
324324

325-
In Azure Maps, the pin location needs to be in the "longitude latitude" format. Google Maps uses "latitude,longitude" format. A space, not a comma, separates longitude and latitude in the Azure Maps format.
325+
In Azure Maps, the pin location needs to be in the "longitude,latitude" format. Google Maps uses "latitude,longitude" format. A space, not a comma, separates longitude and latitude in the Azure Maps format.
326326

327327
The `iconType` specifies the type of pin to create. It can have the following values:
328328

@@ -396,7 +396,7 @@ Add lines and polygons to a static map image by specifying the `path` parameter
396396
&path=pathStyles||pathLocation1|pathLocation2|...
397397
```
398398

399-
When it comes to path locations, Azure Maps requires the coordinates to be in "longitude latitude" format. Google Maps uses "latitude,longitude" format. A space, not a comma, separates longitude and latitude in the Azure Maps format. Azure Maps doesn't support encoded paths or addresses for points.
399+
When it comes to path locations, Azure Maps requires the coordinates to be in "longitude,latitude" format. Google Maps uses "latitude,longitude" format. A space, not a comma, separates longitude and latitude in the Azure Maps format. Azure Maps doesn't support encoded paths or addresses for points.
400400

401401
Add path styles with the `optionNameValue` format. Separate multiple styles by pipe (\|) characters, like this `optionName1Value1|optionName2Value2`. The option names and values aren't separated. Use the following style option names to style paths in Azure Maps:
402402

‎articles/cost-management-billing/reservations/exchange-and-refund-azure-reservations.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: cost-management-billing
77
ms.subservice: reservations
88
ms.custom: ignite-2022
99
ms.topic: how-to
10-
ms.date: 08/08/2023
10+
ms.date: 09/25/2023
1111
ms.author: banders
1212
---
1313

@@ -52,7 +52,7 @@ You can exchange your reservation from the [Azure portal](https://portal.azure.c
5252
1. Review and complete the transaction.
5353
[![Example image showing the VM product to purchase with an exchange, completing the return](./media/exchange-and-refund-azure-reservations/exchange-refund-confirm-exchange.png)](./media/exchange-and-refund-azure-reservations/exchange-refund-confirm-exchange.png#lightbox)
5454

55-
To refund a reservation, go into the Reservationthat you are looking to cancel and select **Return**.
55+
To refund a reservation, go into the Reservation that you're looking to cancel and select **Return**.
5656

5757
## Exchange multiple reservations
5858

@@ -86,6 +86,12 @@ Money is added to the Azure Prepayment (previously called monetary commitment) f
8686

8787
If the original reservation purchase was made from an overage, the refund is returned to you as a partial credit note. The refund doesn’t affect the original or later invoices.
8888

89+
### Microsoft Customer Agreement customers
90+
91+
For customers that pay by wire transfer, the refunded amount is automatically applied to the next month’s invoice. The return or refund doesn't generate a new invoice.
92+
93+
For customers that pay by credit card, the refunded amount is returned to the credit card that was used for the original purchase. If you've changed your card, [contact support](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest).
94+
8995
### Pay-as-you-go invoice payments and CSP program
9096

9197
The original reservation purchase invoice is canceled and then a new invoice is created for the refund. For exchanges, the new invoice shows the refund and the new purchase. The refund amount is adjusted against the purchase. If you only refunded a reservation, then the prorated amount stays with Microsoft and it's adjusted against a future reservation purchase. If you bought a reservation at pay-as-you-go rates and later move to a CSP, the reservation can be returned and repurchased without a penalty.

0 commit comments

Comments
 (0)