# HG changeset patch
# User KarlDieter Crisman
# Date 1324003722 18000
# Node ID e90f29ec1a460c6bc2560f13ae9e0144d2a6b4e9
# Parent 9df9a2ffbdf0d8474a5e25e712471e6c4b973b14
#11948  reviewer patch redoing a bit of documentation
diff git a/sage/functions/other.py b/sage/functions/other.py
 a/sage/functions/other.py
+++ b/sage/functions/other.py
@@ 35,17 +35,29 @@
Sage implements the error function via the ``erfc()`` function in PARI.
 EXAMPLES::
+ EXAMPLES:
+
+ We can evaluate the error function at varying precisions::
sage: erf(2)
erf(2)
sage: erf(2).n()
0.995322265018953
+ sage: erf(2).n(200)
+ 0.99532226501895273416206925636725292861089179704006007673835
+
+ Complex values can be evaluated as well::
+
+ sage: erf(3*I).n()
+ 1.00000000000000 + 1629.86732385786*I
+
+ TESTS:
+
+ Test pickling::
+
sage: loads(dumps(erf))
erf
 TESTS:

Check if conversion from maxima elements work::
sage: merf = maxima(erf(x)).sage().operator()
diff git a/sage/symbolic/expression.pyx b/sage/symbolic/expression.pyx
 a/sage/symbolic/expression.pyx
+++ b/sage/symbolic/expression.pyx
@@ 7547,21 +7547,21 @@
 ``multiplicities``  bool (default: False); if True,
return corresponding multiplicities. This keyword is
incompatible with ``to_poly_solve=True`` and does not make
 any sense when solving inequality.
+ any sense when solving an inequality.
 ``solution_dict``  bool (default: False); if True or nonzero,
return a list of dictionaries containing solutions. Not used
 when solving inequality.
+ when solving an inequality.
 ``explicit_solutions``  bool (default: False); require that
all roots be explicit rather than implicit. Not used
 when solving inequality.
+ when solving an inequality.
 ``to_poly_solve``  bool (default: False) or string; use
Maxima's ``to_poly_solver`` package to search for more possible
solutions, but possibly encounter approximate solutions.
This keyword is incompatible with ``multiplicities=True``
 and is not used when solving inequality. Setting ``to_poly_solve``
+ and is not used when solving an inequality. Setting ``to_poly_solve``
to 'force' (string) omits Maxima's solve command (usefull when
some solution of trigonometric equations are lost).