diff --git a/docs/README.md b/docs/README.md
index b1bac65e9..8222e07ea 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,6 +2,8 @@
 Sphinx Documentation
 ====================
 
+Building the docs requires Python 3.8+
+
 In project root
 ```
 pip install -r requirements-dev.txt
diff --git a/src/neo4j/_async/work/session.py b/src/neo4j/_async/work/session.py
index f01cce16f..f793fd08b 100644
--- a/src/neo4j/_async/work/session.py
+++ b/src/neo4j/_async/work/session.py
@@ -452,10 +452,18 @@ async def begin_transaction(
 
         :param timeout:
             the transaction timeout in seconds.
-            Transactions that execute longer than the configured timeout will be terminated by the database.
-            This functionality allows to limit query/transaction execution time.
-            Specified timeout overrides the default timeout configured in the database using ``dbms.transaction.timeout`` setting.
-            Value should not represent a duration of zero or negative duration.
+            Transactions that execute longer than the configured timeout will
+            be terminated by the database.
+            This functionality allows to limit query/transaction execution
+            time.
+            The Specified timeout overrides the default timeout configured in
+            the database using the ``db.transaction.timeout`` setting
+            (``dbms.transaction.timeout`` before Neo4j 5.0).
+            Values higher than ``db.transaction.timeout`` will be ignored and
+            will fall back to the default for server versions 4.2 to including
+            5.2. The value should not represent a negative duration.
+            A ``0`` duration will make the transaction execute indefinitely.
+            :data:`None` will use the default timeout configured on the server.
 
         :returns: A new transaction instance.
 
diff --git a/src/neo4j/_sync/work/session.py b/src/neo4j/_sync/work/session.py
index a60934b7c..f1635cb99 100644
--- a/src/neo4j/_sync/work/session.py
+++ b/src/neo4j/_sync/work/session.py
@@ -452,10 +452,18 @@ def begin_transaction(
 
         :param timeout:
             the transaction timeout in seconds.
-            Transactions that execute longer than the configured timeout will be terminated by the database.
-            This functionality allows to limit query/transaction execution time.
-            Specified timeout overrides the default timeout configured in the database using ``dbms.transaction.timeout`` setting.
-            Value should not represent a duration of zero or negative duration.
+            Transactions that execute longer than the configured timeout will
+            be terminated by the database.
+            This functionality allows to limit query/transaction execution
+            time.
+            The Specified timeout overrides the default timeout configured in
+            the database using the ``db.transaction.timeout`` setting
+            (``dbms.transaction.timeout`` before Neo4j 5.0).
+            Values higher than ``db.transaction.timeout`` will be ignored and
+            will fall back to the default for server versions 4.2 to including
+            5.2. The value should not represent a negative duration.
+            A ``0`` duration will make the transaction execute indefinitely.
+            :data:`None` will use the default timeout configured on the server.
 
         :returns: A new transaction instance.
 
diff --git a/src/neo4j/_work/query.py b/src/neo4j/_work/query.py
index bfbc7a72d..addb3aba6 100644
--- a/src/neo4j/_work/query.py
+++ b/src/neo4j/_work/query.py
@@ -36,9 +36,31 @@ class Query:
 
     :param text: The query text.
     :type text: typing.LiteralString
-    :param metadata: metadata attached to the query.
+    :param metadata:
+        a dictionary with metadata.
+        Specified metadata will be attached to the executing transaction
+        and visible in the output of ``SHOW TRANSACTIONS YIELD *``
+        It will also get logged to the ``query.log``.
+        This functionality makes it easier to tag transactions and is
+        equivalent to the ``dbms.setTXMetaData`` procedure, see
+        https://neo4j.com/docs/cypher-manual/current/clauses/transaction-clauses/#query-listing-transactions
+        and https://neo4j.com/docs/operations-manual/current/reference/procedures/
+        for reference.
     :type metadata: typing.Dict[str, typing.Any] | None
-    :param timeout: seconds.
+    :param timeout:
+        the transaction timeout in seconds.
+        Transactions that execute longer than the configured timeout will
+        be terminated by the database.
+        This functionality allows to limit query/transaction execution
+        time.
+        The Specified timeout overrides the default timeout configured in
+        the database using the ``db.transaction.timeout`` setting
+        (``dbms.transaction.timeout`` before Neo4j 5.0).
+        Values higher than ``db.transaction.timeout`` will be ignored and
+        will fall back to the default for server versions 4.2 to including
+        5.2. The value should not represent a negative duration.
+        A ``0`` duration will make the transaction execute indefinitely.
+        :data:`None` will use the default timeout configured on the server.
     :type timeout: float | None
     """
     def __init__(
@@ -90,16 +112,18 @@ def count_people_tx(tx):
 
     :param timeout:
         the transaction timeout in seconds.
-        Transactions that execute longer than the configured timeout will be
-        terminated by the database.
-        This functionality allows to limit query/transaction execution time.
-        Specified timeout overrides the default timeout configured in the
-        database using ``dbms.transaction.timeout`` setting.
-        Values higher than ``dbms.transaction.timeout`` will be ignored and
-        will fall back to default (unless using Neo4j < 4.2).
-        Value should not represent a negative duration.
-        A zero duration will make the transaction execute indefinitely.
-        None will use the default timeout configured in the database.
+        Transactions that execute longer than the configured timeout will
+        be terminated by the database.
+        This functionality allows to limit query/transaction execution
+        time.
+        The Specified timeout overrides the default timeout configured in
+        the database using the ``db.transaction.timeout`` setting
+        (``dbms.transaction.timeout`` before Neo4j 5.0).
+        Values higher than ``db.transaction.timeout`` will be ignored and
+        will fall back to the default for server versions 4.2 to including
+        5.2. The value should not represent a negative duration.
+        A ``0`` duration will make the transaction execute indefinitely.
+        :data:`None` will use the default timeout configured on the server.
     :type timeout: float | None
 
     :rtype: typing.Callable[[T], T]