Index: general.ent
===================================================================
--- general.ent	(revision 176c4756db999c4fa9687cb75874434fc6941c88)
+++ general.ent	(revision 9aa1897eda77030d11c632f67977ef9c6e484767)
@@ -1,7 +1,7 @@
-<!ENTITY day          "22">
+<!ENTITY day          "24">
 <!ENTITY month        "12">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "December &day;nd, &year;">
+<!ENTITY releasedate  "December &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
@@ -436,5 +436,5 @@
 <!ENTITY ffmpeg-version               "0.4.9-pre1">
 <!ENTITY avifile-version              "0.7.41">  
-<!ENTITY mplayer-version              "1.0pre5"> 
+<!ENTITY mplayer-version              "1.0pre6"> 
 <!ENTITY xine-ui-version              "0.99.2">  
 <!ENTITY transcode-version            "0.6.12"> 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 176c4756db999c4fa9687cb75874434fc6941c88)
+++ introduction/welcome/changelog.xml	(revision 9aa1897eda77030d11c632f67977ef9c6e484767)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>December 24th, 2004 [randy]: Updated to 
+MPlayer-1.0pre6</para></listitem>
 
 <listitem><para>December 22nd, 2004 [randy]: Updated to Gnumeric-1.4.1, 
Index: multimedia/libdriv/libmpeg3.xml
===================================================================
--- multimedia/libdriv/libmpeg3.xml	(revision 176c4756db999c4fa9687cb75874434fc6941c88)
+++ multimedia/libdriv/libmpeg3.xml	(revision 9aa1897eda77030d11c632f67977ef9c6e484767)
@@ -3,5 +3,5 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY libmpeg3-download-http "http://prdownloads.sourceforge.net/heroines/libmpeg3-&libmpeg3-version;-src.tar.bz2">
   <!ENTITY libmpeg3-download-ftp  " ">
@@ -17,5 +17,5 @@
 </sect1info>
 <?dbhtml filename="libmpeg3.html"?>
-<title>libmpeg3-&libmpeg3-version;</title>
+<title><application>libmpeg3</application>-&libmpeg3-version;</title>
 
 <sect2>
@@ -27,9 +27,13 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&libmpeg3-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&libmpeg3-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&libmpeg3-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&libmpeg3-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &libmpeg3-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &libmpeg3-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &libmpeg3-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&libmpeg3-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&libmpeg3-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -44,5 +48,6 @@
 <sect3><title><application>libmpeg3</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="NASM"/></para></sect4>
+<para><xref linkend="NASM"/></para>
+</sect4>
 </sect3>
 
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 176c4756db999c4fa9687cb75874434fc6941c88)
+++ multimedia/videoutils/mplayer.xml	(revision 9aa1897eda77030d11c632f67977ef9c6e484767)
@@ -6,7 +6,7 @@
   <!ENTITY mplayer-download-http "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.bz2">
   <!ENTITY mplayer-download-ftp  "ftp://ftp1.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.bz2">
-  <!ENTITY mplayer-size          "5.1 MB">
-  <!ENTITY mplayer-buildsize     "74 MB (additional 19 MB for CODECs)">
-  <!ENTITY mplayer-time          "1.80 SBU">
+  <!ENTITY mplayer-size          "5.6 MB">
+  <!ENTITY mplayer-buildsize     "82 MB (additional 22 MB for essential CODECs)">
+  <!ENTITY mplayer-time          "2.18 SBU">
   <!ENTITY mplayer-default-codec "essential-20041107.tar.bz2">
   <!ENTITY mplayer-default-skin  "Blue-1.4.tar.bz2">
@@ -20,5 +20,5 @@
 </sect1info>
 <?dbhtml filename="mplayer.html"?>
-<title>MPlayer-&mplayer-version;</title>
+<title><application>MPlayer</application>-&mplayer-version;</title>
 
 <sect2>
@@ -33,16 +33,21 @@
 <application>X</application> window system installed.</para>
 
-<para>For a full list of file formats, <acronym>CODEC</acronym>s and 
+<para>For <application>MPlayer</application> general information and available 
+features, including a full list of file formats, <acronym>CODEC</acronym>s and 
 output devices supported by <application>MPlayer</application>, visit the 
