Beautify docbook files

1 files changed, 221 insertions, 739 deletions

diff --git a/tde-i18n-sl/docs/tdebase/glossary/tdeprintingglossary.docbook b/tde-i18n-sl/docs/tdebase/glossary/tdeprintingglossary.docbook
index fe8cf155a5e..39e1bad97e8 100644
--- a/tde-i18n-sl/docs/tdebase/glossary/tdeprintingglossary.docbook
+++ b/tde-i18n-sl/docs/tdebase/glossary/tdeprintingglossary.docbook
@@ -11,25 +11,13 @@
 <glossary id="glossary">
 -->
         <glossdiv id="glossdiv-printing">
-                <title
->Tiskanje</title>
+                <title>Tiskanje</title>
  
 
                 <glossentry id="gloss-acl">
-                        <glossterm
-><acronym
->ACLs</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->A</emphasis
->ccess
-			<emphasis
->C</emphasis
->ontrol <emphasis
->L</emphasis
->ists;
+                        <glossterm><acronym>ACLs</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>A</emphasis>ccess
+			<emphasis>C</emphasis>ontrol <emphasis>L</emphasis>ists;
 				ACLs are used to check for the access by a given
 				(authenticated) user. A first rough support for ACLs
 				for printing is available from &CUPS;; this will be refined
@@ -39,11 +27,8 @@
                 </glossentry>
 
                 <glossentry id="gloss-appsocketprotocol">
-                        <glossterm
->AppSocket Protocol</glossterm>
-                        <glossdef
-><para
->AppSocket is a protocol for the transfer of
+                        <glossterm>AppSocket Protocol</glossterm>
+                        <glossdef><para>AppSocket is a protocol for the transfer of
 				print data, also frequently called "Direct TCP/IP Printing".
 				&Hewlett-Packard; have used AppSocket to add a few minor
 				extensions around it and were very successfull to re-name
@@ -54,11 +39,8 @@
                 </glossentry>
  
                 <glossentry id="gloss-apsfilter">
-                        <glossterm
->APSfilter</glossterm>
-                        <glossdef
-><para
->APSfilter is used mainly in the context of  "classical"
+                        <glossterm>APSfilter</glossterm>
+                        <glossdef><para>APSfilter is used mainly in the context of  "classical"
 				&UNIX; printing (BSD-style LPD). It is a sophisticated shell script,
 				disguising as an "all-in-one" filtering program. In reality,
 				APSfilter calls "real filters" to do the jobs needed. It sends
@@ -78,9 +60,7 @@
 				</para>
 				<para>
 -->
-				&CUPS; has <emphasis
->no</emphasis
-> need for APSfilter,
+				&CUPS; has <emphasis>no</emphasis> need for APSfilter,
 				as it runs its own file type recognition (based on &MIME; types)
 				and applies its own filtering logic.</para>
                                 <glossseealso otherterm="gloss-ghostscript"/>Ghostscript</glossseealso>
@@ -91,11 +71,8 @@
                 </glossentry>
 
                 <glossentry id="gloss-authentication">
