Merge branch 'main' into live

Author: github-actions

docs/design/keyboard-shortcuts.md

@@ -189,7 +189,7 @@ For the best user experience, we recommend that you minimize keyboard shortcut c
 - Avoid using established keyboard shortcuts in Excel and Word. For a list, see the following:
   - [Keyboard shortcuts in Excel](https://support.microsoft.com/office/1798d9d5-842a-42b8-9c99-9b7213f0040f)
   - [Keyboard shortcuts in Word](https://support.microsoft.com/office/95ef89dd-7142-4b50-afb2-f762f663ceb2)
-- When the keyboard focus is inside the add-in UI, <kbd>Ctrl</kbd>+<kbd>Spacebar</kbd> and <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>F10</kbd> won't work as these are essential accessibility shortcuts.
+- When the keyboard focus is inside the add-in UI, <kbd>Ctrl</kbd>+<kbd>Space</kbd> and <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>F10</kbd> won't work as these are essential accessibility shortcuts.
 - On a Windows or Mac computer, if the **Reset Office Add-ins shortcut preferences** command isn't available on the search menu, the user can manually add the command to the ribbon by customizing the ribbon through the context menu.
 
 ## Localize the description of a keyboard shortcut

docs/develop/make-office-add-in-compatible-with-existing-com-add-in.md

@@ -1,7 +1,7 @@
 ---
 title: Make your Office Add-in compatible with an existing COM add-in
 description: Enable compatibility between your Office Add-in and equivalent COM add-in.
-ms.date: 06/18/2024
+ms.date: 01/30/2025
 ms.localizationpriority: medium
 ---
 
@@ -47,14 +47,16 @@ The following example shows the portion of the manifest that specifies a COM add
 ```
 
 > [!TIP]
-> For information about COM add-in and XLL UDF compatibility, see [Make your custom functions compatible with XLL user-defined functions](../excel/make-custom-functions-compatible-with-xll-udf.md). Not applicable for Outlook.
+>
+> - For information about COM add-in and XLL UDF compatibility, see [Make your custom functions compatible with XLL user-defined functions](../excel/make-custom-functions-compatible-with-xll-udf.md). Not applicable for Outlook.
+> - If you're unable to specify the **\<EquivalentAddins\>** element in the manifest of your Outlook web add-in, you must configure Group Policy instead. This only applies to Outlook. For guidance, see [Configure the Group Policy setting for Outlook add-ins](#configure-the-group-policy-setting-for-outlook-add-ins).
 
-### Configure the Group Policy setting
+### Configure the Group Policy setting for Outlook add-ins
 
-> [!IMPORTANT]
-> Applies to Outlook only.
+For Outlook web add-ins, if you're unable to update the add-in's manifest to specify the **\<EquivalentAddins\>** element, you must identify the equivalent COM add-in in the **Deactivate Outlook web add-ins whose equivalent COM or VSTO add-in is installed** Group Policy setting instead. This setting must be configured on the user's machine. Then, classic Outlook on Windows will use the COM add-in instead of the web add-in if they're both installed.
 
-To declare compatibility between your Outlook web add-in and COM add-in, identify the equivalent COM add-in in the **Deactivate Outlook web add-ins whose equivalent COM or VSTO add-in is installed** Group Policy setting. This must be configured on the user's machine. Then, classic Outlook on Windows will use the COM add-in instead of the web add-in, if they're both installed.
+> [!NOTE]
+> Configuring the Group Policy setting isn't necessary if the add-in's manifest already contains an **\<EquivalentAddins\>** section.
 
 1. Download the latest [Administrative Templates tool](https://www.microsoft.com/download/details.aspx?id=49030), paying attention to the tool's **Install Instructions**.
 1. Open the Local Group Policy Editor (**gpedit.msc**).

docs/includes/new-outlook-vsto-com-support.md

@@ -1,3 +1,3 @@
 > [!IMPORTANT]
 >
-> COM and VSTO add-ins aren't supported in the [new Outlook on Windows](https://insider.office.com/blog/new-outlook-for-windows-available-to-all-office-insiders) that's currently in preview. These add-ins are still supported in the classic Outlook on Windows desktop client. To learn more, see [Develop Outlook add-ins for new Outlook on Windows](../outlook/one-outlook.md).
+> COM and VSTO add-ins aren't supported in the [new Outlook on Windows](https://support.microsoft.com/office/656bb8d9-5a60-49b2-a98b-ba7822bc7627). These add-ins are still supported in the classic Outlook on Windows desktop client. To learn more, see [Develop Outlook add-ins for new Outlook on Windows](../outlook/one-outlook.md).

docs/outlook/debug-autolaunch.md

@@ -119,7 +119,7 @@ Configure the debugger in Visual Studio Code. Follow the steps applicable to you
 1. Create a new folder called **Debugging** (perhaps in your **Desktop** folder).
 1. Open Visual Studio Code.
 1. Go to **File** > **Open Folder**, navigate to the folder you just created, then choose **Select Folder**.
-1. On the Activity Bar, select **Run and Debug** (<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>D<kbd>).
+1. On the Activity Bar, select **Run and Debug** (<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>D</kbd>).
 
     ![The Run and Debug icon on the Activity Bar.](../images/vs-code-debug.png)
 

docs/publish/government-cloud-guidance.md

@@ -2,7 +2,7 @@
 title: Guidance for deploying Office Add-ins on government clouds
 description: Learn how to deploy your Office Add-in to secure, government cloud environments
 ms.topic: best-practice
-ms.date: 10/10/2023
+ms.date: 1/28/2025
 ms.localizationpriority: medium
 ---
 
@@ -24,22 +24,25 @@ For all government cloud (i.e. Sovereign Cloud) environments, the public Microso
 
 [Centralized deployment](/microsoft-365/admin/manage/centralized-deployment-of-add-ins) of add-ins outside of the store is still supported.
 
-## US Government Community Cloud (GCC)
+In addition to requirements applicable to all Sovereign Clouds, each Sovereign Cloud environment has its own considerations that may affect Office Add-ins targeting the environment. These requirements and recommendations are described in the following sections.
 
-In addition to requirements applicable to all Sovereign Clouds, each Sovereign Cloud environment has its own considerations that may affect Office Add-ins targeting the environment. GCC is the least restrictive of the government cloud environments and some of the resources required by the add-in are available from their usual production endpoints in this environment. One such resource is the Office JavaScript API library. Solution partners can continue to reference the public Office.js resource as they do with their public production solution.
+### US Government Community Cloud (GCC)
 
-## GCC High (GCCH), US Department of Defense (DOD), or other sovereign managed clouds
+GCC is the least restrictive of the government cloud environments. Solution partners are permitted to reference the public Office JavaScript API library (office.js) resource as they do with their public production solution. However, we recommend that partners reference the library from the following URL.
 
-These government clouds remain internet-connected, but the set of public endpoints made available is severely restricted. One such restricted endpoint is the public endpoint for loading the Office JavaScript API library. The public CDN location for Office.js will not be accessible from within these environments. However, there will be an internal, per-cloud Microsoft Office CDN provisioned with the same resource. This means the endpoint URL to access Office.js will be different and your Office Add-in may need some level of customization to run. Given the additional restrictions, it's likely that any solution provided to customers will require hosting provider services within the environment as well, necessitating additional customizations. You'll need to determine the best way to provide your solution to customers, such that it conforms to the additional restrictions imposed on services running within the boundaries of these environments. The Office JavaScript Library CDN URLs are as follows:
+- **GCC**: `https://appsforoffice.gcc.cdn.office.net/appsforoffice/lib/1/hosted/office.js`
 
-- **GCC High**: https://appsforoffice.gcch.cdn.office.net/appsforoffice/lib/1/hosted/office.js
-- **DOD**: https://appsforoffice.dod.cdn.office.net/appsforoffice/lib/1/hosted/office.js
+### GCC High (GCCH), US Department of Defense (DOD), or other sovereign managed clouds
 
+These government clouds remain internet-connected, but the set of public endpoints made available is severely restricted. One such restricted endpoint is the public endpoint for loading the Office JavaScript API library. The public CDN location for Office.js won't be accessible from within these environments. However, there'll an internal, per-cloud Microsoft Office CDN provisioned with the same resource. This means the endpoint URL to access Office.js will be different and your Office Add-in may need some level of customization to run. Given the additional restrictions, it's likely that any solution provided to customers will require hosting provider services within the environment as well, necessitating additional customizations. You'll need to determine the best way to provide your solution to customers, such that it conforms to the additional restrictions imposed on services running within the boundaries of these environments. The Office JavaScript Library CDN URLs are as follows:
 
-## Airgapped Sovereign Clouds
+- **GCC High**: `https://appsforoffice.gcch.cdn.office.net/appsforoffice/lib/1/hosted/office.js`
+- **DOD**: `https://appsforoffice.dod.cdn.office.net/appsforoffice/lib/1/hosted/office.js`
+
+### Airgapped Sovereign Clouds
 
 These government clouds are essentially disconnected from the public internet entirely. Any resource that would normally be accessed from public resources must instead be custom-provisioned inside these cloud environments. In the GCCH and DOD clouds mentioned previously, most (if not all) solution providers will need to provision their services and resources inside the cloud. There is an option to make firewall exceptions that allows access to public services and resources. However, this bypass is not possible in airgapped clouds. As with the GCCH and DOD clouds, there will be a Microsoft Office CDN provisioned inside each cloud environment that hosts required resources such as the Office.js library. You'll need to work closely with customer tenant administrators to determine the best way to provide your services and resources in a way that conforms to the strict access requirements for airgapped Sovereign Clouds.
 
-## Office 365 operated by 21Vianet
+### Office 365 operated by 21Vianet
 
 [!INCLUDE [Information about the China-specific CDN](../includes/21Vianet-CDN.md)]

docs/tutorials/powerpoint-tutorial-vs.md

@@ -620,7 +620,7 @@ Complete the following steps to add code that navigates between the slides of a
 
     ![The Go to Last Slide button highlighted in the add-in.](../images/powerpoint-tutorial-go-to-last-slide.png)
 
-1. In Visual Studio, stop the add-in by pressing <kbd>Shift</kbd>+<kbd>F5*</kbd> or choosing the **Stop** button. PowerPoint will automatically close when the add-in is stopped.
+1. In Visual Studio, stop the add-in by pressing <kbd>Shift</kbd>+<kbd>F5</kbd> or choosing the **Stop** button. PowerPoint will automatically close when the add-in is stopped.
 
     ![The Stop button highlighted on the Visual Studio toolbar.](../images/powerpoint-tutorial-stop.png)
 

docs/word/create-better-add-ins-for-word-with-office-open-xml.md

@@ -327,7 +327,7 @@ To turn off RSID attributes in Word for documents you create going forward, do t
 To remove RSID tags from an existing document, try the following shortcut with the document open in Office Open XML.
 
 1. With your insertion point in the main body of the document, press <kbd>Ctrl</kbd>+<kbd>Home</kbd> to go to the top of the document.
-1. On the keyboard, press <kbd>Spacebar</kbd>, <kbd>Delete</kbd>, <kbd>Spacebar</kbd>. Then, save the document.
+1. On the keyboard, press <kbd>Space</kbd>, <kbd>Delete</kbd>, <kbd>Space</kbd>. Then, save the document.
 
 After removing the majority of the markup from this package, you're left with the minimal markup that needs to be inserted for the sample, as shown in the preceding section.