Skip to content

Commit 4a44e50

Browse files
committed
Merge branch '194726-review-jaep-read-how-to' of https://github.com/laujan/azure-docs-pr into 194726-review-jaep-read-how-to
2 parents 6831b25 + dbe8ab1 commit 4a44e50

File tree

2,564 files changed

+32355
-19852
lines changed

Some content is hidden

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

2,564 files changed

+32355
-19852
lines changed

.github/workflows/stale.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
# start-date: '2021-03-19'
2424
stale-pr-message: >
2525
This pull request has been inactive for at least 14 days.
26-
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.
26+
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
2727
28-
[Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=master)
28+
[Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=main)
2929
3030
[Docs Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
3131
32-
[Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=master)
32+
[Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
3333

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ AzureMigration.ps1
2424
.gitignore
2525
**/.vscode/settings.json
2626
*.pdn
27-
articles/azure-cache-for-redis/media/cache-managed-identity/Screenshot 2022-01-20 092913.pdn

.openpublishing.publish.config.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,14 @@
860860
"url": "https://github.com/Azure/azure-webpubsub",
861861
"branch": "main",
862862
"branch_mapping": {}
863+
},
864+
{
865+
"path_to_root": "functions-sql-todo-sample",
866+
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
867+
"branch": "docs-snippets",
868+
"branch_mapping": {}
863869
}
870+
864871
],
865872
"branch_target_mapping": {
866873
"live": [
@@ -884,6 +891,7 @@
884891
"redirection_files": [
885892
".openpublishing.redirection.json",
886893
".openpublishing.redirection.active-directory.json",
894+
".openpublishing.redirection.azure-blob.json",
887895
".openpublishing.redirection.azure-sql.json",
888896
"articles/data-factory/.openpublishing.redirection.data-factory.json",
889897
".openpublishing.redirection.defender-for-cloud.json",
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/storage/blobs/storage-upload-process-images.md",
5+
"redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/storage/blobs/storage-secure-access-application.md",
10+
"redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
11+
"redirect_document_id": true
12+
},
13+
{
14+
"source_path_from_root": "/articles/storage/blobs/storage-monitor-troubleshoot-storage-application.md",
15+
"redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
16+
"redirect_document_id": false
17+
}
18+
]
19+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,21 @@
3939
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
4040
"redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",
4141
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-monitor/app/pricing.md",
45+
"redirect_url": "/azure/azure-monitor/logs/cost-logs",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/logs/manage-cost-storage.md",
50+
"redirect_url": "/azure/azure-monitor/logs/cost-logs",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/logs/data-ingestion-from-file.md",
55+
"redirect_url": "/azure/azure-monitor/agents/data-sources-custom-logs",
56+
"redirect_document_id": false
4257
}
43-
4458
]
4559
}

.openpublishing.redirection.defender-for-iot.json

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-manage-proprietary-protocols.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/overview#extend-support-to-proprietary-protocols",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-windows-endpoint-monitoring.md",
10+
"redirect_url": "/azure/defender-for-iot/organizations/how-to-control-what-traffic-is-monitored#configure-windows-endpoint-monitoring",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/defender-for-iot/organizations/concept-key-concepts.md",
15+
"redirect_url": "/azure/defender-for-iot/organizations/overview",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/defender-for-iot/organizations/overview-eiot.md",
20+
"redirect_url": "/azure/defender-for-iot/organizations/overview",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
525
"redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -32,7 +52,7 @@
3252
},
3353
{
3454
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
35-
"redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
55+
"redirect_url": "/azure/defender-for-iot/organizations/overview",
3656
"redirect_document_id": false
3757
},
3858
{
@@ -47,7 +67,7 @@
4767
},
4868
{
4969
"source_path_from_root": "/articles/defender-for-iot/concept-key-concepts.md",
50-
"redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts",
70+
"redirect_url": "/azure/defender-for-iot/organizations/overview",
5171
"redirect_document_id": false
5272
},
5373
{
@@ -497,7 +517,7 @@
497517
},
498518
{
499519
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-sensor-deployment-checklist.md",
500-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-set-up-your-network#predeployment-checklist",
520+
"redirect_url": "/azure/defender-for-iot/organizations/pre-deployment-checklist",
501521
"redirect_document_id": false
502522
},
503523
{

0 commit comments

Comments
 (0)