Merge remote-tracking branch 'MicrosoftDocs/master'

Author: timeyoutakeit

.openpublishing.redirection.json

@@ -1594,6 +1594,16 @@
             "redirect_url": "/visualstudio/msbuild/msbuild-glossary",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/nodejs/tutorial-nodejs.md",
+            "redirect_url": "/visualstudio/javascript/tutorial-nodejs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/nodejs/tutorial-nodejs-with-react-and-jsx.md",
+            "redirect_url": "/visualstudio/javascript/tutorial-nodejs-with-react-and-jsx",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/profiling/profiling-tools.md",
             "redirect_url": "/visualstudio/profiling/profiling-feature-tour",
@@ -5715,6 +5725,11 @@
             "source_path": "connected-environment/troubleshooting.md",
             "redirect_url": "/azure/dev-spaces/troubleshooting",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "mac/benefits-vsmac-over-xs.md",
+            "redirect_url": "/visualstudio/mac/",
+            "redirect_document_id": false
         }
 
     ]

docs/javascript/TOC.yml

@@ -8,9 +8,9 @@
 - name: Tutorials
   items:
   - name: Create a Node.js app with Express
-    href: /visualstudio/nodejs/tutorial-nodejs?toc=/visualstudio/javascript/toc.json
+    href: tutorial-nodejs.md
   - name: Create a Node.js app with React
-    href: /visualstudio/nodejs/tutorial-nodejs-with-react-and-jsx?toc=/visualstudio/javascript/toc.json
+    href: tutorial-nodejs-with-react-and-jsx.md
   - name: Publish to Linux App Service
     href: publish-nodejs-app-azure.md
 - name: How-to Guides

docs/nodejs/media/tutorial-nodejs-deploy-target.png renamed to docs/javascript/media/tutorial-nodejs-deploy-target.png

@@ -54,7 +54,7 @@ First, create a Node.js web application project.
 
     Visual Studio creates the new solution and opens your project.
 
-    ![Node.js project in Solution Explorer](../nodejs/media/tutorial-nodejs-react-project-structure.png)
+    ![Node.js project in Solution Explorer](../javascript/media/tutorial-nodejs-react-project-structure.png)
 
     * Highlighted in bold is your project, using the name you gave in the **New Project** dialog box. In the file system, this project is represented by a *.njsproj* file in your project folder. You can set properties and environment variables associated with the project by right-clicking the project and choosing **Properties**. You can do round-tripping with other development tools, since the project file does not make custom changes to the Node.js project source.
 
@@ -83,7 +83,7 @@ This app requires a number of npm modules to run correctly.
 
 1. In the **Install New npm Packages** dialog box, search for the react package, and select **Install Package** to install it.
 
-    ![Install npm packages](../nodejs/media/tutorial-nodejs-react-install-packages.png)
+    ![Install npm packages](../javascript/media/tutorial-nodejs-react-install-packages.png)
 
     Select the **Output** window to see progress on installing the package (select **Npm** in the **Show output from** field). When installed, the package appears under the **npm** node.
 
@@ -110,7 +110,7 @@ This app requires a number of npm modules to run correctly.
 
     Here are the npm modules as they appear in Solution Explorer after they are installed.
 
-    ![npm packages](../nodejs/media/tutorial-nodejs-react-npm-modules.png)
+    ![npm packages](../javascript/media/tutorial-nodejs-react-npm-modules.png)
 
     > [!NOTE]
     > If you prefer to install npm packages using the command line, right-click the project node and choose **Open Command Prompt Here**. Use standard Node.js commands to install packages.
@@ -260,7 +260,7 @@ In the previous steps, you added *webpack-config.js* to the project. Next, you a
 
     The command prompt window shows the result.
 
-    ![Run webpack](../nodejs/media/tutorial-nodejs-react-run-webpack.png)
+    ![Run webpack](../javascript/media/tutorial-nodejs-react-run-webpack.png)
 
     If you see any errors instead of the preceding output, you must resolve them before your app will work. If your npm package versions are different than the versions shown in this tutorial, that can be a source of errors. One way to fix errors is to use the exact versions shown in the earlier steps. Also, if one or more of these package versions has been deprecated and results in an error, you may need to install a more recent version to fix errors.
 
@@ -272,23 +272,23 @@ In the previous steps, you added *webpack-config.js* to the project. Next, you a
 
 1. If prompted to reload externally modified files, select **Yes to All**.
 
