Merge branch 'master' into docfix_column-formatting

Author: andrewconnell

.openpublishing.redirection.json

@@ -74,6 +74,11 @@
             "source_path": "docs/spfx/web-parts/guidance/creating-team-manifest-manually-for-webpart.md",
             "redirect_url": "docs/spfx/deployment-spfx-teams-solutions.md",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/general-development/office-365-cdn.md",
+            "redirect_url": "/office365/enterprise/use-office-365-cdn-with-spo",
+            "redirect_document_id": false
         }
     ]
 }

README.md

@@ -14,7 +14,7 @@ You can also tweet / follow [@Microsoft365Dev](https://twitter.com/Microsoft365D
 
 ## SharePoint Framework Releases
 
-Review all the SPFx releases here from the initial GA release in February 2017 in the docs: https://docs.microsoft.com/en-us/sharepoint/dev/spfx/roadmap
+Review all the SPFx releases here from the initial GA release in February 2017 in the docs: https://docs.microsoft.com/sharepoint/dev/spfx/roadmap
 
 ## Get Started
 
@@ -27,14 +27,14 @@ Review all the SPFx releases here from the initial GA release in February 2017 i
 
 * [Background and Philosophy](https://docs.microsoft.com/sharepoint/dev/spfx/sharepoint-framework-overview)
 * [Design Great Web Parts](https://docs.microsoft.com/sharepoint/dev/design/design-guidance-overview)
-* [API Docs](https://docs.microsoft.com/javascript/api/sp-application-base)
+* [API Docs](/javascript/api/sp-application-base)
 
 ## Updates & Feedback
 
 To keep track of improvements to the Office 365 Framework, please take a look at:
 
 * [@SharePoint](https://twitter.com/sharepoint), [@Microsoft365Dev](https://twitter.com/Microsoft365Dev) and [@m365pnp](https://twitter.com/m365pnp) on Twitter
-* [Office Developer Blog](https://developer.microsoft.com/en-us/office/blogs/)
+* [Office Developer Blog](https://developer.microsoft.com/office/blogs/)
 
 Provide Feedback:
 
@@ -49,7 +49,7 @@ Please see following guidance if you are planning to submit changes on the Share
 
 * [Contribution guidance](https://github.com/SharePoint/sp-dev-docs/blob/master/.github/CONTRIBUTING.md)
 * [How to Create Good Pull Requests](https://github.com/SharePoint/sp-dev-docs/wiki/How-to-Create-Good-Pull-Requests)
-* If you are a Microsoft contributor, please review official guidance from our [internal documentation](https://review.docs.microsoft.com/en-us/help/contribute/?branch=master) for docs.microsoft.com contributors
+* If you are a Microsoft contributor, please review official guidance from our [internal documentation](https://review.docs.microsoft.com/help/contribute/?branch=master) for docs.microsoft.com contributors
 
 ## Have Fun
 

docs/apis/alm-api-for-spfx-add-ins.md

@@ -28,7 +28,7 @@ ALM APIs can be used to perform exactly the same operations that are available f
 ALM APIs are supported for the tenant-scoped site collections and [site collection app catalog](../general-development/site-collection-app-catalog.md). Use the corresponding app catalog's URL to target a specific app catalog. You must first enabled a site collection app catalog before targeting it with the actions documented on this page.
 
 > [!IMPORTANT]
-> Tenant-scoped permissions which require [tenant administrative approval](https://docs.microsoft.com/sharepoint/dev/solution-guidance/how-to-provide-add-in-app-only-tenant-administrative-permissions-in-sharepoint-online) are not supported with the ALM APIs.
+> Tenant-scoped permissions which require [tenant administrative permissions](../solution-guidance/how-to-provide-add-in-app-only-tenant-administrative-permissions-in-sharepoint-online.md) are not supported with the ALM APIs.
 
 ## Options for working with ALM APIs
 
@@ -42,12 +42,12 @@ The app catalog must be included in all HTTP requests when using the REST API as
 
 For example:
 
-|      Scope      |                                            Endpoint                                            |
-| :-------------- | :--------------------------------------------------------------------------------------------- |
-| tenant          | **https://contoso.sharepoint.com/sites/AppCatalog/_api/web/tenantappcatalog/{command}**        |
-| site collection | **https://contoso.sharepoint.com/sites/Marketing/_api/web/sitecollectionappcatalog/{command}** |
+|      Scope      |                                           Endpoint                                           |
+| :-------------- | :------------------------------------------------------------------------------------------- |
+| tenant          | `https://contoso.sharepoint.com/sites/AppCatalog/_api/web/tenantappcatalog/{command}`        |
+| site collection | `https://contoso.sharepoint.com/sites/Marketing/_api/web/sitecollectionappcatalog/{command}` |
 
-- when targeting the tenant app catalog located at **https://contoso.sharepoint.com/sites/AppCatalog**, the endpoint would be **
+- when targeting the tenant app catalog located at `https://contoso.sharepoint.com/sites/AppCatalog`, the endpoint would be **
 
 Learn more here: [SharePoint REST API](../sp-add-ins/get-to-know-the-sharepoint-rest-service.md)
 
@@ -57,7 +57,7 @@ The PnP CSOM implements the ALM APIs by calling the SharePoint REST API.
 
 Before using any of the ALM APIs in PnP CSOM, you need to obtain an authenticated client context using the [Microsoft.SharePointOnline.CSOM](https://www.nuget.org/packages/Microsoft.SharePointOnline.CSOM). Then use the authenticated client context to get an instance of the PnP CSOM's **AppManager** object to call the ALM commands:
 
-```cs
+```csharp
 using Microsoft.SharePoint.Client;
 using OfficeDevPnP.Core.ALM;
 
@@ -72,7 +72,7 @@ using (var context = new ClientContext(webURL)) {
 
 In all PnP Core methods, it's assumed the request targets the tenant app catalog in the tenant you connect to using the SharePoint CSOM `ClientContext` object. you can override the scope of all commands with an optional scope argument, for example
 
-```cs
+```csharp
 appManager.Install('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx', AppCatalogScope.Site);
 ```
 
@@ -128,7 +128,7 @@ Byte array of the file
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 // read file
 var filePath = "c:\path\to\file\sharepoint-solution-package.sppkg";
 // get an instance of the PnP CSOM's AppManager as shown above
@@ -190,7 +190,7 @@ POST /_api/web/{scope}appcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 appManager.Deploy('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')
 ```
 
@@ -237,7 +237,7 @@ POST /_api/web/{scope}appcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 // get an app package
 appManager.Retract('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')
 ```
@@ -274,7 +274,7 @@ POST /_api/web/{scope}appcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 appManager.Remove('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')
 ```
 
@@ -357,7 +357,7 @@ GET /_api/web/{scope}appcatalog/AvailableApps
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 var allAppPackages = appManager.GetAvailable();
 ```
 
@@ -419,7 +419,7 @@ GET /_api/web/{scope}appcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-x
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 var appPackage = appManager.GetAvailable('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx');
 ```
 
@@ -463,7 +463,7 @@ POST /_api/web/{scope}appcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 // get an app package
 appManager.Install('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')
 ```
@@ -508,7 +508,7 @@ POST /_api/web/{scope}appcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 // get an app package
 var appPackage = appManager.GetAvailable('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx');
 if (appPackage.CanUpgrade) {
@@ -559,7 +559,7 @@ POST /_api/web/{scope}appcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 appManager.Uninstall('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')
 ```
 
@@ -603,7 +603,7 @@ POST /_api/web/{scope}appcatalog/SyncSolutionToTeams(id=xxxxx)
 
 # [PnP CSOM](#tab/pnpcsom)
 
-```cs
+```csharp
 appManager.SyncToTeams('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')
 ```