summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-06-08 18:53:36 (GMT)
committerGitHub <noreply@github.com>2020-06-08 18:53:36 (GMT)
commitb155381314c632e7dd452fbade3903e58657cfc7 (patch)
treec7393a96f373e2c43981e6958a6b818ee63b66d3 /Doc
parent3dc4428a3704b0173ddcf22e01d6b3003e0837a9 (diff)
downloadcpython-b155381314c632e7dd452fbade3903e58657cfc7.zip
cpython-b155381314c632e7dd452fbade3903e58657cfc7.tar.gz
cpython-b155381314c632e7dd452fbade3903e58657cfc7.tar.bz2
bpo-24914: mention Python supports multiple paradigms in the FAQ (GH-20658) (GH-20737)
(cherry picked from commit 3ab3475c42c8ee5580f4ea1aeda73ebc8e5d5478) Co-authored-by: Brett Cannon <brett@python.org> Co-authored-by: Brett Cannon <brett@python.org>
Diffstat (limited to 'Doc')
-rw-r--r--Doc/faq/general.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 3ef553e..7083734 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -17,12 +17,13 @@ What is Python?
Python is an interpreted, interactive, object-oriented programming language. It
incorporates modules, exceptions, dynamic typing, very high level dynamic data
-types, and classes. Python combines remarkable power with very clear syntax.
-It has interfaces to many system calls and libraries, as well as to various
-window systems, and is extensible in C or C++. It is also usable as an
-extension language for applications that need a programmable interface.
-Finally, Python is portable: it runs on many Unix variants, on the Mac, and on
-Windows 2000 and later.
+types, and classes. It supports multiple programming paradigms beyond
+object-oriented programming, such as procedural and functional programming.
+Python combines remarkable power with very clear syntax. It has interfaces to
+many system calls and libraries, as well as to various window systems, and is
+extensible in C or C++. It is also usable as an extension language for
+applications that need a programmable interface. Finally, Python is portable:
+it runs on many Unix variants including Linux and macOS, and on Windows.
To find out more, start with :ref:`tutorial-index`. The `Beginner's Guide to
Python <https://wiki.python.org/moin/BeginnersGuide>`_ links to other