Fix indentation and escape *args and **kwargs

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index bbe5b56c9b705d96683da7ba268cca41785f458c..afc5c6e2e7ccadf9e75ed5bb919b281cf607a5ad 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -245,7 +245,7 @@ class Mapper(_InspectionAttr):
     def entity(self):
         """Part of the inspection API.
 
-        Returns self.class_.
+        Returns self.class\_.
 
         """
         return self.class_

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 28388b9696dc88eba538f04eeea24e785ac15fef..2d4e316afe5031b246e7498bc33eb81009e7b87b 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1639,7 +1639,7 @@ class Query(object):
         example :ref:`examples_xmlpersistence` which illustrates
         an XPath-like query system using algorithmic joins.
 
-        :param *props: A collection of one or more join conditions,
+        :param \*props: A collection of one or more join conditions,
          each consisting of a relationship-bound attribute or string
          relationship name representing an "on clause", or a single
          target entity, or a tuple in the form of ``(target, onclause)``.
@@ -2211,7 +2211,7 @@ class Query(object):
         ``Query``.
 
         :param \*prefixes: optional prefixes, typically strings,
-        not using any commas.   In particular is useful for MySQL keywords.
+         not using any commas.   In particular is useful for MySQL keywords.
 
         e.g.::