# HG changeset patch
# User KarlDieter Crisman <kcrisman@gmail.com>
# 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

b


35  35  
36  36  Sage implements the error function via the ``erfc()`` function in PARI. 
37  37  
38   EXAMPLES:: 
 38  EXAMPLES: 
 39  
 40  We can evaluate the error function at varying precisions:: 
39  41  
40  42  sage: erf(2) 
41  43  erf(2) 
42  44  sage: erf(2).n() 
43  45  0.995322265018953 
 46  sage: erf(2).n(200) 
 47  0.99532226501895273416206925636725292861089179704006007673835 
 48  
 49  Complex values can be evaluated as well:: 
 50  
 51  sage: erf(3*I).n() 
 52  1.00000000000000 + 1629.86732385786*I 
 53  
 54  TESTS: 
 55  
 56  Test pickling:: 
 57  
44  58  sage: loads(dumps(erf)) 
45  59  erf 
46  60  
47   TESTS: 
48   
49  61  Check if conversion from maxima elements work:: 
50  62  
51  63  sage: merf = maxima(erf(x)).sage().operator() 
diff git a/sage/symbolic/expression.pyx b/sage/symbolic/expression.pyx
a

b


7547  7547   ``multiplicities``  bool (default: False); if True, 
7548  7548  return corresponding multiplicities. This keyword is 
7549  7549  incompatible with ``to_poly_solve=True`` and does not make 
7550   any sense when solving inequality. 
 7550  any sense when solving an inequality. 
7551  7551  
7552  7552   ``solution_dict``  bool (default: False); if True or nonzero, 
7553  7553  return a list of dictionaries containing solutions. Not used 
7554   when solving inequality. 
 7554  when solving an inequality. 
7555  7555  
7556  7556   ``explicit_solutions``  bool (default: False); require that 
7557  7557  all roots be explicit rather than implicit. Not used 
7558   when solving inequality. 
 7558  when solving an inequality. 
7559  7559  
7560  7560   ``to_poly_solve``  bool (default: False) or string; use 
7561  7561  Maxima's ``to_poly_solver`` package to search for more possible 
7562  7562  solutions, but possibly encounter approximate solutions. 
7563  7563  This keyword is incompatible with ``multiplicities=True`` 
7564   and is not used when solving inequality. Setting ``to_poly_solve`` 
 7564  and is not used when solving an inequality. Setting ``to_poly_solve`` 
7565  7565  to 'force' (string) omits Maxima's solve command (usefull when 
7566  7566  some solution of trigonometric equations are lost). 
7567  7567  