Merge branch 'master' into maintenance

OctoPrint · Feb 21, 2022 · 0dee0dd · 0dee0dd
2 parents 357afa0 + 1d40437
commit 0dee0dd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -47,7 +47,6 @@
 todo_include_todos = True
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
-    "python2": ("https://docs.python.org/2", None),
     "pyserial": ("https://pythonhosted.org/pyserial", None),
 }
 

diff --git a/docs/configuration/config_yaml.rst b/docs/configuration/config_yaml.rst
@@ -692,7 +692,7 @@ Use the following settings to configure the serial connection to the printer:
      maxWritePasses: 5
 
      # Use this to define additional patterns to consider for serial port listing. Must be a valid
-     # "glob" pattern (see http://docs.python.org/2/library/glob.html). Defaults to not set.
+     # "glob" pattern (see http://docs.python.org/3/library/glob.html). Defaults to not set.
      additionalPorts:
      - /dev/myPrinterSymlink
 

diff --git a/docs/plugins/concepts.rst b/docs/plugins/concepts.rst
@@ -3,7 +3,7 @@
 General Concepts
 ================
 
-OctoPrint's plugins are `Python Packages <https://docs.python.org/2/tutorial/modules.html#packages>`_ which in their
+OctoPrint's plugins are :ref:`Python Packages <tut-packages>` which in their
 top-level module define a bunch of :ref:`control properties <sec-plugins-controlproperties>` defining
 metadata (like name, version etc of the plugin) as well as information on how to initialize the plugin and into what
 parts of the system the plugin will actually plug in to perform its job.

diff --git a/docs/plugins/gettingstarted.rst b/docs/plugins/gettingstarted.rst
@@ -120,7 +120,7 @@ up and ready to serve requests.
 
 You'll also note that we are using ``self._logger`` for logging. Where did that one come from? OctoPrint's plugin system
 injects :ref:`a some useful objects <sec-plugins-mixins-injectedproperties>` into our plugin implementation classes,
-one of those being a fully instantiated `python logger <https://docs.python.org/2/library/logging.html>`_ ready to be
+one of those being a fully instantiated :ref:`python logger <logging>` ready to be
 used by your plugin. As you can see in the log output above, that logger uses the namespace ``octoprint.plugins.helloworld``
 for our little plugin here, or more generally ``octoprint.plugins.<plugin identifier>``.