-                        <glossterm
->Authentication</glossterm>
-                        <glossdef
-><para
->Proofing the identity of a certain person (maybe via username/password
+                        <glossterm>Authentication</glossterm>
+                        <glossdef><para>Proofing the identity of a certain person (maybe via username/password
 				or by means of a certificate) is often called authentication. Once you are
 				authenticated, you may or may not get access to a requested ressource,
 				possibly based on ACLs.</para>
@@ -104,37 +81,26 @@
                 </glossentry>
  
                 <glossentry id="gloss-bidirectionalcommunication">
-                        <glossterm
->Bi-directional communication</glossterm>
-                        <glossdef
-><para
->In the context of printing, a server or a host may receive additional
+                        <glossterm>Bi-directional communication</glossterm>
+                        <glossdef><para>In the context of printing, a server or a host may receive additional
 				information sent back from the printer (status messages &etc;), either
 				upon a query or unrequested. AppSocket ( = &HP; JetDirect), &CUPS; and IPP do 
 				support bi-directional communication, LPR/LPD and BSD-style printing
 				do not...</para>
-                                <glossseealso otherterm="gloss-appsocketprotocol"/>AppSocket Protocol</glossseealso
-> 
+                                <glossseealso otherterm="gloss-appsocketprotocol"/>AppSocket Protocol</glossseealso> 
                                 <glossseealso otherterm="gloss-cups"/>&CUPS;</glossseealso>
-                                <glossseealso otherterm="gloss-directtcpipprinting"/>Direct TCP/IP Printing</glossseealso
-> 
-                                <glossseealso otherterm="gloss-hpjetdirectprotocol"/>&HP; JetDirect</glossseealso
-> 
+                                <glossseealso otherterm="gloss-directtcpipprinting"/>Direct TCP/IP Printing</glossseealso> 
+                                <glossseealso otherterm="gloss-hpjetdirectprotocol"/>&HP; JetDirect</glossseealso> 
                                 <glossseealso otherterm="gloss-ipp"/>IPP</glossseealso>
                                 <glossseealso otherterm="gloss-lprlpd"/>LPR/LPD</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-bsdstyleprinting">
-                        <glossterm
->BSD-style Printing</glossterm>
-                        <glossdef
-><para
->Generic term for different variants of the traditional &UNIX;
+                        <glossterm>BSD-style Printing</glossterm>
+                        <glossdef><para>Generic term for different variants of the traditional &UNIX;
 				printing method. Its first version appeared in the early 70s on
-				BSD &UNIX; and was formally described in <ulink url="http://www.rfc.net/rfc1179.html"
->RFC 1179</ulink
-> only as late
+				BSD &UNIX; and was formally described in <ulink url="http://www.rfc.net/rfc1179.html">RFC 1179</ulink> only as late
 				as 1990.
 <!--
 				</para>
@@ -175,21 +141,10 @@
                 </glossentry>
  
                 <glossentry id="gloss-cups">
-                        <glossterm
->&CUPS;</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->C</emphasis
->ommon
-				<emphasis
->U</emphasis
->NIX <emphasis
->P</emphasis
->rinting
-				<emphasis
->S</emphasis
->ystem; &CUPS; is most modern &UNIX; and Linux
+                        <glossterm>&CUPS;</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>C</emphasis>ommon
+				<emphasis>U</emphasis>NIX <emphasis>P</emphasis>rinting
+				<emphasis>S</emphasis>ystem; &CUPS; is most modern &UNIX; and Linux
 				printing system, providing also cross-platform printservices
 				to &Microsoft; &Windows; and Apple MacOS clients. Based on IPP, it does
 				away with all the pitfalls of old-style BSD printing,
@@ -218,16 +173,9 @@
 
  
                 <glossentry id="gloss-cupsfaq">
-                        <glossterm
-><acronym
->&CUPS;-FAQ</acronym
-></glossterm>
-                        <glossdef
-><para
->Presently only available in German (translation is on the way),
-				the <ulink url="http://www.danka.de/printpro/faq.html"
->&CUPS;-FAQ</ulink
-> 
+                        <glossterm><acronym>&CUPS;-FAQ</acronym></glossterm>
+                        <glossdef><para>Presently only available in German (translation is on the way),
+				the <ulink url="http://www.danka.de/printpro/faq.html">&CUPS;-FAQ</ulink> 
 				is a valuable ressource to answer many question anyone new to 
 				&CUPS; printing might have at first.
 				</para>
@@ -237,28 +185,19 @@
 
 
                 <glossentry id="gloss-cups-o-matic">
-                        <glossterm
->&CUPS;-O-Matic</glossterm>
-                        <glossdef
-><para
->&CUPS;-O-Matic was the first "Third Party" plugin for
+                        <glossterm>&CUPS;-O-Matic</glossterm>
+                        <glossdef><para>&CUPS;-O-Matic was the first "Third Party" plugin for
 				the &CUPS; printing software. It is available on the  <ulink 
-				url="http://www.linuxprinting.org/cups-doc.html"
->Linuxprinting.org
-				website</ulink
-> to provide an online PPD-generating service.
+				url="http://www.linuxprinting.org/cups-doc.html">Linuxprinting.org
+				website</ulink> to provide an online PPD-generating service.
 <!--
 				</para>
 				<para>
 -->
 
-				Together with the companion <application
->cupsomatic</application
-> Perl-Script,
+				Together with the companion <application>cupsomatic</application> Perl-Script,
 				that needs to be installed as an additional &CUPS; backend,
-				it re-directs output from the native <application
->pstops</application
-> filter into
+				it re-directs output from the native <application>pstops</application> filter into
 				a chain of suitable Ghostscript filters. Upon finishing, it
 				gives the resulting data back to a &CUPS; "backend" for sending
 				them onward to the printer.
@@ -278,20 +217,13 @@
 
 
                 <glossentry id="gloss-cupsomatic">
-                        <glossterm
->cupsomatic</glossterm>
-                        <glossdef
-><para
->The Perlscript <application
->cupsomatic</application
-> (plus a working Perl installation
+                        <glossterm>cupsomatic</glossterm>
+                        <glossdef><para>The Perlscript <application>cupsomatic</application> (plus a working Perl installation
 				on your system) is needed to make any &CUPS;-O-Matic (or PPD-O-Matic) 
 				generated PPD work with &CUPS;. It was written by Grant Taylor, Author of
 				the Linux Printing HOWTO and Maintainer of the <ulink 
-				url="http://www.linuxprinting.org/printer_list.cgi"
->printer 
-				database</ulink
-> at the Linuxprinting.org website.</para>
+				url="http://www.linuxprinting.org/printer_list.cgi">printer 
+				database</ulink> at the Linuxprinting.org website.</para>
                                 <glossseealso otherterm="gloss-cups-o-matic"/>&CUPS;-O-Matic</glossseealso>
                                 <glossseealso otherterm="gloss-foomatic"/>Foomatic</glossseealso>
                                 <glossseealso otherterm="gloss-cupsomatic"/>cupsomatic</glossseealso>
@@ -299,25 +231,10 @@
                 </glossentry>
 
                 <glossentry id="gloss-daemon">
-                        <glossterm
-><acronym
->Daemon</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->D</emphasis
->isk
-				<emphasis
->a</emphasis
->nd <emphasis
->e</emphasis
->xecution
-				<emphasis
->mon</emphasis
->itor; <acronym
->Daemons</acronym
-> are present
+                        <glossterm><acronym>Daemon</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>D</emphasis>isk
+				<emphasis>a</emphasis>nd <emphasis>e</emphasis>xecution
+				<emphasis>mon</emphasis>itor; <acronym>Daemons</acronym> are present
 				on all &UNIX; systems to perform tasks independent of user
 				intervention. Readers more familiar with &Microsoft; &Windows; might
 				want to compare daemons and the tasks they are responsible
@@ -335,11 +252,8 @@
                 </glossentry>
  
                 <glossentry id="gloss-databaselinuxprinting">
-                        <glossterm
->Database, Linuxprinting.org</glossterm>
-                        <glossdef
-><para
->Already years ago, when Linux printing was still really difficult
+                        <glossterm>Database, Linuxprinting.org</glossterm>
+                        <glossdef><para>Already years ago, when Linux printing was still really difficult
 				(only commandline printing  was known to most Linux users, no device
 				specific print options were available for doing the jobs), Grant Taylor, 
 				Author of the "Linux Printing HOWTO", collected most or the available
@@ -374,11 +288,8 @@
                 </glossentry>
 
                 <glossentry id="gloss-directtcpipprinting">
-                        <glossterm
->Direct TCP/IP Printing</glossterm>
-                        <glossdef
-><para
->This is a method that often uses TCP/IP port 9100 to connect
+                        <glossterm>Direct TCP/IP Printing</glossterm>
+                        <glossdef><para>This is a method that often uses TCP/IP port 9100 to connect
 				to the printer. It works with many modern network printers and has
 				a few advantages over LPR/LPD, as it is faster and provides some 
 				"backchannel feedback data" from the printer to the host sending
@@ -390,11 +301,8 @@
 
 
                 <glossentry id="gloss-drivers">
-                        <glossterm
->Drivers, Printer Drivers</glossterm>
-                        <glossdef
-><para
->The term "printer drivers", used in the same sense
+                        <glossterm>Drivers, Printer Drivers</glossterm>
+                        <glossdef><para>The term "printer drivers", used in the same sense
 				as on the &Microsoft; &Windows; platform, is not entirely applicable
 				for a Linux or &UNIX; platform. A "driver" functionality
 				is supplied on &UNIX; by different modular components working
@@ -409,35 +317,23 @@
                 </glossentry>
 
                 <glossentry id="gloss-easysoftwareproducts">
-                        <glossterm
->Easy Software Products</glossterm>
-                        <glossdef
-><para
->Mike Sweet's company, which has contributed a few substantial
+                        <glossterm>Easy Software Products</glossterm>
+                        <glossdef><para>Mike Sweet's company, which has contributed a few substantial
 				software products towards the Free Software community; amongst
 				them the initial version of <ulink 
-				url="http://gimp-print.sf.net/"
->Gimp-Print,</ulink
->, the <ulink 
-				url="http://www.easysw.com/epm/"
->EPM software packaging</ulink
-> tool 
-				and <ulink url="http://www.easysw.com/htmldoc/"
->HTMLDOC</ulink>
+				url="http://gimp-print.sf.net/">Gimp-Print,</ulink>, the <ulink 
+				url="http://www.easysw.com/epm/">EPM software packaging</ulink> tool 
+				and <ulink url="http://www.easysw.com/htmldoc/">HTMLDOC</ulink>
 				(used by the "Linux Documentation Project" to build the PDF versions
 				of the HOWTOs) -- but most importantly:  <ulink 
-				url="http://www.cups.org/"
->&CUPS;</ulink
-> (the 'Common &UNIX; Printing
+				url="http://www.cups.org/">&CUPS;</ulink> (the 'Common &UNIX; Printing
 				System').
 <!--
 				</para>
 				<para>
 -->
 				ESP finance themselves by selling a commercial version
-				of &CUPS;, called <ulink url="http://www.easysw.com/"
->ESP PrintPro</ulink
->, 
+				of &CUPS;, called <ulink url="http://www.easysw.com/">ESP PrintPro</ulink>, 
 				that includes some professional enhancements.
 				</para>
                                 <glossseealso otherterm="gloss-cups"/>&CUPS;</glossseealso>
@@ -448,11 +344,8 @@
                 </glossentry>
  
                 <glossentry id="gloss-encryption">
-                        <glossterm
->Encryption</glossterm>
-                        <glossdef
-><para
->Encryption of confidential data is an all-important issue if
+                        <glossterm>Encryption</glossterm>
+                        <glossdef><para>Encryption of confidential data is an all-important issue if
 				you transfer it over the internet or even inside intra-nets.
 <!--
 				</para>
@@ -479,13 +372,8 @@
 
 
                 <glossentry id="gloss-epson">
-                        <glossterm
-><acronym
->Epson</acronym
-></glossterm>
-                        <glossdef
-><para
->Epson inkjets belong to the best supported models by Free software
+                        <glossterm><acronym>Epson</acronym></glossterm>
+                        <glossdef><para>Epson inkjets belong to the best supported models by Free software
 				drivers as the company was not necessarily as secretive about their
 				devices and handed technical specification documents to developers.
 				The excellent print quality achieved by Gimp-Print on the Styli
@@ -505,11 +393,8 @@
 
 
                 <glossentry id="gloss-escapesequence">
-                        <glossterm
->Escape Sequences</glossterm>
-                        <glossdef
-><para
->The first ever printers printed ASCII data only. To
+                        <glossterm>Escape Sequences</glossterm>
+                        <glossdef><para>The first ever printers printed ASCII data only. To
 				initiate a new line, or eject a page, they included special
 				command sequences, often carrying a leading [ESC]-character.
 				&HP; evolved this concept through its series of PCL language
@@ -522,23 +407,10 @@
                 </glossentry>
 
                 <glossentry id="gloss-escp">
-                        <glossterm
-><acronym
->ESC/P</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->E</emphasis
->pson
-				<emphasis
->S</emphasis
->tandard <emphasis
->C</emphasis
->odes for
-				<emphasis
->P</emphasis
->rinters. Epsons ESC/P printer language is besides
+                        <glossterm><acronym>ESC/P</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>E</emphasis>pson
+				<emphasis>S</emphasis>tandard <emphasis>C</emphasis>odes for
+				<emphasis>P</emphasis>rinters. Epsons ESC/P printer language is besides
 				&PostScript; and PCL one of the best known.</para>
                                 <glossseealso otherterm="gloss-escp"/>ESC/P</glossseealso>
                                 <glossseealso otherterm="gloss-pcl"/>PCL</glossseealso>
@@ -548,20 +420,9 @@
                 </glossentry>
 
                 <glossentry id="gloss-esp">
-                        <glossterm
-><acronym
->ESP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->E</emphasis
->asy
-				<emphasis
->S</emphasis
->oftware <emphasis
->P</emphasis
->roducts;
+                        <glossterm><acronym>ESP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>E</emphasis>asy
+				<emphasis>S</emphasis>oftware <emphasis>P</emphasis>roducts;
 				the company that developed &CUPS; (the "Common &UNIX; Printing System").
 				</para>
                                 <glossseealso otherterm="gloss-easysoftwareproducts"/>Easy Software Products</glossseealso>
@@ -572,13 +433,8 @@
 
 
                 <glossentry id="gloss-espghostscript">
-                        <glossterm
-><acronym
->ESP</acronym
-> Ghostscript</glossterm>
-                        <glossdef
-><para
->A Ghostscript version that is maintained by Easy Software
+                        <glossterm><acronym>ESP</acronym> Ghostscript</glossterm>
+                        <glossdef><para>A Ghostscript version that is maintained by Easy Software
 				Products. It includes pre-compiled Gimp-Print drivers for
 				many inkjets ()plus some other goodies). ESP Ghostscript
 				drives especially the Epson Stylus model series to photographic
@@ -591,17 +447,11 @@
                 </glossentry>
 
                 <glossentry id="gloss-espprintpro">
-                        <glossterm
-><acronym
->ESP</acronym
-> PrintPro</glossterm>
-                        <glossdef
-><para
-> This professional enhancement to &CUPS; (the "Common &UNIX; 
+                        <glossterm><acronym>ESP</acronym> PrintPro</glossterm>
+                        <glossdef><para> This professional enhancement to &CUPS; (the "Common &UNIX; 
 				Printing System") is sold by the developers 
 				of &CUPS; complete with more than 2.300 printer drivers for several commercial
-				&UNIX; platforms. <ulink url="http://www.easysw.com/printpro/"
->ESP PrintPro</ulink>
+				&UNIX; platforms. <ulink url="http://www.easysw.com/printpro/">ESP PrintPro</ulink>
 				is supposed to work "out of the box" with little or no configuration
 				for users or admins. ESP sell also support contracts for
 				&CUPS; and PrintPro. These sales help to feed the programmers who
@@ -612,11 +462,8 @@
                 </glossentry>
 
                <glossentry id="gloss-filter">
-                        <glossterm
->Filter</glossterm>
-                        <glossdef
-><para
->Filters, in general, are programs that take some input
+                        <glossterm>Filter</glossterm>
+                        <glossdef><para>Filters, in general, are programs that take some input
 				data, work on it and pass it on as their output data. Filters
 				may or may not change the data.
 <!--
@@ -635,14 +482,10 @@
                 </glossentry>
 
                 <glossentry id="gloss-foomatic">
-                        <glossterm
->Foomatic</glossterm>
-                        <glossdef
-><para
->Foomatic started out as the wrapper name for a set of
+                        <glossterm>Foomatic</glossterm>
+                        <glossdef><para>Foomatic started out as the wrapper name for a set of
 				different tools available from <ulink
-				url="http://www.linuxprinting.org/"
->Linuxprinting.org</ulink>
+				url="http://www.linuxprinting.org/">Linuxprinting.org</ulink>
 				These tools aimed to make the usage of traditional
 				ghostscript and other print filters more easy for users and
 				extend the filters capabilities by adding more commandline
@@ -672,14 +515,9 @@
                 </glossentry>
 
                <glossentry id="gloss-ghostscript">
-                        <glossterm
->Ghostscript</glossterm>
-                        <glossdef
-><para
->Ghostscipt is a &PostScript; RIP in software, originally
-				developed by L. Peter Deutsch. There is always a <acronym
->GPL</acronym
-> version
+                        <glossterm>Ghostscript</glossterm>
+                        <glossdef><para>Ghostscipt is a &PostScript; RIP in software, originally
+				developed by L. Peter Deutsch. There is always a <acronym>GPL</acronym> version
 				of ghostscript available for free usage and distribution
 				(mostly 1 year old) while
 				the current version is commercially sold under another license.
@@ -696,11 +534,8 @@
                 </glossentry>
 
                 <glossentry id="gloss-gimpprint">
-                        <glossterm
->Gimp-Print</glossterm>
-                        <glossdef
-><para
->Contrary to its name, Gimp-Print is not any longer
+                        <glossterm>Gimp-Print</glossterm>
+                        <glossdef><para>Contrary to its name, Gimp-Print is not any longer
 				just the plugin to be used for printing from the popular
 				Gimp program -- its codebase can also serve to be compiled
 				into...
@@ -730,22 +565,18 @@
 <!--
 after 4 hours fiddling, I
 could not get those s!@*#?
-<itemizedlist
-> to pass
+<itemizedlist> to pass
 through the meinproc checks.
 For the time being I gave up
 on it and handle it differently
 now.
 				<itemizedlist>
-				<listitem
->...a set of PPDs and associated filters that integrate seamlessly
+				<listitem>...a set of PPDs and associated filters that integrate seamlessly
 				into &CUPS;, supporting around 130 different printer models, providing
 				photografic output quality in many cases;</listitem>
-				<listitem
->...a Gostscript filter that can be used with any other
+				<listitem>...a Gostscript filter that can be used with any other
 				program that needs a software-RIP;</listitem>
-				<listitem
->...a library that can be used by other software applications
+				<listitem>...a library that can be used by other software applications
 				in need of rasterization functions.</listitem>
 				</itemizedlist>
 -->
@@ -757,17 +588,8 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-hp">
-                        <glossterm
-><acronym
->&HP;</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->H</emphasis
->ewlett-<emphasis
->Packard</emphasis
->;
+                        <glossterm><acronym>&HP;</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>H</emphasis>ewlett-<emphasis>Packard</emphasis>;
 				none of the first companys to distribute their own Linux printer
 				drivers  [...to be completed...]
 				</para>
@@ -776,19 +598,9 @@ now.
 
 
                 <glossentry id="gloss-hpgl">
-                        <glossterm
-><acronym
->&HP;/GL</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->&HP;</emphasis>
-				<emphasis
->G</emphasis
->rafical <emphasis
->L</emphasis
->anguage;
+                        <glossterm><acronym>&HP;/GL</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>&HP;</emphasis>
+				<emphasis>G</emphasis>rafical <emphasis>L</emphasis>anguage;
 				a &HP; printer language mainly used for plotters; many CAD
 				(Computer Aided software programs output &HP;/GL files for
 				printing.</para>
@@ -799,11 +611,8 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-hpjetdirectprotocol">
-                        <glossterm
->&HP; JetDirect Protocol</glossterm>
-                        <glossdef
-><para
->A term branded by &HP; to describe their implementation
+                        <glossterm>&HP; JetDirect Protocol</glossterm>
+                        <glossdef><para>A term branded by &HP; to describe their implementation
 				of print data transfer to the printer via an otherwise "AppSocket" or
 				"Direct TCP/IP Prining" named protocol.</para>
                                 <glossseealso otherterm="gloss-appsocketprotocol"/>AppSocket Protocol</glossseealso>
@@ -812,23 +621,10 @@ now.
                 </glossentry>
 
 		<glossentry id="gloss-ietf">
-                        <glossterm
-><acronym
->IETF</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->I</emphasis
->nternet
-				<emphasis
->E</emphasis
->ngineering <emphasis
->T</emphasis
->ask
-				<emphasis
->F</emphasis
->orce; an assembly of internet, software
+                        <glossterm><acronym>IETF</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>I</emphasis>nternet
+				<emphasis>E</emphasis>ngineering <emphasis>T</emphasis>ask
+				<emphasis>F</emphasis>orce; an assembly of internet, software
 				and hardware experts that discuss
 				new networking technologies and very often arrive at
 				conclusions that are regarded by many as standards. "TCP/IP"
@@ -850,20 +646,9 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-ipp">
-                        <glossterm
-><acronym
->IPP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->I</emphasis
->nternet
-				<emphasis
->P</emphasis
->rinting <emphasis
->P</emphasis
->rotocol;
+                        <glossterm><acronym>IPP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>I</emphasis>nternet
+				<emphasis>P</emphasis>rinting <emphasis>P</emphasis>rotocol;
 				defined in a series of RFCs accepted by the IETF with
 				status "proposed standard"; was designed
 				by the PWG. -- IPP is a completely new design for network printing,
@@ -900,14 +685,11 @@ now.
 <!--
 				</para>
 				<itemizedlist>
-					<listitem
->Basic, Digest or Certificate authentication
+					<listitem>Basic, Digest or Certificate authentication
 					mechanisms</listitem>
-					<listitem
->SSL or TLS for encryption of transferred
+					<listitem>SSL or TLS for encryption of transferred
 					data</listitem>
-					<listitem
->LDAP for directory services (to publish
+					<listitem>LDAP for directory services (to publish
 					data on printers, device-options, drivers, costs or
 					elso to the network; or to check for passwords while
 					conducting authentication)</listitem>
@@ -924,13 +706,8 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-tdeprint">
-                        <glossterm
-><acronym
->TDEPrint</acronym
-></glossterm>
-                        <glossdef
-><para
->The new printing functionality of &kde; since its version 2.2
+                        <glossterm><acronym>TDEPrint</acronym></glossterm>
+                        <glossdef><para>The new printing functionality of &kde; since its version 2.2
 				consists of several modules that translate the features and settings
 				of different available print subsystems (&CUPS;, BSD-style LPR/LPD, RLPR...)
 				into nice &kde; desktop &GUI; representation and dialogs to ease their
@@ -940,12 +717,9 @@ now.
 				<para>
 -->
 				Most important for day-to-day usage is "kprinter", the new
-				&GUI; print command. -- Note: TDEPrint does <emphasis
->not</emphasis
-> implement its own
+				&GUI; print command. -- Note: TDEPrint does <emphasis>not</emphasis> implement its own
 				spooling mechanism or its own &PostScript; processing; for this it
-				relies on the selected <emphasis
->print subsystem</emphasis>
+				relies on the selected <emphasis>print subsystem</emphasis>
 				-- however it does add some functionality of its own on top of this
 				foundation...
 				</para>
@@ -958,17 +732,11 @@ now.
 
 
                 <glossentry id="gloss-tdeprinthandbook">
-                        <glossterm
-><acronym
->TDEPrint Handbook...</acronym
-></glossterm>
-                        <glossdef
-><para
->...is the name of the reference document that describes TDEPrint
+                        <glossterm><acronym>TDEPrint Handbook...</acronym></glossterm>
+                        <glossdef><para>...is the name of the reference document that describes TDEPrint
 				functions to users and administrators. You can load it into Konqueror by
 				typing "help:/tdeprint" into the address field. The <ulink
-				url="http://printing.kde.org/"
->TDEPrint website</ulink>
+				url="http://printing.kde.org/">TDEPrint website</ulink>
 				is the ressource for updates to this documentation as well as PDF
 				versions fit for printing it. It is authored and maintained by Kurt 
 				Pfeifle.
@@ -978,38 +746,25 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-kprinter">
-                        <glossterm
->kprinter</glossterm>
-                        <glossdef
-><para
-><emphasis
->kprinter</emphasis
-> is the new powerfull
+                        <glossterm>kprinter</glossterm>
+                        <glossdef><para><emphasis>kprinter</emphasis> is the new powerfull
 				print utility that is natively used by all &kde; applications.
 <!--
 				</para>
 				<para>
 -->
 				Contrary to some common misconceptions,
-				<emphasis
->kprinter</emphasis
-> is <emphasis
->not</emphasis
-> a &CUPS;-only tool,
+				<emphasis>kprinter</emphasis> is <emphasis>not</emphasis> a &CUPS;-only tool,
 				but supports different print subsystems. You can even switch
 				to a different printsubsystem "on the fly", in between two jobs,
 				without re-configuration. Of course, due to the powerful
-				features of &CUPS;, <emphasis
->kprinter</emphasis
-> is in
+				features of &CUPS;, <emphasis>kprinter</emphasis> is in
 				best shape when used as a &CUPS; frontend.
 <!--
 				</para>
 				<para>
 -->
-				<emphasis
->kprinter</emphasis
-> is the successor
+				<emphasis>kprinter</emphasis> is the successor
 				to "qtcups", which is no longer being actively maintained. kprinter has
 				inherited all the best features of qtcups and added several new ones.
 <!--
@@ -1017,8 +772,7 @@ now.
 				<para>
 -->
 
-				AND MOST IMPORTANT: you can use <emphasis
->kprinter</emphasis>
+				AND MOST IMPORTANT: you can use <emphasis>kprinter</emphasis>
 				with all its features in all non-&kde; applications that allow
 				a customized print command, like gv, AcrobatReader, Netscape,
 				Mozilla, Galeon, StarOffice, OpenOffice and all GNOME programs.
@@ -1026,9 +780,7 @@ now.
 				</para>
 				<para>
 -->
-				<emphasis
->kprinter</emphasis
-> can act as a "standalone"
+				<emphasis>kprinter</emphasis> can act as a "standalone"
 				utility, started from an X-Terminal or a "Mini-CLI" to
 				print many different files, from different directories, with different 
 				formats, in one job and at once, without the need to first open the
@@ -1041,24 +793,16 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-lexmark">
-                        <glossterm
-><acronym
->Lexmark</acronym
-></glossterm>
-                        <glossdef
-><para
->was one of the first companys to distribute their own Linux printer
+                        <glossterm><acronym>Lexmark</acronym></glossterm>
+                        <glossdef><para>was one of the first companys to distribute their own Linux printer
 				drivers for some of their models. [...to be completed...] 
 				 </para>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-linuxprintingorg">
-                        <glossterm
->Linuxprinting.org</glossterm>
-                        <glossdef
-><para
->Linuxprinting.org = not only for Linux; all &UNIX;-like OS-es
+                        <glossterm>Linuxprinting.org</glossterm>
+                        <glossdef><para>Linuxprinting.org = not only for Linux; all &UNIX;-like OS-es
 				like *BSD and also commercial Unices may find useful printing
 				information on that site;  Foomatic -- Printer Data Base -- Driver Data	
 				Base....</para>
@@ -1068,13 +812,8 @@ now.
 
 
                 <glossentry id="gloss-linuxprintingdatabase">
-                        <glossterm
-><acronym
->Linuxprinting.org Database</acronym
-></glossterm>
-                        <glossdef
-><para
->....Data Base containing printers and drivers suitable
+                        <glossterm><acronym>Linuxprinting.org Database</acronym></glossterm>
+                        <glossdef><para>....Data Base containing printers and drivers suitable
 				for them... ...a lot of information and documentation to be found... ...it 
 				is now also providing some tools and utilities for easing the integration 
 				of those drivers into a given system... ...the "Foomatic" family 
@@ -1086,38 +825,18 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-lprlpd">
-                        <glossterm
-><acronym
->LPR/LPD</acronym
-> printing</glossterm>
-                        <glossdef
-><para
->LPR == some people translate <emphasis
->L</emphasis
->ine
-				<emphasis
->P</emphasis
->rinting <emphasis
->R</emphasis
->equest, others:
-				<emphasis
->L</emphasis
->ine <emphasis
->P</emphasis
->rinter
-				<emphasis
->R</emphasis
->emote.</para>
+                        <glossterm><acronym>LPR/LPD</acronym> printing</glossterm>
+                        <glossdef><para>LPR == some people translate <emphasis>L</emphasis>ine
+				<emphasis>P</emphasis>rinting <emphasis>R</emphasis>equest, others:
+				<emphasis>L</emphasis>ine <emphasis>P</emphasis>rinter
+				<emphasis>R</emphasis>emote.</para>
                                 <glossseealso otherterm="gloss-bsdstyleprinting"/>BSD-style printing</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-magicfilter">
-                        <glossterm
->Magicfilter</glossterm>
-                        <glossdef
-><para
->Similarly to the APSfilter program, Magicfilter
+                        <glossterm>Magicfilter</glossterm>
+                        <glossdef><para>Similarly to the APSfilter program, Magicfilter
 				provides automatic file type recognition functions, and base
 				on that, automatic file conversion to a printable format,
 				depending on the target printer.</para>
@@ -1126,21 +845,10 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-mimetypes">
-                        <glossterm
->&MIME;-Types</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->M</emphasis
->ultipurpose (or
-				Multimedia) <emphasis
->I</emphasis
->nternet <emphasis
->M</emphasis
->ail
-				<emphasis
->E</emphasis
->xtensions; &MIME;-Types were first used to allow
+                        <glossterm>&MIME;-Types</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>M</emphasis>ultipurpose (or
+				Multimedia) <emphasis>I</emphasis>nternet <emphasis>M</emphasis>ail
+				<emphasis>E</emphasis>xtensions; &MIME;-Types were first used to allow
 				the transport of binary data (like mail attachments containing
 				grafics) over mail connections that were normally only transmitting
 				ASCII characters: the data had to be encoded into an ASCII representation.
@@ -1160,22 +868,16 @@ now.
 				<para>
 -->
 				&MIME; typed filed carry a recognition string with them, describing
-				their file format base on <emphasis
->main_category/sub_category</emphasis
->.
+				their file format base on <emphasis>main_category/sub_category</emphasis>.
 				Inside IPP, printfiled are also described using the &MIME; type scheme.
 				&MIME; types are registered with the IANA (Internet Assigning Numbers
-				<emphasis
->Association</emphasis
->) to keep them unambigious.
+				<emphasis>Association</emphasis>) to keep them unambigious.
 <!--
 				</para>
 				<para>
 -->
 				&CUPS; has some &MIME; types of its own registered, like
-				<emphasis
->application/vnd.cups-raster</emphasis
-> (for the &CUPS;-internal
+				<emphasis>application/vnd.cups-raster</emphasis> (for the &CUPS;-internal
 				raster image format).
 
 				</para>
@@ -1187,20 +889,9 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-pcl">
-                        <glossterm
-><acronym
->PCL</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->rinter
-				<emphasis
->C</emphasis
->ontrol <emphasis
->L</emphasis
->anguage;
+                        <glossterm><acronym>PCL</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>rinter
+				<emphasis>C</emphasis>ontrol <emphasis>L</emphasis>anguage;
 				developed by &HP;. PCL started off in version 1 as a simple
 				command set for ASCII printing; now,
 				in its versions PCL6 and PCL-X it is capable of printing grafics
@@ -1214,20 +905,9 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-pdl">
-                        <glossterm
-><acronym
->PDL</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->age
-				<emphasis
->D</emphasis
->escription <emphasis
->L</emphasis
->anguage;
+                        <glossterm><acronym>PDL</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>age
+				<emphasis>D</emphasis>escription <emphasis>L</emphasis>anguage;
 				PDLs describe in an abstract way the grafical representation
 				of a page. - Before it is actually transferred into
 				toner or ink layed down onto paper, a PDL needs to be
@@ -1242,16 +922,9 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-pixel">
-                        <glossterm
->Pixel</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->Pic</emphasis
->ture
-				<emphasis
->El</emphasis
->ement; this term describes the smallest
+                        <glossterm>Pixel</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>Pic</emphasis>ture
+				<emphasis>El</emphasis>ement; this term describes the smallest
 				part of a raster picture (either as printed on paper
 				or as put on a monitor by cathode rays or LCD elements). As
 				any grafical or image representation on those kind of output
@@ -1266,20 +939,9 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-pjl">
-                        <glossterm
-><acronym
->PJL</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->rint
-				<emphasis
->J</emphasis
->ob <emphasis
->L</emphasis
->anguage;
+                        <glossterm><acronym>PJL</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>rint
+				<emphasis>J</emphasis>ob <emphasis>L</emphasis>anguage;
 				developed by &HP; to control and influence default and per-job
 				settings of a printer. May not only be used
 				for &HP;'s own (PCL-)printers; also many &PostScript;
@@ -1290,11 +952,8 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-postscript">
-                        <glossterm
->&PostScript;</glossterm>
-                        <glossdef
-><para
->&PostScript; (often shortened "PS") is the de-facto
+                        <glossterm>&PostScript;</glossterm>
+                        <glossdef><para>&PostScript; (often shortened "PS") is the de-facto
 				standard in the &UNIX; world for printing files. It was
 				developed by Adobe and licensed to printer manufacturers 
 				and software companies.
@@ -1316,20 +975,9 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-ppd">
-                        <glossterm
-><acronym
->PPD</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->ostScript
-				<emphasis
->P</emphasis
->rinter <emphasis
->D</emphasis
->escription;
+                        <glossterm><acronym>PPD</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>ostScript
+				<emphasis>P</emphasis>rinter <emphasis>D</emphasis>escription;
 				PPDs are ASCII files storing all information about the special
 				capabilities of a printer, plus definitions of the (PostScript-
 				or PJL-)commands to call on a certain capability (like printing
@@ -1357,9 +1005,7 @@ now.
 				<para>
 -->
 
-				PPDs for non-PostScript printers <emphasis
->need</emphasis
-> a
+				PPDs for non-PostScript printers <emphasis>need</emphasis> a
 				companion "filter" to process the &PostScript; print files towards
 				a format digestable for the non-PostScript target device. Those
 				PPD/filter combos are not (yet) available from the vendors. After
@@ -1379,11 +1025,8 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-PPD-O-Matic">
-                        <glossterm
->PPD-O-Matic</glossterm>
-                        <glossdef
-><para
->PPD-O-Matic is a set of Perl-Scripts that run on the Linuxprinting.org
+                        <glossterm>PPD-O-Matic</glossterm>
+                        <glossdef><para>PPD-O-Matic is a set of Perl-Scripts that run on the Linuxprinting.org
 				webserver and can be used online to generate PPDs for any printer that is known
 				to print with ghostscript.
 <!--
@@ -1401,10 +1044,8 @@ now.
 -->
 
 				To generate a PPD, go to the <ulink
-				url="http://www.linuxprinting.org/printer_list.cgi"
->printer 
-				database</ulink
->, select your printer model, follow
+				url="http://www.linuxprinting.org/printer_list.cgi">printer 
+				database</ulink>, select your printer model, follow
 				the link to show the available ghostscript filters for that printer, select
 				one, click "generate" and finally safe the file to your local system.
 				Make sure to read the instructions. Make sure your local system
@@ -1419,11 +1060,8 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-printcap">
-                        <glossterm
->printcap</glossterm>
-                        <glossdef
-><para
->The "printcap" file holds in BSD-style print systems
+                        <glossterm>printcap</glossterm>
+                        <glossdef><para>The "printcap" file holds in BSD-style print systems
 				the configuration information; the printing daemon reads this file
 				to know which printers are available, what filters are to
 				user for each, where the spooling directory is located,
@@ -1436,23 +1074,10 @@ now.
   
 
                 <glossentry id="gloss-printermib">
-                        <glossterm
->Printer-<acronym
->MIB</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for
-				<emphasis
->Printer</emphasis
->-<emphasis
->M</emphasis
->anagement
-				<emphasis
->I</emphasis
->nformation <emphasis
->B</emphasis
->ase; the
+                        <glossterm>Printer-<acronym>MIB</acronym></glossterm>
+                        <glossdef><para>Abbreviation for
+				<emphasis>Printer</emphasis>-<emphasis>M</emphasis>anagement
+				<emphasis>I</emphasis>nformation <emphasis>B</emphasis>ase; the
 				Printer-MIB defines a set of parameters that are to be
 				stored inside the printer for access
 				through the network. This is useful if many (in some cases, literally 
@@ -1464,21 +1089,10 @@ now.
                 </glossentry>
   
                 <glossentry id="gloss-pwg">
-                        <glossterm
-><acronym
->PWG</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for
-				<emphasis
->P</emphasis
->rinter <emphasis
->W</emphasis
->orking
-				<emphasis
->G</emphasis
->roup; the PWG is a loose grouping of
+                        <glossterm><acronym>PWG</acronym></glossterm>
+                        <glossdef><para>Abbreviation for
+				<emphasis>P</emphasis>rinter <emphasis>W</emphasis>orking
+				<emphasis>G</emphasis>roup; the PWG is a loose grouping of
 				representatives of the printer industry that has in the past
 				years developed different standards
 				in relation to nework printing, which were later accepted by the
@@ -1492,11 +1106,8 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-printtdeioslave">
-                        <glossterm
->print:/ TDEIO Slave</glossterm>
-                        <glossdef
-><para
->You can use a syntax of "print:/..." to get quick access
+                        <glossterm>print:/ TDEIO Slave</glossterm>
+                        <glossdef><para>You can use a syntax of "print:/..." to get quick access
 				to TDEPrint ressources. Typing "print:/manager" as a Konqueror URL
 				address gives administrative access to TDEPrint. Konqueror uses &kde;'s
 				famous "KParts" technology to achieve that. </para>
@@ -1507,23 +1118,15 @@ now.
 
 
                 <glossentry id="gloss-printerdatabase">
-                        <glossterm
->Printer Data Base</glossterm>
-                        <glossdef
-><para
->.</para>
+                        <glossterm>Printer Data Base</glossterm>
+                        <glossdef><para>.</para>
                                 <glossseealso otherterm="gloss-linuxprintingdatabase"/>Linuxprinting Data Base</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-qtcups">
-                        <glossterm
-><acronym
->Qt&CUPS;</acronym
-></glossterm>
-                        <glossdef
-><para
->co-developer of Qt&CUPS; and KUPS, the predecessors of TDEPrint,
+                        <glossterm><acronym>Qt&CUPS;</acronym></glossterm>
+                        <glossdef><para>co-developer of Qt&CUPS; and KUPS, the predecessors of TDEPrint,
 				sole developer of TDEPrint -- a very nice and productive guy and quick bug fixer...  ;-)
 				 </para>
                                 <glossseealso otherterm="gloss-kprinter"/>kprinter</glossseealso>
@@ -1531,11 +1134,8 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-raster">
-                        <glossterm
->Raster Image</glossterm>
-                        <glossdef
-><para
->In the last resort, every picture on a physical medium
+                        <glossterm>Raster Image</glossterm>
+                        <glossdef><para>In the last resort, every picture on a physical medium
 				is composed of a pattern of discrete dots in different colors and (maybe)
 				sizes. This is called a "raster image".
 <!--
@@ -1568,21 +1168,10 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-rip">
-                        <glossterm
-><acronym
->RIP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for
-				<emphasis
->R</emphasis
->aster <emphasis
->I</emphasis
->mage
-				<emphasis
->P</emphasis
->rocess(or); if used in the context of
+                        <glossterm><acronym>RIP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for
+				<emphasis>R</emphasis>aster <emphasis>I</emphasis>mage
+				<emphasis>P</emphasis>rocess(or); if used in the context of
 				printing, "RIP" means a hardware or software
 				instance that converts &PostScript; (or other print files
 				that represented in one of the non-Raster PDLs) into a
@@ -1618,23 +1207,10 @@ now.
 
 
                 <glossentry id="gloss-rlpr">
-                        <glossterm
-><acronym
->RLPR</acronym
-> (Remote LPR)</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->R</emphasis
->emote
-				<emphasis
->L</emphasis
->ine <emphasis
->P</emphasis
->rinting
-				<emphasis
->R</emphasis
->equest; this is a a BSD-style printing system,
+                        <glossterm><acronym>RLPR</acronym> (Remote LPR)</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>R</emphasis>emote
+				<emphasis>L</emphasis>ine <emphasis>P</emphasis>rinting
+				<emphasis>R</emphasis>equest; this is a a BSD-style printing system,
 				that needs no root priviledges to be installed and no "printcap" to
 				work: all parameters may be specified on the command
 				line.
@@ -1665,23 +1241,10 @@ now.
 
  
                 <glossentry id="gloss-snmp">
-                        <glossterm
-><acronym
->SNMP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->S</emphasis
->imple
-				<emphasis
->N</emphasis
->etwork <emphasis
->M</emphasis
->anagement
-				<emphasis
->P</emphasis
->rotocol; SNMP is widely used to control
+                        <glossterm><acronym>SNMP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>S</emphasis>imple
+				<emphasis>N</emphasis>etwork <emphasis>M</emphasis>anagement
+				<emphasis>P</emphasis>rotocol; SNMP is widely used to control
 				all sorts network nodes (Hosts, Routers, Switches, Gateways,
 				Printers...) remotely.</para>
                                 <glossseealso otherterm="gloss-pwg"/>PWG</glossseealso>
@@ -1690,103 +1253,50 @@ now.
                 </glossentry>
 
 	        <glossentry id="gloss-ssl">
-                        <glossterm
-><acronym
->SSL(3)</acronym
-> encryption</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->S</emphasis
->ecure
-				<emphasis
->S</emphasis
->ocket <emphasis
->L</emphasis
->ayer;
-				<acronym
->SSL</acronym
-> is a proprietary encryption method for data
+                        <glossterm><acronym>SSL(3)</acronym> encryption</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>S</emphasis>ecure
+				<emphasis>S</emphasis>ocket <emphasis>L</emphasis>ayer;
+				<acronym>SSL</acronym> is a proprietary encryption method for data
 				transfer over HTTP that was developed by Netscape and is now being 
 				re-placed by an IETF standard named TLS.
 				</para>
-                                <glossseealso otherterm="gloss-daemon"/><acronym
->Daemon</acronym
-></glossseealso>
+                                <glossseealso otherterm="gloss-daemon"/><acronym>Daemon</acronym></glossseealso>
                         </glossdef>
                 </glossentry>
 
 
 	        <glossentry id="gloss-spooling">
-                        <glossterm
-><acronym
->SPOOL</acronym
->ing</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->S</emphasis
->ynchronous
-				<emphasis
->P</emphasis
->eripherals <emphasis
->O</emphasis
->perations
-				<emphasis
->O</emphasis
->n<emphasis
->L</emphasis
->ine;
-				<acronym
->SPOOL</acronym
->ing enables printing applications
+                        <glossterm><acronym>SPOOL</acronym>ing</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>S</emphasis>ynchronous
+				<emphasis>P</emphasis>eripherals <emphasis>O</emphasis>perations
+				<emphasis>O</emphasis>n<emphasis>L</emphasis>ine;
+				<acronym>SPOOL</acronym>ing enables printing applications
 				(and users) to continue their work
-                                as the job is being taken care of by a system <acronym
->daemon</acronym>
+                                as the job is being taken care of by a system <acronym>daemon</acronym>
 				who stores the file at a temporary location until the printer is ready
 				to print. </para>
-                                <glossseealso otherterm="gloss-daemon"/><acronym
->Daemon</acronym
-></glossseealso>
+                                <glossseealso otherterm="gloss-daemon"/><acronym>Daemon</acronym></glossseealso>
                         </glossdef>
                 </glossentry>
 
 
 	        <glossentry id="gloss-tls">
-                        <glossterm
-><acronym
->TLS</acronym
-> encryption</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->T</emphasis
->ransport
-				<emphasis
->L</emphasis
->ayer <emphasis
->S</emphasis
->ecurity;
-				<acronym
->SSL</acronym
-> is an encryption standard for
+                        <glossterm><acronym>TLS</acronym> encryption</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>T</emphasis>ransport
+				<emphasis>L</emphasis>ayer <emphasis>S</emphasis>ecurity;
+				<acronym>SSL</acronym> is an encryption standard for
 				data transfered over HTTP 1.1; it is defined in RFC ???? [#look up
 				number --TO BE DONE--] ; although based on the former SSL development
 				(from Netscape) it is not fully compatible to it.
 				</para>
-                                <glossseealso otherterm="gloss-daemon"/><acronym
->Daemon</acronym
-></glossseealso>
+                                <glossseealso otherterm="gloss-daemon"/><acronym>Daemon</acronym></glossseealso>
                         </glossdef>
                 </glossentry>
 
 
 	        <glossentry id="gloss-systemVstyleprinting">
-                        <glossterm
->System V-style printing</glossterm>
-                        <glossdef
-><para
->This is the second flavour of traditional &UNIX;
+                        <glossterm>System V-style printing</glossterm>
+                        <glossdef><para>This is the second flavour of traditional &UNIX;
 				printing (as opposed to BSD-style printing). It uses
 				a different command set (lp, lpadmin,...) from BSD,
 				but is not fundamentally different from it. However, the 
@@ -1796,21 +1306,14 @@ now.
 				tweaking... IPP is supposed to resolve this weakness
 				and more.
 				</para>
-                                <glossseealso otherterm="gloss-bsdstyleprinting"/><acronym
->BSD-style printing</acronym
-></glossseealso>
-                                <glossseealso otherterm="gloss-ipp"/><acronym
->IPP</acronym
-></glossseealso>
+                                <glossseealso otherterm="gloss-bsdstyleprinting"/><acronym>BSD-style printing</acronym></glossseealso>
+                                <glossseealso otherterm="gloss-ipp"/><acronym>IPP</acronym></glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-turboprint">
-                        <glossterm
->TurboPrint</glossterm>
-                        <glossdef
-><para
->A Shareware providing photo quality printing for many
+                        <glossterm>TurboPrint</glossterm>
+                        <glossdef><para>A Shareware providing photo quality printing for many
 				inkjet printers; it is useful if you don't find a driver for your
 				printer otherwise; it may be hooked into a traditional Ghostscript
 				or into a modern &CUPS; system.</para>
@@ -1819,53 +1322,32 @@ now.
                 </glossentry>
 
                 <glossentry id="gloss-xpp">
-                        <glossterm
-><acronym
->XPP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->X</emphasis>
-				<emphasis
->P</emphasis
->rinting <emphasis
->P</emphasis
->anel;
-				<acronym
->XPP</acronym
-> was the first Free
+                        <glossterm><acronym>XPP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>X</emphasis>
+				<emphasis>P</emphasis>rinting <emphasis>P</emphasis>anel;
+				<acronym>XPP</acronym> was the first Free
 				graphical print command for &CUPS;, written by Till Kamppeter,
 				and in some ways a model for the "kprinter" utility in &kde;.</para>
                         </glossdef>
                 </glossentry>
 <!--
                 <glossentry id="gloss-1">
-                        <glossterm
->xxxx</glossterm>
-                        <glossdef
-><para
->.</para>
+                        <glossterm>xxxx</glossterm>
+                        <glossdef><para>.</para>
                                 <glossseealso otherterm="gloss-1"/>xyz</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-3">
-                        <glossterm
->xxxx</glossterm>
-                        <glossdef
-><para
->.</para>
+                        <glossterm>xxxx</glossterm>
+                        <glossdef><para>.</para>
                                 <glossseealso otherterm="gloss-1"/>xyz</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-4">
-                        <glossterm
->xxxx</glossterm>
-                        <glossdef
-><para
->.</para>
+                        <glossterm>xxxx</glossterm>
+                        <glossdef><para>.</para>
                                 <glossseealso otherterm="gloss-1"/>xyz</glossseealso>
                         </glossdef>
                 </glossentry>