Index: general/prog/python/python-desc.xml
===================================================================
--- general/prog/python/python-desc.xml	(revision 9f887ee33b78a5e134d4508422d4e3463e196467)
+++ general/prog/python/python-desc.xml	(revision de74c283e2d29b005207eb994fc0fef06979a6af)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The Python package contains <userinput>python</userinput> and
-<userinput>pydoc</userinput>.</para>
+<para>The <application>Python</application> package contains <command>python</command> and
+<command>pydoc</command>.</para>
 
 </sect2>
@@ -10,9 +10,9 @@
 
 <sect3><title>python</title>
-<para>python is an interpreted, interactive, object-oriented programming
+<para><command>python</command> is an interpreted, interactive, object-oriented programming
 language.</para></sect3>
 
 <sect3><title>pydoc</title>
-<para>pydoc is the Python documentation tool.</para></sect3>
+<para><command>pydoc</command> is the <application>Python</application> documentation tool.</para></sect3>
 
 </sect2>
Index: general/prog/python/python-inst.xml
===================================================================
--- general/prog/python/python-inst.xml	(revision 9f887ee33b78a5e134d4508422d4e3463e196467)
+++ general/prog/python/python-inst.xml	(revision de74c283e2d29b005207eb994fc0fef06979a6af)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of Python</title>
+<title>Installation of <application>Python</application></title>
 
-<para>Install Python by running the following commands:</para>
+<para>Install <application>Python</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install </userinput></screen></para>
+make install </command></userinput></screen></para>
 
 </sect2>
Index: general/prog/python/python-intro.xml
===================================================================
--- general/prog/python/python-intro.xml	(revision 9f887ee33b78a5e134d4508422d4e3463e196467)
+++ general/prog/python/python-intro.xml	(revision de74c283e2d29b005207eb994fc0fef06979a6af)
@@ -1,18 +1,22 @@
 <sect2>
-<title>Introduction to Python</title>
+<title>Introduction to <application>Python</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&Python-download-http;"/>
-Download location (FTP):        <ulink url="&Python-download-ftp;"/>
-Version used:                   &Python-version;
-Package size:                   &Python-size;
-Estimated Disk space required:  &Python-buildsize;
-Estimated build time:           &Python-time;</screen>
-
-<para>The Python package contains the python development environment.
+<para>The <application>Python</application> package contains the python development environment.
 This is useful for object-oriented programming, writing scripts,
 prototyping large programs or developing them entirely.</para>
 
-<screen>Python will utilize:
-<xref linkend="expat"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&Python-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&Python-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &Python-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &Python-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &Python-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Python</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="expat"/></para></sect4>
+</sect3>
 
 </sect2>
Index: general/prog/python/python.ent
===================================================================
--- general/prog/python/python.ent	(revision 9f887ee33b78a5e134d4508422d4e3463e196467)
+++ general/prog/python/python.ent	(revision de74c283e2d29b005207eb994fc0fef06979a6af)
@@ -5,8 +5,8 @@
 <!ENTITY Python-desc SYSTEM "python-desc.xml">
 <!ENTITY Python-config SYSTEM "python-config.xml">
-<!ENTITY Python-buildsize "59.7 MB">
-<!ENTITY Python-version "2.2.2">
-<!ENTITY Python-download-http "http://www.python.org/ftp/python/2.2.2/Python-2.2.2.tgz">
-<!ENTITY Python-download-ftp "ftp://ftp.python.org/pub/python/2.2.2/Python-2.2.2.tgz">
-<!ENTITY Python-size "6.5 MB">
+<!ENTITY Python-buildsize "54.6 MB">
+<!ENTITY Python-version "2.2.3">
+<!ENTITY Python-download-http "http://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz">
+<!ENTITY Python-download-ftp "ftp://ftp.python.org/pub/python/2.2.3/Python-2.2.3.tgz">
+<!ENTITY Python-size "6.6 MB">
 <!ENTITY Python-time "2.45 SBU">
