diff --git a/index.html b/index.html
index 1e8f89c..3b67b79 100644
--- a/index.html
+++ b/index.html
@@ -26,25 +26,24 @@ h1:before{content:''}
- What’s New in “Dive Into Python 3”
-
- Installing Python
+
- Installing Python
- Your First Python Program
- Native Datatypes
- Strings
- Regular Expressions
- Generators
-
- Iterators
+
- Classes & Iterators
- Advanced Iterators
- Unit Testing
-
- Test-first programming
+
- Advanced Unit Testing
- Refactoring
- Advanced Classes
- Files
- XML
-
- HTML
+
- Serializing Python Objects
- HTTP Web Services
-
- Performance tuning
+
- Threading & Multiprocessing
- Packaging Python libraries
-
- Creating graphics with the Python Imaging Library
- Case Study: Porting
chardet to Python 3
- Where to go from here
- Porting Code to Python 3 with
2to3
diff --git a/table-of-contents.html b/table-of-contents.html
index 3615afe..a536ec0 100644
--- a/table-of-contents.html
+++ b/table-of-contents.html
@@ -19,13 +19,16 @@ ul li ol{margin:0;padding:0 0 0 2.5em}
Table of Contents
- What’s New In “Dive Into Python 3”
-
- Installing Python
+
- Installing Python
- - Python on Windows
-
- Python on Mac OS X
-
- Python on Ubuntu Linux
-
- Python from source
-
- The interactive shell
+
- Diving In
+
- Which Python Is Right For You?
+
- Installing on Microsoft Windows
+
- Installing on Mac OS X
+
- Installing on Ubuntu Linux
+
- Installing on Other Platforms
+
- Using The Python Shell
+
- Python Editors and IDEs
- Your first Python program
@@ -165,7 +168,7 @@ ul li ol{margin:0;padding:0 0 0 2.5em}
- More halting, more fire
- ...
- - Test-first programming
+
- Advanced Unit Testing
- ...
@@ -207,55 +210,32 @@ ul li ol{margin:0;padding:0 0 0 2.5em}
- Generating XML
- Further Reading
- - HTML
+
- Serializing Python Objects
+
- HTTP Web Services
- - Diving in
-
- html5lib
+
- Diving In
+
- Features of HTTP
- - Installing html5lib
-
- Using html5lib
+
- Caching
+
- Last-Modified Checking
+
- ETags
+
- Compression
+
- Redirects
- - Extracting data from HTML documents
-
- Building HTML documents
-
- Putting it all together
-
- Summary
-
- - HTTP Web Services
-
- - Diving in
-
- How not to fetch data over HTTP
-
- Features of HTTP
+
- How Not To Fetch Data Over HTTP
+
- What’s On The Wire?
+
- Introducing
httplib2
- - User-Agent
-
- Redirects
-
- Last-Modified/If-Modified-Since
-
- ETag-If-None-Match
-
- Compression
+
- How
httplib2 Handles Caching
+ - How
httplib2 Handles Last-Modified and ETag Headers
+ - How
http2lib Handles Compression
+ - How
httplib2 Handles Redirects
- - Differences from Python 2
-
- httplib2 (note: needs port)
-
- - Installing httplib2
-
- Why httplib2 is better than http.client
-
- - Debugging HTTP web services
-
- Setting the User-Agent
-
- Handling Last-Modified and ETag
-
- Handling redirects
-
- Handling compressed data
-
- Putting it all together
-
- Summary
-
- - Performance tuning
-
- - Diving in
-
- Using the timeit module
-
- Optimizing regular expressions
-
- Optimizing dictionary lookups
-
- Optimizing list operations
-
- Optimizing string manipulation
-
- Summary
+
- Beyond HTTP GET
+
- Beyond HTTP POST
+
- Further Reading
+ - Threading & Multiprocessing
- Packaging Python libraries
@@ -270,10 +250,6 @@ ul li ol{margin:0;padding:0 0 0 2.5em}
- Py2exe
-Creating graphics with the Python Imaging Library
-
- - ...will likely get ported in time...
-
Case study: porting chardet to Python 3
- Introducing
chardet: a mini-FAQ