diff --git a/Lib/os.py b/Lib/os.py
index 1ca4648cc95c3e..a5e1d805556998 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -222,14 +222,14 @@ def _add(str, fn):
 def makedirs(name, mode=0o777, exist_ok=False, *, parent_mode=None):
     """makedirs(name [, mode=0o777][, exist_ok=False][, parent_mode=None])
 
-    Super-mkdir; create a leaf directory and all intermediate ones.  Works like
-    mkdir, except that any intermediate path segment (not just the rightmost)
-    will be created if it does not exist. If the target directory already
-    exists, raise an OSError if exist_ok is False. Otherwise no exception is
-    raised.  If parent_mode is not None, it will be used as the mode for any
-    newly-created, intermediate-level directories. Otherwise, intermediate
-    directories are created with the default permissions (respecting umask).
-    This is recursive.
+    Super-mkdir; create a leaf directory and all intermediate ones.  Works
+    like mkdir, except that any intermediate path segment (not just the
+    rightmost) will be created if it does not exist.  If the target
+    directory already exists, raise an OSError if exist_ok is False.
+    Otherwise no exception is raised.  If parent_mode is not None, it will
+    be used as the mode for any newly-created, intermediate-level
+    directories. Otherwise, intermediate directories are created with the
+    default permissions (respecting umask).  This is recursive.
 
     """
     head, tail = path.split(name)
@@ -321,12 +321,12 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
         dirpath, dirnames, filenames
 
     dirpath is a string, the path to the directory.  dirnames is a list of
-    the names of the subdirectories in dirpath (including symlinks to directories,
-    and excluding '.' and '..').
+    the names of the subdirectories in dirpath (including symlinks to
+    directories, and excluding '.' and '..').
     filenames is a list of the names of the non-directory files in dirpath.
-    Note that the names in the lists are just names, with no path components.
-    To get a full path (which begins with top) to a file or directory in
-    dirpath, do os.path.join(dirpath, name).
+    Note that the names in the lists are just names, with no path
+    components.  To get a full path (which begins with top) to a file or
+    directory in dirpath, do os.path.join(dirpath, name).
 
     If optional arg 'topdown' is true or not specified, the triple for a
     directory is generated before the triples for any of its subdirectories
@@ -336,13 +336,13 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
 
     When topdown is true, the caller can modify the dirnames list in-place
     (e.g., via del or slice assignment), and walk will only recurse into the
-    subdirectories whose names remain in dirnames; this can be used to prune the
-    search, or to impose a specific order of visiting.  Modifying dirnames when
-    topdown is false has no effect on the behavior of os.walk(), since the
-    directories in dirnames have already been generated by the time dirnames
-    itself is generated. No matter the value of topdown, the list of
-    subdirectories is retrieved before the tuples for the directory and its
-    subdirectories are generated.
+    subdirectories whose names remain in dirnames; this can be used to prune
+    the search, or to impose a specific order of visiting.  Modifying
+    dirnames when topdown is false has no effect on the behavior of
+    os.walk(), since the directories in dirnames have already been generated
+    by the time dirnames itself is generated. No matter the value of
+    topdown, the list of subdirectories is retrieved before the tuples for
+    the directory and its subdirectories are generated.
 
     By default errors from the os.scandir() call are ignored.  If
     optional arg 'onerror' is specified, it should be a function; it
@@ -469,9 +469,9 @@ def fwalk(top=".", topdown=True, onerror=None, *, follow_symlinks=False, dir_fd=
         The advantage of fwalk() over walk() is that it's safe against symlink
         races (when follow_symlinks is False).
 
-        If dir_fd is not None, it should be a file descriptor open to a directory,
-          and top should be relative; top will then be relative to that directory.
-          (dir_fd is always supported for fwalk.)
+        If dir_fd is not None, it should be a file descriptor open to
+        a directory, and top should be relative; top will then be relative to
+        that directory.  (dir_fd is always supported for fwalk.)
 
         Caution:
         Since fwalk() yields file descriptors, those are only valid until the
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 5403b875b04a32..00a4f6009186af 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -512,9 +512,9 @@ PyDoc_STRVAR(os_chdir__doc__,
 "\n"
 "Change the current working directory to the specified path.\n"
 "\n"
-"path may always be specified as a string.\n"
-"On some platforms, path may also be specified as an open file descriptor.\n"
-"If this functionality is unavailable, using it raises an exception.");
+"path may always be specified as a string.  On some platforms, path may\n"
+"also be specified as an open file descriptor.  If this functionality is\n"
+"unavailable, using it raises an exception.");
 
 #define OS_CHDIR_METHODDEF    \
     {"chdir", _PyCFunction_CAST(os_chdir), METH_FASTCALL|METH_KEYWORDS, os_chdir__doc__},
@@ -649,14 +649,15 @@ PyDoc_STRVAR(os_chmod__doc__,
 "Change the access permissions of a file.\n"
 "\n"
 "  path\n"
-"    Path to be modified.  May always be specified as a str, bytes, or a path-like object.\n"
-"    On some platforms, path may also be specified as an open file descriptor.\n"
-"    If this functionality is unavailable, using it raises an exception.\n"
+"    Path to be modified.  May always be specified as a str, bytes, or\n"
+"    a path-like object.  On some platforms, path may also be specified\n"
+"    as an open file descriptor.  If this functionality is unavailable,\n"
+"    using it raises an exception.\n"
 "  mode\n"
 "    Operating-system mode bitfield.\n"
-"    Be careful when using number literals for *mode*. The conventional UNIX notation for\n"
-"    numeric modes uses an octal base, which needs to be indicated with a ``0o`` prefix in\n"
-"    Python.\n"
+"    Be careful when using number literals for *mode*. The conventional\n"
+"    UNIX notation for numeric modes uses an octal base, which needs to\n"
+"    be indicated with a ``0o`` prefix in Python.\n"
 "  dir_fd\n"
 "    If not None, it should be a file descriptor open to a directory,\n"
 "    and path should be relative; path will then be relative to that\n"
@@ -765,9 +766,9 @@ PyDoc_STRVAR(os_fchmod__doc__,
 "    The file descriptor of the file to be modified.\n"
 "  mode\n"
 "    Operating-system mode bitfield.\n"
-"    Be careful when using number literals for *mode*. The conventional UNIX notation for\n"
-"    numeric modes uses an octal base, which needs to be indicated with a ``0o`` prefix in\n"
-"    Python.\n"
+"    Be careful when using number literals for *mode*.  The conventional\n"
+"    UNIX notation for numeric modes uses an octal base, which needs to\n"
+"    be indicated with a ``0o`` prefix in Python.\n"
 "\n"
 "Equivalent to os.chmod(fd, mode).");
 
@@ -841,8 +842,8 @@ PyDoc_STRVAR(os_lchmod__doc__,
 "\n"
 "Change the access permissions of a file, without following symbolic links.\n"
 "\n"
-"If path is a symlink, this affects the link itself rather than the target.\n"
-"Equivalent to chmod(path, mode, follow_symlinks=False).\"");
+"If path is a symlink, this affects the link itself rather than the\n"
+"target.  Equivalent to chmod(path, mode, follow_symlinks=False).");
 
 #define OS_LCHMOD_METHODDEF    \
     {"lchmod", _PyCFunction_CAST(os_lchmod), METH_FASTCALL|METH_KEYWORDS, os_lchmod__doc__},
@@ -916,9 +917,9 @@ PyDoc_STRVAR(os_chflags__doc__,
 "\n"
 "Set file flags.\n"
 "\n"
-"If follow_symlinks is False, and the last element of the path is a symbolic\n"
-"  link, chflags will change flags on the symbolic link itself instead of the\n"
-"  file the link points to.\n"
+"If follow_symlinks is False, and the last element of the path is\n"
+"a symbolic link, chflags() will change flags on the symbolic link itself\n"
+"instead of the file the link points to.\n"
 "follow_symlinks may not be implemented on your platform.  If it is\n"
 "unavailable, using it will raise a NotImplementedError.");
 
@@ -1329,10 +1330,11 @@ PyDoc_STRVAR(os_chown__doc__,
 "chown($module, /, path, uid, gid, *, dir_fd=None, follow_symlinks=True)\n"
 "--\n"
 "\n"
-"Change the owner and group id of path to the numeric uid and gid.\\\n"
+"Change the owner and group id of path to the numeric uid and gid.\n"
 "\n"
 "  path\n"
-"    Path to be examined; can be string, bytes, a path-like object, or open-file-descriptor int.\n"
+"    Path to be examined; can be string, bytes, a path-like object, or\n"
+"    open-file-descriptor int.\n"
 "  dir_fd\n"
 "    If not None, it should be a file descriptor open to a directory,\n"
 "    and path should be relative; path will then be relative to that\n"
@@ -1342,18 +1344,19 @@ PyDoc_STRVAR(os_chown__doc__,
 "    stat will examine the symbolic link itself instead of the file\n"
 "    the link points to.\n"
 "\n"
-"path may always be specified as a string.\n"
-"On some platforms, path may also be specified as an open file descriptor.\n"
-"  If this functionality is unavailable, using it raises an exception.\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
-"If follow_symlinks is False, and the last element of the path is a symbolic\n"
-"  link, chown will modify the symbolic link itself instead of the file the\n"
-"  link points to.\n"
+"path may always be specified as a string.  On some platforms, path may\n"
+"also be specified as an open file descriptor.  If this functionality is\n"
+"unavailable, using it raises an exception.\n"
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative to\n"
+"that directory.\n"
+"If follow_symlinks is False, and the last element of the path is\n"
+"a symbolic link, chown will modify the symbolic link itself instead of\n"
+"the file the link points to.\n"
 "It is an error to use dir_fd or follow_symlinks when specifying path as\n"
-"  an open file descriptor.\n"
-"dir_fd and follow_symlinks may not be implemented on your platform.\n"
-"  If they are unavailable, using them will raise a NotImplementedError.");
+"an open file descriptor.\n"
+"dir_fd and follow_symlinks may not be implemented on your platform.  If\n"
+"they are unavailable, using them will raise a NotImplementedError.");
 
 #define OS_CHOWN_METHODDEF    \
     {"chown", _PyCFunction_CAST(os_chown), METH_FASTCALL|METH_KEYWORDS, os_chown__doc__},
@@ -1641,14 +1644,15 @@ PyDoc_STRVAR(os_link__doc__,
 "Create a hard link to a file.\n"
 "\n"
 "If either src_dir_fd or dst_dir_fd is not None, it should be a file\n"
-"  descriptor open to a directory, and the respective path string (src or dst)\n"
-"  should be relative; the path will then be relative to that directory.\n"
+"descriptor open to a directory, and the respective path string (src or\n"
+"dst) should be relative; the path will then be relative to that\n"
+"directory.\n"
 "If follow_symlinks is False, and the last element of src is a symbolic\n"
-"  link, link will create a link to the symbolic link itself instead of the\n"
-"  file the link points to.\n"
-"src_dir_fd, dst_dir_fd, and follow_symlinks may not be implemented on your\n"
-"  platform.  If they are unavailable, using them will raise a\n"
-"  NotImplementedError.");
+"link, link will create a link to the symbolic link itself instead of the\n"
+"file the link points to.\n"
+"src_dir_fd, dst_dir_fd, and follow_symlinks may not be implemented on\n"
+"your platform.  If they are unavailable, using them will raise\n"
+"a NotImplementedError.");
 
 #define OS_LINK_METHODDEF    \
     {"link", _PyCFunction_CAST(os_link), METH_FASTCALL|METH_KEYWORDS, os_link__doc__},
@@ -1750,13 +1754,13 @@ PyDoc_STRVAR(os_listdir__doc__,
 "\n"
 "Return a list containing the names of the files in the directory.\n"
 "\n"
-"path can be specified as either str, bytes, or a path-like object.  If path is bytes,\n"
-"  the filenames returned will also be bytes; in all other circumstances\n"
-"  the filenames returned will be str.\n"
+"path can be specified as either str, bytes, or a path-like object.  If\n"
+"path is bytes, the filenames returned will also be bytes; in all other\n"
+"circumstances the filenames returned will be str.\n"
 "If path is None, uses the path=\'.\'.\n"
-"On some platforms, path may also be specified as an open file descriptor;\\\n"
-"  the file descriptor must refer to a directory.\n"
-"  If this functionality is unavailable, using it raises NotImplementedError.\n"
+"On some platforms, path may also be specified as an open file\n"
+"descriptor; the file descriptor must refer to a directory.  If this\n"
+"functionality is unavailable, using it raises NotImplementedError.\n"
 "\n"
 "The list is in arbitrary order.  It does not include the special\n"
 "entries \'.\' and \'..\' even if they are present in the directory.");