-<ulink url="http://www.mplayerhq.hu/DOCS/HTML/en/features.html">
+<ulink url="http://www1.mplayerhq.hu/homepage/design7/info.html">
 <application>MPlayer</application> web site</ulink>.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&mplayer-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&mplayer-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&mplayer-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&mplayer-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &mplayer-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &mplayer-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &mplayer-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&mplayer-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&mplayer-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -57,6 +62,6 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Proprietary <acronym>CODEC</acronym>s: <ulink 
-url="http://www.mplayerhq.hu/MPlayer/releases/codecs/&mplayer-default-codec;"/></para>
-</listitem>
+url="http://www.mplayerhq.hu/MPlayer/releases/codecs/&mplayer-default-codec;"/>
+</para></listitem>
 <listitem><para>Additional <acronym>CODEC</acronym>s: <ulink 
 url="http://www.mplayerhq.hu/MPlayer/releases/codecs/"/></para>
@@ -86,50 +91,62 @@
 
 <sect3><title><application>MPlayer</application> dependencies</title>
-<sect4><title>Optional</title>
-<para>
-X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
-<xref linkend="libpng"/>,
-<xref linkend="libjpeg"/>,
-<xref linkend="GTK"/>,
-<ulink url="http://www.directfb.org/">DirectFB</ulink>,
-<ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
-<xref linkend="freetype2"/>,
-<xref linkend="fontconfig"/>,
-<xref linkend="libungif"/> or <xref linkend="giflib"/>,
-<xref linkend="libogg"/>
-<xref linkend="libvorbis"/>,
-<xref linkend="aalib"/>,
-<xref linkend="sdl"/>,
-<xref linkend="xvid"/>,
-<xref linkend="arts"/>,
-<xref linkend="alsa"/>,
-<xref linkend="esound"/>,
-<xref linkend="LZO"/>,
-<xref linkend="libmad"/>,
-<xref linkend="CDParanoia"/>,
-<xref linkend="libdv"/>,
-<xref linkend="libdvdread"/>,
-<xref linkend="nas"/>,
-<xref linkend="samba3"/>,
-<xref linkend="lame"/>,
-<xref linkend="xmms"/>,
-<xref linkend="flac"/>,
-<xref linkend="libfame"/>,
-<ulink url="http://www.theora.org/">Theora</ulink>,
-<ulink url="http://prdownloads.sourceforge.net/zapping/mp1e-1.9.3.tar.bz2">MP1E</ulink>,
-<ulink url="http://faac.sourceforge.net/">FAAD2</ulink>,
-<ulink url="http://www.ggi-project.org/">GGI</ulink>,
-<ulink url="http://fribidi.sourceforge.net/">FriBidi</ulink>,
-<ulink url="http://www.unrarlib.org/">unrarlib</ulink>,
-<ulink url="http://www.lirc.org/">LIRC</ulink>,
-<ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink>, 
+<sect4><title>Optional input drivers and libraries</title>
+<para><xref linkend="CDParanoia"/>, 
+<xref linkend="libdv"/>, 
+<xref linkend="libdvdread"/>, 
+<xref linkend="samba3"/>, 
+<ulink url="http://www.live.com/mplayer/">LIVE.COM Streaming Media</ulink>, 
+<ulink url="http://www.matroska.org/downloads/linux.html">libmatroska</ulink> 
+and <ulink url="http://www.metzlerbros.org/dvb/">DVB</ulink></para>
+</sect4>
+
+<sect4><title>Optional audio output drivers and libraries</title>
+<para><xref linkend="alsa"/>, 
+<xref linkend="arts"/>, 
+<xref linkend="esound"/>, 
+<xref linkend="nas"/>, 
+<xref linkend="sdl"/> (also used for video output), 
+<xref linkend="xmms"/>, 
+<ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>, 
+<ulink url="http://bio2jack.sourceforge.net/">bio2jack</ulink> (requires 
+<ulink url="http://jackit.sourceforge.net/">JACK</ulink>)</para>
+</sect4>
+
+<sect4><title>Optional video output drivers and libraries</title>
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
+<xref linkend="libpng"/>, 
+<xref linkend="libjpeg"/>, 
+<xref linkend="libungif"/> or <xref linkend="giflib"/>, 
+<xref linkend="GTK"/>, 
+<xref linkend="freetype2"/>, 
+<xref linkend="fontconfig"/>, 
+<xref linkend="aalib"/>, 
+<ulink url="http://www.directfb.org/">DirectFB</ulink>, 
+<ulink url="http://www.svgalib.org/">SVGAlib</ulink>, 
+<ulink url="http://www.ggi-project.org/">GGI</ulink>, 
 <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>, 
