--- wikisrc/templates/programlisting.mdwn	2010/05/12 14:44:35	1.1
+++ wikisrc/templates/programlisting.mdwn	2010/05/12 16:41:24	1.7
@@ -1,8 +1,4 @@
-<div class="programlisting">
-<div>
-<TMPL_VAR text>
-</div>
-</div>
+<pre class="programlisting"><TMPL_VAR raw_text></pre>
 <TMPL_UNLESS NAME="text">
 
 ## Description
@@ -10,53 +6,7 @@
 Use this template to display a program listing, or a succession of commands (together with their output).
 
 Remember that shell commands may be prefixed by:
-* *$* when the command should be run as a normal user
-* *#* when the command should be run as root
-
-* *text* - text to display as program listing.
-
-## Examples
-
-[[!template id=programlisting text="""
-$ uname
-NetBSD
-$ cd /bin
-$ ls
-[          cpio       domainname kill       mt         rcmd       sleep
-cat        csh        echo       ksh        mv         rcp        stty
-chio       date       ed         ln         pax        rm         sync
-chmod      dd         expr       ls         ps         rmdir      tar
-cp         df         hostname   mkdir      pwd        sh         test
-"""]]
-
-is obtained with:
 
-    \[[!template id=programlisting text="""
-    $ uname
-    NetBSD
-    $ cd /bin
-    $ ls
-    [          cpio       domainname kill       mt         rcmd       sleep
-    cat        csh        echo       ksh        mv         rcp        stty
-    chio       date       ed         ln         pax        rm         sync
-    chmod      dd         expr       ls         ps         rmdir      tar
-    cp         df         hostname   mkdir      pwd        sh         test
-    """]]
-
-</TMPL_UNLESS>
-
-
-
-<div class="programlisting">
-<TMPL_VAR text>
-</div>
-<TMPL_UNLESS NAME="text">
-
-## Description
-
-Use this template to display a program listing, or a succession of commands (together with their output).
-
-Remember that shell commands may be prefixed by:
 * *$* when the command should be run as a normal user
 * *#* when the command should be run as root