summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorƁukasz Langa <lukasz@langa.pl>2021-09-28 21:13:16 (GMT)
committerGitHub <noreply@github.com>2021-09-28 21:13:16 (GMT)
commit68223cd12f81adcb14f28f619d08a7f6a634fcc5 (patch)
tree997e374ebdf50ef7b822605dad0531ba789c96c6 /Doc
parentcd00fee8dd63bc3a1360280f55640409cb579a05 (diff)
downloadcpython-68223cd12f81adcb14f28f619d08a7f6a634fcc5.zip
cpython-68223cd12f81adcb14f28f619d08a7f6a634fcc5.tar.gz
cpython-68223cd12f81adcb14f28f619d08a7f6a634fcc5.tar.bz2
[3.9] [docs] Improve the markup of powers (GH-28598) (GH-28608)
(cherry picked from commit 4f05f15d7b25ef8b690cb94fdc4c8cb5521a4e27) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/functions.rst4
-rw-r--r--Doc/library/hashlib.rst4
-rw-r--r--Doc/library/ipaddress.rst6
-rw-r--r--Doc/library/plistlib.rst2
-rw-r--r--Doc/reference/datamodel.rst2
-rw-r--r--Doc/using/cmdline.rst2
-rw-r--r--Doc/whatsnew/2.0.rst2
-rw-r--r--Doc/whatsnew/2.7.rst8
-rw-r--r--Doc/whatsnew/3.1.rst8
9 files changed, 19 insertions, 19 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 15bfbf4..4f96782 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1298,8 +1298,8 @@ are always available. They are listed here in alphabetical order.
coercion rules for binary arithmetic operators apply. For :class:`int`
operands, the result has the same type as the operands (after coercion)
unless the second argument is negative; in that case, all arguments are
- converted to float and a float result is delivered. For example, ``10**2``
- returns ``100``, but ``10**-2`` returns ``0.01``.
+ converted to float and a float result is delivered. For example, ``pow(10, 2)``
+ returns ``100``, but ``pow(10, -2)`` returns ``0.01``.
For :class:`int` operands *base* and *exp*, if *mod* is present, *mod* must
also be of integer type and *mod* must be nonzero. If *mod* is present and
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index 615ee11..f3e942b 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -372,10 +372,10 @@ Constructor functions also accept the following tree hashing parameters:
* *depth*: maximal depth of tree (1 to 255, 255 if unlimited, 1 in
sequential mode).
-* *leaf_size*: maximal byte length of leaf (0 to 2**32-1, 0 if unlimited or in
+* *leaf_size*: maximal byte length of leaf (0 to ``2**32-1``, 0 if unlimited or in
sequential mode).
-* *node_offset*: node offset (0 to 2**64-1 for BLAKE2b, 0 to 2**48-1 for
+* *node_offset*: node offset (0 to ``2**64-1`` for BLAKE2b, 0 to ``2**48-1`` for
BLAKE2s, 0 for the first, leftmost, leaf, or in sequential mode).
* *node_depth*: node depth (0 to 255, 0 for leaves, or in sequential mode).
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 2ab4dd8..74d922d 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -41,7 +41,7 @@ IP addresses, networks and interfaces:
Return an :class:`IPv4Address` or :class:`IPv6Address` object depending on
the IP address passed as argument. Either IPv4 or IPv6 addresses may be
- supplied; integers less than 2**32 will be considered to be IPv4 by default.
+ supplied; integers less than ``2**32`` will be considered to be IPv4 by default.
A :exc:`ValueError` is raised if *address* does not represent a valid IPv4
or IPv6 address.
@@ -56,7 +56,7 @@ IP addresses, networks and interfaces:
Return an :class:`IPv4Network` or :class:`IPv6Network` object depending on
the IP address passed as argument. *address* is a string or integer
representing the IP network. Either IPv4 or IPv6 networks may be supplied;
- integers less than 2**32 will be considered to be IPv4 by default. *strict*
+ integers less than ``2**32`` will be considered to be IPv4 by default. *strict*
is passed to :class:`IPv4Network` or :class:`IPv6Network` constructor. A
:exc:`ValueError` is raised if *address* does not represent a valid IPv4 or
IPv6 address, or if the network has host bits set.
@@ -70,7 +70,7 @@ IP addresses, networks and interfaces:
Return an :class:`IPv4Interface` or :class:`IPv6Interface` object depending
on the IP address passed as argument. *address* is a string or integer
representing the IP address. Either IPv4 or IPv6 addresses may be supplied;
- integers less than 2**32 will be considered to be IPv4 by default. A
+ integers less than ``2**32`` will be considered to be IPv4 by default. A
:exc:`ValueError` is raised if *address* does not represent a valid IPv4 or
IPv6 address.
diff --git a/Doc/library/plistlib.rst b/Doc/library/plistlib.rst
index ce6d4a8..5ded966 100644
--- a/Doc/library/plistlib.rst
+++ b/Doc/library/plistlib.rst
@@ -133,7 +133,7 @@ The following classes are available:
encoded data, which contains UID (see PList manual).
It has one attribute, :attr:`data`, which can be used to retrieve the int value
- of the UID. :attr:`data` must be in the range `0 <= data < 2**64`.
+ of the UID. :attr:`data` must be in the range ``0 <= data < 2**64``.
.. versionadded:: 3.8
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 47fbcac..94f7e5a 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1492,7 +1492,7 @@ Basic customization
This is intended to provide protection against a denial-of-service caused
by carefully-chosen inputs that exploit the worst case performance of a
- dict insertion, O(n^2) complexity. See
+ dict insertion, O(n\ :sup:`2`) complexity. See
http://www.ocert.org/advisories/ocert-2011-003.html for details.
Changing hash values affects the iteration order of sets.
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 23d66ec..5739388 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -322,7 +322,7 @@ Miscellaneous options
Hash randomization is intended to provide protection against a
denial-of-service caused by carefully-chosen inputs that exploit the worst
- case performance of a dict construction, O(n^2) complexity. See
+ case performance of a dict construction, O(n\ :sup:`2`) complexity. See
http://www.ocert.org/advisories/ocert-2011-003.html for details.
:envvar:`PYTHONHASHSEED` allows you to set a fixed value for the hash
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index ace396b..dd49da8 100644
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -791,7 +791,7 @@ Previously the Python virtual machine used 16-bit numbers in its bytecode,
limiting the size of source files. In particular, this affected the maximum
size of literal lists and dictionaries in Python source; occasionally people who
are generating Python code would run into this limit. A patch by Charles G.
-Waldman raises the limit from ``2^16`` to ``2^{32}``.
+Waldman raises the limit from ``2**16`` to ``2**32``.
Three new convenience functions intended for adding constants to a module's
dictionary at module initialization time were added: :func:`PyModule_AddObject`,
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index d19c8e0..abb6522 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -953,12 +953,12 @@ Several performance enhancements have been added:
considered and traversed by the collector.
(Contributed by Antoine Pitrou; :issue:`4688`.)
-* Long integers are now stored internally either in base 2**15 or in base
- 2**30, the base being determined at build time. Previously, they
- were always stored in base 2**15. Using base 2**30 gives
+* Long integers are now stored internally either in base ``2**15`` or in base
+ ``2**30``, the base being determined at build time. Previously, they
+ were always stored in base ``2**15``. Using base ``2**30`` gives
significant performance improvements on 64-bit machines, but
benchmark results on 32-bit machines have been mixed. Therefore,
- the default is to use base 2**30 on 64-bit machines and base 2**15
+ the default is to use base ``2**30`` on 64-bit machines and base ``2**15``
on 32-bit machines; on Unix, there's a new configure option
:option:`!--enable-big-digits` that can be used to override this default.
diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst
index 919fbee..f1e6d0c 100644
--- a/Doc/whatsnew/3.1.rst
+++ b/Doc/whatsnew/3.1.rst
@@ -474,12 +474,12 @@ Build and C API Changes
Changes to Python's build process and to the C API include:
-* Integers are now stored internally either in base 2**15 or in base
- 2**30, the base being determined at build time. Previously, they
- were always stored in base 2**15. Using base 2**30 gives
+* Integers are now stored internally either in base ``2**15`` or in base
+ ``2**30``, the base being determined at build time. Previously, they
+ were always stored in base ``2**15``. Using base ``2**30`` gives
significant performance improvements on 64-bit machines, but
benchmark results on 32-bit machines have been mixed. Therefore,
- the default is to use base 2**30 on 64-bit machines and base 2**15
+ the default is to use base ``2**30`` on 64-bit machines and base ``2**15``
on 32-bit machines; on Unix, there's a new configure option
``--enable-big-digits`` that can be used to override this default.