-<ulink url="http://www.matroska.org/downloads/linux.html">libmatroska</ulink>, 
-<ulink url="http://www.live.com/mplayer/">LIVE.COM Streaming Media</ulink>, 
-<ulink url="http://bio2jack.sourceforge.net/">bio2jack</ulink>, 
+<ulink url="http://www.ladspa.org/">LADSPA</ulink>, 
 <ulink url="http://dxr2.sourceforge.net/">Dxr2</ulink>, 
-<ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink> and 
-<ulink url="http://trific.ath.cx/software/enca/">Enca</ulink>
-</para></sect4>
+<ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>, 
+<ulink url="http://prdownloads.sourceforge.net/zapping/mp1e-1.9.3.tar.bz2">MP1E</ulink>, 
+<ulink url="http://freedesktop.org/Software/FriBidi">FriBidi</ulink> and 
+<ulink url="http://trific.ath.cx/software/enca/">Enca</ulink></para>
+</sect4>
+
+<sect4><title>Optional <acronym>CODEC</acronym>s</title>
+<para><xref linkend="libvorbis"/>, 
+<xref linkend="xvid"/>, 
+<xref linkend="LZO"/>, 
+<xref linkend="libmad"/>, 
+<xref linkend="lame"/>, 
+<xref linkend="libfame"/>, 
+<ulink url="http://www.theora.org/">Theora</ulink>, 
+<ulink url="http://www.xiph.org/ogg/vorbis/index.html">Tremor</ulink>, 
+<ulink url="http://www.audiocoding.com/modules/mydownloads/">FAAD2</ulink>, 
+<ulink url="http://www.divx.com/divx/linux/">DivX4Linux</ulink>, 
+<ulink url="http://users.tpg.com.au/adslblvi/#tooLAME">tooLAME</ulink>, 
+<ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink> 
+and <ulink url="http://www.lirc.org/">LIRC</ulink></para>
+</sect4>
 </sect3>
 
@@ -150,10 +167,10 @@
 
 <screen><userinput><command>install -d -m755 /usr/lib/mplayer/codecs &amp;&amp;
-tar xjfv ../&mplayer-default-codec; \
+tar xjvf ../&mplayer-default-codec; \
     -C /usr/lib/mplayer/codecs --strip-path=1 &amp;&amp;
 chown -R root:root /usr/lib/mplayer/codecs</command></userinput></screen>
 
-<para>If you installed any <acronym>CODEC</acronym>s, ensure you add
-<parameter>--with-codecsdir=/usr/lib/mplayer/codecs</parameter>
+<para>If you installed any <acronym>CODEC</acronym>s, ensure you add 
+<option>--with-codecsdir=/usr/lib/mplayer/codecs</option> 
 to the <command>configure</command> script.</para>
 </sect3>
@@ -164,13 +181,14 @@
 <para>To enable building the <acronym>GUI</acronym> version of
 <application>MPlayer</application> (requires <xref linkend="GTK"/>), add 
-<parameter>--enable-gui</parameter> to the <command>configure</command> 
+<option>--enable-gui</option> to the <command>configure</command> 
 script. You'll also need to extract at least one skin. Extract the desired 
-skin to the default location:</para>
-
-<screen><userinput><command>install -d -m755 /usr/share/mplayer/Skin &amp;&amp;
+skin and create the default location:</para>
+
+<screen><userinput><command>install -v -d -m755 /usr/share/mplayer/Skin &amp;&amp;
 tar xjvf ../&mplayer-default-skin; \
     -C /usr/share/mplayer/Skin &amp;&amp;
-chown -R root:root /usr/share/mplayer/Skin/Blue &amp;&amp;
-ln -sf Blue /usr/share/mplayer/Skin/default</command></userinput></screen>
+chown -v -R root:root /usr/share/mplayer/Skin/Blue &amp;&amp;
+chmod -v 0755 /usr/share/mplayer/Skin/Blue{,/icons} &amp;&amp;
+ln -sfv Blue /usr/share/mplayer/Skin/default</command></userinput></screen>
 </sect3>
 
@@ -180,5 +198,5 @@
 
 <para>To enable <acronym>OSD</acronym> (On Screen Display) and subtitles 
-support, add <parameter>--enable-menu</parameter> to the 
+support, add <option>--enable-menu</option> to the 
 <command>configure</command> script. You'll also need to set up at least one 
 font (see font installation instructions a little later).</para>
