Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (#412)

openpublishbuild · Colin Robertson · commit d2e29d5e20da · 2017-11-03T14:37:01.000-07:00
* Fix Overview link in concurrency-runtime.

It was leading to overview-of-the-concurrency-runtime on the old msdn.microsoft.com site, not to asynchronous-message-blocks.

* Fix the display of underscore characters

* Use inline code block for better formatting

Update automatic-linking-of-mfc-library-version.md to use inline code block for define example.

* Replace the bogus "operator 0-" with the intended "operator[]"
diff --git a/docs/mfc/automatic-linking-of-mfc-library-version.md b/docs/mfc/automatic-linking-of-mfc-library-version.md
@@ -21,31 +21,21 @@ In versions of MFC before version 3.0 (before Visual C++ version 2.0), you had t
   
  For example, the following code fragment from the AFX.H header file instructs the linker to link in either the NAFXCWD.LIB or NAFXCW.LIB version of MFC, depending on whether you are using the debug version of MFC:  
   
- `#ifndef _UNICODE`  
-  
- `#ifdef _DEBUG`  
-  
- `#pragma comment(lib, "nafxcwd.lib")`  
-  
- `#else`  
-  
- `#pragma comment(lib, "nafxcw.lib")`  
-  
- `#endif`  
-  
- `#else`  
-  
- `#ifdef _DEBUG`  
-  
- `#pragma comment(lib, "uafxcwd.lib")`  
-  
- `#else`  
-  
- `#pragma comment(lib, "uafxcw.lib")`  
-  
- `#endif`  
-  
- `#endif`  
+```c++
+#ifndef _UNICODE 
+#ifdef _DEBUG
+#pragma comment(lib, "nafxcwd.lib")
+#else
+#pragma comment(lib, "nafxcw.lib")
+#endif
+#else
+#ifdef _DEBUG
+#pragma comment(lib, "uafxcwd.lib")
+#else
+#pragma comment(lib, "uafxcw.lib")
+#endif
+#endif
+```  
   
  MFC header files also link in all required libraries, including MFC libraries, Win32 libraries, OLE libraries, OLE libraries built from samples, ODBC libraries, and so on. The Win32 libraries include Kernel32.Lib, User32.Lib, and GDI32.Lib.  
   
diff --git a/docs/standard-library/map-class.md b/docs/standard-library/map-class.md
@@ -1837,7 +1837,7 @@ int main( )
 ```  
 Type& operator[](const Key& key);
 
-Type& operator 0-(Key&& key);
+Type& operator[](Key&& key);
 ```  
   
 ### Parameters  
