Merge with 3.3

1 files changed, 5 insertions, 3 deletions

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 137fd42..16bec77 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2024,9 +2024,10 @@ features:
    Create a symbolic link pointing to *source* named *link_name*.
 
    On Windows, a symlink represents either a file or a directory, and does not
-   morph to the target dynamically.  If *target_is_directory* is set to ``True``,
-   the symlink will be created as a directory symlink, otherwise as a file symlink
-   (the default).  On non-Window platforms, *target_is_directory* is ignored.
+   morph to the target dynamically.  If the target is present, the type of the
+   symlink will be created to match. Otherwise, the symlink will be created
+   as a directory if *target_is_directory* is ``True`` or a file symlink (the
+   default) otherwise.  On non-Window platforms, *target_is_directory* is ignored.
 
    Symbolic link support was introduced in Windows 6.0 (Vista).  :func:`symlink`
    will raise a :exc:`NotImplementedError` on Windows versions earlier than 6.0.
@@ -2042,6 +2043,7 @@ features:
       to the administrator level. Either obtaining the privilege or running your
       application as an administrator are ways to successfully create symlinks.
 
+
       :exc:`OSError` is raised when the function is called by an unprivileged
       user.