Merge pull request MicrosoftDocs#3604 from MicrosoftDocs/master

Taojunshen · web-flow · commit 1cd5f2d44db7 · 2021-06-08T01:29:42.000+08:00
6/7/2021 AM Publish
diff --git a/docs/build/cmake-presets-vs.md b/docs/build/cmake-presets-vs.md
@@ -173,7 +173,7 @@ Use a forward slash (`/`) for paths in `CMakePresets.json` and `CMakeUserPresets
 
 ### Add new Configure Presets
 
-To add a new Configure Preset to `CMakePresets.json`, from **Solution Explorer**, right-click `CMakePresets.json` from **Folder View** and select **Add Configure Preset** from the shortcut menu. The dialog to select a Configure Preset template appears:
+To add a new Configure Preset to `CMakePresets.json`, from **Solution Explorer**, right-click `CMakePresets.json` from **Folder View** and select **Add Configuration** from the shortcut menu. The dialog to select a Configure Preset template appears:
 
 ![Screenshot of the dialog for adding a Configure Preset to the J S O N file.](./media/add-configure-preset-to-cmakepresets.png)
 
@@ -451,4 +451,4 @@ Learn more about configuring and debugging CMake projects in Visual Studio:
 > [Customize CMake build settings](customize-cmake-settings.md)<br/><br/>
 > [Configure CMake debugging sessions](configure-cmake-debugging-sessions.md)<br/><br/>
 > [CMake predefined configuration reference](cmake-predefined-configuration-reference.md)
->
+>
diff --git a/docs/build/tips-for-improving-time-critical-code.md b/docs/build/tips-for-improving-time-critical-code.md
@@ -119,9 +119,9 @@ For more information, see [Idle Loop Processing](../mfc/idle-loop-processing.md)
 
 Smaller working sets mean better locality of reference, fewer page faults, and more cache hits. The process working set is the closest metric the operating system directly provides for measuring locality of reference.
 
-- To set the upper and lower limits of the working set, use [SetProcessWorkingSetSize](/windows/win32/api/winbase/nf-winbase-getprocessworkingsetsize).
+- To set the upper and lower limits of the working set, use [`SetProcessWorkingSetSize`](/windows/win32/api/memoryapi/nf-memoryapi-setprocessworkingsetsize).
 
-- To get the upper and lower limits of the working set, use [GetProcessWorkingSetSize](/windows/win32/api/winbase/nf-winbase-setprocessworkingsetsize).
+- To get the upper and lower limits of the working set, use [`GetProcessWorkingSetSize`](/windows/win32/api/memoryapi/nf-memoryapi-getprocessworkingsetsize).
 
 - To view the size of the working set, use Spy++.
 
diff --git a/docs/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps.md b/docs/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps.md
@@ -16,7 +16,7 @@ The following table lists the CRT functions that are unavailable when you build
 |-|-|-|
 |`_beep` `_sleep` `_seterrormode`|These functions were obsolete in previous versions of the CRT. Also, the corresponding Win32 APIs are not available for UWP apps.|No workaround.|
 |`chdir` `_chdrive` `getcwd`|These functions are obsolete or are not thread-safe.|Use `_chdir`, `_getcwd` and related functions.|
-|`_cgets` `_cgets_s` `_cgetws` `_cgetws_s` `_cprintf` `_cprintf_l` `_cprintf_p` `_cprintf_p_l` `_cprintf_s` `_cprintf_s_l` `_cputs` `_cputws` `_cscanf` `_cscanf_l` `_cscanf_s` `_cscanf_s_l` `_cwait` `_cwprintf` `_cwprintf_l` `_cwprintf_p` `_cwprintf_p_l` `_cwprintf_s` `_cwprintf_s_l` `_cwscanf` `_cwscanf_l` `_cwscanf_s` `_cwscanf_s_l` `_vcprintf` `_vcprintf_l` `_vcprintf_p` `_vcprintf_p_l` `_vcprintf_s` `_vcprintf_s_l` `_vcwprintf` `_vcwprintf_l` `_vcwprintf_p` `_vcwprintf_p_l` `_vcwprintf_s` `_vcwprintf_s_l` `_getch` `_getch_nolock` `_getche` `_getche_nolock` `_getwch` `_getwch_nolock` `_getwche` `_getwche_nolock` `_putch` `_putch_nolock` `_putwch` `_putwch_nolock` `_ungetch` `_ungetch_nolock` `_ungetwch` `_ungetwch_nolock` `_kbhit` `kbhit` `putch` `cgets` `cprintf` `cputs` `cscanf` `cwait` `getch` `getche` `ungetch`|These functions are used to read and write directly from and to the console. UWP apps are GUI only; they don't support console.|No workaround.|
+|`_cgets` `_cgets_s` `_cgetws` `_cgetws_s` `_cprintf` `_cprintf_l` `_cprintf_p` `_cprintf_p_l` `_cprintf_s` `_cprintf_s_l` `_cputs` `_cputws` `_cscanf` `_cscanf_l` `_cscanf_s` `_cscanf_s_l` `_cwait` `_cwprintf` `_cwprintf_l` `_cwprintf_p` `_cwprintf_p_l` `_cwprintf_s` `_cwprintf_s_l` `_cwscanf` `_cwscanf_l` `_cwscanf_s` `_cwscanf_s_l` `_vcprintf` `_vcprintf_l` `_vcprintf_p` `_vcprintf_p_l` `_vcprintf_s` `_vcprintf_s_l` `_vcwprintf` `_vcwprintf_l` `_vcwprintf_p` `_vcwprintf_p_l` `_vcwprintf_s` `_vcwprintf_s_l` `_getch` `_getch_nolock` `_getche` `_getche_nolock` `_getwch` `_getwch_nolock` `_getwche` `_getwche_nolock` `_putch` `_putch_nolock` `_putwch` `_putwch_nolock` `_ungetch` `_ungetch_nolock` `_ungetwch` `_ungetwch_nolock` `_kbhit` `kbhit` `putch` `cgets` `cprintf` `cputs` `cscanf` `cwait` `getch` `getche` `ungetch`| These console I/O functions are unavailable in GUI-based UWP apps. | UWP console apps can use these functions. For more information, see [Create a Universal Windows Platform console app](/windows/uwp/launch-resume/console-uwp). |
 |`getpid` `_getpid` | These functions are obsolete.|Use the Win32 API `GetCurrentProcessId`.|
 |`_getdiskfree`|Not available.|Use the Win32 API `GetDiskFreeSpaceExW`.|
 |`_getdrive` `_getdrives`|Corresponding API is not available for UWP apps.|No workaround.|
diff --git a/docs/overview/visual-cpp-language-conformance.md b/docs/overview/visual-cpp-language-conformance.md
