Merge pull request #5879 from MicrosoftDocs/master637359590768117846

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: ghogen

docs/javascript/TOC.yml

@@ -11,7 +11,7 @@
   - name: First look at the Visual Studio IDE
     href: quickstart-ide-orientation-js.md
   - name: Create a Node.js project
-    href: /visualstudio/ide/quickstart-nodejs?toc=/visualstudio/javascript/toc.json
+    href: ../ide/quickstart-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json
   - name: Create a Vue.js project
     href: quickstart-vuejs-with-nodejs.md
 - name: Tutorials
@@ -31,7 +31,7 @@
     - name: Write and edit code
       href: write-and-edit-code.md
     - name: JavaScript IntelliSense
-      href: /visualstudio/ide/javascript-intellisense?toc=/visualstudio/javascript/toc.json
+      href: ../ide/javascript-intellisense.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json
   - name: Build
     items:
     - name: Compile TypeScript code using tsc
@@ -55,4 +55,4 @@
   - name: package.json configuration
     href: configure-packages-with-package-json.md
   - name: JavaScript and TypeScript docs repo
-    href: https://github.com/Microsoft/JSTSdocs
+    href: https://github.com/Microsoft/JSTSdocs

docs/javascript/compile-typescript-code-npm.md

@@ -21,7 +21,7 @@ For ASP.NET Core projects, it is recommended that you use the [NuGet package](..
 
 The [TypeScript npm package](https://www.npmjs.com/package/typescript) adds TypeScript support. When the npm package for TypeScript 2.1 or higher is installed into your project, the corresponding version of the TypeScript language service gets loaded in the editor.
 
-1. [Follow instructions](/visualstudio/ide/quickstart-nodejs?toc=/visualstudio/javascript/toc.json) to install the Node.js development workload and the Node.js runtime.
+1. [Follow instructions](../ide/quickstart-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json) to install the Node.js development workload and the Node.js runtime.
 
    For the simplest integration with Visual Studio, create your project using one of the Node.js TypeScript templates, such as the Blank Node.js Web Application template. Otherwise, use either a Node.js JavaScript template included with Visual Studio and follow instructions here, or use an [Open Folder](../javascript/develop-javascript-code-without-solutions-projects.md) project.
 
@@ -112,4 +112,4 @@ The [TypeScript npm package](https://www.npmjs.com/package/typescript) adds Type
 You can use Task Runner Explorer in Visual Studio to help automate tasks for third-party tools like npm and webpack.
 
 - [NPM Task Runner](https://marketplace.visualstudio.com/items?itemName=MadsKristensen.NPMTaskRunner) - Adds support for npm scripts defined in *package.json*. Supports yarn.
-- [Webpack Task Runner](https://marketplace.visualstudio.com/items?itemName=MadsKristensen.WebPackTaskRunner) - Adds support for webpack.
+- [Webpack Task Runner](https://marketplace.visualstudio.com/items?itemName=MadsKristensen.WebPackTaskRunner) - Adds support for webpack.

docs/javascript/javascript-in-vs-2017.md

@@ -29,7 +29,7 @@ Visual Studio now supports syntax for ECMAScript language updates such as ECMASc
 JavaScript is still evolving as a programming language and [TC39](https://www.ecma-international.org/memento/tc39-m.htm) is the committee responsible for making updates.
 ECMAScript 2015 is an update to the JavaScript language that brings helpful new syntax and functionality. For a deep dive on ES6 features, check out [this](http://es6-features.org/#Constants) reference site.
 
-In addition to support for ECMAScript 2015, Visual Studio also supports ECMAScript 2016 and will have support for future versions of ECMAScript as they are released. To keep up with TC39 and the latest changes in ECMAScript, follow their work on [github](https://github.com/tc39).
+In addition to support for ECMAScript 2015, Visual Studio also supports ECMAScript 2016 and will have support for future versions of ECMAScript as they are released. To keep up with TC39 and the latest changes in ECMAScript, follow their work on [GitHub](https://github.com/tc39).
 
 ### Transpile JavaScript
 
@@ -110,7 +110,7 @@ exports.default = Subscription_1.Subscription;
 
 ## Better IntelliSense
 
-JavaScript IntelliSense in [!include[vs_dev15](../../docs/misc/includes/vs_dev15_md.md)] will now display a lot more information on parameters and member lists. This new information is provided by the TypeScript language service, which uses static analysis behind the scenes to better understand your code. You can read more about the new IntelliSense experience and how it works [here](/visualstudio/ide/javascript-intellisense/).
+JavaScript IntelliSense in [!include[vs_dev15](../../docs/misc/includes/vs_dev15_md.md)] will now display a lot more information on parameters and member lists. This new information is provided by the TypeScript language service, which uses static analysis behind the scenes to better understand your code. You can read more about the new IntelliSense experience and how it works [here](../ide/javascript-intellisense.md).
 
 ## <a name="JSX"></a> JSX syntax support
 
@@ -235,7 +235,7 @@ The most notable changes are the replacement of VSDoc with JSDoc, the removal of
 
 Previously it was fairly complicated to understand at any given moment which files were in your IntelliSense scope. Sometimes it was desirable to have all your files in scope and other times it wasn't, and this led to complex configurations involving manual reference management. Going forward you no longer need to think about reference management and so you don't need triple slash references comments or `_references.js` files.
 
-See the [JavaScript IntelliSense](/visualstudio/ide/javascript-intellisense/) page for more info on how IntelliSense works.
+See the [JavaScript IntelliSense](../ide/javascript-intellisense.md) page for more info on how IntelliSense works.
 
 ### VSDoc
 
@@ -244,7 +244,7 @@ VSDoc is no longer supported in favor of [JSDoc](https://jsdoc.app/about-getting
 
 ### `.intellisense.js` extensions
 
-Previously, you could author [IntelliSense extensions](https://msdn.microsoft.com/library/hh874692.aspx) which would allow you to add custom completion results for third-party libraries.
+Previously, you could author [IntelliSense extensions](../vs-2015/ide/extending-javascript-intellisense.md) which would allow you to add custom completion results for third-party libraries.
 These extensions were fairly difficult to write and installing and referencing them was cumbersome, so going forward the new language service won't support these files.
 As an easier alternative, you can write a TypeScript definition file to provide the same IntelliSense benefits as the old `.intellisense.js` extensions.
 You can learn more about declaration (`.d.ts`) file authoring [here](http://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html).
@@ -283,4 +283,4 @@ var obj = {};
 obj.a = 10;
 obj.b = "hello world";
 obj. // IntelliSense shows properties a and b
-```
+```

docs/javascript/npm-package-management.md

@@ -37,7 +37,7 @@ These features work together and synchronize with the project system and the *pa
 
 ### Prerequisites
 
-You need the **Node.js development** workload and the Node.js runtime installed to add npm support to your project. For detailed steps, see [Create a Node.js project](/visualstudio/ide/quickstart-nodejs?toc=/visualstudio/javascript/toc.json).
+You need the **Node.js development** workload and the Node.js runtime installed to add npm support to your project. For detailed steps, see [Create a Node.js project](../ide/quickstart-nodejs.md?toc=%252fvisualstudio%252fjavascript%252ftoc.json).
 
 > [!NOTE]
 > For existing Node.js projects, use the **From existing Node.js code** solution template or the [Open folder (Node.js)](../javascript/develop-javascript-code-without-solutions-projects.md) project type to enable npm in your project.
@@ -82,12 +82,12 @@ Right-click the **npm** node to take one of the following actions:
 
 * **Install New npm Packages** Opens the UI to install new packages.
 * **Install npm Packages** Runs the npm install command to install all packages listed in *package.json*. (Runs `npm install`.)
-* **Update npm Packages** Updates packages to the lastest versions, according to the semver range specified in *package.json*. (Runs `npm update --save`.). Semver ranges are typically specified using "~" or "^". For more information, [package.json configuration](../javascript/configure-packages-with-package-json.md).
+* **Update npm Packages** Updates packages to the latest versions, according to the semantic versioning (semver) range specified in *package.json*. (Runs `npm update --save`.). Semver ranges are typically specified using "~" or "^". For more information, [package.json configuration](../javascript/configure-packages-with-package-json.md).
 
 Right-click a package node to take one of the following actions:
 
 * **Install npm Package(s)** Runs the npm install command to install the package version listed in *package.json*. (Runs `npm install`.)
-* **Update npm Package(s)** Updates the package to the lastest version, according to the semver range specified in *package.json*. (Run `npm update --save`.) Semver ranges are typically specified using "~" or "^".
+* **Update npm Package(s)** Updates the package to the latest version, according to the semver range specified in *package.json*. (Run `npm update --save`.) Semver ranges are typically specified using "~" or "^".
 * **Uninstall npm Package(s)** Uninstalls the package and removes it from *package.json* (Runs `npm uninstall --save`.)
 ::: moniker-end
 ::: moniker range="vs-2017"
@@ -125,7 +125,7 @@ For projects such as ASP.NET Core projects, you can integrate npm support in you
 * [Install packages using package.json](#npmInstallPackage)
 
 >[!NOTE]
-> For ASP.NET Core projects, you can also use [Library Manager](https://docs.microsoft.com/aspnet/core/client-side/libman/?view=aspnetcore-3.1) or yarn instead of npm to install client-side JavaScript and CSS files.
+> For ASP.NET Core projects, you can also use [Library Manager](/aspnet/core/client-side/libman/?view=aspnetcore-3.1) or yarn instead of npm to install client-side JavaScript and CSS files.
 
 ### <a name="npmAdd"></a> Add npm support to a project (ASP.NET Core)
 
@@ -180,4 +180,3 @@ It may take several minutes to install a package. Check progress on package inst
 * In some scenarios, Solution Explorer may not show the correct status for installed npm packages due to a known issue described [here](https://github.com/aspnet/Tooling/issues/479). For example, the package may appear as not installed when it is installed. In most cases, you can update Solution Explorer by deleting *package.json*, restarting Visual Studio, and re-adding the *package.json* file as described earlier in this article. Or, when installing packages, you can use the npm Output window to verify installation status.
 
 * If you see any errors when building your app or transpiling TypeScript code, check for npm package incompatibilities as a potential source of errors. To help identify errors, check the npm Output window when installing the packages, as described previously in this article. For example, if one or more npm package versions has been deprecated and results in an error, you may need to install a more recent version to fix errors. For information on using *package.json* to control npm package versions, see [package.json configuration](../javascript/configure-packages-with-package-json.md).
-

docs/sharepoint/create-sharepoint-solutions.md

@@ -29,8 +29,8 @@ ms.workload:
 |![Code Samples](../sharepoint/media/vs-icon-codesamples.gif "Code Samples")|**Code Samples**<br /><br /> -   [SharePoint Development Samples](../sharepoint/sharepoint-development-samples.md)<br />-   [SharePoint Developer Downloads](/sharepoint/dev/)|
 |![Training](../sharepoint/media/vs-icon-training.gif "Training")|**Training**<br /><br /> -   [Learn SharePoint Development](/sharepoint/dev/)|
 |![Forums](../sharepoint/media/vs-icon-forums.gif "Forums")|**Forums**<br /><br /> -   [SharePoint Development with Visual Studio](https://social.msdn.microsoft.com/Forums/vstudio/home?forum=vssharepointdevelopment)<br />-   [SharePoint 2010](https://social.msdn.microsoft.com/Forums/sharepoint/home?category=sharepoint2010,sharepoint)|
-|![Training](../sharepoint/media/vs-icon-training.gif "Training")|**Blogs**<br /><br /> -   [Visual Studio SharePoint Development Blog](https://blogs.msdn.microsoft.com/vssharepointtoolsblog/)|
+|![Training](../sharepoint/media/vs-icon-training.gif "Training")|**Blogs**<br /><br /> -   [Visual Studio SharePoint Development Blog](/archive/blogs/vssharepointtoolsblog/)|
 |![How Do I? Videos](../sharepoint/media/vs-icon-howdoivideos.gif "How Do I? Videos")|**How Do I? Videos**<br /><br /> -   [How Do I: Create Visual Web Parts for SharePoint 2010 in Visual Studio 2010?](https://visualstudio.microsoft.com/)<br />-   [How Do I: Create Content Types for SharePoint 2010 in Visual Studio 2010?](/previous-versions/visualstudio/visual-studio-2010/dd831853\(v\=vs.100\))<br />-   [How Do I: Create Site Definitions for SharePoint 2010 in Visual Studio 2010?](/previous-versions/visualstudio/visual-studio-2010/dd831853\(v\=vs.100\))<br />-   [How Do I: Create a Business Data Connectivity Model for SharePoint 2010 Using Visual Studio 2010?](/previous-versions/visualstudio/visual-studio-2010/dd831853\(v\=vs.100\))|
 |![Channel 9 Videos](../sharepoint/media/vs-icon-channel9videos.gif "Channel 9 Videos")|**Channel 9 Videos**<br /><br /> -   [Overview of SharePoint Development in Visual Studio 2010](https://channel9.msdn.com/blogs/funkyonex/overview-of-sharepoint-development-in-visual-studio-2010)<br />-   [Best Practices on Building SharePoint 2010 Web Parts with Visual Studio 2010](https://channel9.msdn.com/blogs/funkyonex/best-practices-on-building-sharepoint-2010-web-parts-with-visual-studio-2010)<br />-   [SharePoint Feature and Package Designers in Visual Studio 2010](https://channel9.msdn.com/blogs/funkyonex/sharepoint-feature-and-package-designers-in-visual-studio-2010)|
-|![Developer Center](../sharepoint/media/vs-icon-msdndevcenter.gif "Developer Center")|**Developer Centers**<br /><br /> -   [Visual Studio Development Center](https://visualstudio.microsoft.com/)<br />-   [SharePoint Developer Center](/sharepoint/dev/)<br />-   [SharePoint Server Developer Center](/previous-versions/office/fp161348\(v\=office.15\))<br />-   [SharePoint Designer Developer Center](/previous-versions/office/fp161348\(v\=office.15\))<br />-   [ASP.NET Developer Center](https://msdn.microsoft.com/aa336522.aspx)|
-|![Providing Feedback](../sharepoint/media/vs-icon-feedback.gif "Providing Feedback")|**Providing Feedback**<br /><br /> Provide feedback about Visual Studio:<br /><br /> -   [Microsoft Connect](/collaborate/connect-redirect)<br /><br /> Provide feedback about the documentation for Visual Studio:<br /><br /> -   **Lightweight View.** If you are at the top of any topic, you can choose the **Rate this topic** link to jump to the bottom of that topic, where you can specify **Yes** or **No** in response to **Did you find this helpful?** You can then select one or more of the check boxes that appear if you chose **No**, provide more information in the text box, or both. When you finish, choose the **Submit** button.<br />-   **Scriptfree View.** At the top of the topic, choose the **Feedback** link to provide feedback in the TechNet and Expression Library Feedback forum.<br />-   **Classic View.** At the top of the topic, choose the **Click to Rate and Give Feedback** icons to provide feedback about the topic to the documentation team.|
+|![Developer Center](../sharepoint/media/vs-icon-msdndevcenter.gif "Developer Center")|**Developer Centers**<br /><br /> -   [Visual Studio Development Center](https://visualstudio.microsoft.com/)<br />-   [SharePoint Developer Center](/sharepoint/dev/)<br />-   [SharePoint Server Developer Center](/previous-versions/office/fp161348\(v\=office.15\))<br />-   [SharePoint Designer Developer Center](/previous-versions/office/fp161348\(v\=office.15\))<br />-   [ASP.NET Developer Center](/previous-versions/msdn10/aa336522(v=msdn.10))|
+|![Providing Feedback](../sharepoint/media/vs-icon-feedback.gif "Providing Feedback")|**Providing Feedback**<br /><br /> Provide feedback about Visual Studio:<br /><br /> -   [Microsoft Connect](/collaborate/connect-redirect)<br /><br /> Provide feedback about the documentation for Visual Studio:<br /><br /> -   **Lightweight View.** If you are at the top of any topic, you can choose the **Rate this topic** link to jump to the bottom of that topic, where you can specify **Yes** or **No** in response to **Did you find this helpful?** You can then select one or more of the check boxes that appear if you chose **No**, provide more information in the text box, or both. When you finish, choose the **Submit** button.<br />-   **Scriptfree View.** At the top of the topic, choose the **Feedback** link to provide feedback in the TechNet and Expression Library Feedback forum.<br />-   **Classic View.** At the top of the topic, choose the **Click to Rate and Give Feedback** icons to provide feedback about the topic to the documentation team.|

docs/sharepoint/creating-web-parts-for-sharepoint.md

@@ -79,7 +79,7 @@ ms.workload:
 
 - Visual web parts don't directly support SharePoint server tokens such as $SPUrl. For more information, see "Token Restrictions in Sandboxed Visual Web Parts" in the topic [Troubleshoot SharePoint solutions](../sharepoint/troubleshooting-sharepoint-solutions.md).
 
-- Visual web parts in a sandboxed solution occasionally get the error, "The sandboxed code execution request was refused because the Sandboxed Code Host Service was too busy to handle the request." For more information about this error, see this post in the [SharePoint Developer Team Blog](https://blogs.msdn.microsoft.com/sharepointdev/2011/02/08/error-the-sandboxed-code-execution-request-was-refused-because-the-sandboxed-code-host-service-was-too-busy-to-handle-the-request-ricky-kirkham/#10149157).
+- Visual web parts in a sandboxed solution occasionally get the error, "The sandboxed code execution request was refused because the Sandboxed Code Host Service was too busy to handle the request." For more information about this error, see this post in the [SharePoint Developer Team Blog](/archive/blogs/sharepointdev/error-the-sandboxed-code-execution-request-was-refused-because-the-sandboxed-code-host-service-was-too-busy-to-handle-the-request-ricky-kirkham#10149157).
 
 - Server-side JavaScript debugging isn't supported in Visual Studio, but client-side JavaScript debugging is supported.
 
@@ -109,4 +109,4 @@ ms.workload:
 |[How to: Create a user control for a SharePoint application page or web part](../sharepoint/how-to-create-a-user-control-for-a-sharepoint-application-page-or-web-part.md)|Shows you how to create custom, reusable controls that can be consumed by application pages and web parts that run in SharePoint.|
 |[Walkthrough: Create a web part for SharePoint](../sharepoint/walkthrough-creating-a-web-part-for-sharepoint.md)|Describes how to design a web part for SharePoint.|
 |[Walkthrough: Create a web part for SharePoint by using a designer](../sharepoint/walkthrough-creating-a-web-part-for-sharepoint-by-using-a-designer.md)|Describes how to design a web part for SharePoint by dragging controls to a visual design surface.|
-|[Walkthrough: Create Silverlight web part that displays OData for SharePoint](../sharepoint/walkthrough-creating-a-silverlight-web-part-that-displays-odata-for-sharepoint.md)|Describes how to design a web part for SharePoint that hosts a Silverlight application and displays data from SharePoint lists.|
+|[Walkthrough: Create Silverlight web part that displays OData for SharePoint](../sharepoint/walkthrough-creating-a-silverlight-web-part-that-displays-odata-for-sharepoint.md)|Describes how to design a web part for SharePoint that hosts a Silverlight application and displays data from SharePoint lists.|