Merge pull request MicrosoftDocs#645 from MicrosoftDocs/master636810152692608420

Colin Robertson · web-flow · commit 82a5de41dec9 · 2018-12-21T23:16:57.000-08:00
Fix git push error for protected CLA branch
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -2694,6 +2694,11 @@
             "redirect_url": "/cpp/dotnet/pure-and-verifiable-code-cpp-cli",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/dotnet/mixed-pure-and-verifiable-feature-comparison-cpp-cli.md",
+            "redirect_url": "/cpp/dotnet/pure-and-verifiable-code-cpp-cli",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/dotnet/greater-equal-stl-clr.md",
             "redirect_url": "/cpp/dotnet/functional-stl-clr#greater_equal",
@@ -6729,6 +6734,11 @@
             "redirect_url": "/cpp/parallel/amp/reference/reference-cpp-amp",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/parallel/concrt/convert-an-openmp-loop-that uses-exception-handling.md",
+            "redirect_url": "/cpp/parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling",
+            "redirect_document_id": true
+        },
         {
             "source_path": "docs/parallel/concrt/index.md",
             "redirect_url": "/cpp/parallel/concrt/concurrency-runtime",
diff --git a/docs/dotnet/mixed-pure-and-verifiable-feature-comparison-cpp-cli.md b/docs/dotnet/mixed-pure-and-verifiable-feature-comparison-cpp-cli.md
diff --git a/docs/error-messages/compiler-warnings/TOC.md b/docs/error-messages/compiler-warnings/TOC.md
@@ -508,6 +508,7 @@
 ## [Compiler Warning (level 1) C4838](compiler-warning-level-1-c4838.md)
 ## [Compiler Warning (level 3) C4839](compiler-warning-level-3-c4839.md)
 ## [Compiler Warning (level 4) C4840](compiler-warning-level-4-c4840.md)
+## [Compiler Warning (level 4) C4866](c4866.md)
 ## [Compiler Warning C4867](compiler-warning-c4867.md)
 ## [Compiler Warning C4868](compiler-warning-c4868.md)
 ## [Compiler Warning (level 1) C4900](compiler-warning-level-1-c4900.md)
diff --git a/docs/linux/TOC.md b/docs/linux/TOC.md
@@ -12,5 +12,6 @@
 ## [C/C++ Properties (Linux)](prop-pages/c-cpp-linux.md)
 ## [Linker Properties (Linux)](prop-pages/linker-linux.md)
 ## [Build Event Properties (Linux)](prop-pages/build-events-linux.md)
-## [Custom Build Step Properties (Linux)](prop-pages/custom-build-step-linux.md) 
-## [Makefile Project Properties (Linux)](prop-pages/makefile-linux.md)
+## [Custom Build Step Properties (Linux)](prop-pages/custom-build-step-linux.md)
+## [Makefile Project Properties (Linux)](prop-pages/makefile-linux.md)
+## [Remote Archive Properties (Linux)](prop-pages/remote-ar-linux.md)
diff --git a/docs/mfc/reference/TOC.md b/docs/mfc/reference/TOC.md
@@ -1,5 +1,5 @@
 # [MFC Classes](mfc-classes.md)
-## [CAccelerateDecelerateTransition Class1](cacceleratedeceleratetransition-class1.md)
+## [CAccelerateDecelerateTransition Class](cacceleratedeceleratetransition-class.md)
 ## [CAnimateCtrl Class](canimatectrl-class.md)
 ## [CAnimationBaseObject Class](canimationbaseobject-class.md)
 ## [CAnimationColor Class](canimationcolor-class.md)
diff --git a/docs/parallel/concrt/TOC.md b/docs/parallel/concrt/TOC.md
@@ -7,7 +7,7 @@
 ## [Migrating from OpenMP to the Concurrency Runtime](migrating-from-openmp-to-the-concurrency-runtime.md)
 ### [How to: Convert an OpenMP parallel for Loop to Use the Concurrency Runtime](how-to-convert-an-openmp-parallel-for-loop-to-use-the-concurrency-runtime.md)
 ### [How to: Convert an OpenMP Loop that Uses Cancellation to Use the Concurrency Runtime](convert-an-openmp-loop-that-uses-cancellation.md)
-### [How to: Convert an OpenMP Loop that Uses Exception Handling to Use the Concurrency Runtime](convert-an-openmp-loop-that uses-exception-handling.md)
+### [How to: Convert an OpenMP Loop that Uses Exception Handling to Use the Concurrency Runtime](convert-an-openmp-loop-that-uses-exception-handling.md)
 ### [How to: Convert an OpenMP Loop that Uses a Reduction Variable to Use the Concurrency Runtime](convert-an-openmp-loop-that-uses-a-reduction-variable.md)
 # [Parallel Patterns Library (PPL)](parallel-patterns-library-ppl.md)
 ## [Task Parallelism (Concurrency Runtime)](task-parallelism-concurrency-runtime.md)
diff --git a/docs/parallel/concrt/codesnippet/CPP/convert-an-openmp-loop-that-uses-exception-handling_1.cpp b/docs/parallel/concrt/codesnippet/CPP/convert-an-openmp-loop-that-uses-exception-handling_1.cpp
diff --git a/docs/parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling.md b/docs/parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling.md
@@ -16,7 +16,7 @@ In the Concurrency Runtime, when you throw an exception in the body of a work fu
 
 This example demonstrates how to handle exceptions in an OpenMP `parallel` region and in a call to `parallel_for`. The `do_work` function performs a memory allocation request that does not succeed and therefore throws an exception of type [std::bad_alloc](../../standard-library/bad-alloc-class.md). In the version that uses OpenMP, the thread that throws the exception must also catch it. In other words, each iteration of an OpenMP parallel loop must handle the exception. In the version that uses the Concurrency Runtime, the main thread catches an exception that is thrown by another thread.
 
-[!code-cpp[concrt-openmp#3](../../parallel/concrt/codesnippet/cpp/convert-an-openmp-loop-that uses-exception-handling_1.cpp)]
+[!code-cpp[concrt-openmp#3](../../parallel/concrt/codesnippet/cpp/convert-an-openmp-loop-that-uses-exception-handling_1.cpp)]
 
 This example produces the following output.
 
diff --git a/docs/parallel/concrt/migrating-from-openmp-to-the-concurrency-runtime.md b/docs/parallel/concrt/migrating-from-openmp-to-the-concurrency-runtime.md
@@ -47,7 +47,7 @@ Given a basic loop that uses the OpenMP [parallel](../../parallel/concrt/how-to-
 [How to: Convert an OpenMP Loop that Uses Cancellation to Use the Concurrency Runtime](../../parallel/concrt/convert-an-openmp-loop-that-uses-cancellation.md)<br/>
 Given an OpenMP [parallel](../../parallel/concrt/how-to-use-parallel-invoke-to-write-a-parallel-sort-routine.md#parallel)[for](../../parallel/openmp/reference/for-openmp.md) loop that does not require all iterations to run, demonstrates how to convert it to use the Concurrency Runtime cancellation mechanism.
 
-[How to: Convert an OpenMP Loop that Uses Exception Handling to Use the Concurrency Runtime](../../parallel/concrt/convert-an-openmp-loop-that uses-exception-handling.md)<br/>
+[How to: Convert an OpenMP Loop that Uses Exception Handling to Use the Concurrency Runtime](../../parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling.md)<br/>
 Given an OpenMP [parallel](../../parallel/concrt/how-to-use-parallel-invoke-to-write-a-parallel-sort-routine.md#parallel)[for](../../parallel/openmp/reference/for-openmp.md) loop that performs exception handling, demonstrates how to convert it to use the Concurrency Runtime exception handling mechanism.
 
 [How to: Convert an OpenMP Loop that Uses a Reduction Variable to Use the Concurrency Runtime](../../parallel/concrt/convert-an-openmp-loop-that-uses-a-reduction-variable.md)<br/>
diff --git a/docs/parallel/concrt/reference/TOC.md b/docs/parallel/concrt/reference/TOC.md
@@ -91,10 +91,12 @@
 ### [task_canceled Class](task-canceled-class.md)
 ### [task_completion_event Class](task-completion-event-class.md)
 ### [task_continuation_context Class](task-continuation-context-class.md)
+### [task_group Class](task-group-class.md)
 ### [task_handle Class](task-handle-class.md)
 ### [task_options Class (Concurrency Runtime)](task-options-class-concurrency-runtime.md)
 ### [timer Class](timer-class.md)
 ### [transformer Class](transformer-class.md)
+### [unbounded_buffer Class](unbounded-buffer-class.md)
 ### [unsupported_os Class](unsupported-os-class.md)
 ## [std Namespace](std-namespace.md)
 ### [make_exception_ptr Function](make-exception-ptr-function.md)