@@ -2709,13 +2713,14 @@ PyDoc_STRVAR(os_mkdir__doc__,
 "\n"
 "Create a directory.\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
-"dir_fd may not be implemented on your platform.\n"
-"  If it is unavailable, using it will raise a NotImplementedError.\n"
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative to\n"
+"that directory.\n"
+"dir_fd may not be implemented on your platform.  If it is unavailable,\n"
+"using it will raise a NotImplementedError.\n"
 "\n"
-"The mode argument is ignored on Windows. Where it is used, the current umask\n"
-"value is first masked out.");
+"The mode argument is ignored on Windows.  Where it is used, the current\n"
+"umask value is first masked out.");
 
 #define OS_MKDIR_METHODDEF    \
     {"mkdir", _PyCFunction_CAST(os_mkdir), METH_FASTCALL|METH_KEYWORDS, os_mkdir__doc__},
@@ -2981,10 +2986,11 @@ PyDoc_STRVAR(os_rename__doc__,
 "Rename a file or directory.\n"
 "\n"
 "If either src_dir_fd or dst_dir_fd is not None, it should be a file\n"
-"  descriptor open to a directory, and the respective path string (src or dst)\n"
-"  should be relative; the path will then be relative to that directory.\n"
+"descriptor open to a directory, and the respective path string (src or\n"
+"dst) should be relative; the path will then be relative to that\n"
+"directory.\n"
 "src_dir_fd and dst_dir_fd, may not be implemented on your platform.\n"
-"  If they are unavailable, using them will raise a NotImplementedError.");
+"If they are unavailable, using them will raise a NotImplementedError.");
 
 #define OS_RENAME_METHODDEF    \
     {"rename", _PyCFunction_CAST(os_rename), METH_FASTCALL|METH_KEYWORDS, os_rename__doc__},
@@ -3075,10 +3081,11 @@ PyDoc_STRVAR(os_replace__doc__,
 "Rename a file or directory, overwriting the destination.\n"
 "\n"
 "If either src_dir_fd or dst_dir_fd is not None, it should be a file\n"
-"  descriptor open to a directory, and the respective path string (src or dst)\n"
-"  should be relative; the path will then be relative to that directory.\n"
+"descriptor open to a directory, and the respective path string (src or\n"
+"dst) should be relative; the path will then be relative to that\n"
+"directory.\n"
 "src_dir_fd and dst_dir_fd, may not be implemented on your platform.\n"
-"  If they are unavailable, using them will raise a NotImplementedError.");
+"If they are unavailable, using them will raise a NotImplementedError.");
 
 #define OS_REPLACE_METHODDEF    \
     {"replace", _PyCFunction_CAST(os_replace), METH_FASTCALL|METH_KEYWORDS, os_replace__doc__},
@@ -3168,10 +3175,11 @@ PyDoc_STRVAR(os_rmdir__doc__,
 "\n"
 "Remove a directory.\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative\n"
+"to that directory.\n"
 "dir_fd may not be implemented on your platform.\n"
-"  If it is unavailable, using it will raise a NotImplementedError.");
+"If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_RMDIR_METHODDEF    \
     {"rmdir", _PyCFunction_CAST(os_rmdir), METH_FASTCALL|METH_KEYWORDS, os_rmdir__doc__},
@@ -3426,10 +3434,11 @@ PyDoc_STRVAR(os_unlink__doc__,
 "\n"
 "Remove a file (same as remove()).\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative to\n"
+"that directory.\n"
 "dir_fd may not be implemented on your platform.\n"
-"  If it is unavailable, using it will raise a NotImplementedError.");
+"If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_UNLINK_METHODDEF    \
     {"unlink", _PyCFunction_CAST(os_unlink), METH_FASTCALL|METH_KEYWORDS, os_unlink__doc__},
@@ -3503,10 +3512,11 @@ PyDoc_STRVAR(os_remove__doc__,
 "\n"
 "Remove a file (same as unlink()).\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative\n"
+"to that directory.\n"
 "dir_fd may not be implemented on your platform.\n"
-"  If it is unavailable, using it will raise a NotImplementedError.");
+"If it is unavailable, using it will raise a NotImplementedError.");
 
 #define OS_REMOVE_METHODDEF    \
     {"remove", _PyCFunction_CAST(os_remove), METH_FASTCALL|METH_KEYWORDS, os_remove__doc__},
@@ -3606,27 +3616,28 @@ PyDoc_STRVAR(os_utime__doc__,
 "\n"
 "Set the access and modified time of path.\n"
 "\n"
-"path may always be specified as a string.\n"
-"On some platforms, path may also be specified as an open file descriptor.\n"
-"  If this functionality is unavailable, using it raises an exception.\n"
+"path may always be specified as a string.  On some platforms, path may\n"
+"also be specified as an open file descriptor.  If this functionality is\n"
+"unavailable, using it raises an exception.\n"
 "\n"
 "If times is not None, it must be a tuple (atime, mtime);\n"
-"    atime and mtime should be expressed as float seconds since the epoch.\n"
+"atime and mtime should be expressed as float seconds since the epoch.\n"
 "If ns is specified, it must be a tuple (atime_ns, mtime_ns);\n"
-"    atime_ns and mtime_ns should be expressed as integer nanoseconds\n"
-"    since the epoch.\n"
+"atime_ns and mtime_ns should be expressed as integer nanoseconds\n"
+"since the epoch.\n"
 "If times is None and ns is unspecified, utime uses the current time.\n"
 "Specifying tuples for both times and ns is an error.\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
-"If follow_symlinks is False, and the last element of the path is a symbolic\n"
-"  link, utime will modify the symbolic link itself instead of the file the\n"
-"  link points to.\n"
-"It is an error to use dir_fd or follow_symlinks when specifying path\n"
-"  as an open file descriptor.\n"
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative to\n"
+"that directory.\n"
+"If follow_symlinks is False, and the last element of the path is\n"
+"a symbolic link, utime will modify the symbolic link itself instead of\n"
+"the file the link points to.\n"
+"It is an error to use dir_fd or follow_symlinks when specifying path as\n"
+"an open file descriptor.\n"
 "dir_fd and follow_symlinks may not be available on your platform.\n"
-"  If they are unavailable, using them will raise a NotImplementedError.");
+"If they are unavailable, using them will raise a NotImplementedError.");
 
 #define OS_UTIME_METHODDEF    \
     {"utime", _PyCFunction_CAST(os_utime), METH_FASTCALL|METH_KEYWORDS, os_utime__doc__},
@@ -3929,7 +3940,8 @@ PyDoc_STRVAR(os_posix_spawn__doc__,
 "  resetids\n"
 "    If the value is `true` the POSIX_SPAWN_RESETIDS will be activated.\n"
 "  setsid\n"
-"    If the value is `true` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated.\n"
+"    If the value is `true` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP\n"
+"    will be activated.\n"
 "  setsigmask\n"
 "    The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.\n"
 "  setsigdef\n"
@@ -4082,7 +4094,8 @@ PyDoc_STRVAR(os_posix_spawnp__doc__,
 "  resetids\n"
 "    If the value is `True` the POSIX_SPAWN_RESETIDS will be activated.\n"
 "  setsid\n"
-"    If the value is `True` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated.\n"
+"    If the value is `True` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP\n"
+"    will be activated.\n"
 "  setsigmask\n"
 "    The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.\n"
 "  setsigdef\n"
@@ -4953,8 +4966,8 @@ PyDoc_STRVAR(os_posix_openpt__doc__,
 "Open and return a file descriptor for a master pseudo-terminal device.\n"
 "\n"
 "Performs a posix_openpt() C function call. The oflag argument is used to\n"
-"set file status flags and file access modes as specified in the manual page\n"
-"of posix_openpt() of your system.");
+"set file status flags and file access modes as specified in the manual\n"
+"page of posix_openpt() of your system.");
 
 #define OS_POSIX_OPENPT_METHODDEF    \
     {"posix_openpt", (PyCFunction)os_posix_openpt, METH_O, os_posix_openpt__doc__},
@@ -5411,9 +5424,9 @@ PyDoc_STRVAR(os_initgroups__doc__,
 "\n"
 "Initialize the group access list.\n"
 "\n"
-"Call the system initgroups() to initialize the group access list with all of\n"
-"the groups of which the specified username is a member, plus the specified\n"
-"group id.");
+"Call the system initgroups() to initialize the group access list with\n"
+"all of the groups of which the specified username is a member, plus the\n"
+"specified group id.");
 
 #define OS_INITGROUPS_METHODDEF    \
     {"initgroups", _PyCFunction_CAST(os_initgroups), METH_FASTCALL, os_initgroups__doc__},
@@ -5457,9 +5470,9 @@ PyDoc_STRVAR(os_initgroups__doc__,
 "\n"
 "Initialize the group access list.\n"
 "\n"
-"Call the system initgroups() to initialize the group access list with all of\n"
-"the groups of which the specified username is a member, plus the specified\n"
-"group id.");
+"Call the system initgroups() to initialize the group access list with\n"
+"all of the groups of which the specified username is a member, plus the\n"
+"specified group id.");
 
 #define OS_INITGROUPS_METHODDEF    \
     {"initgroups", _PyCFunction_CAST(os_initgroups), METH_FASTCALL, os_initgroups__doc__},
@@ -5612,7 +5625,8 @@ PyDoc_STRVAR(os_getppid__doc__,
 "Return the parent\'s process id.\n"
 "\n"
 "If the parent process has already exited, Windows machines will still\n"
-"return its id; others systems will return the id of the \'init\' process (1).");
+"return its id; others systems will return the id of the \'init\' proces\n"
+"(1).");
 
 #define OS_GETPPID_METHODDEF    \
     {"getppid", (PyCFunction)os_getppid, METH_NOARGS, os_getppid__doc__},
@@ -6162,8 +6176,8 @@ PyDoc_STRVAR(os_waitid__doc__,
 "    Constructed from the ORing of one or more of WEXITED, WSTOPPED\n"
 "    or WCONTINUED and additionally may be ORed with WNOHANG or WNOWAIT.\n"
 "\n"
-"Returns either waitid_result or None if WNOHANG is specified and there are\n"
-"no children in a waitable state.");
+"Returns either waitid_result or None if WNOHANG is specified and there\n"
+"are no children in a waitable state.");
 
 #define OS_WAITID_METHODDEF    \
     {"waitid", _PyCFunction_CAST(os_waitid), METH_FASTCALL, os_waitid__doc__},
@@ -6324,8 +6338,8 @@ PyDoc_STRVAR(os_pidfd_open__doc__,
 "\n"
 "Return a file descriptor referring to the process *pid*.\n"
 "\n"
-"The descriptor can be used to perform process management without races and\n"
-"signals.");
+"The descriptor can be used to perform process management without races\n"
+"and signals.");
 
 #define OS_PIDFD_OPEN_METHODDEF    \
     {"pidfd_open", _PyCFunction_CAST(os_pidfd_open), METH_FASTCALL|METH_KEYWORDS, os_pidfd_open__doc__},
@@ -6636,8 +6650,9 @@ PyDoc_STRVAR(os_readlink__doc__,
 "\n"
 "Return a string representing the path to which the symbolic link points.\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"and path should be relative; path will then be relative to that directory.\n"
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative to\n"
+"that directory.\n"
 "\n"
 "dir_fd may not be implemented on your platform.  If it is unavailable,\n"
 "using it will raise a NotImplementedError.");
@@ -6719,14 +6734,15 @@ PyDoc_STRVAR(os_symlink__doc__,
 "Create a symbolic link pointing to src named dst.\n"
 "\n"
 "target_is_directory is required on Windows if the target is to be\n"
-"  interpreted as a directory.  (On Windows, symlink requires\n"
-"  Windows 6.0 or greater, and raises a NotImplementedError otherwise.)\n"
-"  target_is_directory is ignored on non-Windows platforms.\n"
+"interpreted as a directory.  (On Windows, symlink requires Windows 6.0\n"
+"or greater, and raises a NotImplementedError otherwise.)\n"
+"target_is_directory is ignored on non-Windows platforms.\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
-"dir_fd may not be implemented on your platform.\n"
-"  If it is unavailable, using it will raise a NotImplementedError.");
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative\n"
+"to that directory.\n"
+"dir_fd may not be implemented on your platform.  If it is unavailable,\n"
+"using it will raise a NotImplementedError.");
 
 #define OS_SYMLINK_METHODDEF    \
     {"symlink", _PyCFunction_CAST(os_symlink), METH_FASTCALL|METH_KEYWORDS, os_symlink__doc__},
