Resolve syncing conflicts from FromPrivateLiveToMaster to main

docs/mfc/how-to-update-user-interface-objects.md

@@ -11,7 +11,7 @@ helpviewer_keywords: ["menus [MFC], updating as context changes", "user interfac
 
 Typically, menu items and toolbar buttons have more than one state. For example, a menu item is grayed (dimmed) if it is unavailable in the present context. Menu items can also be checked or unchecked. A toolbar button can also be disabled if unavailable, or it can be checked.
 
-Who updates the state of these items as program conditions change Logically, if a menu item generates a command that is handled by, say, a document, it makes sense to have the document update the menu item. The document probably contains the information on which the update is based.
+Who updates the state of these items as program conditions change? Logically, if a menu item generates a command that a document handles, it makes sense to have the document update the menu item. The document probably contains the information on which the update is based.
 
 If a command has multiple user-interface objects (perhaps a menu item and a toolbar button), both are routed to the same handler function. This encapsulates your user-interface update code for all of the equivalent user-interface objects in a single place.
 

docs/overview/acquire-msvc.md

@@ -197,6 +197,20 @@ cmake -G "Visual Studio 18 2026" -T "version=14.51" ..\
 cmake -G "Visual Studio 18 2026" -T "version=14.52" ..\
 ```
 
+### vcpkg
+
+Configure vcpkg with the [VCPKG_PLATFORM_TOOLSET_VERSION](/vcpkg/users/triplets#vcpkg_platform_toolset_version) triplet. For example:
+
+```
+set(VCPKG_PLATFORM_TOOLSET_VERSION "14.50")
+```
+
+or
+
+```
+set(VCPKG_PLATFORM_TOOLSET_VERSION "14.51")
+```
+
 ### Visual Studio Command Prompt
 
 Some build systems need the command prompt to have the `PATH`, `LIB`, `INCLUDE`, and related environment variables set before you run them.

docs/standard-library/directory-iterator-class.md

@@ -1,10 +1,9 @@
 ---
 description: "Learn more about: directory_iterator Class"
 title: "directory_iterator Class"
-ms.date: 04/28/2023
+ms.date: 08/27/2026
 f1_keywords: ["filesystem/std::filesystem::directory_iterator", "filesystem/std::filesystem::_Directory_iterator::_Directory_iterator", "filesystem/std::filesystem::directory_iterator::directory_iterator", "filesystem/std::filesystem::directory_iterator::increment", "filesystem/std::filesystem::directory_iterator::operator=", "filesystem/std::filesystem::directory_iterator::operator==", "filesystem/std::filesystem::directory_iterator::operator!=", "filesystem/std::filesystem::directory_iterator::operator*", "filesystem/std::filesystem::directory_iterator::operator->", "filesystem/std::filesystem::directory_iterator::operator++"]
-ms.assetid: dca2ecf8-3e69-4644-a83d-705061e10cc8
-helpviewer_keywords: ["std::filesystem::directory_iterator", "std::filesystem::_Directory_iterator::_Directory_iterator", "std::filesystem::directory_iterator", "std::filesystem::directory_iterator::directory_iterator", "std::filesystem::directory_iterator::increment", "std::filesystem::directory_iterator::operator=", "std::filesystem::directory_iterator::operator==", "std::filesystem::directory_iterator::operator!=", "std::filesystem::directory_iterator::operator*", "std::filesystem::directory_iterator::operator->", "std::filesystem::directory_iterator::operator++"]
+helpviewer_keywords: ["std::filesystem::directory_iterator", "std::filesystem::_Directory_iterator::_Directory_iterator", "std::filesystem::directory_iterator::directory_iterator", "std::filesystem::directory_iterator::increment", "std::filesystem::directory_iterator::operator=", "std::filesystem::directory_iterator::operator==", "std::filesystem::directory_iterator::operator!=", "std::filesystem::directory_iterator::operator*", "std::filesystem::directory_iterator::operator->", "std::filesystem::directory_iterator::operator++"]
 ms.custom: devdivchpfy22
 ---
 
@@ -59,15 +58,14 @@ class directory_iterator;
 
 ## <a name="directory_iterator"></a> `directory_iterator::directory_iterator`
 
-The first constructor produces an end-of-sequence iterator. The second and third constructors store *`pval`* in `mydir`, then attempt to open and read `mydir` as a directory. If successful, they store the first filename in the directory in `myentry`; otherwise they produce an end-of-sequence iterator.
-
-The default constructor behaves as expected.
+The first constructor produces an end-of-sequence iterator. The constructors that take a *`pval`* argument store it in `mydir`, then attempt to open and read `mydir` as a directory. If successful, they store the first filename in the directory in `myentry`; otherwise they produce an end-of-sequence iterator. The overloads that take an *`options`* argument control how the directory is enumerated. The overloads that take an *`ec`* argument report errors in *`ec`* instead of throwing an exception. The copy and move constructors behave as expected.
 
 ```cpp
 directory_iterator() noexcept;
 explicit directory_iterator(const path& pval);
-
+directory_iterator(const path& pval, directory_options options);
 directory_iterator(const path& pval, error_code& ec) noexcept;
+directory_iterator(const path& pval, directory_options options, error_code& ec) noexcept;
 directory_iterator(const directory_iterator&) = default;
 directory_iterator(directory_iterator&&) noexcept = default;
 ```
@@ -77,6 +75,9 @@ directory_iterator(directory_iterator&&) noexcept = default;
 *`pval`*\
 The stored file name path.
 
+*`options`*\
+The `directory_options` value that controls how the directory is enumerated. The default is `directory_options::none`.
+
 *`ec`*\
 The status error code.
 
@@ -88,9 +89,14 @@ The stored object.
 The function attempts to advance to the next filename in the directory. If successful, it stores that filename in `myentry`; otherwise it produces an end-of-sequence iterator.
 
 ```cpp
-directory_iterator& increment(error_code& ec) noexcept;
+directory_iterator& increment(error_code& ec);
 ```
 
+### Parameters
+
+*`ec`*\
+The status error code.
+
 ## <a name="op_neq"></a> `directory_iterator::operator!=`
 
 The member operator returns `!(*this == right)`.
@@ -153,13 +159,13 @@ The first member function calls `increment()`, then returns **`*this`**. The sec
 
 ```cpp
 directory_iterator& operator++();
-directory_iterator& operator++(int);
+directory_iterator operator++(int);
 ```
 
 ### Parameters
 
 *`int`*\
-The number of increments.
+Dummy argument. It's a C++ convention used only to distinguish the postfix increment operator from the prefix increment operator. The C++ standard requires the postfix form to take a dummy int parameter.
 
 ## See also