Merge branch 'main' into external-kernels

Author: Zsailer

docs/source/developers/extensions.rst

@@ -580,4 +580,4 @@ There are a few key steps to make this happen:
             )
 
 
-.. _`classic Notebook Server`: https://jupyter-notebook.readthedocs.io/en/stable/extending/handlers.html
+.. _`classic Notebook Server`: https://jupyter-notebook.readthedocs.io/en/v6.5.4/extending/handlers.html

docs/source/operators/public-server.rst

@@ -111,7 +111,7 @@ Preparing a hashed password
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can prepare a hashed password manually, using the function
-:func:`notebook.auth.security.passwd`:
+:func:`jupyter_server.auth.passwd`:
 
 .. code-block:: python
 
@@ -123,7 +123,7 @@ You can prepare a hashed password manually, using the function
 
 .. caution::
 
-  :func:`~notebook.auth.security.passwd` when called with no arguments
+  :func:`~jupyter_server.auth.passwd` when called with no arguments
   will prompt you to enter and verify your password such as
   in the above code snippet. Although the function can also
   be passed a string as an argument such as ``passwd('mypassword')``, please