Fixup docstrings & txn names

synapse/storage/databases/main/appservice.py

@@ -372,19 +372,27 @@ def _get_oldest_unsent_txn(
         )
 
     async def get_appservice_last_pos(self) -> int:
+        """
+        Get the last stream ordering position for the appservice process.
+        """
+
         return await self.db_pool.simple_select_one_onecol(
             table="appservice_stream_position",
             retcol="stream_ordering",
             keyvalues={},
-            desc="get_appservice_last_pos_txn",
+            desc="get_appservice_last_pos",
         )
 
     async def set_appservice_last_pos(self, pos: int) -> None:
+        """
+        Set the last stream ordering position for the appservice process.
+        """
+
         await self.db_pool.simple_update_one(
             table="appservice_stream_position",
             keyvalues={},
             updatevalues={"stream_ordering": pos},
-            desc="set_appservice_last_pos_txn",
+            desc="set_appservice_last_pos",
         )
 
     async def get_type_stream_id_for_appservice(

synapse/storage/databases/main/stream.py

@@ -1032,12 +1032,14 @@ async def get_all_new_events_stream(
             from_id:  the stream_ordering of the last event we processed
             current_id:  the stream_ordering of the most recently processed event
             limit: the maximum number of events to return
+            get_prev_content: whether to fetch previous event content
 
         Returns:
-            A tuple of (next_id, events), where `next_id` is the next value to
-            pass as `from_id` (it will either be the stream_ordering of the
-            last returned event, or, if fewer than `limit` events were found,
-            the `current_id`).
+            A tuple of (next_id, events, event_to_received_ts), where `next_id`
+            is the next value to pass as `from_id` (it will either be the
+            stream_ordering of the last returned event, or, if fewer than `limit`
+            events were found, the `current_id`). The `event_to_received_ts` is
+            a dictionary mapping event ID to the event `received_ts`.
         """
 
         def get_all_new_events_stream_txn(