Improved the table of contents of super.pdf

5 files changed, 14 insertions, 10 deletions

diff --git a/artima/python/Makefile b/artima/python/Makefile
index 4d58c37..1d221ca 100644
--- a/artima/python/Makefile
+++ b/artima/python/Makefile
@@ -6,20 +6,20 @@ default:
 	echo "Available python files:"; ls *.py
 
 super1:	super1.py
-	$(MINIDOC) -d super1; $(POST) /tmp/super1.rst 236275
+	$(MINIDOC) -d super1; #$(POST) /tmp/super1.rst 236275
 
 super2:	super2.py
-	$(MINIDOC) -d super2; $(POST) /tmp/super2.rst 236278
+	$(MINIDOC) -d super2; #$(POST) /tmp/super2.rst 236278
 
 super3:	super3.py
-	$(MINIDOC) -d super3; $(POST) /tmp/super3.rst 237121
+	$(MINIDOC) -d super3; #$(POST) /tmp/super3.rst 237121
 
 super4:	super4.py
-	$(MINIDOC) -d super4; $(POST) /tmp/super4.rst 281127
+	$(MINIDOC) -d super4; #$(POST) /tmp/super4.rst 281127
 
-super: super.rst
+super: super.rst super1.py super2.py super3.py super4.py
 	$(RST) -tp super.rst
-	scp super.pdf micheles@merlin.phyast.pitt.edu:public_html/python
+	#scp super.pdf micheles@merlin.phyast.pitt.edu:public_html/python
 
 generic: genericfunctions.py
 	$(MINIDOC) -d genericfunctions; $(POST) /tmp/genericfunctions.rst 237764
diff --git a/artima/python/super.pdf b/artima/python/super.pdf
index e330968..82f4636 100644
--- a/artima/python/super.pdf
+++ b/artima/python/super.pdf
diff --git a/artima/python/super.rst b/artima/python/super.rst
index d89424f..04e3009 100644
--- a/artima/python/super.rst
+++ b/artima/python/super.rst
@@ -4,15 +4,17 @@ Things to know about super
 :author: Michele Simionato
 :date: August 2008
 
-This document is the sum of three blog post appeared on Artima
+This document is the sum of four blog post appeared on Artima
 and converted into PDF form for readers' convenience:
 
 - http://www.artima.com/weblogs/viewpost.jsp?thread=236275
 - http://www.artima.com/weblogs/viewpost.jsp?thread=236278
 - http://www.artima.com/weblogs/viewpost.jsp?thread=237121
+- http://www.artima.com/weblogs/viewpost.jsp?thread=281127
 
 .. contents::
 
 .. include:: /tmp/super1.rst
 .. include:: /tmp/super2.rst
 .. include:: /tmp/super3.rst
+.. include:: /tmp/super4.rst
diff --git a/artima/python/super1.py b/artima/python/super1.py
index c42cf6d..b9f2d03 100644
--- a/artima/python/super1.py
+++ b/artima/python/super1.py
@@ -66,7 +66,7 @@ I have discovered with my experimentations, which is certainly
 not the whole truth ;)
 
 A fair warning is in order here: this document is aimed at expert
-Pythonistas. It assumes you are familiar with `new style classes`_ and
+Pythonistas. It assumes you are familiar with `new-style classes`_ and
 the `Method Resolution Order`_ (MRO); moreover a good understanding of
 descriptors_ would be extremely useful. Some parts also require good
 familiarity with metaclasses_. All in all, this paper is not for the
@@ -312,7 +312,7 @@ function first:
 <unbound method D.__repr__>
 
 .. _Method Resolution Order: http://www.python.org/download/releases/2.3/mro/
-.. _new style classes: http://www.python.org/download/releases/2.2.3/descrintro/
+.. _new-style classes: http://www.python.org/download/releases/2.2.3/descrintro/
 .. _descriptors: http://users.rcn.com/python/download/Descriptor.htm
 .. _metaclasses: http://www.ibm.com/developerworks/library/l-pymeta.html
 .. _comp.lang.python in May 2003: http://tinyurl.com/5ms8lk
diff --git a/artima/python/super4.py b/artima/python/super4.py
index 024fcf2..4f6507f 100644
--- a/artima/python/super4.py
+++ b/artima/python/super4.py
@@ -1,4 +1,7 @@
 """\
+Super in Python 3
+==================================================
+
 Most languages supporting inheritance support cooperative inheritance,
 i.e.  there is a language-supported way for children methods
 to dispatch to their parent method: this is usually done via a
@@ -373,7 +376,6 @@ avoid multiple inheritance; you may be interested in reading my series
 `Mixins considered harmful`_.
 
 .. _MRO paper: http://www.python.org/download/releases/2.3/mro/
-.. _new style classes: http://www.python.org/download/releases/2.2.3/descrintro/
 .. _Super considered harmful: http://fuhm.net/super-harmful/
 .. _Menno Smits: http://freshfoo.com/blog/object__init__takes_no_parameters
 .. _Things to know about super: http://www.phyast.pitt.edu/~micheles/python/super.pdf