diff --git a/docs/core/howto/index.rst b/docs/core/howto/index.rst index d6f4ce5f6d6..3eda585b946 100644 --- a/docs/core/howto/index.rst +++ b/docs/core/howto/index.rst @@ -193,12 +193,15 @@ Developer Guides Utilities - - :doc:`Logging ` + - :doc:`Emitting and Observing Logs ` + + Keep a record of what your application is up to, and inspect that record to discover interesting information. + (You may also be interested in the :doc:`legacy logging system ` if you are maintaining code written to work with older versions of Twisted.) - Keep a record of what your application is up to. - :doc:`Symbolic constants ` enum-like constants. + - :doc:`Twisted RDBMS support with adbapi ` Using SQL with your relational database via DB-API adapters. @@ -215,7 +218,6 @@ Developer Guides Using wrappers for sendmsg(2) and recvmsg(2). - - .. _core-howto-index-amp: Asynchronous Messaging Protocol (AMP) diff --git a/docs/core/howto/logging.rst b/docs/core/howto/logging.rst index 8890b43ae16..99d1dbc1049 100644 --- a/docs/core/howto/logging.rst +++ b/docs/core/howto/logging.rst @@ -3,21 +3,17 @@ :LastChangedRevision: $LastChangedRevision$ :LastChangedBy: $LastChangedBy$ -Logging with twisted.python.log -=============================== +Twisted's Legacy Logging System: ``twisted.python.log`` +======================================================= -Note: New Logging System ------------------------- +.. note:: -There is now a new logging system in Twisted (:api:`twisted.logger `) which is a replacement for :api:`twisted.python.log `. - -The old logging API, described here, remains for compatibility, and is now implemented as a client of the new logging system. - -New code should adopt the new API. -The new API, and notes on transitioning from the old API, is documented in the :ref:`logger HOWTO `. + There is now a new logging system in Twisted (:doc:`you can read about how to use it here ` and :api:`twisted.logger `) which is a replacement for :api:`twisted.python.log `. + The old logging API, described here, remains for compatibility, and is now implemented as a client of the new logging system. + New code should adopt the new API. Basic usage ----------- diff --git a/twisted/topfiles/7904.doc b/twisted/topfiles/7904.doc new file mode 100644 index 00000000000..beb52e3abb7 --- /dev/null +++ b/twisted/topfiles/7904.doc @@ -0,0 +1 @@ +twisted.logger's documentation is now correctly listed in the table of contents.