Rename $PYTHON_VERSION to $PACKAGE_VERSION; this is the version number for

whatever is being documented, not necessarily Python.  (These tools are
also used for the How-To documents, etc.)

diff --git a/Doc/perl/python.perl b/Doc/perl/python.perl
index 476ef662a9a4a7998dd642be0602cd6f90d95a2f..00667034ce710d59fb17c1ec4734780dc3f9d771 100644 (file)
--- a/Doc/perl/python.perl
+++ b/Doc/perl/python.perl
@@ -103,13 +103,13 @@ sub do_cmd_e{ '\' . @_[0]; }
 
 $DEVELOPER_ADDRESS = '';
 $SHORT_VERSION = '';
-$PYTHON_VERSION = '';
+$PACKAGE_VERSION = '';
 
-sub do_cmd_version{ $PYTHON_VERSION . @_[0]; }
+sub do_cmd_version{ $PACKAGE_VERSION . @_[0]; }
 sub do_cmd_shortversion{ $SHORT_VERSION . @_[0]; }
 sub do_cmd_release{
     local($_) = @_;
-    $PYTHON_VERSION = next_argument();
+    $PACKAGE_VERSION = next_argument();
     return $_;
 }
 
@@ -1024,6 +1024,9 @@ sub fix_font{
     elsif ($font eq 'kbd') {
         $font = 'kbd';
     }
+    elsif ($font eq 'programopt') {
+        $font = 'b';
+    }
     return $font;
 }
 
@@ -1270,8 +1273,8 @@ sub make_my_titlepage() {
     }
     if ($t_date) {
        $the_title .= "\n<p><strong>$t_date</strong>";
-       if ($PYTHON_VERSION) {
-           $the_title .= "<br><strong>Release $PYTHON_VERSION</strong>";
+       if ($PACKAGE_VERSION) {
+           $the_title .= "<br><strong>Release $PACKAGE_VERSION</strong>";
         }
        $the_title .= "</p>"
     }