summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/faq/general.rst4
-rw-r--r--Doc/tutorial/whatnow.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 510ebb5..6c7e4fc 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -113,8 +113,8 @@ to many different classes of problems.
The language comes with a large standard library that covers areas such as
string processing (regular expressions, Unicode, calculating differences between
-files), internet protocols (HTTP, FTP, SMTP, XML-RPC, POP, IMAP, CGI
-programming), software engineering (unit testing, logging, profiling, parsing
+files), internet protocols (HTTP, FTP, SMTP, XML-RPC, POP, IMAP),
+software engineering (unit testing, logging, profiling, parsing
Python code), and operating system interfaces (system calls, filesystems, TCP/IP
sockets). Look at the table of contents for :ref:`library-index` to get an idea
of what's available. A wide variety of third-party extensions are also
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
index 5f7010c..dbe2d7f 100644
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -17,7 +17,7 @@ the set are:
reference material about types, functions, and the modules in the standard
library. The standard Python distribution includes a *lot* of additional code.
There are modules to read Unix mailboxes, retrieve documents via HTTP, generate
- random numbers, parse command-line options, write CGI programs, compress data,
+ random numbers, parse command-line options, compress data,
and many other tasks. Skimming through the Library Reference will give you an
idea of what's available.