@@ -200,6 +218,15 @@
 make install &amp;&amp;
 install -d -m755 /usr/share/doc/mplayer &amp;&amp;
-cp -R DOCS/* /usr/share/doc/mplayer &amp;&amp;
-chown -R root:root /usr/share/doc/mplayer</command></userinput></screen>
+cp -R DOCS/* /usr/share/doc/mplayer</command></userinput></screen>
+
+<para><application>MPlayer</application> can build a shared post-processing 
+library which other packages can link to. Doing this means that 
+<application>MPlayer</application> must also link dynamically to this library 
+instead of the default statically linked method. If you desire to build the 
+shared library, add <option>--enable-shared-pp</option> to the 
+<command>configure</command> script, then execute the following command after 
+the commands above:</para>
+
+<screen><userinput><command>make -C libavcodec/libpostproc install</command></userinput></screen>
 
 <para>You will need <filename>codecs.conf</filename> only if you want to
@@ -207,7 +234,14 @@
 it. Ensure any changes you make to <filename>codecs.conf</filename> achieve 
 the desired results, as incorrect entries in this file have been known to
-cause errors. If necessary, create the file using the following command.</para>
-
-<screen><userinput><command>cp etc/codecs.conf /etc/mplayer</command></userinput></screen>
+cause errors and render the player unusable. If necessary, create the file 
+using the following command.</para>
+
+<screen><userinput><command>install -m644 etc/codecs.conf /etc/mplayer</command></userinput></screen>
+
+<para>You may also want to copy all the default configuration files to
+<filename class='directory'>/etc/mplayer</filename> for future reference or 
+more customization ability.</para>
+
+<screen><userinput><command>install -m644 etc/*.conf /etc/mplayer</command></userinput></screen>
 </sect3>
 
@@ -251,10 +285,16 @@
 <application>MPlayer</application>, you need to ensure a link exists 
 from your <acronym>DVD</acronym> drive to <filename>/dev/dvd</filename>. If
-necessary, create the link using the following command:</para>
-
-<screen><userinput><command>ln -s /dev/<replaceable>[dvd drive]</replaceable> /dev/dvd</command></userinput></screen>
+necessary, create the link using the following commands:</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/udev/rules.d/24-dvd.rules &lt;&lt; "EOF"</command>
+# Create a /dev/dvd symlink 
+ 
+KERNEL="<replaceable>[dvd drive]</replaceable>", SYMLINK="dvd"
+ 
+<command>EOF
+udevstart</command></userinput></screen>
 
 <para>Replace <replaceable>[dvd drive]</replaceable> with whatever
-device is appropriate, for example <filename>/dev/hdc</filename>. If
+device is appropriate, for example <filename>hdc</filename>. If
 you don't know which device to choose, type:</para>
 
@@ -265,5 +305,4 @@
 <screen><userinput>hdc: Pioneer DVD-ROM ATAPIModel DVD-114 0110,
 ATAPI CD/DVD-ROM drive</userinput></screen>
-
 </sect3>
 
@@ -271,5 +310,5 @@
 
 <sect2>
-<title>Configuring MPlayer</title>
+<title>Configuring <application>MPlayer</application></title>
 
 <sect3><title>Config files</title>
@@ -278,4 +317,14 @@
 </sect3>
 
+<sect3><title>Configuration information</title>
+<para>Typically, there's no configuration required for the system-wide files 
+in <filename class='directory'>/etc/mplayer</filename> (in fact, this 
+directory is empty unless you copied the default files as mentioned above). 
+Configuration can be accomplished by choosing the configuration button located 
+on the <application>MPlayer</application> <acronym>GUI</acronym>. Any 
+configuration changes made here will be copied to the user's 
+<filename>~/.mplayer</filename> directory.</para>
+</sect3>
+
 </sect2>
 
@@ -284,5 +333,5 @@
 
 <para>The <application>MPlayer</application> package contains 
-<command>mplayer</command>,
+<command>mplayer</command>, 
 <command>gmplayer</command> and 
 <command>mencoder</command>.</para>
@@ -312,6 +361,7 @@
 
 <sect3><title>gmplayer</title>
-<para><command>gmplayer</command> is <application>MPlayer</application> with a 
-graphical user interface.</para></sect3>
+<para><command>gmplayer</command> is a symlink to 
+<command>mplayer</command> which brings up the graphical user 
+interface component of <application>MPlayer</application>.</para></sect3>
 
 <sect3><title>mencoder</title>
