summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-09-17 18:40:35 (GMT)
committerGeorg Brandl <georg@python.org>2011-09-17 18:40:35 (GMT)
commit902e8955784698a3b2f2d83f9a349cc8b9f0416c (patch)
tree7702cee8487f3c1cf918f087e2b6c969cf59c88c /Doc/library
parente30186bf4bfde9415229e58d25e467a5c6561239 (diff)
parent73dd7c71f69b234fb1f3944efa1f08969b3ae3cc (diff)
downloadcpython-902e8955784698a3b2f2d83f9a349cc8b9f0416c.zip
cpython-902e8955784698a3b2f2d83f9a349cc8b9f0416c.tar.gz
cpython-902e8955784698a3b2f2d83f9a349cc8b9f0416c.tar.bz2
merge doc fixes from 3.2
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/datetime.rst2
-rw-r--r--Doc/library/random.rst7
2 files changed, 8 insertions, 1 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 8296a4d..73b3901 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -30,7 +30,7 @@ set to an instance of a subclass of the abstract :class:`tzinfo` class. These
:class:`tzinfo` objects capture information about the offset from UTC time, the
time zone name, and whether Daylight Saving Time is in effect. Note that only
one concrete :class:`tzinfo` class, the :class:`timezone` class, is supplied by the
-:mod:`datetime` module. The :class:`timezone` class can reprsent simple
+:mod:`datetime` module. The :class:`timezone` class can represent simple
timezones with fixed offset from UTC such as UTC itself or North American EST and
EDT timezones. Supporting timezones at whatever level of detail is
required is up to the application. The rules for time adjustment across the
diff --git a/Doc/library/random.rst b/Doc/library/random.rst
index 3040411..2b10e6e 100644
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -169,6 +169,7 @@ be found in any statistics text.
The end-point value ``b`` may or may not be included in the range
depending on floating-point rounding in the equation ``a + (b-a) * random()``.
+
.. function:: triangular(low, high, mode)
Return a random floating point number *N* such that ``low <= N <= high`` and
@@ -197,6 +198,12 @@ be found in any statistics text.
Gamma distribution. (*Not* the gamma function!) Conditions on the
parameters are ``alpha > 0`` and ``beta > 0``.
+ The probability distribution function is::
+
+ x ** (alpha - 1) * math.exp(-x / beta)
+ pdf(x) = --------------------------------------
+ math.gamma(alpha) * beta ** alpha
+
.. function:: gauss(mu, sigma)