Merge branch 'main' of https://github.com/MicrosoftDocs/cpp-docs-pr into alttext

TylerMSFT · TylerMSFT · commit a2d655c1da5f · 2023-02-01T15:58:51.000-08:00
diff --git a/docs/atl/reference/compiler-options-macros.md b/docs/atl/reference/compiler-options-macros.md
@@ -2,7 +2,7 @@
 description: "Learn more about: Compiler Options Macros"
 title: "Compiler Options Macros"
 ms.date: "08/19/2019"
-f1_keywords: ["_ATL_ALL_WARNINGS", "_ATL_APARTMENT_THREADED", "_ATL_CSTRING_EXPLICIT_CONSTRUCTORS ", "_ATL_ENABLE_PTM_WARNING", "_ATL_FREE_THREADED", "_ATL_MULTI_THREADED", "_ATL_NO_AUTOMATIC_NAMESPACE", "_ATL_NO_COM_SUPPORT", "ATL_NO_VTABLE", "ATL_NOINLINE", "_ATL_SINGLE_THREADED"]
+f1_keywords: ["_ATL_ALL_WARNINGS", "_ATL_APARTMENT_THREADED", "_ATL_CSTRING_EXPLICIT_CONSTRUCTORS ", "_ATL_ENABLE_PTM_WARNING", "_ATL_FREE_THREADED", "_ATL_MODULES", "_ATL_MULTI_THREADED", "_ATL_NO_AUTOMATIC_NAMESPACE", "_ATL_NO_COM_SUPPORT", "ATL_NO_VTABLE", "ATL_NOINLINE", "_ATL_SINGLE_THREADED"]
 helpviewer_keywords: ["compiler options, macros"]
 ms.assetid: a869adc6-b3de-4299-b040-9ae20b45f82c
 ---
@@ -17,6 +17,7 @@ These macros control specific compiler features.
 |[_ATL_CSTRING_EXPLICIT_CONSTRUCTORS](#_atl_cstring_explicit_constructors)|Makes certain `CString` constructors explicit, preventing any unintentional conversions.|
 |[_ATL_ENABLE_PTM_WARNING](#_atl_enable_ptm_warning)|Define this macro to require C++ standard syntax. It generates the C4867 compiler error when non-standard syntax is used to initialize a pointer to a member function.|
 |[_ATL_FREE_THREADED](#_atl_free_threaded)|Define if one or more of your objects use free or neutral threading.|
+|[_ATL_MODULES](#_ATL_MODULES)|Allows you to compile ATL projects with [permissive-](../../build/reference/permissive-standards-conformance.md) and use ATL with [C++ modules](../../cpp/modules-cpp.md).|
 |[_ATL_MULTI_THREADED](#_atl_multi_threaded)|A symbol that indicates the project will have objects that are marked as Both, Free or Neutral. The macro [_ATL_FREE_THREADED](#_atl_free_threaded) should be used instead.|
 |[_ATL_NO_AUTOMATIC_NAMESPACE](#_atl_no_automatic_namespace)|A symbol that prevents the default use of namespace as ATL.|
 |[_ATL_NO_COM_SUPPORT](#_atl_no_com_support)|A symbol that prevents COM-related code from being compiled with your project.|
@@ -122,6 +123,14 @@ _ATL_FREE_THREADED
 
 Specifies free threading. Free threading is equivalent to a multithread apartment model. See [Specifying the Project's Threading Model](../../atl/specifying-the-threading-model-for-a-project-atl.md) for other threading options, and [Options, ATL Simple Object Wizard](../../atl/reference/options-atl-simple-object-wizard.md) for a description of the threading models available for an ATL object.
 
+## <a name="_ATL_MODULES"></a> `_ATLMODULES`
+
+Allows you to compile ATL projects with [permissive-](../../build/reference/permissive-standards-conformance.md) and use ATL with [C++ modules](../../cpp/modules-cpp.md).
+
+```
+_ATL_MODULES
+```
+
 ## <a name="_atl_multi_threaded"></a> _ATL_MULTI_THREADED
 
 A symbol that indicates the project will have objects that are marked as Both, Free or Neutral.
diff --git a/docs/c-runtime-library/reference/log1p-log1pf-log1pl2.md b/docs/c-runtime-library/reference/log1p-log1pf-log1pl2.md
@@ -1,14 +1,13 @@
 ---
 title: "log1p, log1pf, log1pl2"
 description: "API reference for log1p, log1pf, log1pl2; which compute the natural logarithm of 1 plus the specified value."
-ms.date: "9/1/2020"
+ms.date: "2/1/2023"
 api_name: ["log1p", "log1pf", "log1pl", "_o_log1p", "_o_log1pf", "_o_log1pl"]
 api_location: ["msvcrt.dll", "msvcr80.dll", "msvcr90.dll", "msvcr100.dll", "msvcr100_clr0400.dll", "msvcr110.dll", "msvcr110_clr0400.dll", "msvcr120.dll", "msvcr120_clr0400.dll", "ucrtbase.dll", "api-ms-win-crt-math-l1-1-0.dll"]
 api_type: ["DLLExport"]
 topic_type: ["apiref"]
 f1_keywords: ["log1p", "log1pf", "log1pl", "math/log1p", "math/log1pf", "math/log1pl"]
 helpviewer_keywords: ["log1p function", "log1pf function", "log1pl function"]
-ms.assetid: a40d965d-b4f6-42f4-ba27-2395546f7c12
 ---
 # `log1p`, `log1pf`, `log1pl`
 
@@ -17,25 +16,14 @@ Computes the natural logarithm of 1 plus the specified value.
 ## Syntax
 
 ```C
-double log1p(
-   double x
-);
-float log1pf(
-   float x
-);
-long double log1pl(
-   long double x
-);
+double log1p(double x);
+float log1pf(float x);
+long double log1pl(long double x);
 
 #define log1p(X) // Requires C11 or higher
 
-float log1p(
-   float x
-); //C++ only
-
-long double log1p(
-   long double x
-); //C++ only
+float log1p(float x); //C++ only
+long double log1p(long double x); //C++ only
 ```
 
 ### Parameters
@@ -68,18 +56,18 @@ The **`log1p`** functions may be more accurate than using `log(x + 1)` when *`x`
 
 Because C++ allows overloading, you can call overloads of **`log1p`** that take and return **`float`** and **`long double`** types. In a C program, unless you're using the \<tgmath.h> macro to call this function, **`log1p`** always takes and returns a **`double`**.
 
-If you use the \<tgmath.h> `log1p()` macro, the type of the argument determines which version of the function is selected. See [Type-generic math](../tgmath.md) for details.
+If you use the `<tgmath.h>` `log1p()` macro, the type of the argument determines which version of the function is selected. See [Type-generic math](../tgmath.md) for details.
 
-If *`x`* is a natural number, this function returns the logarithm of the factorial of (*`x`* - 1).
+Where *`x`* is a natural number, this function returns the base e logarithm of *`x`* + 1.
 
 By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
 
 ## Requirements
 
 | Function | C header | C++ header |
 |---|---|---|
-| **`log1p`**, **`log1pf`**, **`log1pl`** | \<math.h> | \<cmath> |
-| **`log1p`** macro | \<tgmath.h> |  |
+| **`log1p`**, **`log1pf`**, **`log1pl`** | `<math.h>` | `<cmath>` |
+| **`log1p`** macro | `<tgmath.h>` |  |
 
 For more compatibility information, see [Compatibility](../compatibility.md).
 