-    ![Load modified files](../nodejs/media/tutorial-nodejs-react-reload-files.png)
+    ![Load modified files](../javascript/media/tutorial-nodejs-react-reload-files.png)
 
 Each time you make changes to *app.tsx*, you must rerun the webpack command.
 
 ## Run the app
 
 1. Make sure that Chrome is selected as the current debug target.
 
-    ![Select Chrome as debug target](../nodejs/media/tutorial-nodejs-react-debug-target.png)
+    ![Select Chrome as debug target](../javascript/media/tutorial-nodejs-react-debug-target.png)
 
 1. To run the app, press **F5** (**Debug** > **Start Debugging**) or the green arrow button.
 
     A Node.js console window opens that shows the port on which the debugger is listening.
 
     Visual Studio starts the app by launching the startup file, *server.js*.
 
-    ![Run React in browser](../nodejs/media/tutorial-nodejs-react-running-react.png)
+    ![Run React in browser](../javascript/media/tutorial-nodejs-react-running-react.png)
 
 1. Close the browser window.
 
@@ -298,7 +298,7 @@ Each time you make changes to *app.tsx*, you must rerun the webpack command.
 
 1. In *server.js*, click in the gutter to the left of the `staticPath` declaration to set a breakpoint:
 
-    ![Set a breakpoint](../nodejs/media/tutorial-nodejs-react-set-breakpoint.png)
+    ![Set a breakpoint](../javascript/media/tutorial-nodejs-react-set-breakpoint.png)
 
     Breakpoints are the most basic and essential feature of reliable debugging. A breakpoint indicates where Visual Studio should suspend your running code so you can take a look at the values of variables, or the behavior of memory, or whether or not a branch of code is getting run.
 
@@ -326,7 +326,7 @@ In the preceding section, you attached the debugger to server-side Node.js code.
 
 1. Switch to Visual Studio and set a breakpoint in *app-bundle.js* code in the `render()` function as shown in the following illustration:
 
-    ![Set a breakpoint](../nodejs/media/tutorial-nodejs-react-set-breakpoint-client-code.png)
+    ![Set a breakpoint](../javascript/media/tutorial-nodejs-react-set-breakpoint-client-code.png)
 
 1. With Chrome selected as the debug target in Visual Studio, press **Ctrl**+**F5** (**Debug** > **Start Without Debugging**) to run the app in the browser.
 
@@ -338,7 +338,7 @@ In the preceding section, you attached the debugger to server-side Node.js code.
 
 1. Select the Chrome process with the correct host port (1337 in this example), and select **Attach**.
 
-    ![Attach to process](../nodejs/media/tutorial-nodejs-react-attach-to-process.png)
+    ![Attach to process](../javascript/media/tutorial-nodejs-react-attach-to-process.png)
 
     You know the debugger has attached correctly when the DOM Explorer and the JavaScript Console open in Visual Studio. These debugging tools are similar to Chrome Developer Tools and F12 Tools for Edge.
 

docs/nodejs/media/tutorial-nodejs-error-list.png renamed to docs/javascript/media/tutorial-nodejs-error-list.png

@@ -71,7 +71,7 @@ In this tutorial, you begin with a simple project containing code for a Node.js
 
     Visual Studio creates the new solution and opens your project in the right pane. The *app.js* project file opens in the editor (left pane).
 
-    ![Project structure](../nodejs/media/tutorial-project-structure.png)
+    ![Project structure](../javascript/media/tutorial-project-structure.png)
 
     (1) Highlighted in **bold** is your project, using the name you gave in the **New Project** dialog box. In the file system, this project is represented by a *.njsproj* file in your project folder. You can set properties and environment variables associated with the project by right-clicking the project and choosing **Properties**. You can do round-tripping with other development tools, because the project file does not make custom changes to the Node.js project source.
 
@@ -154,19 +154,19 @@ IntelliSense is a Visual Studio tool that assists you as you write code.
 
 1. Put your cursor after the `data` string, type `: get` and IntelliSense will show you the `getData` function defined earlier in the code. Select `getData`.
 
-    ![Use IntelliSense](../nodejs/media/tutorial-nodejs-intellisense.png)
+    ![Use IntelliSense](../javascript/media/tutorial-nodejs-intellisense.png)
 
 1. Remove the comma (`,`) before `"data"` and you see green syntax highlighting on the expression. Hover over the syntax highlighting.
 
-    ![View syntax error](../nodejs/media/tutorial-nodejs-syntax-checking.png)
+    ![View syntax error](../javascript/media/tutorial-nodejs-syntax-checking.png)
 
     The last line of this message tells you that the JavaScript interpreter expected a comma (`,`).
 
 1. In the lower pane, click the **Error List** tab.
 
     You see the warning and description along with the filename and line number.
 