@@ -7394,10 +7410,11 @@ PyDoc_STRVAR(os_open__doc__,
 "\n"
 "Open a file for low level IO.  Returns a file descriptor (integer).\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
-"dir_fd may not be implemented on your platform.\n"
-"  If it is unavailable, using it will raise a NotImplementedError.");
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative to\n"
+"that directory.\n"
+"dir_fd may not be implemented on your platform.  If it is unavailable,\n"
+"using it will raise a NotImplementedError.");
 
 #define OS_OPEN_METHODDEF    \
     {"open", _PyCFunction_CAST(os_open), METH_FASTCALL|METH_KEYWORDS, os_open__doc__},
@@ -7771,7 +7788,8 @@ PyDoc_STRVAR(os_lseek__doc__,
 "    - SEEK_CUR: seek from the current file position.\n"
 "    - SEEK_END: seek from the end of the file.\n"
 "\n"
-"The return value is the number of bytes relative to the beginning of the file.");
+"The return value is the number of bytes relative to the beginning of\n"
+"the file.");
 
 #define OS_LSEEK_METHODDEF    \
     {"lseek", _PyCFunction_CAST(os_lseek), METH_FASTCALL, os_lseek__doc__},
@@ -7862,15 +7880,15 @@ PyDoc_STRVAR(os_readinto__doc__,
 "\n"
 "Read into a buffer object from a file descriptor.\n"
 "\n"
-"The buffer should be mutable and bytes-like. On success, returns the number of\n"
-"bytes read. Less bytes may be read than the size of the buffer. The underlying\n"
-"system call will be retried when interrupted by a signal, unless the signal\n"
-"handler raises an exception. Other errors will not be retried and an error will\n"
-"be raised.\n"
+"The buffer should be mutable and bytes-like.  On success, returns the\n"
+"number of bytes read.  Less bytes may be read than the size of the\n"
+"buffer.  The underlying system call will be retried when interrupted by\n"
+"a signal, unless the signal handler raises an exception.  Other errors\n"
+"will not be retried and an error will be raised.\n"
 "\n"
-"Returns 0 if *fd* is at end of file or if the provided *buffer* has length 0\n"
-"(which can be used to check for errors without reading data). Never returns\n"
-"negative.");
+"Returns 0 if *fd* is at end of file or if the provided *buffer* has\n"
+"length 0 (which can be used to check for errors without reading data).\n"
+"Never returns negative.");
 
 #define OS_READINTO_METHODDEF    \
     {"readinto", _PyCFunction_CAST(os_readinto), METH_FASTCALL, os_readinto__doc__},
@@ -8025,14 +8043,15 @@ PyDoc_STRVAR(os_preadv__doc__,
 "\n"
 "Reads from a file descriptor into a number of mutable bytes-like objects.\n"
 "\n"
-"Combines the functionality of readv() and pread(). As readv(), it will\n"
-"transfer data into each buffer until it is full and then move on to the next\n"
-"buffer in the sequence to hold the rest of the data. Its fourth argument,\n"
-"specifies the file offset at which the input operation is to be performed. It\n"
-"will return the total number of bytes read (which can be less than the total\n"
-"capacity of all the objects).\n"
+"Combines the functionality of readv() and pread().  As readv(), it will\n"
+"transfer data into each buffer until it is full and then move on to the\n"
+"next buffer in the sequence to hold the rest of the data.  Its fourth\n"
+"argument, specifies the file offset at which the input operation is to\n"
+"be performed.  It will return the total number of bytes read (which can\n"
+"be less than the total capacity of all the objects).\n"
 "\n"
-"The flags argument contains a bitwise OR of zero or more of the following flags:\n"
+"The flags argument contains a bitwise OR of zero or more of the\n"
+"following flags:\n"
 "\n"
 "- RWF_HIPRI\n"
 "- RWF_NOWAIT\n"
@@ -8766,14 +8785,16 @@ PyDoc_STRVAR(os_pwritev__doc__,
 "\n"
 "Writes the contents of bytes-like objects to a file descriptor at a given offset.\n"
 "\n"
-"Combines the functionality of writev() and pwrite(). All buffers must be a sequence\n"
-"of bytes-like objects. Buffers are processed in array order. Entire contents of first\n"
-"buffer is written before proceeding to second, and so on. The operating system may\n"
-"set a limit (sysconf() value SC_IOV_MAX) on the number of buffers that can be used.\n"
-"This function writes the contents of each object to the file descriptor and returns\n"
-"the total number of bytes written.\n"
+"Combines the functionality of writev() and pwrite(). All buffers must be\n"
+"a sequence of bytes-like objects.  Buffers are processed in array order.\n"
+"Entire contents of first buffer is written before proceeding to second,\n"
+"and so on. The operating system may set a limit (sysconf() value\n"
+"SC_IOV_MAX) on the number of buffers that can be used.\n"
+"This function writes the contents of each object to the file descriptor\n"
+"and returns the total number of bytes written.\n"
 "\n"
-"The flags argument contains a bitwise OR of zero or more of the following flags:\n"
+"The flags argument contains a bitwise OR of zero or more of the\n"
+"following flags:\n"
 "\n"
 "- RWF_DSYNC\n"
 "- RWF_SYNC\n"
@@ -9088,10 +9109,11 @@ PyDoc_STRVAR(os_mkfifo__doc__,
 "\n"
 "Create a \"fifo\" (a POSIX named pipe).\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
-"dir_fd may not be implemented on your platform.\n"
-"  If it is unavailable, using it will raise a NotImplementedError.");
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative to\n"
+"that directory.\n"
+"dir_fd may not be implemented on your platform.  If it is unavailable,\n"
+"using it will raise a NotImplementedError.");
 
 #define OS_MKFIFO_METHODDEF    \
     {"mkfifo", _PyCFunction_CAST(os_mkfifo), METH_FASTCALL|METH_KEYWORDS, os_mkfifo__doc__},
@@ -9183,17 +9205,18 @@ PyDoc_STRVAR(os_mknod__doc__,
 "\n"
 "Create a node in the file system.\n"
 "\n"
-"Create a node in the file system (file, device special file or named pipe)\n"
-"at path.  mode specifies both the permissions to use and the\n"
+"Create a node in the file system (file, device special file or named\n"
+"pipe) at path.  mode specifies both the permissions to use and the\n"
 "type of node to be created, being combined (bitwise OR) with one of\n"
-"S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO.  If S_IFCHR or S_IFBLK is set on mode,\n"
-"device defines the newly created device special file (probably using\n"
-"os.makedev()).  Otherwise device is ignored.\n"
+"S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO.  If S_IFCHR or S_IFBLK is set\n"
+"on mode, device defines the newly created device special file (probably\n"
+"using os.makedev()).  Otherwise device is ignored.\n"
 "\n"
-"If dir_fd is not None, it should be a file descriptor open to a directory,\n"
-"  and path should be relative; path will then be relative to that directory.\n"
-"dir_fd may not be implemented on your platform.\n"
-"  If it is unavailable, using it will raise a NotImplementedError.");
+"If dir_fd is not None, it should be a file descriptor open to\n"
+"a directory, and path should be relative; path will then be relative\n"
+"to that directory.\n"
+"dir_fd may not be implemented on your platform.  If it is unavailable,\n"
+"using it will raise a NotImplementedError.");
 
 #define OS_MKNOD_METHODDEF    \
     {"mknod", _PyCFunction_CAST(os_mknod), METH_FASTCALL|METH_KEYWORDS, os_mknod__doc__},
@@ -9439,8 +9462,9 @@ PyDoc_STRVAR(os_truncate__doc__,
 "\n"
 "Truncate a file, specified by path, to a specific length.\n"
 "\n"
-"On some platforms, path may also be specified as an open file descriptor.\n"
-"  If this functionality is unavailable, using it raises an exception.");
+"On some platforms, path may also be specified as an open file\n"
+"descriptor.  If this functionality is unavailable, using it raises\n"
+"an exception.");
 
 #define OS_TRUNCATE_METHODDEF    \
     {"truncate", _PyCFunction_CAST(os_truncate), METH_FASTCALL|METH_KEYWORDS, os_truncate__doc__},
@@ -9514,7 +9538,8 @@ PyDoc_STRVAR(os_posix_fallocate__doc__,
 "Ensure a file has allocated at least a particular number of bytes on disk.\n"
 "\n"
 "Ensure that the file specified by fd encompasses a range of bytes\n"
-"starting at offset bytes from the beginning and continuing for length bytes.");
+"starting at offset bytes from the beginning and continuing for length\n"
+"bytes.");
 
 #define OS_POSIX_FALLOCATE_METHODDEF    \
     {"posix_fallocate", _PyCFunction_CAST(os_posix_fallocate), METH_FASTCALL, os_posix_fallocate__doc__},
@@ -9560,8 +9585,8 @@ PyDoc_STRVAR(os_posix_fadvise__doc__,
 "\n"
 "Announce an intention to access data in a specific pattern.\n"
 "\n"
-"Announce an intention to access data in a specific pattern, thus allowing\n"
-"the kernel to make optimizations.\n"
+"Announce an intention to access data in a specific pattern, thus\n"
+"allowing the kernel to make optimizations.\n"
 "The advice applies to the region of the file specified by fd starting at\n"
 "offset and continuing for length bytes.\n"
 "advice is one of POSIX_FADV_NORMAL, POSIX_FADV_SEQUENTIAL,\n"
@@ -10383,8 +10408,9 @@ PyDoc_STRVAR(os_statvfs__doc__,
 "Perform a statvfs system call on the given path.\n"
 "\n"
 "path may always be specified as a string.\n"
-"On some platforms, path may also be specified as an open file descriptor.\n"
-"  If this functionality is unavailable, using it raises an exception.");
+"On some platforms, path may also be specified as an open file\n"
+"descriptor.  If this functionality is unavailable, using it raises\n"
+"an exception.");
 
 #define OS_STATVFS_METHODDEF    \
     {"statvfs", _PyCFunction_CAST(os_statvfs), METH_FASTCALL|METH_KEYWORDS, os_statvfs__doc__},
@@ -10567,8 +10593,9 @@ PyDoc_STRVAR(os_pathconf__doc__,
 "Return the configuration limit name for the file or directory path.\n"
 "\n"
 "If there is no limit, return -1.\n"
-"On some platforms, path may also be specified as an open file descriptor.\n"
-"  If this functionality is unavailable, using it raises an exception.");
+"On some platforms, path may also be specified as an open file\n"
+"descriptor.  If this functionality is unavailable, using it raises\n"
+"an exception.");
 
 #define OS_PATHCONF_METHODDEF    \
     {"pathconf", _PyCFunction_CAST(os_pathconf), METH_FASTCALL|METH_KEYWORDS, os_pathconf__doc__},
@@ -10711,8 +10738,8 @@ PyDoc_STRVAR(os_abort__doc__,
 "\n"
 "Abort the interpreter immediately.\n"
 "\n"
-"This function \'dumps core\' or otherwise fails in the hardest way possible\n"
-"on the hosting operating system.  This function never returns.");
+"This function \'dumps core\' or otherwise fails in the hardest way\n"
+"possible on the hosting operating system.  This function never returns.");
 
 #define OS_ABORT_METHODDEF    \
     {"abort", (PyCFunction)os_abort, METH_NOARGS, os_abort__doc__},
@@ -11100,10 +11127,11 @@ PyDoc_STRVAR(os_getxattr__doc__,
 "\n"
 "Return the value of extended attribute attribute on path.\n"
 "\n"
-"path may be either a string, a path-like object, or an open file descriptor.\n"
-"If follow_symlinks is False, and the last element of the path is a symbolic\n"
-"  link, getxattr will examine the symbolic link itself instead of the file\n"
-"  the link points to.");
+"path may be either a string, a path-like object, or an open file\n"
+"descriptor.\n"
+"If follow_symlinks is False, and the last element of the path is\n"
+"a symbolic link, getxattr will examine the symbolic link itself\n"
+"instead of the file the link points to.");
 
 #define OS_GETXATTR_METHODDEF    \
     {"getxattr", _PyCFunction_CAST(os_getxattr), METH_FASTCALL|METH_KEYWORDS, os_getxattr__doc__},
