Skip to content

Commit 4212977

Browse files
committed
Merge remote-tracking branch 'upstream/main' into rpc-srv-setup-jopilov-082625
2 parents 2213ac1 + a020233 commit 4212977

115 files changed

Lines changed: 3104 additions & 471 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13664,7 +13664,6 @@
1366413664
"source_path": "support/dynamics/gp/unapproved-pending-change-order-exist.md",
1366513665
"redirect_url": "/troubleshoot/dynamics/gp/welcome-gp"
1366613666
},
13667-
1366813667
{
1366913668
"source_path": "support/dynamics/gp/use-banked-paycodes-with-project-accounting.md",
1367013669
"redirect_url": "/troubleshoot/dynamics/gp/welcome-gp"
@@ -13688,12 +13687,12 @@
1368813687
{
1368913688
"source_path": "support/windows-server/active-directory/troubleshoot-errors-join-computer-to-domain.md",
1369013689
"redirect_url": "/troubleshoot/windows-server/active-directory/domain-join-networking-errors"
13691-
},
13690+
},
13691+
{
13692+
"source_path": "support/power-platform/power-automate/desktop-flows/troubleshoot-excel-errors.md",
13693+
"redirect_url": "/troubleshoot/power-platform/power-automate/desktop-flows/office-automation/excel/troubleshoot-excel-errors"
13694+
},
1369213695
{
13693-
"source_path": "support/power-platform/power-automate/desktop-flows/troubleshoot-excel-errors.md",
13694-
"redirect_url": "/troubleshoot/power-platform/power-automate/desktop-flows/office-automation/excel/troubleshoot-excel-errors"
13695-
},
13696-
{
1369713696
"source_path": "support/entra/entra-id/mfa/authorization-request-denied-graph-api.md",
1369813697
"redirect_url": "/troubleshoot/entra/entra-id/app-integration/troubleshoot-authorization-requestdenied-graph-api",
1369913698
"redirect_document_id": false
@@ -13804,41 +13803,38 @@
1380413803
{
1380513804
"source_path": "support/azure/azure-monitor/activity-logs/config-export/centralized-configuration-of-activity-logs-to-event-hub.md",
1380613805
"redirect_url": "/troubleshoot/azure/azure-monitor/welcome-azure-monitor"
13807-
}
13808-
,
13806+
},
1380913807
{
1381013808
"source_path": "support/azure/azure-monitor/activity-logs/config-export/exporting-directory-level-activity-logs-to-event-hub.md",
1381113809
"redirect_url": "/troubleshoot/azure/azure-monitor/welcome-azure-monitor"
13812-
}
13813-
,
13810+
},
1381413811
{
1381513812
"source_path": "support/azure/azure-monitor/activity-logs/config-export/pushing-subscription-activity-logs-to-sentinel.md",
1381613813
"redirect_url": "/troubleshoot/azure/azure-monitor/activity-logs/config-export/push-subscription-activity-logs-to-sentinel"
13817-
}
13818-
,
13814+
},
1381913815
{
1382013816
"source_path": "support/azure/azure-monitor/activity-logs/config-export/resolving-log-limit-issues-in-azure-function-apps.md",
1382113817
"redirect_url": "/troubleshoot/azure/azure-monitor/welcome-azure-monitor"
13822-
}
13823-
,
13818+
},
1382413819
{
1382513820
"source_path": "support/azure/azure-monitor/activity-logs/config-export/understanding-and-managing-diagnostic-settings-retention.md",
1382613821
"redirect_url": "/troubleshoot/azure/azure-monitor/welcome-azure-monitor"
13827-
}
13828-
,
13822+
},
1382913823
{
1383013824
"source_path": "support/azure/azure-monitor/activity-logs/config-export/understanding-and-transitioning-from-legacy-to-diagnostic-settings.md",
1383113825
"redirect_url": "/troubleshoot/azure/azure-monitor/welcome-azure-monitor"
13832-
}
13833-
,
13826+
},
1383413827
{
1383513828
"source_path": "support/azure/azure-monitor/activity-logs/config-export/diagnostic-settings-transition-from-legacy-solutions.md",
1383613829
"redirect_url": "/troubleshoot/azure/azure-monitor/welcome-azure-monitor"
13837-
}
13838-
,
13830+
},
1383913831
{
1384013832
"source_path": "support/sql/database-engine/install/windows/error-install-sql-server-2008-r2.md",
1384113833
"redirect_url": "/troubleshoot/sql/database-engine/install/windows/error-install-sql-server"
13834+
},
13835+
{
13836+
"source_path": "support/sql/database-engine/install/windows/update-or-slipstream-installation.md",
13837+
"redirect_url": "/sql/database-engine/install-windows/install-sql-server-using-slipstream"
1384213838
}
1384313839
]
13844-
}
13840+
}

