summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2023-02-05 16:36:33 (GMT)
committerGitHub <noreply@github.com>2023-02-05 16:36:33 (GMT)
commit0672a6c23b2b72666e10d9c61fc025e66aad9c2b (patch)
tree369081c41c392803bc1354a3c26eccf5dd5439c7 /Doc
parent19ac43629e6fd73f2dbf9fd5a0b97d791c28acc7 (diff)
downloadcpython-0672a6c23b2b72666e10d9c61fc025e66aad9c2b.zip
cpython-0672a6c23b2b72666e10d9c61fc025e66aad9c2b.tar.gz
cpython-0672a6c23b2b72666e10d9c61fc025e66aad9c2b.tar.bz2
Revert "gh-89381: Fix invalid signatures of math/cmath.log (#101404)" (#101580)
This reverts commit 0ef92d979311ba82d4c41b22ef38e12e1b08b13d.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/cmath.rst2
-rw-r--r--Doc/library/math.rst9
2 files changed, 6 insertions, 5 deletions
diff --git a/Doc/library/cmath.rst b/Doc/library/cmath.rst
index c575b90..28cd96b 100644
--- a/Doc/library/cmath.rst
+++ b/Doc/library/cmath.rst
@@ -89,7 +89,7 @@ Power and logarithmic functions
logarithms.
-.. function:: log(x, base=None)
+.. function:: log(x[, base])
Returns the logarithm of *x* to the given *base*. If the *base* is not
specified, returns the natural logarithm of *x*. There is one branch cut, from 0
diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index 9da22b6..797f324 100644
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -393,12 +393,13 @@ Power and logarithmic functions
.. versionadded:: 3.2
-.. function:: log(x, base=None)
+.. function:: log(x[, base])
- Return the logarithm of *x* to the given *base*.
+ With one argument, return the natural logarithm of *x* (to base *e*).
+
+ With two arguments, return the logarithm of *x* to the given *base*,
+ calculated as ``log(x)/log(base)``.
- If the *base* is not specified, returns the natural
- logarithm (base *e*) of *x*.
.. function:: log1p(x)