@@ -11190,10 +11218,11 @@ PyDoc_STRVAR(os_setxattr__doc__,
 "\n"
 "Set extended attribute attribute on path to value.\n"
 "\n"
-"path may be either a string, a path-like object,  or an open file descriptor.\n"
-"If follow_symlinks is False, and the last element of the path is a symbolic\n"
-"  link, setxattr will modify the symbolic link itself instead of the file\n"
-"  the link points to.");
+"path may be either a string, a path-like object,  or an open file\n"
+"descriptor.\n"
+"If follow_symlinks is False, and the last element of the path is\n"
+"a symbolic link, setxattr will modify the symbolic link itself instead\n"
+"of the file the link points to.");
 
 #define OS_SETXATTR_METHODDEF    \
     {"setxattr", _PyCFunction_CAST(os_setxattr), METH_FASTCALL|METH_KEYWORDS, os_setxattr__doc__},
@@ -11301,10 +11330,11 @@ PyDoc_STRVAR(os_removexattr__doc__,
 "\n"
 "Remove extended attribute attribute on path.\n"
 "\n"
-"path may be either a string, a path-like object, or an open file descriptor.\n"
-"If follow_symlinks is False, and the last element of the path is a symbolic\n"
-"  link, removexattr will modify the symbolic link itself instead of the file\n"
-"  the link points to.");
+"path may be either a string, a path-like object, or an open file\n"
+"descriptor.\n"
+"If follow_symlinks is False, and the last element of the path is\n"
+"a symbolic link, removexattr will modify the symbolic link itself\n"
+"instead of the file the link points to.");
 
 #define OS_REMOVEXATTR_METHODDEF    \
     {"removexattr", _PyCFunction_CAST(os_removexattr), METH_FASTCALL|METH_KEYWORDS, os_removexattr__doc__},
@@ -11390,11 +11420,12 @@ PyDoc_STRVAR(os_listxattr__doc__,
 "\n"
 "Return a list of extended attributes on path.\n"
 "\n"
-"path may be either None, a string, a path-like object, or an open file descriptor.\n"
-"if path is None, listxattr will examine the current directory.\n"
-"If follow_symlinks is False, and the last element of the path is a symbolic\n"
-"  link, listxattr will examine the symbolic link itself instead of the file\n"
-"  the link points to.");
+"path may be either None, a string, a path-like object, or an open file\n"
+"descriptor.  If path is None, listxattr will examine the current\n"
+"directory.\n"
+"If follow_symlinks is False, and the last element of the path is\n"
+"a symbolic link, listxattr will examine the symbolic link itself instead\n"
+"of the file the link points to.");
 
 #define OS_LISTXATTR_METHODDEF    \
     {"listxattr", _PyCFunction_CAST(os_listxattr), METH_FASTCALL|METH_KEYWORDS, os_listxattr__doc__},
@@ -12416,9 +12447,9 @@ PyDoc_STRVAR(os_scandir__doc__,
 "\n"
 "Return an iterator of DirEntry objects for given path.\n"
 "\n"
-"path can be specified as either str, bytes, or a path-like object.  If path\n"
-"is bytes, the names of yielded DirEntry objects will also be bytes; in\n"
-"all other circumstances they will be str.\n"
+"path can be specified as either str, bytes, or a path-like object.  If\n"
+"path is bytes, the names of yielded DirEntry objects will also be bytes;\n"
+"in all other circumstances they will be str.\n"
 "\n"
 "If path is None, uses the path=\'.\'.");
 
@@ -12490,9 +12521,9 @@ PyDoc_STRVAR(os_fspath__doc__,
 "\n"
 "Return the file system path representation of the object.\n"
 "\n"
-"If the object is str or bytes, then allow it to pass through as-is. If the\n"
-"object defines __fspath__(), then return the result of that method. All other\n"
-"types raise a TypeError.");
+"If the object is str or bytes, then allow it to pass through as-is.  If\n"
+"the object defines __fspath__(), then return the result of that method.\n"
+"All other types raise a TypeError.");
 
 #define OS_FSPATH_METHODDEF    \
     {"fspath", _PyCFunction_CAST(os_fspath), METH_FASTCALL|METH_KEYWORDS, os_fspath__doc__},
@@ -12786,8 +12817,8 @@ PyDoc_STRVAR(os_waitstatus_to_exitcode__doc__,
 "On Windows, return status shifted right by 8 bits.\n"
 "\n"
 "On Unix, if the process is being traced or if waitpid() was called with\n"
-"WUNTRACED option, the caller must first check if WIFSTOPPED(status) is true.\n"
-"This function must not be called if WIFSTOPPED(status) is true.");
+"WUNTRACED option, the caller must first check if WIFSTOPPED(status) is\n"
+"true.  This function must not be called if WIFSTOPPED(status) is true.");
 
 #define OS_WAITSTATUS_TO_EXITCODE_METHODDEF    \
     {"waitstatus_to_exitcode", _PyCFunction_CAST(os_waitstatus_to_exitcode), METH_FASTCALL|METH_KEYWORDS, os_waitstatus_to_exitcode__doc__},
