Issue #25022: Merge with 3.4

diff --cc PC/readme.txt
index 8639dc33d9ab6c69fb4cb675de741adf74d2bc32,99006bfe61367ef040f06e76cc15ac83c96a0bcb..0a96d269b0977d36eadc80a181931765f3427e2c
--- 1/PC/readme.txt
--- 2/PC/readme.txt
+++ b/PC/readme.txt
@@@ -71,9 -71,12 +71,7 @@@ getpathp.c     Default sys.path calcula
  dllbase_nt.txt A (manually maintained) list of base addresses for
                 various DLLs, to avoid run-time relocation.
  
- example_nt     A subdirectory showing how to build an extension as a
-                DLL.
  
 -Legacy support for older versions of Visual Studio
 -==================================================
 -The subdirectories VC6, VS7.1 and VS8.0 contain legacy support older
 -versions of Microsoft Visual Studio. See PCbuild/readme.txt.
 -
  Note for Windows 3.x and DOS users
  ==================================
  

diff --cc PCbuild/readme.txt
index 7e7ab6424bd9a8f3d2c7259d0c51f4187d3eac26,a3c7fbd59fecf62b441b714336677467e09bdee1..09a996f34c00400796f5d3fb84eb3497fec29780
--- 1/PCbuild/readme.txt
--- 2/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@@ -282,27 -288,27 +282,19 @@@ also have to change the "Runtime Librar
  Visual Studio properties\r
  ------------------------\r
  \r
 -The PCbuild solution makes heavy use of Visual Studio property files\r
 -(*.props). The properties can be viewed and altered in the Property\r
 -Manager (View -> Other Windows -> Property Manager).\r
 -\r
 -The property files used are (+-- = "also imports"):\r
 - * debug (debug macro: _DEBUG)\r
 - * pginstrument (PGO)\r
 - * pgupdate (PGO)\r
 -    +-- pginstrument\r
 - * pyd (python extension, release build)\r
 -    +-- release\r
 -    +-- pyproject\r
 - * pyd_d (python extension, debug build)\r
 -    +-- debug\r
 -    +-- pyproject\r
 - * pyproject (base settings for all projects, user macros like PyDllName)\r
 - * release (release macro: NDEBUG)\r
 - * sqlite3 (used only by sqlite3.vcxproj)\r
 - * x64 (AMD64 / x64 platform specific settings)\r
 -\r
 -The pyproject property file defines _WIN32 and x64 defines _WIN64 and\r
 -_M_X64 although the macros are set by the compiler, too. The GUI doesn't\r
 -always know about the macros and confuse the user with false\r
 -information.\r
 +The PCbuild solution makes use of Visual Studio property files (*.props)\r
 +to simplify each project. The properties can be viewed in the Property\r
 +Manager (View -> Other Windows -> Property Manager) but should be\r
 +carefully modified by hand.\r
 +\r
 +The property files used are:\r
 + * python (versions, directories and build names)\r
 + * pyproject (base settings for all projects)\r
 + * openssl (used by libeay and ssleay projects)\r
 + * tcltk (used by _tkinter, tcl, tk and tix projects)\r
 +\r
 +The pyproject property file defines all of the build settings for each\r
 +project, with some projects overriding certain specific values. The GUI\r
 +doesn't always reflect the correct settings and may confuse the user\r
 +with false information, especially for settings that automatically adapt\r
 +for diffirent configurations.\r
- \r
- \r
- Your Own Extension DLLs\r
- -----------------------\r
- \r
- If you want to create your own extension module DLL (.pyd), there's an\r
- example with easy-to-follow instructions in ..\PC\example_nt\; read the\r
- file readme.txt there first.\r