.openpublishing.redirection.outlook.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
{
2020
"source_path": "Outlook/Mobile/exchange-connectivity/outlook-for-ios-and-android-with-abq-rules-are-quarantined.md",
2121
"redirect_url": "/previous-versions/troubleshoot/outlook/outlook-for-ios-and-android-with-abq-rules-are-quarantined"
22+
},
23+
{
24+
"source_path": "Outlook/Mac/outlook-mac-welcome.yml",
25+
"redirect_url": "/troubleshoot/outlook/legacy-outlook-mac-welcome"
2226
}
2327
]
2428
}

Exchange/ExchangeOnline/onlinetoc/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ items:
106106
href: ../administration/public-folder-permissions-in-exchange-admin-center-show-guid-not-name.md
107107
- name: Repeated calls against the same folder are slow
108108
href: ../administration/slow-repeated-calls-against-same-folder.md
109+
- name: Resolve validation errors for an archive mailbox
110+
href: ../administration/validation-errors-for-mailbox-archive-guid.md
109111
- name: Self-help diagnostics
110112
href: ../administration/self-help-diagnostics.md
111113
- name: Site mailbox retirement
@@ -126,8 +128,6 @@ items:
126128
href: ../administration/update-of-client-access-rules-for-office-365-customers.md
127129
- name: UsageLocation validation error about Enable-UMMailbox
128130
href: ../administration/enable-ummailbox-cannot-be-performed-error.md
129-
- name: Resolve validation errors for an archive mailbox
130-
href: ../administration/validation-errors-for-mailbox-archive-guid.md
131131
- name: View and update address list membership
132132
href: ../administration/view-update-address-list-membership.md
133133
- name: Voice mail settings are missing from Options

Exchange/Hub/index.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ productDirectory:
7676
links:
7777
- url: /troubleshoot/outlook/outlook-client-welcome
7878
text: Outlook for Windows
79-
- url: /troubleshoot/outlook/outlook-mac-welcome
80-
text: Outlook for Mac
79+
- url: /troubleshoot/outlook/legacy-outlook-mac-welcome
80+
text: Legacy Outlook for Mac
81+
- url: /troubleshoot/outlook/overview-new-outlook-mac
82+
text: New Outlook for Mac
8183
# Card
8284
- title: OneDrive
8385
imageSrc: /office/media/logos/logo-onedriveforbusiness.svg

Microsoft365/Hub/index.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ productDirectory:
7676
links:
7777
- url: /troubleshoot/outlook/outlook-client-welcome
7878
text: Outlook for Windows
79-
- url: /troubleshoot/outlook/outlook-mac-welcome
80-
text: Outlook for Mac
79+
- url: /troubleshoot/outlook/legacy-outlook-mac-welcome
80+
text: Legacy Outlook for Mac
81+
- url: /troubleshoot/outlook/overview-new-outlook-mac
82+
text: New Outlook for Mac
8183
# Card
8284
- title: OneDrive
8385
imageSrc: /office/media/logos/logo-onedriveforbusiness.svg
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
title: include file
3+
description: include file
4+
services: azure-policy
5+
author: aashishr
6+
7+
ms.service: azure-policy
8+
ms.topic: include
9+
ms.collection: M365-security-compliance
10+
ms.date: 04/11/2024
11+
ms.author: aashishr
12+
ms.custom: include file
13+
---
14+
15+
16+
> [!NOTE]
17+
> **Are you looking for [Microsoft Purview Information Protection](/purview/information-protection)**, formerly Microsoft Information Protection (MIP)?
18+
>
19+
>The Azure Information Protection add-in is [retired](https://techcommunity.microsoft.com/t5/security-compliance-and-identity/retirement-notification-for-the-azure-information-protection/ba-p/3791908) and replaced with labels that are [built in to your Microsoft 365 apps and services](/purview/sensitivity-labels#sensitivity-labels-and-azure-information-protection). Learn more about the [support status of other Azure Information Protection components](https://techcommunity.microsoft.com/t5/security-compliance-and-identity/azure-information-protection-and-the-information-protection/ba-p/3671070).
20+
>
21+
> The [Microsoft Purview Information Protection client](https://www.microsoft.com/en-us/download/details.aspx?id=53018) (without the add-in) is [generally available](/purview/information-protection-client-relnotes).

Microsoft365/purview/purviewtoc/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@
125125
items:
126126
- name: Can't send encrypted email to many recipients
127127
href: ../sensitivity-labels/encrypted-email-cannot-send-many-recipients.md
128+
- name: Known issues for Information Protection client
129+
href: ../sensitivity-labels/known-issues-ip-client.md
128130
- name: Mail contacts lose access to encrypted content
129131
href: ../sensitivity-labels/mail-contacts-lose-access-encrypted-content.md
130132
- name: Sensitivity labels are missing

0 commit comments

Comments
 (0)