@@ -13702,4 +13733,4 @@ os__emscripten_log(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py
 #ifndef OS__EMSCRIPTEN_LOG_METHODDEF
     #define OS__EMSCRIPTEN_LOG_METHODDEF
 #endif /* !defined(OS__EMSCRIPTEN_LOG_METHODDEF) */
-/*[clinic end generated code: output=c4cf19262e42e352 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=250ea2e34fdd133f input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index db29c6e5f08d6f..d04b13b8c124f4 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -2365,7 +2365,7 @@ PyDoc_STRVAR(stat_result__doc__,
 "stat_result: Result from stat, fstat, or lstat.\n\n\
 This object may be accessed either as a tuple of\n\
   (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)\n\
-or via the attributes st_mode, st_ino, st_dev, st_nlink, st_uid, and so on.\n\
+or via the attributes st_mode, st_ino, st_dev, st_nlink, and so on.\n\
 \n\
 Posix/windows: If your platform supports st_blksize, st_blocks, st_rdev,\n\
 or st_flags, they are available as attributes only.\n\
@@ -3925,14 +3925,14 @@ os.chdir
 
 Change the current working directory to the specified path.
 
-path may always be specified as a string.
-On some platforms, path may also be specified as an open file descriptor.
-If this functionality is unavailable, using it raises an exception.
+path may always be specified as a string.  On some platforms, path may
+also be specified as an open file descriptor.  If this functionality is
+unavailable, using it raises an exception.
 [clinic start generated code]*/
 
 static PyObject *
 os_chdir_impl(PyObject *module, path_t *path)
-/*[clinic end generated code: output=3be6400eee26eaae input=a74ceab5d72adf74]*/
+/*[clinic end generated code: output=3be6400eee26eaae input=64673c342e4369f1]*/
 {
     int result;
 
@@ -4045,15 +4045,16 @@ win32_fchmod(int fd, int mode)
 os.chmod
 
     path: path_t(allow_fd='PATH_HAVE_FCHMOD')
-        Path to be modified.  May always be specified as a str, bytes, or a path-like object.
-        On some platforms, path may also be specified as an open file descriptor.
-        If this functionality is unavailable, using it raises an exception.
+        Path to be modified.  May always be specified as a str, bytes, or
+        a path-like object.  On some platforms, path may also be specified
+        as an open file descriptor.  If this functionality is unavailable,
+        using it raises an exception.
 
     mode: int
         Operating-system mode bitfield.
-        Be careful when using number literals for *mode*. The conventional UNIX notation for
-        numeric modes uses an octal base, which needs to be indicated with a ``0o`` prefix in
-        Python.
+        Be careful when using number literals for *mode*. The conventional
+        UNIX notation for numeric modes uses an octal base, which needs to
+        be indicated with a ``0o`` prefix in Python.
 
     *
 
@@ -4080,7 +4081,7 @@ dir_fd and follow_symlinks may not be implemented on your platform.
 static PyObject *
 os_chmod_impl(PyObject *module, path_t *path, int mode, int dir_fd,
               int follow_symlinks)
-/*[clinic end generated code: output=5cf6a94915cc7bff input=fcf115d174b9f3d8]*/
+/*[clinic end generated code: output=5cf6a94915cc7bff input=7b6e2eeadd8bf199]*/
 {
     int result;
 
@@ -4216,9 +4217,9 @@ os.fchmod
         The file descriptor of the file to be modified.
     mode: int
         Operating-system mode bitfield.
-        Be careful when using number literals for *mode*. The conventional UNIX notation for
-        numeric modes uses an octal base, which needs to be indicated with a ``0o`` prefix in
-        Python.
+        Be careful when using number literals for *mode*.  The conventional
+        UNIX notation for numeric modes uses an octal base, which needs to
+        be indicated with a ``0o`` prefix in Python.
 
 Change the access permissions of the file given by file descriptor fd.
 
@@ -4227,7 +4228,7 @@ Equivalent to os.chmod(fd, mode).
 
 static PyObject *
 os_fchmod_impl(PyObject *module, int fd, int mode)
-/*[clinic end generated code: output=afd9bc05b4e426b3 input=b5594618bbbc22df]*/
+/*[clinic end generated code: output=afd9bc05b4e426b3 input=d24331f9fdc17f49]*/
 {
     int res;
 
@@ -4261,6 +4262,7 @@ os_fchmod_impl(PyObject *module, int fd, int mode)
 
 #if defined(HAVE_LCHMOD) || defined(MS_WINDOWS)
 /*[clinic input]
+@permit_long_summary
 os.lchmod
 
     path: path_t
@@ -4268,13 +4270,13 @@ os.lchmod
 
 Change the access permissions of a file, without following symbolic links.
 
-If path is a symlink, this affects the link itself rather than the target.
-Equivalent to chmod(path, mode, follow_symlinks=False)."
+If path is a symlink, this affects the link itself rather than the
+target.  Equivalent to chmod(path, mode, follow_symlinks=False).
 [clinic start generated code]*/
 
 static PyObject *
 os_lchmod_impl(PyObject *module, path_t *path, int mode)
-/*[clinic end generated code: output=082344022b51a1d5 input=90c5663c7465d24f]*/
+/*[clinic end generated code: output=082344022b51a1d5 input=13110fb62911b015]*/
 {
     int res;
     if (PySys_Audit("os.chmod", "Oii", path->object, mode, -1) < 0) {
@@ -4312,9 +4314,9 @@ os.chflags
 
 Set file flags.
 
-If follow_symlinks is False, and the last element of the path is a symbolic
-  link, chflags will change flags on the symbolic link itself instead of the
-  file the link points to.
+If follow_symlinks is False, and the last element of the path is
+a symbolic link, chflags() will change flags on the symbolic link itself
+instead of the file the link points to.
 follow_symlinks may not be implemented on your platform.  If it is
 unavailable, using it will raise a NotImplementedError.
 
@@ -4323,7 +4325,7 @@ unavailable, using it will raise a NotImplementedError.
 static PyObject *
 os_chflags_impl(PyObject *module, path_t *path, unsigned long flags,
                 int follow_symlinks)
-/*[clinic end generated code: output=85571c6737661ce9 input=0327e29feb876236]*/
+/*[clinic end generated code: output=85571c6737661ce9 input=31391927707be1de]*/
 {
     int result;
 
@@ -4473,7 +4475,8 @@ os_fdatasync_impl(PyObject *module, int fd)
 os.chown
 
     path : path_t(allow_fd='PATH_HAVE_FCHOWN')
-        Path to be examined; can be string, bytes, a path-like object, or open-file-descriptor int.
+        Path to be examined; can be string, bytes, a path-like object, or
+        open-file-descriptor int.
 
     uid: uid_t
 
@@ -4481,7 +4484,7 @@ os.chown
 
     *
 
-    dir_fd : dir_fd(requires='fchownat') = None
+    dir_fd: dir_fd(requires='fchownat') = None
         If not None, it should be a file descriptor open to a directory,
         and path should be relative; path will then be relative to that
         directory.
@@ -4491,27 +4494,28 @@ os.chown
         stat will examine the symbolic link itself instead of the file
         the link points to.
 
-Change the owner and group id of path to the numeric uid and gid.\
+Change the owner and group id of path to the numeric uid and gid.
 
-path may always be specified as a string.
-On some platforms, path may also be specified as an open file descriptor.
-  If this functionality is unavailable, using it raises an exception.
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
-If follow_symlinks is False, and the last element of the path is a symbolic
-  link, chown will modify the symbolic link itself instead of the file the
-  link points to.
+path may always be specified as a string.  On some platforms, path may
+also be specified as an open file descriptor.  If this functionality is
+unavailable, using it raises an exception.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative to
+that directory.
+If follow_symlinks is False, and the last element of the path is
+a symbolic link, chown will modify the symbolic link itself instead of
+the file the link points to.
 It is an error to use dir_fd or follow_symlinks when specifying path as
-  an open file descriptor.
-dir_fd and follow_symlinks may not be implemented on your platform.
-  If they are unavailable, using them will raise a NotImplementedError.
+an open file descriptor.
+dir_fd and follow_symlinks may not be implemented on your platform.  If
+they are unavailable, using them will raise a NotImplementedError.
 
 [clinic start generated code]*/
 
 static PyObject *
 os_chown_impl(PyObject *module, path_t *path, uid_t uid, gid_t gid,
               int dir_fd, int follow_symlinks)
-/*[clinic end generated code: output=4beadab0db5f70cd input=b08c5ec67996a97d]*/
+/*[clinic end generated code: output=4beadab0db5f70cd input=509c91b7a0e72f52]*/
 {
     int result;
 
@@ -4795,7 +4799,6 @@ os_getcwdb_impl(PyObject *module)
 #ifdef HAVE_LINK
 /*[clinic input]
 
-@permit_long_docstring_body
 os.link
 
     src : path_t
@@ -4808,20 +4811,21 @@ os.link
 Create a hard link to a file.
 
 If either src_dir_fd or dst_dir_fd is not None, it should be a file
-  descriptor open to a directory, and the respective path string (src or dst)
-  should be relative; the path will then be relative to that directory.
+descriptor open to a directory, and the respective path string (src or
+dst) should be relative; the path will then be relative to that
+directory.
 If follow_symlinks is False, and the last element of src is a symbolic
-  link, link will create a link to the symbolic link itself instead of the
-  file the link points to.
-src_dir_fd, dst_dir_fd, and follow_symlinks may not be implemented on your
-  platform.  If they are unavailable, using them will raise a
-  NotImplementedError.
+link, link will create a link to the symbolic link itself instead of the
+file the link points to.
+src_dir_fd, dst_dir_fd, and follow_symlinks may not be implemented on
+your platform.  If they are unavailable, using them will raise
+a NotImplementedError.
 [clinic start generated code]*/
 
 static PyObject *
 os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd,
              int dst_dir_fd, int follow_symlinks)
-/*[clinic end generated code: output=7f00f6007fd5269a input=e2a50a6497050e44]*/
+/*[clinic end generated code: output=7f00f6007fd5269a input=a28e6866fbd20a01]*/
 {
 #ifdef MS_WINDOWS
     BOOL result = FALSE;
@@ -5115,30 +5119,28 @@ _posix_listdir(path_t *path, PyObject *list)
 
 
 /*[clinic input]
-@permit_long_docstring_body
 os.listdir
 
     path : path_t(nullable=True, allow_fd='PATH_HAVE_FDOPENDIR') = None
 
 Return a list containing the names of the files in the directory.
 
-path can be specified as either str, bytes, or a path-like object.  If path is bytes,
-  the filenames returned will also be bytes; in all other circumstances
-  the filenames returned will be str.
+path can be specified as either str, bytes, or a path-like object.  If
+path is bytes, the filenames returned will also be bytes; in all other
+circumstances the filenames returned will be str.
 If path is None, uses the path='.'.
-On some platforms, path may also be specified as an open file descriptor;\
-  the file descriptor must refer to a directory.
-  If this functionality is unavailable, using it raises NotImplementedError.
+On some platforms, path may also be specified as an open file
+descriptor; the file descriptor must refer to a directory.  If this
+functionality is unavailable, using it raises NotImplementedError.
 
 The list is in arbitrary order.  It does not include the special
 entries '.' and '..' even if they are present in the directory.
 
-
 [clinic start generated code]*/
 
 static PyObject *
 os_listdir_impl(PyObject *module, path_t *path)
-/*[clinic end generated code: output=293045673fcd1a75 input=0bd1728387391b9a]*/
+/*[clinic end generated code: output=293045673fcd1a75 input=4eefe7c6a42ec9b2]*/
 {
     if (PySys_Audit("os.listdir", "O",
                     path->object ? path->object : Py_None) < 0) {
@@ -5597,6 +5599,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path)
 }
 
 /*[clinic input]
+@permit_long_summary
 os._findfirstfile
     path: path_t
     /
@@ -5605,7 +5608,7 @@ A function to get the real file name without accessing the file in Windows.
 
 static PyObject *
 os__findfirstfile_impl(PyObject *module, path_t *path)
-/*[clinic end generated code: output=106dd3f0779c83dd input=0734dff70f60e1a8]*/
+/*[clinic end generated code: output=106dd3f0779c83dd input=48c319aaa48d05d4]*/
 {
     PyObject *result;
     HANDLE hFindFile;
@@ -6159,22 +6162,21 @@ os.mkdir
 
     dir_fd : dir_fd(requires='mkdirat') = None
 
-# "mkdir(path, mode=0o777, *, dir_fd=None)\n\n\
-
 Create a directory.
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
-dir_fd may not be implemented on your platform.
-  If it is unavailable, using it will raise a NotImplementedError.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative to
+that directory.
+dir_fd may not be implemented on your platform.  If it is unavailable,
+using it will raise a NotImplementedError.
 
-The mode argument is ignored on Windows. Where it is used, the current umask
-value is first masked out.
+The mode argument is ignored on Windows.  Where it is used, the current
+umask value is first masked out.
 [clinic start generated code]*/
 
 static PyObject *
 os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd)
-/*[clinic end generated code: output=a70446903abe821f input=a61722e1576fab03]*/
+/*[clinic end generated code: output=a70446903abe821f input=30270d369599634b]*/
 {
     int result;
 #ifdef MS_WINDOWS
@@ -6428,7 +6430,6 @@ internal_rename(path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd, int is
 
 
 /*[clinic input]
-@permit_long_docstring_body
 os.rename
 
     src : path_t
@@ -6440,38 +6441,39 @@ os.rename
 Rename a file or directory.
 
 If either src_dir_fd or dst_dir_fd is not None, it should be a file
-  descriptor open to a directory, and the respective path string (src or dst)
-  should be relative; the path will then be relative to that directory.
+descriptor open to a directory, and the respective path string (src or
+dst) should be relative; the path will then be relative to that
+directory.
 src_dir_fd and dst_dir_fd, may not be implemented on your platform.
-  If they are unavailable, using them will raise a NotImplementedError.
+If they are unavailable, using them will raise a NotImplementedError.
 [clinic start generated code]*/
 
 static PyObject *
 os_rename_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd,
                int dst_dir_fd)
-/*[clinic end generated code: output=59e803072cf41230 input=11aae8c091162766]*/
+/*[clinic end generated code: output=59e803072cf41230 input=7d320d687c715fd6]*/
 {
     return internal_rename(src, dst, src_dir_fd, dst_dir_fd, 0);
 }
 
 
 /*[clinic input]
-@permit_long_docstring_body
 os.replace = os.rename
 
 Rename a file or directory, overwriting the destination.
 
 If either src_dir_fd or dst_dir_fd is not None, it should be a file
-  descriptor open to a directory, and the respective path string (src or dst)
-  should be relative; the path will then be relative to that directory.
+descriptor open to a directory, and the respective path string (src or
+dst) should be relative; the path will then be relative to that
+directory.
 src_dir_fd and dst_dir_fd, may not be implemented on your platform.
-  If they are unavailable, using them will raise a NotImplementedError.
+If they are unavailable, using them will raise a NotImplementedError.
 [clinic start generated code]*/
 
 static PyObject *
 os_replace_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd,
                 int dst_dir_fd)
-/*[clinic end generated code: output=1968c02e7857422b input=78d6c8087e90994c]*/
+/*[clinic end generated code: output=1968c02e7857422b input=44ed6b762d5953fc]*/
 {
     return internal_rename(src, dst, src_dir_fd, dst_dir_fd, 1);
 }
@@ -6486,15 +6488,16 @@ os.rmdir
 
 Remove a directory.
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative
+to that directory.
 dir_fd may not be implemented on your platform.
-  If it is unavailable, using it will raise a NotImplementedError.
+If it is unavailable, using it will raise a NotImplementedError.
 [clinic start generated code]*/
 
 static PyObject *
 os_rmdir_impl(PyObject *module, path_t *path, int dir_fd)
-/*[clinic end generated code: output=080eb54f506e8301 input=38c8b375ca34a7e2]*/
+/*[clinic end generated code: output=080eb54f506e8301 input=84325211e33a98e0]*/
 {
     int result;
 #ifdef HAVE_UNLINKAT
@@ -6665,16 +6668,17 @@ os.unlink
 
 Remove a file (same as remove()).
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative to
+that directory.
 dir_fd may not be implemented on your platform.
-  If it is unavailable, using it will raise a NotImplementedError.
+If it is unavailable, using it will raise a NotImplementedError.
 
 [clinic start generated code]*/
 
 static PyObject *
 os_unlink_impl(PyObject *module, path_t *path, int dir_fd)
-/*[clinic end generated code: output=621797807b9963b1 input=d7bcde2b1b2a2552]*/
+/*[clinic end generated code: output=621797807b9963b1 input=1a2ef2579207eab1]*/
 {
     int result;
 #ifdef HAVE_UNLINKAT
@@ -6726,15 +6730,16 @@ os.remove = os.unlink
 
 Remove a file (same as unlink()).
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative
+to that directory.
 dir_fd may not be implemented on your platform.
-  If it is unavailable, using it will raise a NotImplementedError.
+If it is unavailable, using it will raise a NotImplementedError.
 [clinic start generated code]*/
 
 static PyObject *
 os_remove_impl(PyObject *module, path_t *path, int dir_fd)
-/*[clinic end generated code: output=a8535b28f0068883 input=e05c5ab55cd30983]*/
+/*[clinic end generated code: output=a8535b28f0068883 input=9f6e66912126bd56]*/
 {
     return os_unlink_impl(module, path, dir_fd);
 }
@@ -7056,38 +7061,37 @@ os.utime
     dir_fd: dir_fd(requires='futimensat') = None
     follow_symlinks: bool=True
 
-# "utime(path, times=None, *[, ns], dir_fd=None, follow_symlinks=True)\n\
-
 Set the access and modified time of path.
 
-path may always be specified as a string.
-On some platforms, path may also be specified as an open file descriptor.
-  If this functionality is unavailable, using it raises an exception.
+path may always be specified as a string.  On some platforms, path may
+also be specified as an open file descriptor.  If this functionality is
+unavailable, using it raises an exception.
 
 If times is not None, it must be a tuple (atime, mtime);
-    atime and mtime should be expressed as float seconds since the epoch.
+atime and mtime should be expressed as float seconds since the epoch.
 If ns is specified, it must be a tuple (atime_ns, mtime_ns);
-    atime_ns and mtime_ns should be expressed as integer nanoseconds
-    since the epoch.
+atime_ns and mtime_ns should be expressed as integer nanoseconds
+since the epoch.
 If times is None and ns is unspecified, utime uses the current time.
 Specifying tuples for both times and ns is an error.
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
-If follow_symlinks is False, and the last element of the path is a symbolic
-  link, utime will modify the symbolic link itself instead of the file the
-  link points to.
-It is an error to use dir_fd or follow_symlinks when specifying path
-  as an open file descriptor.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative to
+that directory.
+If follow_symlinks is False, and the last element of the path is
+a symbolic link, utime will modify the symbolic link itself instead of
+the file the link points to.
+It is an error to use dir_fd or follow_symlinks when specifying path as
+an open file descriptor.
 dir_fd and follow_symlinks may not be available on your platform.
-  If they are unavailable, using them will raise a NotImplementedError.
+If they are unavailable, using them will raise a NotImplementedError.
 
 [clinic start generated code]*/
 
 static PyObject *
 os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
               int dir_fd, int follow_symlinks)
-/*[clinic end generated code: output=cfcac69d027b82cf input=2fbd62a2f228f8f4]*/
+/*[clinic end generated code: output=cfcac69d027b82cf input=5ab470b2bc250788]*/
 {
 #ifdef MS_WINDOWS
     HANDLE hFile;
@@ -7244,6 +7248,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
 
 
 /*[clinic input]
+@permit_long_summary
 os._exit
 
     status: int
@@ -7253,7 +7258,7 @@ Exit to the system with specified status, without normal exit processing.
 
 static PyObject *
 os__exit_impl(PyObject *module, int status)
-/*[clinic end generated code: output=116e52d9c2260d54 input=5e6d57556b0c4a62]*/
+/*[clinic end generated code: output=116e52d9c2260d54 input=c35d282acfebe8fd]*/
 {
     _exit(status);
     return NULL; /* Make gcc -Wall happy */
@@ -8057,7 +8062,8 @@ os.posix_spawn
     resetids: bool = False
         If the value is `true` the POSIX_SPAWN_RESETIDS will be activated.
     setsid: bool = False
-        If the value is `true` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated.
+        If the value is `true` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP
+        will be activated.
     setsigmask: object(c_default='NULL') = ()
         The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.
     setsigdef: object(c_default='NULL') = ()
@@ -8074,7 +8080,7 @@ os_posix_spawn_impl(PyObject *module, path_t *path, PyObject *argv,
                     PyObject *setpgroup, int resetids, int setsid,
                     PyObject *setsigmask, PyObject *setsigdef,
                     PyObject *scheduler)
-/*[clinic end generated code: output=14a1098c566bc675 input=69e7c9ebbdcf94a5]*/
+/*[clinic end generated code: output=14a1098c566bc675 input=c7592dcbc96e8114]*/
 {
     return py_posix_spawn(0, module, path, argv, env, file_actions,
                           setpgroup, resetids, setsid, setsigmask, setsigdef,
@@ -8103,7 +8109,8 @@ os.posix_spawnp
     resetids: bool = False
         If the value is `True` the POSIX_SPAWN_RESETIDS will be activated.
     setsid: bool = False
-        If the value is `True` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated.
+        If the value is `True` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP
+        will be activated.
     setsigmask: object(c_default='NULL') = ()
         The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.
     setsigdef: object(c_default='NULL') = ()
@@ -8120,7 +8127,7 @@ os_posix_spawnp_impl(PyObject *module, path_t *path, PyObject *argv,
                      PyObject *setpgroup, int resetids, int setsid,
                      PyObject *setsigmask, PyObject *setsigdef,
                      PyObject *scheduler)
-/*[clinic end generated code: output=7b9aaefe3031238d input=a5c057527c6881a5]*/
+/*[clinic end generated code: output=7b9aaefe3031238d input=43ccc1452cae2be3]*/
 {
     return py_posix_spawn(1, module, path, argv, env, file_actions,
                           setpgroup, resetids, setsid, setsigmask, setsigdef,
@@ -9156,13 +9163,13 @@ os.posix_openpt -> int
 Open and return a file descriptor for a master pseudo-terminal device.
 
 Performs a posix_openpt() C function call. The oflag argument is used to
-set file status flags and file access modes as specified in the manual page
-of posix_openpt() of your system.
+set file status flags and file access modes as specified in the manual
+page of posix_openpt() of your system.
 [clinic start generated code]*/
 
 static int
 os_posix_openpt_impl(PyObject *module, int oflag)
-/*[clinic end generated code: output=ee0bc2624305fc79 input=0de33d0e29693caa]*/
+/*[clinic end generated code: output=ee0bc2624305fc79 input=3ce4eb297fa64307]*/
 {
     int fd;
 
@@ -9437,6 +9444,7 @@ os_openpty_impl(PyObject *module)
 
 #if defined(HAVE_LOGIN_TTY) || defined(HAVE_FALLBACK_LOGIN_TTY)
 /*[clinic input]
+@permit_long_summary
 os.login_tty
 
     fd: fildes
@@ -9451,7 +9459,7 @@ calling process; close fd.
 
 static PyObject *
 os_login_tty_impl(PyObject *module, int fd)
-/*[clinic end generated code: output=495a79911b4cc1bc input=5f298565099903a2]*/
+/*[clinic end generated code: output=495a79911b4cc1bc input=b102a7c36e8baf00]*/
 {
 #ifdef HAVE_LOGIN_TTY
     if (login_tty(fd) == -1) {
@@ -9806,14 +9814,14 @@ os.initgroups
 
 Initialize the group access list.
 
-Call the system initgroups() to initialize the group access list with all of
-the groups of which the specified username is a member, plus the specified
-group id.
+Call the system initgroups() to initialize the group access list with
+all of the groups of which the specified username is a member, plus the
+specified group id.
 [clinic start generated code]*/
 
 static PyObject *
 os_initgroups_impl(PyObject *module, PyObject *oname, int gid)
-/*[clinic end generated code: output=7f074d30a425fd3a input=984e60c7fed88cb4]*/
+/*[clinic end generated code: output=7f074d30a425fd3a input=35f2d4fb7fcc0bdf]*/
 #else
 /*[clinic input]
 os.initgroups
@@ -9824,14 +9832,14 @@ os.initgroups
 
 Initialize the group access list.
 
-Call the system initgroups() to initialize the group access list with all of
-the groups of which the specified username is a member, plus the specified
-group id.
+Call the system initgroups() to initialize the group access list with
+all of the groups of which the specified username is a member, plus the
+specified group id.
 [clinic start generated code]*/
 
 static PyObject *
 os_initgroups_impl(PyObject *module, PyObject *oname, gid_t gid)
-/*[clinic end generated code: output=59341244521a9e3f input=17d8fbe2dea42ca4]*/
+/*[clinic end generated code: output=59341244521a9e3f input=7e4514dff4526a95]*/
 #endif
 {
     const char *username = PyBytes_AS_STRING(oname);
@@ -10028,12 +10036,13 @@ os.getppid
 Return the parent's process id.
 
 If the parent process has already exited, Windows machines will still
-return its id; others systems will return the id of the 'init' process (1).
+return its id; others systems will return the id of the 'init' proces
+(1).
 [clinic start generated code]*/
 
 static PyObject *
 os_getppid_impl(PyObject *module)
-/*[clinic end generated code: output=43b2a946a8c603b4 input=e637cb87539c030e]*/
+/*[clinic end generated code: output=43b2a946a8c603b4 input=e17c1de18f41316b]*/
 {
 #ifdef MS_WINDOWS
     return win32_getppid();
@@ -10587,13 +10596,13 @@ os.waitid
 
 Returns the result of waiting for a process or processes.
 
-Returns either waitid_result or None if WNOHANG is specified and there are
-no children in a waitable state.
+Returns either waitid_result or None if WNOHANG is specified and there
+are no children in a waitable state.
 [clinic start generated code]*/
 
 static PyObject *
 os_waitid_impl(PyObject *module, idtype_t idtype, id_t id, int options)
-/*[clinic end generated code: output=5d2e1c0bde61f4d8 input=d8e7f76e052b7920]*/
+/*[clinic end generated code: output=5d2e1c0bde61f4d8 input=14956bc8d102b5db]*/
 {
     PyObject *result;
     int res;
@@ -10760,13 +10769,13 @@ os.pidfd_open
 
 Return a file descriptor referring to the process *pid*.
 
-The descriptor can be used to perform process management without races and
-signals.
+The descriptor can be used to perform process management without races
+and signals.
 [clinic start generated code]*/
 
 static PyObject *
 os_pidfd_open_impl(PyObject *module, pid_t pid, unsigned int flags)
-/*[clinic end generated code: output=5c7252698947dc41 input=c3fd99ce947ccfef]*/
+/*[clinic end generated code: output=5c7252698947dc41 input=03058b32c389f874]*/
 {
     int fd = syscall(__NR_pidfd_open, pid, flags);
     if (fd < 0) {
@@ -10874,8 +10883,9 @@ os.readlink
 
 Return a string representing the path to which the symbolic link points.
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-and path should be relative; path will then be relative to that directory.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative to
+that directory.
 
 dir_fd may not be implemented on your platform.  If it is unavailable,
 using it will raise a NotImplementedError.
@@ -10883,7 +10893,7 @@ using it will raise a NotImplementedError.
 
 static PyObject *
 os_readlink_impl(PyObject *module, path_t *path, int dir_fd)
-/*[clinic end generated code: output=d21b732a2e814030 input=113c87e0db1ecaf2]*/
+/*[clinic end generated code: output=d21b732a2e814030 input=03d10130870dbca8]*/
 {
 #if defined(HAVE_READLINK)
     char buffer[MAXPATHLEN+1];
@@ -11078,26 +11088,25 @@ os.symlink
     *
     dir_fd: dir_fd(requires='symlinkat')=None
 
-# "symlink(src, dst, target_is_directory=False, *, dir_fd=None)\n\n\
-
 Create a symbolic link pointing to src named dst.
 
 target_is_directory is required on Windows if the target is to be
-  interpreted as a directory.  (On Windows, symlink requires
-  Windows 6.0 or greater, and raises a NotImplementedError otherwise.)
-  target_is_directory is ignored on non-Windows platforms.
+interpreted as a directory.  (On Windows, symlink requires Windows 6.0
+or greater, and raises a NotImplementedError otherwise.)
+target_is_directory is ignored on non-Windows platforms.
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
-dir_fd may not be implemented on your platform.
-  If it is unavailable, using it will raise a NotImplementedError.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative
+to that directory.
+dir_fd may not be implemented on your platform.  If it is unavailable,
+using it will raise a NotImplementedError.
 
 [clinic start generated code]*/
 
 static PyObject *
 os_symlink_impl(PyObject *module, path_t *src, path_t *dst,
                 int target_is_directory, int dir_fd)
-/*[clinic end generated code: output=08ca9f3f3cf960f6 input=e820ec4472547bc3]*/
+/*[clinic end generated code: output=08ca9f3f3cf960f6 input=71b75467b31c45f7]*/
 {
 #ifdef MS_WINDOWS
     DWORD result;
@@ -11656,19 +11665,18 @@ os.open -> int
     *
     dir_fd: dir_fd(requires='openat') = None
 
-# "open(path, flags, mode=0o777, *, dir_fd=None)\n\n\
-
 Open a file for low level IO.  Returns a file descriptor (integer).
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
-dir_fd may not be implemented on your platform.
-  If it is unavailable, using it will raise a NotImplementedError.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative to
+that directory.
+dir_fd may not be implemented on your platform.  If it is unavailable,
+using it will raise a NotImplementedError.
 [clinic start generated code]*/
 
 static int
 os_open_impl(PyObject *module, path_t *path, int flags, int mode, int dir_fd)
-/*[clinic end generated code: output=abc7227888c8bc73 input=ad8623b29acd2934]*/
+/*[clinic end generated code: output=abc7227888c8bc73 input=75f7b4eaf92f2225]*/
 {
     int fd;
     int async_err = 0;
@@ -11942,7 +11950,6 @@ os_lockf_impl(PyObject *module, int fd, int command, Py_off_t length)
 
 
 /*[clinic input]
-@permit_long_docstring_body
 os.lseek -> Py_off_t
 
     fd: int
@@ -11958,12 +11965,13 @@ os.lseek -> Py_off_t
 
 Set the position of a file descriptor.  Return the new position.
 
-The return value is the number of bytes relative to the beginning of the file.
+The return value is the number of bytes relative to the beginning of
+the file.
 [clinic start generated code]*/
 
 static Py_off_t
 os_lseek_impl(PyObject *module, int fd, Py_off_t position, int how)
-/*[clinic end generated code: output=971e1efb6b30bd2f input=4a3de549f07e1c40]*/
+/*[clinic end generated code: output=971e1efb6b30bd2f input=32ea0788da7cb44b]*/
 {
     Py_off_t result;
 
@@ -12027,7 +12035,6 @@ os_read_impl(PyObject *module, int fd, Py_ssize_t length)
 }
 
 /*[clinic input]
-@permit_long_docstring_body
 os.readinto -> Py_ssize_t
     fd: int
     buffer: Py_buffer(accept={rwbuffer})
@@ -12035,20 +12042,20 @@ os.readinto -> Py_ssize_t
 
 Read into a buffer object from a file descriptor.
 
-The buffer should be mutable and bytes-like. On success, returns the number of
-bytes read. Less bytes may be read than the size of the buffer. The underlying
-system call will be retried when interrupted by a signal, unless the signal
-handler raises an exception. Other errors will not be retried and an error will
-be raised.
+The buffer should be mutable and bytes-like.  On success, returns the
+number of bytes read.  Less bytes may be read than the size of the
+buffer.  The underlying system call will be retried when interrupted by
+a signal, unless the signal handler raises an exception.  Other errors
+will not be retried and an error will be raised.
 
-Returns 0 if *fd* is at end of file or if the provided *buffer* has length 0
-(which can be used to check for errors without reading data). Never returns
-negative.
+Returns 0 if *fd* is at end of file or if the provided *buffer* has
+length 0 (which can be used to check for errors without reading data).
+Never returns negative.
 [clinic start generated code]*/
 
 static Py_ssize_t
 os_readinto_impl(PyObject *module, int fd, Py_buffer *buffer)
-/*[clinic end generated code: output=8091a3513c683a80 input=a770382bd3d32f9a]*/
+/*[clinic end generated code: output=8091a3513c683a80 input=2a5f8b212cb5730c]*/
 {
     assert(buffer->len >= 0);
     Py_ssize_t result = _Py_read(fd, buffer->buf, buffer->len);
@@ -12232,7 +12239,7 @@ os_pread_impl(PyObject *module, int fd, Py_ssize_t length, Py_off_t offset)
 
 #if defined(HAVE_PREADV) || defined (HAVE_PREADV2)
 /*[clinic input]
-@permit_long_docstring_body
+@permit_long_summary
 os.preadv -> Py_ssize_t
 
     fd: int
@@ -12243,14 +12250,15 @@ os.preadv -> Py_ssize_t
 
 Reads from a file descriptor into a number of mutable bytes-like objects.
 
-Combines the functionality of readv() and pread(). As readv(), it will
-transfer data into each buffer until it is full and then move on to the next
-buffer in the sequence to hold the rest of the data. Its fourth argument,
-specifies the file offset at which the input operation is to be performed. It
-will return the total number of bytes read (which can be less than the total
-capacity of all the objects).
+Combines the functionality of readv() and pread().  As readv(), it will
+transfer data into each buffer until it is full and then move on to the
+next buffer in the sequence to hold the rest of the data.  Its fourth
+argument, specifies the file offset at which the input operation is to
+be performed.  It will return the total number of bytes read (which can
+be less than the total capacity of all the objects).
 
-The flags argument contains a bitwise OR of zero or more of the following flags:
+The flags argument contains a bitwise OR of zero or more of the
+following flags:
 
 - RWF_HIPRI
 - RWF_NOWAIT
@@ -12262,7 +12270,7 @@ Using non-zero flags requires Linux 4.6 or newer.
 static Py_ssize_t
 os_preadv_impl(PyObject *module, int fd, PyObject *buffers, Py_off_t offset,
                int flags)
-/*[clinic end generated code: output=26fc9c6e58e7ada5 input=34fb3b9ca06f7ba7]*/
+/*[clinic end generated code: output=26fc9c6e58e7ada5 input=bbc70c63b4f4e877]*/
 {
     Py_ssize_t cnt, n;
     int async_err = 0;
@@ -12599,6 +12607,7 @@ os_sendfile_impl(PyObject *module, int out_fd, int in_fd, PyObject *offobj,
 
 #if defined(__APPLE__)
 /*[clinic input]
+@permit_long_summary
 os._fcopyfile
 
     in_fd: int
@@ -12611,7 +12620,7 @@ Efficiently copy content or metadata of 2 regular file descriptors (macOS).
 
 static PyObject *
 os__fcopyfile_impl(PyObject *module, int in_fd, int out_fd, int flags)
-/*[clinic end generated code: output=c9d1a35a992e401b input=1e34638a86948795]*/
+/*[clinic end generated code: output=c9d1a35a992e401b input=80b53ad8863c9101]*/
 {
     int ret;
 
@@ -12800,6 +12809,7 @@ os_pipe2_impl(PyObject *module, int flags)
 
 #ifdef HAVE_WRITEV
 /*[clinic input]
+@permit_long_summary
 os.writev -> Py_ssize_t
     fd: int
     buffers: object
@@ -12813,7 +12823,7 @@ buffers must be a sequence of bytes-like objects.
 
 static Py_ssize_t
 os_writev_impl(PyObject *module, int fd, PyObject *buffers)
-/*[clinic end generated code: output=56565cfac3aac15b input=5b8d17fe4189d2fe]*/
+/*[clinic end generated code: output=56565cfac3aac15b input=5771a0f0c2b326f2]*/
 {
     Py_ssize_t cnt;
     Py_ssize_t result;
@@ -12889,7 +12899,6 @@ os_pwrite_impl(PyObject *module, int fd, Py_buffer *buffer, Py_off_t offset)
 #if defined(HAVE_PWRITEV) || defined (HAVE_PWRITEV2)
 /*[clinic input]
 @permit_long_summary
-@permit_long_docstring_body
 os.pwritev -> Py_ssize_t
 
     fd: int
@@ -12900,14 +12909,16 @@ os.pwritev -> Py_ssize_t
 
 Writes the contents of bytes-like objects to a file descriptor at a given offset.
 
-Combines the functionality of writev() and pwrite(). All buffers must be a sequence
-of bytes-like objects. Buffers are processed in array order. Entire contents of first
-buffer is written before proceeding to second, and so on. The operating system may
-set a limit (sysconf() value SC_IOV_MAX) on the number of buffers that can be used.
-This function writes the contents of each object to the file descriptor and returns
-the total number of bytes written.
+Combines the functionality of writev() and pwrite(). All buffers must be
+a sequence of bytes-like objects.  Buffers are processed in array order.
+Entire contents of first buffer is written before proceeding to second,
+and so on. The operating system may set a limit (sysconf() value
+SC_IOV_MAX) on the number of buffers that can be used.
+This function writes the contents of each object to the file descriptor
+and returns the total number of bytes written.
 
-The flags argument contains a bitwise OR of zero or more of the following flags:
+The flags argument contains a bitwise OR of zero or more of the
+following flags:
 
 - RWF_DSYNC
 - RWF_SYNC
@@ -12921,7 +12932,7 @@ Using non-zero flags requires Linux 4.7 or newer.
 static Py_ssize_t
 os_pwritev_impl(PyObject *module, int fd, PyObject *buffers, Py_off_t offset,
                 int flags)
-/*[clinic end generated code: output=e3dd3e9d11a6a5c7 input=7de72245873f56bf]*/
+/*[clinic end generated code: output=e3dd3e9d11a6a5c7 input=b2e352a22f030e9a]*/
 {
     Py_ssize_t cnt;
     Py_ssize_t result;
@@ -13134,15 +13145,16 @@ os.mkfifo
 
 Create a "fifo" (a POSIX named pipe).
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
-dir_fd may not be implemented on your platform.
-  If it is unavailable, using it will raise a NotImplementedError.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative to
+that directory.
+dir_fd may not be implemented on your platform.  If it is unavailable,
+using it will raise a NotImplementedError.
 [clinic start generated code]*/
 
 static PyObject *
 os_mkfifo_impl(PyObject *module, path_t *path, int mode, int dir_fd)
-/*[clinic end generated code: output=ce41cfad0e68c940 input=73032e98a36e0e19]*/
+/*[clinic end generated code: output=ce41cfad0e68c940 input=d2fb917c01e888d6]*/
 {
     int result;
     int async_err = 0;
@@ -13185,7 +13197,6 @@ os_mkfifo_impl(PyObject *module, path_t *path, int mode, int dir_fd)
 
 #if defined(HAVE_MKNOD) && defined(HAVE_MAKEDEV)
 /*[clinic input]
-@permit_long_docstring_body
 os.mknod
 
     path: path_t
@@ -13196,23 +13207,24 @@ os.mknod
 
 Create a node in the file system.
 
-Create a node in the file system (file, device special file or named pipe)
-at path.  mode specifies both the permissions to use and the
+Create a node in the file system (file, device special file or named
+pipe) at path.  mode specifies both the permissions to use and the
 type of node to be created, being combined (bitwise OR) with one of
-S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO.  If S_IFCHR or S_IFBLK is set on mode,
-device defines the newly created device special file (probably using
-os.makedev()).  Otherwise device is ignored.
+S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO.  If S_IFCHR or S_IFBLK is set
+on mode, device defines the newly created device special file (probably
+using os.makedev()).  Otherwise device is ignored.
 
-If dir_fd is not None, it should be a file descriptor open to a directory,
-  and path should be relative; path will then be relative to that directory.
-dir_fd may not be implemented on your platform.
-  If it is unavailable, using it will raise a NotImplementedError.
+If dir_fd is not None, it should be a file descriptor open to
+a directory, and path should be relative; path will then be relative
+to that directory.
+dir_fd may not be implemented on your platform.  If it is unavailable,
+using it will raise a NotImplementedError.
 [clinic start generated code]*/
 
 static PyObject *
 os_mknod_impl(PyObject *module, path_t *path, int mode, dev_t device,
               int dir_fd)
-/*[clinic end generated code: output=92e55d3ca8917461 input=7121c4723d22545b]*/
+/*[clinic end generated code: output=92e55d3ca8917461 input=7d0099e85c6b4cba]*/
 {
     int result;
     int async_err = 0;
@@ -13381,13 +13393,14 @@ os.truncate
 
 Truncate a file, specified by path, to a specific length.
 
-On some platforms, path may also be specified as an open file descriptor.
-  If this functionality is unavailable, using it raises an exception.
+On some platforms, path may also be specified as an open file
+descriptor.  If this functionality is unavailable, using it raises
+an exception.
 [clinic start generated code]*/
 
 static PyObject *
 os_truncate_impl(PyObject *module, path_t *path, Py_off_t length)
-/*[clinic end generated code: output=43009c8df5c0a12b input=77229cf0b50a9b77]*/
+/*[clinic end generated code: output=43009c8df5c0a12b input=ce33fd7808a511c4]*/
 {
     int result;
 #ifdef MS_WINDOWS
@@ -13430,6 +13443,7 @@ os_truncate_impl(PyObject *module, path_t *path, Py_off_t length)
    OSs, support was dropped in WASI preview2. */
 #if defined(HAVE_POSIX_FALLOCATE) && !defined(__wasi__)
 /*[clinic input]
+@permit_long_summary
 os.posix_fallocate
 
     fd: int
@@ -13440,13 +13454,14 @@ os.posix_fallocate
 Ensure a file has allocated at least a particular number of bytes on disk.
 
 Ensure that the file specified by fd encompasses a range of bytes
-starting at offset bytes from the beginning and continuing for length bytes.
+starting at offset bytes from the beginning and continuing for length
+bytes.
 [clinic start generated code]*/
 
 static PyObject *
 os_posix_fallocate_impl(PyObject *module, int fd, Py_off_t offset,
                         Py_off_t length)
-/*[clinic end generated code: output=73f107139564aa9d input=d7a2ef0ab2ca52fb]*/
+/*[clinic end generated code: output=73f107139564aa9d input=c718971d18b96896]*/
 {
     int result;
     int async_err = 0;
@@ -13481,8 +13496,8 @@ os.posix_fadvise
 
 Announce an intention to access data in a specific pattern.
 
-Announce an intention to access data in a specific pattern, thus allowing
-the kernel to make optimizations.
+Announce an intention to access data in a specific pattern, thus
+allowing the kernel to make optimizations.
 The advice applies to the region of the file specified by fd starting at
 offset and continuing for length bytes.
 advice is one of POSIX_FADV_NORMAL, POSIX_FADV_SEQUENTIAL,
@@ -13493,7 +13508,7 @@ POSIX_FADV_DONTNEED.
 static PyObject *
 os_posix_fadvise_impl(PyObject *module, int fd, Py_off_t offset,
                       Py_off_t length, int advice)
-/*[clinic end generated code: output=412ef4aa70c98642 input=0fbe554edc2f04b5]*/
+/*[clinic end generated code: output=412ef4aa70c98642 input=961b01a4518ef727]*/
 {
     int result;
     int async_err = 0;
@@ -13753,6 +13768,7 @@ os_WCOREDUMP_impl(PyObject *module, int status)
 
 #ifdef WIFCONTINUED
 /*[clinic input]
+@permit_long_summary
 os.WIFCONTINUED -> bool
 
     status: int
@@ -13765,7 +13781,7 @@ job control stop.
 
 static int
 os_WIFCONTINUED_impl(PyObject *module, int status)
-/*[clinic end generated code: output=1e35295d844364bd input=e777e7d38eb25bd9]*/
+/*[clinic end generated code: output=1e35295d844364bd input=7b577845a0f8b12f]*/
 {
     WAIT_TYPE wait_status;
     WAIT_STATUS_INT(wait_status) = status;
@@ -13878,6 +13894,7 @@ os_WTERMSIG_impl(PyObject *module, int status)
 
 #ifdef WSTOPSIG
 /*[clinic input]
+@permit_long_summary
 os.WSTOPSIG -> int
 
     status: int
@@ -13887,7 +13904,7 @@ Return the signal that stopped the process that provided the status value.
 
 static int
 os_WSTOPSIG_impl(PyObject *module, int status)
-/*[clinic end generated code: output=0ab7586396f5d82b input=46ebf1d1b293c5c1]*/
+/*[clinic end generated code: output=0ab7586396f5d82b input=4698db1a6a320433]*/
 {
     WAIT_TYPE wait_status;
     WAIT_STATUS_INT(wait_status) = status;
@@ -14078,13 +14095,14 @@ os.statvfs
 Perform a statvfs system call on the given path.
 
 path may always be specified as a string.
-On some platforms, path may also be specified as an open file descriptor.
-  If this functionality is unavailable, using it raises an exception.
+On some platforms, path may also be specified as an open file
+descriptor.  If this functionality is unavailable, using it raises
+an exception.
 [clinic start generated code]*/
 
 static PyObject *
 os_statvfs_impl(PyObject *module, path_t *path)
-/*[clinic end generated code: output=87106dd1beb8556e input=3f5c35791c669bd9]*/
+/*[clinic end generated code: output=87106dd1beb8556e input=1cfd9a4fd36f7425]*/
 {
     int result;
 
@@ -14133,6 +14151,7 @@ os_statvfs_impl(PyObject *module, path_t *path)
 
 #ifdef MS_WINDOWS
 /*[clinic input]
+@permit_long_summary
 os._getdiskusage
 
     path: path_t
@@ -14142,7 +14161,7 @@ Return disk usage statistics about the given path as a (total, free) tuple.
 
 static PyObject *
 os__getdiskusage_impl(PyObject *module, path_t *path)
-/*[clinic end generated code: output=3bd3991f5e5c5dfb input=6af8d1b7781cc042]*/
+/*[clinic end generated code: output=3bd3991f5e5c5dfb input=aee7e38bc3e7fb08]*/
 {
     BOOL retval;
     ULARGE_INTEGER _, total, free;
@@ -14363,13 +14382,14 @@ os.pathconf -> long
 Return the configuration limit name for the file or directory path.
 
 If there is no limit, return -1.
-On some platforms, path may also be specified as an open file descriptor.
-  If this functionality is unavailable, using it raises an exception.
+On some platforms, path may also be specified as an open file
+descriptor.  If this functionality is unavailable, using it raises
+an exception.
 [clinic start generated code]*/
 
 static long
 os_pathconf_impl(PyObject *module, path_t *path, int name)
-/*[clinic end generated code: output=5bedee35b293a089 input=6f6072f57b10c787]*/
+/*[clinic end generated code: output=5bedee35b293a089 input=e86f6eacfa006426]*/
 {
     long limit;
 
@@ -15174,13 +15194,13 @@ os.abort
 
 Abort the interpreter immediately.
 
-This function 'dumps core' or otherwise fails in the hardest way possible
-on the hosting operating system.  This function never returns.
+This function 'dumps core' or otherwise fails in the hardest way
+possible on the hosting operating system.  This function never returns.
 [clinic start generated code]*/
 
 static PyObject *
 os_abort_impl(PyObject *module)
-/*[clinic end generated code: output=dcf52586dad2467c input=cf2c7d98bc504047]*/
+/*[clinic end generated code: output=dcf52586dad2467c input=ee8bd0ed690440ab]*/
 {
     abort();
     /*NOTREACHED*/
@@ -15389,6 +15409,7 @@ os_setresgid_impl(PyObject *module, gid_t rgid, gid_t egid, gid_t sgid)
 
 #ifdef HAVE_GETRESUID
 /*[clinic input]
+@permit_long_summary
 os.getresuid
 
 Return a tuple of the current process's real, effective, and saved user ids.
@@ -15396,7 +15417,7 @@ Return a tuple of the current process's real, effective, and saved user ids.
 
 static PyObject *
 os_getresuid_impl(PyObject *module)
-/*[clinic end generated code: output=8e0becff5dece5bf input=41ccfa8e1f6517ad]*/
+/*[clinic end generated code: output=8e0becff5dece5bf input=ddf95881f492cb97]*/
 {
     uid_t ruid, euid, suid;
     if (getresuid(&ruid, &euid, &suid) < 0)
@@ -15441,17 +15462,18 @@ os.getxattr
 
 Return the value of extended attribute attribute on path.
 
-path may be either a string, a path-like object, or an open file descriptor.
-If follow_symlinks is False, and the last element of the path is a symbolic
-  link, getxattr will examine the symbolic link itself instead of the file
-  the link points to.
+path may be either a string, a path-like object, or an open file
+descriptor.
+If follow_symlinks is False, and the last element of the path is
+a symbolic link, getxattr will examine the symbolic link itself
+instead of the file the link points to.
 
 [clinic start generated code]*/
 
 static PyObject *
 os_getxattr_impl(PyObject *module, path_t *path, path_t *attribute,
                  int follow_symlinks)
-/*[clinic end generated code: output=5f2f44200a43cff2 input=025789491708f7eb]*/
+/*[clinic end generated code: output=5f2f44200a43cff2 input=db1021ed738d9754]*/
 {
     if (fd_and_follow_symlinks_invalid("getxattr", path->is_fd, follow_symlinks))
         return NULL;
@@ -15498,7 +15520,6 @@ os_getxattr_impl(PyObject *module, path_t *path, path_t *attribute,
 
 
 /*[clinic input]
-@permit_long_docstring_body
 os.setxattr
 
     path: path_t(allow_fd=True)
@@ -15510,17 +15531,18 @@ os.setxattr
 
 Set extended attribute attribute on path to value.
 
-path may be either a string, a path-like object,  or an open file descriptor.
-If follow_symlinks is False, and the last element of the path is a symbolic
-  link, setxattr will modify the symbolic link itself instead of the file
-  the link points to.
+path may be either a string, a path-like object,  or an open file
+descriptor.
+If follow_symlinks is False, and the last element of the path is
+a symbolic link, setxattr will modify the symbolic link itself instead
+of the file the link points to.
 
 [clinic start generated code]*/
 
 static PyObject *
 os_setxattr_impl(PyObject *module, path_t *path, path_t *attribute,
                  Py_buffer *value, int flags, int follow_symlinks)
-/*[clinic end generated code: output=98b83f63fdde26bb input=4098e6f68699f3d7]*/
+/*[clinic end generated code: output=98b83f63fdde26bb input=6c4ee6724e8947a4]*/
 {
     ssize_t result;
 
@@ -15563,17 +15585,18 @@ os.removexattr
 
 Remove extended attribute attribute on path.
 
-path may be either a string, a path-like object, or an open file descriptor.
-If follow_symlinks is False, and the last element of the path is a symbolic
-  link, removexattr will modify the symbolic link itself instead of the file
-  the link points to.
+path may be either a string, a path-like object, or an open file
+descriptor.
+If follow_symlinks is False, and the last element of the path is
+a symbolic link, removexattr will modify the symbolic link itself
+instead of the file the link points to.
 
 [clinic start generated code]*/
 
 static PyObject *
 os_removexattr_impl(PyObject *module, path_t *path, path_t *attribute,
                     int follow_symlinks)
-/*[clinic end generated code: output=521a51817980cda6 input=3d9a7d36fe2f7c4e]*/
+/*[clinic end generated code: output=521a51817980cda6 input=a7ec62a86aa83f01]*/
 {
     ssize_t result;
 
@@ -15602,7 +15625,6 @@ os_removexattr_impl(PyObject *module, path_t *path, path_t *attribute,
 
 
 /*[clinic input]
-@permit_long_docstring_body
 os.listxattr
 
     path: path_t(allow_fd=True, nullable=True) = None
@@ -15611,16 +15633,17 @@ os.listxattr
 
 Return a list of extended attributes on path.
 
-path may be either None, a string, a path-like object, or an open file descriptor.
-if path is None, listxattr will examine the current directory.
-If follow_symlinks is False, and the last element of the path is a symbolic
-  link, listxattr will examine the symbolic link itself instead of the file
-  the link points to.
+path may be either None, a string, a path-like object, or an open file
+descriptor.  If path is None, listxattr will examine the current
+directory.
+If follow_symlinks is False, and the last element of the path is
+a symbolic link, listxattr will examine the symbolic link itself instead
+of the file the link points to.
 [clinic start generated code]*/
 
 static PyObject *
 os_listxattr_impl(PyObject *module, path_t *path, int follow_symlinks)
-/*[clinic end generated code: output=bebdb4e2ad0ce435 input=48aa9ac8be47dea1]*/
+/*[clinic end generated code: output=bebdb4e2ad0ce435 input=cb4a6414afaa99bd]*/
 {
     Py_ssize_t i;
     PyObject *result = NULL;
@@ -16523,7 +16546,7 @@ static PyMemberDef DirEntry_members[] = {
     {"name", Py_T_OBJECT_EX, offsetof(DirEntry, name), Py_READONLY,
      "the entry's base filename, relative to scandir() \"path\" argument"},
     {"path", Py_T_OBJECT_EX, offsetof(DirEntry, path), Py_READONLY,
-     "the entry's full path name; equivalent to os.path.join(scandir_path, entry.name)"},
+     "the entry's full path name; equivalent to\nos.path.join(scandir_path, entry.name)"},
     {NULL}
 };
 
@@ -17017,16 +17040,16 @@ os.scandir
 
 Return an iterator of DirEntry objects for given path.
 
-path can be specified as either str, bytes, or a path-like object.  If path
-is bytes, the names of yielded DirEntry objects will also be bytes; in
-all other circumstances they will be str.
+path can be specified as either str, bytes, or a path-like object.  If
+path is bytes, the names of yielded DirEntry objects will also be bytes;
+in all other circumstances they will be str.
 
 If path is None, uses the path='.'.
 [clinic start generated code]*/
 
 static PyObject *
 os_scandir_impl(PyObject *module, path_t *path)
-/*[clinic end generated code: output=6eb2668b675ca89e input=6bdd312708fc3bb0]*/
+/*[clinic end generated code: output=6eb2668b675ca89e input=6ab9600993f51577]*/
 {
     ScandirIterator *iterator;
 #ifdef MS_WINDOWS
@@ -17173,21 +17196,20 @@ PyOS_FSPath(PyObject *path)
 }
 
 /*[clinic input]
-@permit_long_docstring_body
 os.fspath
 
     path: object
 
 Return the file system path representation of the object.
 
-If the object is str or bytes, then allow it to pass through as-is. If the
-object defines __fspath__(), then return the result of that method. All other
-types raise a TypeError.
+If the object is str or bytes, then allow it to pass through as-is.  If
+the object defines __fspath__(), then return the result of that method.
+All other types raise a TypeError.
 [clinic start generated code]*/
 
 static PyObject *
 os_fspath_impl(PyObject *module, PyObject *path)
-/*[clinic end generated code: output=c3c3b78ecff2914f input=f608743e60a3211e]*/
+/*[clinic end generated code: output=c3c3b78ecff2914f input=d3c54404240d5da0]*/
 {
     return PyOS_FSPath(path);
 }
@@ -17364,13 +17386,13 @@ On Unix:
 On Windows, return status shifted right by 8 bits.
 
 On Unix, if the process is being traced or if waitpid() was called with
-WUNTRACED option, the caller must first check if WIFSTOPPED(status) is true.
-This function must not be called if WIFSTOPPED(status) is true.
+WUNTRACED option, the caller must first check if WIFSTOPPED(status) is
+true.  This function must not be called if WIFSTOPPED(status) is true.
 [clinic start generated code]*/
 
 static PyObject *
 os_waitstatus_to_exitcode_impl(PyObject *module, PyObject *status_obj)
-/*[clinic end generated code: output=db50b1b0ba3c7153 input=7fe2d7fdaea3db42]*/
+/*[clinic end generated code: output=db50b1b0ba3c7153 input=3b44a23f5090006c]*/
 {
 #ifndef MS_WINDOWS
     int status = PyLong_AsInt(status_obj);