Resolve syncing conflicts from FromPublicMasterBranch to master (#407)

openpublishbuild · Colin Robertson · commit ca9ba50d1979 · 2017-10-27T13:43:20.000-07:00
* Add build dir to gitignore * Update linker-tools-error-lnk2019.md * merging recent PRs into live (MicrosoftDocs#398) * Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (MicrosoftDocs#386) * Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (#387) * Update lambda-expressions-in-cpp.md * Update try-except-statement.md * Update try-except-statement.md Added some formatting fixes. * Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (#388) * Update lambda-expressions-in-cpp.md * Update try-except-statement.md * Update try-except-statement.md Added some formatting fixes. * removed duplicate F1 keywords and changed single quotes to doubles in F1 values * Update concurrency-namespace-operators-amp.md * fixed c-language inline topic to remove semicolon per user bug (MicrosoftDocs#391) * fixed c-language inline topic to remove semicolon per user bug * Update inline-functions.md Make it match the 2010 style, the only one that appears to be correct. * Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (#389) * Update lambda-expressions-in-cpp.md * Update 2-7-2-6-reduction.md Fixed spacing and readability issues with reduction statement forms * Update try-except-statement.md * Update 2-7-2-6-reduction.md Added some extra formatting fixes. * Update try-except-statement.md Added some formatting fixes. * Fixed inconsistent reference to C++ language versions * Update std-specify-language-standard-version.md Additional wording for clarity. * Update definitions-and-declarations-cpp.md Fixed typing error * Changing Windows Store Apps to Windows 8.x Apps * Change ownership from Brian Peek * typo * chore: re-apply specific syntax inside block quote Because of commit 2ab53d3 (by @corob-msft), the specific syntax was broken ref: - MicrosoftDocs@2ab53d3#commitcomment-25117491 - https://github.com/MicrosoftDocs/cpp-docs/issues/114 - MicrosoftDocs#116 * Update linker-tools-error-lnk2019.md Expanded on the description to help in diagnosis and correction. * Add references to mbrtoc16/mbrtoc32/c16rtomb/c32rtomb to data conversion and multibyte interpretation function categories
diff --git a/docs/c-runtime-library/data-conversion.md b/docs/c-runtime-library/data-conversion.md
@@ -28,6 +28,7 @@ These routines convert data from one form to another. Generally these routines e
 |[atoi, _atoi_l, _wtoi, _wtoi_l](../c-runtime-library/reference/atoi-atoi-l-wtoi-wtoi-l.md)|Convert string to `int`|  
 |[_atoi64, _atoi64_l, _wtoi64, _wtoi64_l](../c-runtime-library/reference/atoi64-atoi64-l-wtoi64-wtoi64-l.md)|Convert string to `__int64`|  
 |[atol, _atol_l, _wtol, _wtol_l](../c-runtime-library/reference/atol-atol-l-wtol-wtol-l.md)|Convert string to `long`|  
+|[c16rtomb, c32rtomb](../c-runtime-library/reference/c16rtomb-c32rtomb1.md)|Convert UTF-16 or UTF-32 character to equivalent multibyte character|  
 |[_ecvt](../c-runtime-library/reference/ecvt.md), [_ecvt_s](../c-runtime-library/reference/ecvt-s.md)|Convert `double` to string of specified length|  
 |[_fcvt](../c-runtime-library/reference/fcvt.md), [_fcvt_s](../c-runtime-library/reference/fcvt-s.md)|Convert `double` to string with specified number of digits following decimal point|  
 |[_gcvt](../c-runtime-library/reference/gcvt.md), [_gcvt_s](../c-runtime-library/reference/gcvt-s.md)|Convert `double` number to string; store string in buffer|  
@@ -41,6 +42,7 @@ These routines convert data from one form to another. Generally these routines e
 |[_mbctohira, _mbctohira_l, _mbctokata, _mbctokata_l](../c-runtime-library/reference/mbctohira-mbctohira-l-mbctokata-mbctokata-l.md)|Convert multibyte character to 1-byte hiragana code|  
 |[_mbctohira, _mbctohira_l, _mbctokata, _mbctokata_l](../c-runtime-library/reference/mbctohira-mbctohira-l-mbctokata-mbctokata-l.md)|Convert multibyte character to 1-byte katakana code|  
 |[_mbctombb, _mbctombb_l](../c-runtime-library/reference/mbctombb-mbctombb-l.md)|Convert 2-byte multibyte character to corresponding 1-byte multibyte character|  
+|[mbrtoc16, mbrtoc32](../c-runtime-library/reference/mbrtoc16-mbrtoc323.md)|Convert multibyte character to equivalent UTF-16 or UTF-32 character|  
 |[mbstowcs, _mbstowcs_l](../c-runtime-library/reference/mbstowcs-mbstowcs-l.md), [mbstowcs_s, _mbstowcs_s_l](../c-runtime-library/reference/mbstowcs-s-mbstowcs-s-l.md)|Convert sequence of multibyte characters to corresponding sequence of wide characters|  
 |[mbtowc, _mbtowc_l](../c-runtime-library/reference/mbtowc-mbtowc-l.md)|Convert multibyte character to corresponding wide character|  
 |[strtod, _strtod_l, wcstod, _wcstod_l](../c-runtime-library/reference/strtod-strtod-l-wcstod-wcstod-l.md)|Convert string to `double`|  
diff --git a/docs/c-runtime-library/interpretation-of-multibyte-character-sequences.md b/docs/c-runtime-library/interpretation-of-multibyte-character-sequences.md
@@ -29,6 +29,8 @@ Most multibyte-character routines in the Microsoft run-time library recognize mu
 |[mbtowc, _mbtowc_l](../c-runtime-library/reference/mbtowc-mbtowc-l.md)|Convert multibyte character to corresponding wide character|  
 |[wcstombs, _wcstombs_l](../c-runtime-library/reference/wcstombs-wcstombs-l.md), [wcstombs_s, _wcstombs_s_l](../c-runtime-library/reference/wcstombs-s-wcstombs-s-l.md)|Convert sequence of wide characters to corresponding sequence of multibyte characters|  
 |[wctomb, _wctomb_l](../c-runtime-library/reference/wctomb-wctomb-l.md), [wctomb_s, _wctomb_s_l](../c-runtime-library/reference/wctomb-s-wctomb-s-l.md)|Convert wide character to corresponding multibyte character|  
+|[mbrtoc16, mbrtoc32](../c-runtime-library/reference/mbrtoc16-mbrtoc323.md)|Convert multibyte character to equivalent UTF-16 or UTF-32 character|  
+|[c16rtomb, c32rtomb](../c-runtime-library/reference/c16rtomb-c32rtomb1.md)|Convert UTF-16 or UTF-32 character to equivalent multibyte character|  
   
 ## See Also  
  [Internationalization](../c-runtime-library/internationalization.md)   
