Skip to content

Commit fd7918d

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into fixbuildissues
2 parents 693e19f + 885ee93 commit fd7918d

File tree

122 files changed

+2228
-878
lines changed

Some content is hidden

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

122 files changed

+2228
-878
lines changed

.openpublishing.redirection.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36465,57 +36465,57 @@
3646536465
},
3646636466
{
3646736467
"source_path": "articles/iot-central/core/concepts-connectivity-pnp.md",
36468-
"redirect_url": "/azure/iot-central/core/overview-iot-central-get-connected-pnp",
36468+
"redirect_url": "/azure/iot-central/preview/overview-iot-central-get-connected",
3646936469
"redirect_document_id": false
3647036470
},
3647136471
{
3647236472
"source_path": "articles/iot-central/core/concepts-stay-connected.md",
36473-
"redirect_url": "/azure/iot-central/core/overview-iot-central-stay-connected-pnp",
36473+
"redirect_url": "/azure/iot-central/preview/overview-iot-central-stay-connected",
3647436474
"redirect_document_id": false
3647536475
},
3647636476
{
3647736477
"source_path": "articles/iot-central/core/overview-iot-central-transform.md",
36478-
"redirect_url": "/azure/iot-central/core/overview-iot-central-transform-pnp",
36478+
"redirect_url": "/azure/iot-central/preview/overview-iot-central-transform",
3647936479
"redirect_document_id": false
3648036480
},
3648136481
{
3648236482
"source_path": "articles/iot-central/core/howto-create-event-rules-pnp.md",
36483-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
36483+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules",
3648436484
"redirect_document_id": false
3648536485
},
3648636486
{
3648736487
"source_path": "articles/iot-central/core/howto-create-telemetry-rules-pnp.md",
36488-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
36488+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules",
3648936489
"redirect_document_id": false
3649036490
},
3649136491
{
3649236492
"source_path": "articles/iot-central/core/tutorial-configure-rules-pnp.md",
36493-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
36493+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules",
3649436494
"redirect_document_id": false
3649536495
},
3649636496
{
3649736497
"source_path": "articles/iot-central/core/tutorial-monitor-devices-pnp.md",
36498-
"redirect_url": "/azure/iot-central/core/quick-monitor-devices-pnp",
36498+
"redirect_url": "/azure/iot-central/preview/quick-monitor-devices",
3649936499
"redirect_document_id": false
3650036500
},
3650136501
{
3650236502
"source_path": "articles/iot-central/tutorial-add-device-pnp.md",
36503-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device-pnp",
36503+
"redirect_url": "/azure/iot-central/preview/quick-create-pnp-device",
3650436504
"redirect_document_id": false
3650536505
},
3650636506
{
3650736507
"source_path": "articles/iot-central/tutorial-define-device-type-pnp.md",
36508-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device-pnp",
36508+
"redirect_url": "/azure/iot-central/preview/quick-create-pnp-device",
3650936509
"redirect_document_id": false
3651036510
},
3651136511
{
3651236512
"source_path": "articles/iot-central/howto-export-data-blob-storage-pnp.md",
36513-
"redirect_url": "/azure/iot-central/core/howto-export-data-pnp",
36513+
"redirect_url": "/azure/iot-central/preview/howto-export-data",
3651436514
"redirect_document_id": false
3651536515
},
3651636516
{
3651736517
"source_path": "articles/iot-central/howto-export-data-event-hubs-service-bus-pnp.md",
36518-
"redirect_url": "/azure/iot-central/core/howto-export-data-pnp",
36518+
"redirect_url": "/azure/iot-central/preview/howto-export-data",
3651936519
"redirect_document_id": false
3652036520
},
3652136521
{
@@ -41985,7 +41985,7 @@
4198541985
},
4198641986
{
4198741987
"source_path": "articles/iot-central/concepts-architecture-pnp.md",
41988-
"redirect_url": "/azure/iot-central/core/concepts-architecture-pnp/",
41988+
"redirect_url": "/azure/iot-central/preview/concepts-architecture/",
4198941989
"redirect_document_id": true
4199041990
},
4199141991
{
@@ -41995,7 +41995,7 @@
4199541995
},
4199641996
{
4199741997
"source_path": "articles/iot-central/concepts-connectivity-pnp.md",
41998-
"redirect_url": "/azure/iot-central/core/concepts-connectivity-pnp/",
41998+
"redirect_url": "/azure/iot-central/preview/concepts-connectivity/",
4199941999
"redirect_document_id": true
4200042000
},
4200142001
{
@@ -42010,7 +42010,7 @@
4201042010
},
4201142011
{
4201242012
"source_path": "articles/iot-central/howto-administer-pnp.md",
42013-
"redirect_url": "/azure/iot-central/core/howto-administer-pnp/",
42013+
"redirect_url": "/azure/iot-central/preview/howto-administer/",
4201442014
"redirect_document_id": true
4201542015
},
4201642016
{
@@ -42035,7 +42035,7 @@
4203542035
},
4203642036
{
4203742037
"source_path": "articles/iot-central/howto-connect-devkit-pnp.md",
42038-
"redirect_url": "/azure/iot-central/core/howto-connect-devkit-pnp/",
42038+
"redirect_url": "/azure/iot-central/preview/howto-connect-devkit/",
4203942039
"redirect_document_id": true
4204042040
},
4204142041
{
@@ -42045,7 +42045,7 @@
4204542045
},
4204642046
{
4204742047
"source_path": "articles/iot-central/howto-connect-pnp-device-pnp.md",
42048-
"redirect_url": "/azure/iot-central/core/howto-connect-pnp-device-pnp/",
42048+
"redirect_url": "/azure/iot-central/preview/howto-connect-pnp-device/",
4204942049
"redirect_document_id": true
4205042050
},
4205142051
{
@@ -42100,7 +42100,7 @@
4210042100
},
4210142101
{
4210242102
"source_path": "articles/iot-central/howto-create-event-rules-pnp.md",
42103-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules-pnp/",
42103+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules/",
4210442104
"redirect_document_id": true
4210542105
},
4210642106
{
@@ -42110,7 +42110,7 @@
4211042110
},
4211142111
{
4211242112
"source_path": "articles/iot-central/howto-create-telemetry-rules-pnp.md",
42113-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules-pnp",
42113+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules",
4211442114
"redirect_document_id": true
4211542115
},
4211642116
{
@@ -42125,7 +42125,7 @@
4212542125
},
4212642126
{
4212742127
"source_path": "articles/iot-central/howto-customize-ui-pnp.md",
42128-
"redirect_url": "/azure/iot-central/core/howto-customize-ui-pnp/",
42128+
"redirect_url": "/azure/iot-central/preview/howto-customize-ui/",
4212942129
"redirect_document_id": true
4213042130
},
4213142131
{
@@ -42145,7 +42145,7 @@
4214542145
},
4214642146
{
4214742147
"source_path": "articles/iot-central/howto-manage-devices-pnp.md",
42148-
"redirect_url": "/azure/iot-central/core/howto-manage-devices-pnp/",
42148+
"redirect_url": "/azure/iot-central/preview/howto-manage-devices/",
4214942149
"redirect_document_id": true
4215042150
},
4215142151
{
@@ -42175,7 +42175,7 @@
4217542175
},
4217642176
{
4217742177
"source_path": "articles/iot-central/howto-manage-users-roles-pnp.md",
42178-
"redirect_url": "/azure/iot-central/core/howto-manage-users-roles-pnp/",
42178+
"redirect_url": "/azure/iot-central/preview/howto-manage-users-roles/",
4217942179
"redirect_document_id": true
4218042180
},
4218142181
{
@@ -42200,7 +42200,7 @@
4220042200
},
4220142201
{
4220242202
"source_path": "articles/iot-central/howto-set-up-template-pnp.md",
42203-
"redirect_url": "/azure/iot-central/core/howto-set-up-template-pnp/",
42203+
"redirect_url": "/azure/iot-central/preview/howto-set-up-template/",
4220442204
"redirect_document_id": true
4220542205
},
4220642206
{
@@ -42225,12 +42225,12 @@
4222542225
},
4222642226
{
4222742227
"source_path": "articles/iot-central/howto-use-device-groups-pnp.md",
42228-
"redirect_url": "/azure/iot-central/core/tutorial-use-device-groups-pnp/",
42228+
"redirect_url": "/azure/iot-central/preview/tutorial-use-device-groups/",
4222942229
"redirect_document_id": true
4223042230
},
4223142231
{
4223242232
"source_path": "articles/iot-central/core/howto-use-device-groups-pnp.md",
42233-
"redirect_url": "/azure/iot-central/core/tutorial-use-device-groups-pnp/",
42233+
"redirect_url": "/azure/iot-central/preview/tutorial-use-device-groups/",
4223442234
"redirect_document_id": true
4223542235
},
4223642236
{
@@ -42255,7 +42255,7 @@
4225542255
},
4225642256
{
4225742257
"source_path": "articles/iot-central/howto-version-device-template-pnp.md",
42258-
"redirect_url": "/azure/iot-central/core/howto-version-device-template-pnp/",
42258+
"redirect_url": "/azure/iot-central/preview/howto-version-device-template/",
4225942259
"redirect_document_id": true
4226042260
},
4226142261
{
@@ -42265,7 +42265,7 @@
4226542265
},
4226642266
{
4226742267
"source_path": "articles/iot-central/howto-view-bill-pnp.md",
42268-
"redirect_url": "/azure/iot-central/core/howto-view-bill-pnp/",
42268+
"redirect_url": "/azure/iot-central/preview/howto-view-bill/",
4226942269
"redirect_document_id": true
4227042270
},
4227142271
{
@@ -42285,7 +42285,7 @@
4228542285
},
4228642286
{
4228742287
"source_path": "articles/iot-central/overview-iot-central-pnp.md",
42288-
"redirect_url": "/azure/iot-central/core/overview-iot-central-pnp/",
42288+
"redirect_url": "/azure/iot-central/preview/overview-iot-central/",
4228942289
"redirect_document_id": true
4229042290
},
4229142291
{
@@ -42295,7 +42295,7 @@
4229542295
},
4229642296
{
4229742297
"source_path": "articles/iot-central/overview-iot-central-tour-pnp.md",
42298-
"redirect_url": "/azure/iot-central/core/overview-iot-central-tour-pnp/",
42298+
"redirect_url": "/azure/iot-central/preview/overview-iot-central-tour/",
4229942299
"redirect_document_id": true
4230042300
},
4230142301
{
@@ -42305,7 +42305,7 @@
4230542305
},
4230642306
{
4230742307
"source_path": "articles/iot-central/quick-create-pnp-device-pnp.md",
42308-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device-pnp/",
42308+
"redirect_url": "/azure/iot-central/preview/quick-create-pnp-device/",
4230942309
"redirect_document_id": true
4231042310
},
4231142311
{
@@ -42315,7 +42315,7 @@
4231542315
},
4231642316
{
4231742317
"source_path": "articles/iot-central/quick-deploy-iot-central-pnp.md",
42318-
"redirect_url": "/azure/iot-central/core/quick-deploy-iot-central-pnp/",
42318+
"redirect_url": "/azure/iot-central/preview/quick-deploy-iot-central/",
4231942319
"redirect_document_id": true
4232042320
},
4232142321
{
@@ -42330,7 +42330,7 @@
4233042330
},
4233142331
{
4233242332
"source_path": "articles/iot-central/tutorial-configure-rules-pnp.md",
42333-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules-pnp/",
42333+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules/",
4233442334
"redirect_document_id": true
4233542335
},
4233642336
{
@@ -42350,7 +42350,7 @@
4235042350
},
4235142351
{
4235242352
"source_path": "articles/iot-central/tutorial-monitor-devices-pnp.md",
42353-
"redirect_url": "/azure/iot-central/core/quick-monitor-devices-pnp/",
42353+
"redirect_url": "/azure/iot-central/preview/quick-monitor-devices/",
4235442354
"redirect_document_id": true
4235542355
},
4235642356
{

articles/billing/TOC.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
items:
66
- name: Understand your bill
77
href: billing-understand-your-bill.md
8-
- name: Understand your EA bill
9-
href: billing-understand-your-bill-ea.md
108
- name: Understand your bill - Microsoft Customer Agreement
119
href: billing-mca-understand-your-bill.md
1210
- name: Understand your bill - Microsoft Partner Agreement
@@ -74,7 +72,7 @@
7472
- name: SQL Database
7573
href: ../sql-database/sql-database-reserved-capacity.md?toc=/azure/billing/TOC.json
7674
- name: Azure Data Explorer
77-
href: ../data-explorer/pricing-reserved-capacity.md?toc=/azure/billing/TOC.json
75+
href: ../data-explorer/pricing-reserved-capacity.md?toc=/azure/billing/TOC.json
7876
- name: Azure Databricks
7977
href: billing-prepay-databricks-reserved-capacity.md
8078
- name: App Service
@@ -98,15 +96,15 @@
9896
- name: SQL Data Warehouse
9997
href: billing-how-reservation-discount-is-applied-to-azure-sql-dw.md
10098
- name: Azure Data Explorer
101-
href: billing-understand-kusto-azuredataexplorer-reservation-charges.md
99+
href: billing-understand-kusto-azuredataexplorer-reservation-charges.md
102100
- name: Azure Databricks
103101
href: billing-reservation-discount-databricks.md
104102
- name: Azure Database for MySQL
105-
href: billing-understand-reservation-charges-mysql.md
103+
href: billing-understand-reservation-charges-mysql.md
106104
- name: Azure Database for PostgreSQL
107-
href: billing-understand-reservation-charges-postgresql.md
105+
href: billing-understand-reservation-charges-postgresql.md
108106
- name: Azure Database for MariaDB
109-
href: billing-understand-reservation-charges-mariadb.md
107+
href: billing-understand-reservation-charges-mariadb.md
110108
- name: App Service
111109
href: billing-reservation-discount-app-service-isolated-stamp.md
112110
- name: Azure software plans
@@ -159,6 +157,8 @@
159157
items:
160158
- name: Get started in the Azure EA portal
161159
href: billing-ea-portal-get-started.md
160+
- name: Understand your EA bill
161+
href: billing-understand-your-bill-ea.md
162162
- name: EA roles in Azure
163163
href: billing-understand-ea-roles.md
164164
- name: Azure EA portal administration

0 commit comments

Comments
 (0)