-    ![View error list](../nodejs/media/tutorial-nodejs-error-list.png)
+    ![View error list](../javascript/media/tutorial-nodejs-error-list.png)
 
 1. Fix the code by adding the comma (`,`) before `"data"`.
 
@@ -182,21 +182,21 @@ You're next going to run the app with the Visual Studio debugger attached. Befor
 
     Breakpoints are the most basic and essential feature of reliable debugging. A breakpoint indicates where Visual Studio should suspend your running code so you can take a look at the values of variables, or the behavior of memory, or whether or not a branch of code is getting run.
 
-    ![Set a breakpoint](../nodejs/media/tutorial-nodejs-set-breakpoint.png)
+    ![Set a breakpoint](../javascript/media/tutorial-nodejs-set-breakpoint.png)
 
 ## Run the application
 
 1. Select the debug target in the Debug toolbar.
 
-    ![Select the debug target](../nodejs/media/tutorial-nodejs-deploy-target.png)
+    ![Select the debug target](../javascript/media/tutorial-nodejs-deploy-target.png)
 
 1. Press **F5** (**Debug** > **Start Debugging**) to run the application.
 
     The debugger pauses at the breakpoint you set. Now, you can inspect your app state.
 
 1. Hover over `getData` to see its properties in a DataTip
 
-    ![Inspect variables](../nodejs/media/tutorial-nodejs-inspect-variables.png)
+    ![Inspect variables](../javascript/media/tutorial-nodejs-inspect-variables.png)
 
 1. Press **F5** (**Debug** > **Continue**) to continue.
 
@@ -206,15 +206,15 @@ You're next going to run the app with the Visual Studio debugger attached. Befor
 
 1. Click the buttons to display different images.
 
-    ![App running in browser](../nodejs/media/tutorial-nodejs-running-in-browser.png)
+    ![App running in browser](../javascript/media/tutorial-nodejs-running-in-browser.png)
 
 1. Close the web browser.
 
 ## (Optional) Publish to Azure App Service
 
 1. In Solution Explorer, right-click the project and choose **Publish**.
 
-   ![Publish to Azure App Service](../nodejs/media/tutorial-nodejs-publish-to-azure.png)
+   ![Publish to Azure App Service](../javascript/media/tutorial-nodejs-publish-to-azure.png)
 
 1. Choose **Microsoft Azure App Service**.
 
@@ -226,7 +226,7 @@ You're next going to run the app with the Visual Studio debugger attached. Befor
 
     On successful deployment, your app opens in a browser running in Azure App Service. Click a button to display an image.
 
-   ![App running in Azure App Service](../nodejs/media/tutorial-nodejs-running-in-azure.png)
+   ![App running in Azure App Service](../javascript/media/tutorial-nodejs-running-in-azure.png)
 
 Congratulations on completing this tutorial!
 

docs/nodejs/media/tutorial-nodejs-inspect-variables.png renamed to docs/javascript/media/tutorial-nodejs-inspect-variables.png

@@ -8,7 +8,8 @@
 - name: Quickstarts
   items:
   - name: Create a web app with Flask
-    href: ../ide/quickstart-python.md?context=visualstudio/python/default
+    href: ../ide/quickstart-python.md
+    maintainContext: true
   - name: Create a project from a template
     href: quickstart-02-python-in-visual-studio-project-from-template.md
   - name: Create a project from existing code

docs/nodejs/media/tutorial-nodejs-intellisense.png renamed to docs/javascript/media/tutorial-nodejs-intellisense.png

@@ -132,7 +132,7 @@
   - name: R in Visual Studio...
     href: rtvs/getting-started-with-r.md
   - name: Node.js in Visual Studio
-    href: nodejs/tutorial-nodejs.md
+    href: javascript/tutorial-nodejs.md
   - name: C# in Visual Studio
     href: ide/tutorial-csharp-aspnet-core.md
   - name: Visual Basic in Visual Studio

docs/nodejs/media/tutorial-nodejs-publish-to-azure.png renamed to docs/javascript/media/tutorial-nodejs-publish-to-azure.png

@@ -1,5 +1,4 @@
 # [Introducing Visual Studio for Mac](index.md)
-## [Benefits of Visual Studio for Mac over Xamarin Studio](benefits-vsmac-over-xs.md)
 # [IDE Tour](ide-tour.md)
 
 # [Installation](installation.md)