Merge pull request #1 from MicrosoftDocs/master

update from upstream

Author: tynevi

.gitignore

@@ -7,3 +7,6 @@ _themes.MSDN.Modern/
 _themes.VS.Modern/
 
 .openpublishing.buildcore.ps1
+
+# Documentation build
+/docs/vcppdocs

.localization-config

@@ -1,36 +1,56 @@
-{
-  "build_entry_point": "docs",
-  "need_generate_pdf": false,
-  "need_generate_intellisense": false,
-  "docsets_to_publish": [
-    {
-      "docset_name": "vcppdocs",
-      "build_source_folder": "docs",
-      "build_output_subfolder": "vcppdocs",
-      "locale": "en-us",
-      "version": 0,
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "template_folder": "_themes"
-    }
-  ],
-  "notification_subscribers": [],
-  "branches_to_filter": [],
-  "skip_source_output_uploading": false,
-  "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
-  "dependent_repositories": [
-    {
-      "path_to_root": "_themes",
-      "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
-      "branch_mapping": {}
-    }
-  ],
-  "need_generate_pdf_url_template": false,
-  "enable_incremental_build": true
-}
+{
+  "build_entry_point": "docs",
+  "need_generate_pdf": false,
+  "need_generate_intellisense": false,
+  "branch_target_mapping": {
+    "live": [
+      "Publish",
+      "Pdf"
+    ],
+    "master": [
+      "Publish",
+      "Pdf"
+    ]
+  },
+  "Targets": {
+    "Pdf": {
+      "template_folder": "_themes.pdf"
+    }
+  },
+  "docsets_to_publish": [
+    {
+      "docset_name": "vcppdocs",
+      "build_source_folder": "docs",
+      "build_output_subfolder": "vcppdocs",
+      "locale": "en-us",
+      "version": 0,
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "template_folder": "_themes"
+    }
+  ],
+  "notification_subscribers": [],
+  "branches_to_filter": [],
+  "skip_source_output_uploading": false,
+  "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
+  "git_repository_branch_open_to_public_contributors": "master",
+  "dependent_repositories": [
+    {
+      "path_to_root": "_themes",
+      "url": "https://github.com/Microsoft/templates.docs.msft",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "_themes.pdf",
+      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
+      "branch": "master"
+    }
+  ],
+  "need_generate_pdf_url_template": true,
+  "enable_incremental_build": true
+}

.openpublishing.publish.config.json

@@ -1,3 +1,7 @@
 {
-    "files.associations": {}
+    "files.associations": {
+        "random": "cpp"
+    },
+
+    "git.ignoreLimitWarning": true
 }

.vscode/settings.json

@@ -19,7 +19,7 @@ The content inside the **docs** folder is organized into sections that are organ
 
 You can skip this first step for small changes.
 
-**Step 2:** Fork the `Microsoft/cpp-docs` repo.
+**Step 2:** Fork the `MicrosoftDocs/cpp-docs` repo.
 
 **Step 3:** Create a `branch` for your article.
 
@@ -42,7 +42,7 @@ Be sure to follow the proper Markdown syntax. See the [style guide](./styleguide
           /media
               wstring-conversion.png
 
-**Step 5:** Submit a Pull Request (PR) from your branch to `Microsoft/cpp-docs/master`.
+**Step 5:** Submit a Pull Request (PR) from your branch to `MicrosoftDocs/cpp-docs/master`.
 
 If your PR is addressing an existing issue, add the `Fixes #Issue_Number` keyword to the commit message or PR description, so the issue can be automatically closed when the PR is merged. For more information, see [Closing issues via commit messages](https://help.github.com/articles/closing-issues-via-commit-messages/).
 
@@ -52,7 +52,7 @@ The Visual Studio team will review your PR and let you know if the change looks
 
 The maintainers will merge your PR into the master branch once feedback has been applied and your change looks good.
 
-On a certain cadence, we push all commits from master branch into the live branch and then you'll be able to see your contribution live at https://docs.microsoft.com/cpp-docs/.
+On a certain cadence, we push all commits from master branch into the live branch and then you'll be able to see your contribution live at https://docs.microsoft.com/en-us/cpp/.
 
 ## DOs and DON'Ts
 
@@ -70,7 +70,7 @@ Below is a short list of guiding rules that you should keep in mind when you are
 
 ## Building the docs
 
-The documentation is written in [GitHub Flavored Markdown](https://help.github.com/categories/writing-on-github/) and built using [DocFX](http://dotnet.github.io/docfx/) and other internal publishing/building tools. It is hosted at [docs.microsoft.com](https://docs.microsoft.com/dotnet).
+The documentation is written in [GitHub Flavored Markdown](https://help.github.com/categories/writing-on-github/) and built using [DocFX](http://dotnet.github.io/docfx/) and other internal publishing/building tools. It is hosted at [docs.microsoft.com](https://docs.microsoft.com/).
 
 If you want to build the docs locally, you need to install [DocFX](https://dotnet.github.io/docfx/); latest versions are the best.
 
@@ -80,16 +80,16 @@ If you are comfortable with other ways listed on the link above, feel free to us
 
 **Note:** Currently DocFX requires the .NET Framework on Windows or Mono (for Linux or macOS). We hope to port it to .NET Core in the future.
 
-You can build and preview the resulting site locally using a built-in web server. Navigate to the core-docs folder on your machine and type the following command:
+You can build and preview the resulting site locally using a built-in web server. Navigate to the `cpp-docs\docs` folder on your machine and type the following command:
 
 ```
 docfx -t default --serve
 ```
 
-This starts the local preview on [localhost:8080](http://localhost:8080). You can then view the changes by going to `http://localhost:8080/[path]`, such as http://localhost:8080/articles/welcome.html.
+This starts the local preview on [localhost:8080](http://localhost:8080). You can then view the changes by going to `http://localhost:8080/[path]`, such as http://localhost:8080/cpp/visual-cpp-in-visual-studio.html.
 
 **Note:** the local preview currently doesn't contain any themes at the moment so the look and feel won't be the same as in the documentation site. We're working towards fixing that experience.
 
 # Contributing to samples
 
-For now, include required sample code as inline code blocks in your article. The repo has a codesnippets folder, but this is not ready for public contributions.
+For now, include required sample code as inline code blocks in your article. The repo has a codesnippets folder, but this is not ready for public contributions.