PERFORCE change 140976 for review

John Birrell jb at FreeBSD.org
Thu May 1 08:54:56 UTC 2008 

http://perforce.freebsd.org/chv.cgi?CH=140976

Change 140976 by jb at freebsd3 on 2008/05/01 08:54:51

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#9 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#18 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/gjournal-desktop/Makefile#1 branch
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#1 branch
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#15 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#72 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/install/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/multimedia/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/users/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/share/images/articles/gjournal-desktop/disklabel1.png#1 branch
.. //depot/projects/dtrace/doc/share/images/articles/gjournal-desktop/disklabel2.png#1 branch
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#21 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#15 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#18 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/users/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#28 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#10 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/Makefile#7 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/printing/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/virtualization/chapter.sgml#2 integrate
.. //depot/projects/dtrace/ports/GIDs#21 integrate
.. //depot/projects/dtrace/ports/MOVED#82 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#7 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sdl.mk#7 integrate
.. //depot/projects/dtrace/ports/UIDs#25 integrate
.. //depot/projects/dtrace/ports/UPDATING#68 integrate
.. //depot/projects/dtrace/src/Makefile#21 integrate
.. //depot/projects/dtrace/src/UPDATING#30 integrate
.. //depot/projects/dtrace/src/bin/sh/arith.h#4 integrate
.. //depot/projects/dtrace/src/bin/sh/arith.y#4 integrate
.. //depot/projects/dtrace/src/bin/sh/expand.c#6 integrate
.. //depot/projects/dtrace/src/bin/sh/shell.h#4 integrate
.. //depot/projects/dtrace/src/etc/network.subr#15 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#33 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.h#10 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kld.c#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kthr.c#10 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#7 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#8 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#6 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#7 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/tls.c#8 integrate
.. //depot/projects/dtrace/src/lib/libc/powerpc/softfloat/milieu.h#1 branch
.. //depot/projects/dtrace/src/lib/libc/powerpc/softfloat/powerpc-gcc.h#1 branch
.. //depot/projects/dtrace/src/lib/libc/powerpc/softfloat/softfloat.h#1 branch
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#22 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/sctp_generic_recvmsg.2#3 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/sctp_peeloff.2#3 integrate
.. //depot/projects/dtrace/src/lib/libgssapi/gss_accept_sec_context.c#5 integrate
.. //depot/projects/dtrace/src/lib/libgssapi/gss_test_oid_set_member.c#4 integrate
.. //depot/projects/dtrace/src/lib/libgssapi/gss_utils.c#5 integrate
.. //depot/projects/dtrace/src/lib/libstand/Makefile#8 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_create.c#12 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_exit.c#10 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#20 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_resume_np.c#5 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_sem.c#10 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_sig.c#12 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_suspend_np.c#6 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.c#13 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.h#11 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#35 integrate
.. //depot/projects/dtrace/src/share/man/man4/ddb.4#16 integrate
.. //depot/projects/dtrace/src/share/man/man4/iwn.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/termios.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/uscanner.4#10 integrate
.. //depot/projects/dtrace/src/share/man/man9/BUS_SETUP_INTR.9#7 integrate
.. //depot/projects/dtrace/src/share/man/man9/kproc.9#3 integrate
.. //depot/projects/dtrace/src/share/man/man9/kthread.9#6 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.endian.mk#6 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#19 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#47 integrate
.. //depot/projects/dtrace/src/sys/conf/files#87 integrate
.. //depot/projects/dtrace/src/sys/conf/files.powerpc#19 integrate
.. //depot/projects/dtrace/src/sys/conf/kern.mk#10 integrate
.. //depot/projects/dtrace/src/sys/conf/ldscript.mips#2 integrate
.. //depot/projects/dtrace/src/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/dtrace/src/sys/conf/options#49 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/iwn/LICENSE#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#20 integrate
.. //depot/projects/dtrace/src/sys/dev/bfe/if_bfe.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#28 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#18 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/iwn/if_iwn.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/iwn/if_iwnreg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/iwn/if_iwnvar.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/brgphyreg.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/miidevs#16 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2560.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ums.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#32 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#10 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/NOTES#21 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_kthread.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_mbuf.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#32 integrate
.. //depot/projects/dtrace/src/sys/mips/include/pmap.h#3 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#42 integrate
.. //depot/projects/dtrace/src/sys/modules/iwn/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/iwnfw/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net/bpf.c#21 integrate
.. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#16 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw.h#10 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/locore.S#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#10 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/mmu_oea.c#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/mp_cpudep.c#1 branch
.. //depot/projects/dtrace/src/sys/powerpc/aim/swtch.S#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/trap_subr.S#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/vm_machdep.c#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/NOTES#14 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/cpufunc.h#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/pcpu.h#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/smp.h#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/mpc85xx/mpc85xx.c#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/intr_machdep.c#14 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/mp_machdep.c#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/openpic.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.h#9 integrate
.. //depot/projects/dtrace/src/sys/sys/mbuf.h#16 integrate
.. //depot/projects/dtrace/src/sys/sys/umtx.h#13 integrate
.. //depot/projects/dtrace/src/sys/sys/user.h#9 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_kern.c#12 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_map.c#17 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_map.h#7 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#13 integrate
.. //depot/projects/dtrace/src/tools/tools/mfc/mfc.pl#5 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/README#5 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.dfs#2 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/main.c#6 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.c#5 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.h#4 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.c#9 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanwatch/wlanwatch.c#6 integrate
.. //depot/projects/dtrace/src/usr.bin/fstat/Makefile#6 integrate
.. //depot/projects/dtrace/src/usr.bin/fstat/fstat.1#4 integrate
.. //depot/projects/dtrace/src/usr.bin/fstat/zfs/zfs.c#4 delete
.. //depot/projects/dtrace/src/usr.bin/stat/stat.1#5 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/ctl.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/ctl_transact.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/display.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/get_addrs.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/get_iface.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/get_names.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/init_disp.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/invite.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/io.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/look_up.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/msgs.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/talk.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/talk/talk.h#4 integrate
.. //depot/projects/dtrace/www/de/Makefile#9 integrate
.. //depot/projects/dtrace/www/de/community.sgml#6 delete
.. //depot/projects/dtrace/www/de/community.xsl#1 branch
.. //depot/projects/dtrace/www/de/developers.sgml#11 integrate
.. //depot/projects/dtrace/www/de/share/sgml/navibar.l10n.ent#9 integrate
.. //depot/projects/dtrace/www/de/share/sgml/news.xml#21 integrate
.. //depot/projects/dtrace/www/en/cgi/man.cgi#11 integrate
.. //depot/projects/dtrace/www/en/docproj/translations.sgml#12 integrate
.. //depot/projects/dtrace/www/en/docs/books.sgml#16 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.57 2008/04/11 00:18:27 danger Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.58 2008/04/28 15:44:35 gabor Exp $
 
 SUBDIR =
 SUBDIR+= 5-roadmap
@@ -24,6 +24,7 @@
 SUBDIR+= formatting-media
 SUBDIR+= freebsd-questions
 SUBDIR+= geom-class
+SUBDIR+= gjournal-desktop
 SUBDIR+= hats
 SUBDIR+= hubs
 SUBDIR+= ipsec-must

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#18 (text+ko) ====

@@ -13,7 +13,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.272 2008/02/02 07:57:44 imp Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.273 2008/04/27 12:01:34 gabor Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -1126,7 +1126,8 @@
 	<para>You should add your PGP or GnuPG key to
 	  <filename>doc/share/pgpkeys</filename> (and if you do not
 	  have a key, you should create one).  Do not forget to commit
-	  the updated <filename>doc/share/pgpkeys/pgpkeys.ent</filename>.</para>
+	  the updated <filename>doc/share/pgpkeys/pgpkeys.ent</filename>
+	  and <filename>doc/share/pgpkeys/pgpkeys-developers.sgml</filename>.</para>
 
 	<para>&a.des; has
 	  written a shell script to make this extremely simple.  See the
@@ -1409,7 +1410,7 @@
 
     <para>You can run a local copy of GNATS, and then integrate the FreeBSD
       GNATS tree in to it using CVSup.  Then you can run GNATS commands
-      locally, or use other interfaces, such as <command>tkgnats</command>.
+      locally.
       This lets you query the PR database without needing to be connected to
       the Internet.</para>
 
@@ -1492,9 +1493,6 @@
 
 	<screen>&prompt.root; <userinput>query-pr -c docs -s open</userinput></screen>
 
-	<para>Other interfaces, such as that provided by the
-	  <filename role="package">databases/tkgnats</filename> port should also work
-	  nicely.</para>
       </step>
 
       <step>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#7 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.128 2007/08/09 09:09:26 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.129 2008/04/27 12:10:52 gabor Exp $
 -->
 
 <chapter id="multimedia">
@@ -293,7 +293,7 @@
 
     <screen>&prompt.user; <userinput>cat <replaceable>filename</replaceable> &gt; /dev/dsp</userinput></screen>
 
-    <para>where <replaceable>filename</replaceable> can be any file.
+    <para>where <filename><replaceable>filename</replaceable></filename> can be any file.
       This command line should produce some noise, confirming the
       sound card is actually working.</para>
 
@@ -494,7 +494,7 @@
 MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
 </screen>
 
-      <para><literal>/dev/dsp1.0</literal> should be replaced with the
+      <para><devicename><replaceable>/dev/dsp1.0</replaceable></devicename> should be replaced with the
 	<devicename>dsp</devicename> device entry on your system.</para>
 
     </sect2>
@@ -556,8 +556,8 @@
 	<filename role="package">audio/lame</filename> in the ports tree.</para>
 
       <para>Using the ripped WAV files, the following command will
-	convert <filename>audio01.wav</filename> to
-	<filename>audio01.mp3</filename>:</para>
+	convert <filename><replaceable>audio01.wav</replaceable></filename> to
+	<filename><replaceable>audio01.mp3</replaceable></filename>:</para>
 
       <screen>&prompt.root; <userinput>lame -h -b <replaceable>128</replaceable> \
 --tt "<replaceable>Foo Song Title</replaceable>" \
@@ -577,7 +577,7 @@
 	<option>--t</option> indicate ID3 tags, which usually contain
 	song information, to be embedded within the MP3 file.
 	Additional encoding options can be found by consulting the
-	lame man page.</para>
+	<application>lame</application> man page.</para>
     </sect2>
 
     <sect2 id="mp3-decoding">
@@ -644,7 +644,7 @@
       <procedure>
 	<step>
 	  <para>Run <command>mpg123 -s <replaceable>audio01.mp3</replaceable>
-	    &gt; audio01.pcm</command></para>
+	    &gt; <replaceable>audio01.pcm</replaceable></command></para>
 	</step>
       </procedure>
 
@@ -1069,18 +1069,18 @@
 	  through one of the various video interfaces set the
 	  <option>-vo</option> option:</para>
 
-	  <screen>&prompt.user; <userinput>mplayer -vo xv testfile.avi</userinput></screen>
-	  <screen>&prompt.user; <userinput>mplayer -vo sdl testfile.avi</userinput></screen>
-	  <screen>&prompt.user; <userinput>mplayer -vo x11 testfile.avi</userinput></screen>
-	  <screen>&prompt.root; <userinput>mplayer -vo dga testfile.avi</userinput></screen>
-	  <screen>&prompt.root; <userinput>mplayer -vo 'sdl:dga' testfile.avi</userinput></screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo xv <replaceable>testfile.avi</replaceable></userinput></screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo sdl <replaceable>testfile.avi</replaceable></userinput></screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo x11 <replaceable>testfile.avi</replaceable></userinput></screen>
+	  <screen>&prompt.root; <userinput>mplayer -vo dga <replaceable>testfile.avi</replaceable></userinput></screen>
+	  <screen>&prompt.root; <userinput>mplayer -vo 'sdl:dga' <replaceable>testfile.avi</replaceable></userinput></screen>
 
 	<para>It is worth trying all of these options, as their relative
 	  performance depends on many factors and will vary significantly
 	  with hardware.</para>
 
 	<para>To play from a DVD, replace the
-	 <filename>testfile.avi</filename> with <option>dvd://<replaceable>N</replaceable> -dvd-device
+	 <filename><replaceable>testfile.avi</replaceable></filename> with <option>dvd://<replaceable>N</replaceable> -dvd-device
 	 <replaceable>DEVICE</replaceable></option> where <replaceable>N</replaceable> is
 	 the title number to play and
 	 <filename><replaceable>DEVICE</replaceable></filename> is the
@@ -1141,7 +1141,7 @@
 	 or bad performance.  Here are a couple of examples to get
 	 you going.  First a simple copy:</para>
 
-	 <screen>&prompt.user; <userinput>mencoder input.avi -oac copy -ovc copy -o output.avi</userinput></screen>
+	 <screen>&prompt.user; <userinput>mencoder <replaceable>input.avi</replaceable> -oac copy -ovc copy -o <replaceable>output.avi</replaceable></userinput></screen>
 
          <para>Improper combinations of command line options can yield
 	 output files that are
@@ -1149,16 +1149,16 @@
 	 just want to rip to a file, stick to the <option>-dumpfile</option>
 	 in <command>mplayer</command>.</para>
 
-	 <para>To convert <filename>input.avi</filename> to the MPEG4
+	 <para>To convert <filename><replaceable>input.avi</replaceable></filename> to the MPEG4
 	 codec with MPEG3 audio encoding (<filename role="package">audio/lame</filename> is required):</para>
 
-	 <screen>&prompt.user; <userinput>mencoder input.avi -oac mp3lame -lameopts br=192 \
-	 -ovc lavc -lavcopts vcodec=mpeg4:vhq -o output.avi</userinput></screen>
+	 <screen>&prompt.user; <userinput>mencoder <replaceable>input.avi</replaceable> -oac mp3lame -lameopts br=192 \
+	 -ovc lavc -lavcopts vcodec=mpeg4:vhq -o <replaceable>output.avi</replaceable></userinput></screen>
 
 	 <para>This has produced output playable by <command>mplayer</command>
 	 and <command>xine</command>.</para>
 
-	 <para><filename>input.avi</filename> can be replaced with
+	 <para><filename><replaceable>input.avi</replaceable></filename> can be replaced with
 	   <option>dvd://1 -dvd-device /dev/dvd</option> and run as
 	   <username>root</username> to re-encode a DVD title
 	   directly.  Since you are likely to be dissatisfied with
@@ -1202,7 +1202,7 @@
     <para>Alternatively, it may be invoked to play a file immediately
       without the GUI with the command:</para>
 
-      <screen>&prompt.user; <userinput>xine -g -p mymovie.avi</userinput></screen>
+      <screen>&prompt.user; <userinput>xine -g -p <replaceable>mymovie.avi</replaceable></userinput></screen>
 
     </sect3>
 
@@ -1230,11 +1230,11 @@
       example to show how to convert a DivX file into a PAL MPEG-1
       file (PAL VCD):</para>
 
-      <screen>&prompt.user; <userinput>transcode -i input.avi -V --export_prof vcd-pal -o output_vcd</userinput>
-&prompt.user; <userinput>mplex -f 1 -o output_vcd.mpg output_vcd.m1v output_vcd.mpa</userinput></screen>
+      <screen>&prompt.user; <userinput>transcode -i <replaceable>input.avi</replaceable> -V --export_prof vcd-pal -o output_vcd</userinput>
+&prompt.user; <userinput>mplex -f 1 -o <replaceable>output_vcd.mpg output_vcd.m1v output_vcd.mpa</replaceable></userinput></screen>
 
     <para>The resulting MPEG file,
-      <filename>output_vcd.mpg</filename>, is ready to be played with
+      <filename><replaceable>output_vcd.mpg</replaceable></filename>, is ready to be played with
       <application>MPlayer</application>.  You could even burn the
       file on a CD-R media to create a Video CD, in this case you will
       need to install and use both <filename
@@ -1728,7 +1728,7 @@
 	example, our USB scanner uses the device node
 	<filename>/dev/uscanner0</filename> which is owned by the
 	<groupname>operator</groupname> group.  Adding the user
-	<username>joe</username> to the
+	<username><replaceable>joe</replaceable></username> to the
 	<groupname>operator</groupname> group will allow him to use
 	the scanner:</para>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#15 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.279 2008/03/29 04:00:09 ganbold Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.281 2008/04/27 12:19:23 gabor Exp $
 -->
 
 <chapter id="ports">
@@ -318,7 +318,7 @@
         Ports Collection's built-in search mechanism.  To use the
         search feature, you will need to be in the
         <filename>/usr/ports</filename> directory.  Once in that
-        directory, run <command>make search
+        directory, run <command>make <maketarget>search</maketarget>
         name=<replaceable>program-name</replaceable></command> where
         <replaceable>program-name</replaceable> is the name of the
         program you want to find.  For example, if you were looking
@@ -341,8 +341,8 @@
         will not be covered here.</para>
 
       <para>For more in-depth searching you can also use <command>make
-       search key=<replaceable>string</replaceable></command> where
-       <replaceable>string</replaceable> is some text to search for.
+       <maketarget>search</maketarget> key=<replaceable>string</replaceable></command>
+       where <replaceable>string</replaceable> is some text to search for.
        This searches port names, comments, descriptions and
        dependencies and can be used to find ports which relate to a
        particular subject if you do not know the name of the program
@@ -622,16 +622,17 @@
 	<title>CVSup Method</title>
 
 	<para>This is a quick method for getting and keeping your copy of the
-	  Ports Collection up to date using <application>CVSup</application> protocol.
-	  If you want to learn more about <application>CVSup</application>, see
-	  <link linkend="cvsup">Using CVSup</link>.</para>
+	  Ports Collection up to date using <application>CVSup</application>
+	  protocol.  If you want to learn more about
+	  <application>CVSup</application>, see <link
+	    linkend="cvsup">Using CVSup</link>.</para>
 
 	<note>
 	  <para>The implementation of <application>CVSup</application> protocol
-	    included with the &os; system is called <application>csup</application>.
-	    It first appeared in &os; 6.2.  Users of older &os; releases can install
-	    it via the <filename role="package">net/csup</filename>
-	    port/package.</para>
+	    included with the &os; system is called
+	    <application>csup</application>.  It first appeared in &os; 6.2.
+	    Users of older &os; releases can install it via the <filename
+	      role="package">net/csup</filename> port/package.</para>
 	</note>
 
 	<para>Make sure <filename role="directory">/usr/ports</filename>
@@ -691,8 +692,8 @@
 	</step>
 
 	<step>
-	  <para>Running the &man.csup.1; command later will download and apply all
-	    the recent changes to your Ports Collection, except
+	  <para>Running the &man.csup.1; command later will download and apply
+	    all the recent changes to your Ports Collection, except
 	    actually rebuilding the ports for your own system.</para>
 	</step>
       </procedure>
@@ -700,10 +701,10 @@
       <procedure>
 	<title>Portsnap Method</title>
 
-	<para><application>Portsnap</application> is an alternative system for distributing the
-	  Ports Collection.  It was first included in &os;&nbsp;6.0.  On older
-	  systems, you can install it from <filename
-	  role="package">ports-mgmt/portsnap</filename> package:</para>
+	<para><application>Portsnap</application> is an alternative system for
+	  distributing the Ports Collection.  It was first included in
+	  &os;&nbsp;6.0.  On older systems, you can install it from <filename
+	    role="package">ports-mgmt/portsnap</filename> package:</para>
 
 	<screen>&prompt.root; <userinput>pkg_add -r portsnap</userinput></screen>
 
@@ -720,7 +721,8 @@
 	    With previous versions of
 	    <application>Portsnap</application>, you will have to
 	    create an empty directory <filename
-	    role="directory">/usr/ports</filename> if it does not exists:</para>
+	      role="directory">/usr/ports</filename> if it does not
+	    exists:</para>
 
 	  <screen>&prompt.root; <userinput>mkdir /usr/ports</userinput></screen>
 	</step>
@@ -946,7 +948,7 @@
 	  returned to your prompt.  The next step is to install the
 	  port.  In order to install it, you simply need to tack one word
 	  onto the <command>make</command> command, and that word is
-	  <command>install</command>:</para>
+	  <maketarget>install</maketarget>:</para>
 
         <screen>&prompt.root; <userinput>make install</userinput>
 ===&gt;  Installing for lsof-4.57
@@ -981,8 +983,10 @@
 
         <note>
           <para>You can save two extra steps by just running <command>make
-	    install clean</command> instead of <command>make</command>,
-	    <command>make install</command> and <command>make clean</command>
+	    <maketarget>install clean</maketarget></command> instead of
+	    <command>make</command>,
+	    <command>make <maketarget>install</maketarget></command> and
+	    <command>make <maketarget>clean</maketarget></command>
 	    as three separate steps.</para>
 	</note>
 
@@ -1042,7 +1046,7 @@
 	<note><para>You can build all the ports in a category or as a
 	  whole by running <command>make</command> in the top level
 	  directory, just like the aforementioned <command>make
-	  <makevar>fetch</makevar></command> method.  This is
+	  <maketarget>fetch</maketarget></command> method.  This is
 	  dangerous, however, as some ports cannot co-exist.  In other
 	  cases, some ports can install two different files with the
 	  same filename.</para></note>
@@ -1128,15 +1132,15 @@
 	  It is not uncommon for users to wish to revisit this menu to add,
 	  remove, or change these options after a port has been built.  There
 	  are many ways to do this.  One option is to go into the directory
-	  containing the port and type <command>make</command>
-	  <maketarget>config</maketarget>, which will simply present the menu
-	  again with the same options selected.  Another option is to use
-	  <command>make</command> <maketarget>showconfig</maketarget> which
-	  will show you all the configuration options for the port.  Yet
-	  another option is to execute <command>make</command>
-	  <maketarget>rmconfig</maketarget> which will remove all selected
-	  options and allow you to start over.  All of these options, and
-	  others, are explained in great detail in in the man page for
+	  containing the port and type <command>make
+	  <maketarget>config</maketarget></command>, which will simply present
+	  the menu again with the same options selected.  Another option is to
+	  use <command>make <maketarget>showconfig</maketarget></command>,
+	  which will show you all the configuration options for the port.  Yet
+	  another option is to execute <command>make
+	  <maketarget>rmconfig</maketarget></command> which will remove all
+	  selected options and allow you to start over.  All of these options,
+	  and others, are explained in great detail in in the man page for
 	  &man.ports.7;.</para>
       </sect3>
     </sect2>
@@ -1200,8 +1204,8 @@
       <para>The <application>portupgrade</application> utility is designed
 	to easily upgrade installed ports.  It is available from the <filename
 	role="package">ports-mgmt/portupgrade</filename> port.  Install it like
-	any other port, using the <command>make <makevar>install
-	clean</makevar></command> command:</para>
+	any other port, using the <command>make <maketarget>install
+	clean</maketarget></command> command:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/ports-mgmt/portupgrade</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1253,7 +1257,8 @@
 
 	<para><application>Portmanager</application> is another utility for
 	  easy upgrading of installed ports.  It is available from the
-	  <filename role="package">ports-mgmt/portmanager</filename> port:</para>
+	  <filename role="package">ports-mgmt/portmanager</filename>
+	  port:</para>
 
 	<screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/portmanager</filename></userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1267,9 +1272,9 @@
 	  confirmation of every step <application>Portmanager</application>
 	  will perform.  <application>Portmanager</application> can also be
 	  used to install new ports on the system.  Unlike the usual
-	  <command>make install clean</command> command, it will upgrade all
-	  the dependencies prior to building and installing the
-	  selected port.</para>
+	  <command>make <maketarget>install clean</maketarget></command>
+	  command, it will upgrade all the dependencies prior to building and
+	  installing the selected port.</para>
 
 	<screen>&prompt.root; <userinput>portmanager <replaceable>x11/gnome2</replaceable></userinput></screen>
 
@@ -1296,7 +1301,8 @@
 	  system (it does not depend upon other ports) and uses the
 	  information in <filename class="directory">/var/db/pkg/</filename>
 	  to determine which ports to upgrade.  It is available from the
-	  <filename role="package">ports-mgmt/portmaster</filename> port:</para>
+	  <filename role="package">ports-mgmt/portmaster</filename>
+	  port:</para>
 
 	<screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/portmaster</filename></userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1385,9 +1391,10 @@
       <para>Using the Ports Collection will use up disk
 	space over time.  After building and installing software from the
 	ports, you should always remember to clean up
-	the temporary <filename class="directory">work</filename> directories using the <command>make
-	<makevar>clean</makevar></command> command.  You can sweep the whole
-	Ports Collection with the following command:</para>
+	the temporary <filename class="directory">work</filename> directories
+	using the <command>make	<maketarget>clean</maketarget></command>
+	command.  You can sweep the whole Ports Collection with the following
+	command:</para>
 
       <screen>&prompt.root; <userinput>portsclean -C</userinput></screen>
 
@@ -1411,7 +1418,8 @@
 
       <para>Do not forget to remove the installed ports once you no longer need
 	them.  A nice tool to help automate this task is available from the
-	<filename role="package">ports-mgmt/pkg_cutleaves</filename> port.</para>
+	<filename role="package">ports-mgmt/pkg_cutleaves</filename>
+	port.</para>
     </sect2>
 
   </sect1>
@@ -1503,8 +1511,8 @@
 
 	<listitem>
 	  <para>Ask the maintainer of the port for help.  Type
-	    <command>make maintainer</command> or read the
-	    <filename>Makefile</filename> to find the maintainer's
+	    <command>make <maketarget>maintainer</maketarget></command> or read
+	    the <filename>Makefile</filename> to find the maintainer's
 	    email address.  Remember to include the name and version
 	    of the port (send the <literal>&dollar;FreeBSD:</literal>
 	    line from the <filename>Makefile</filename>) and the
@@ -1516,8 +1524,9 @@
 	      instead by a <ulink
 	      url="&url.articles.mailing-list-faq;/article.html">mailing
 	      list</ulink>.  Many, but not all, of these addresses look like
-	      <email role="nolink">freebsd-listname at FreeBSD.org</email>.  Please
-	      take this into account when phrasing your questions.</para>
+	      <email role="nolink">freebsd-listname at FreeBSD.org</email>.
+	      Please take this into account when phrasing your
+	      questions.</para>
 
 	    <para>In particular, ports shown as maintained by
 	      <email role="nolink">freebsd-ports at FreeBSD.org</email> are
@@ -1537,8 +1546,8 @@
 	  <para>Fix it!  The <ulink
 	    url="&url.books.porters-handbook;/index.html">Porter's
 	    Handbook</ulink> includes detailed information on the
-	    <quote>Ports</quote> infrastructure so that you can fix the occasional
-	    broken port or even submit your own!</para>
+	    <quote>Ports</quote> infrastructure so that you can fix the
+	    occasional broken port or even submit your own!</para>
 	</listitem>
 
 	<listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#14 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.112 2008/04/13 15:13:45 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.113 2008/04/29 19:11:39 blackend Exp $
 -->
 
 <chapter id="printing">
@@ -1086,7 +1086,7 @@
 	      users print, you might want to protect the spooling
 	      directory so it is not publicly accessible.  Spooling
 	      directories should be owned and be readable, writable, and
-	      searchable by user daemon and group daemon, and no one else.
+	      searchable by user <username>daemon</username> and group <groupname>daemon</groupname>, and no one else.
 	      We will do this for our example printers:</para>
 
 	    <screen>&prompt.root; <userinput>chown daemon:daemon /var/spool/lpd/rattan</userinput>
@@ -1913,8 +1913,8 @@
             
         <programlisting>:if=/usr/local/libexec/ifhp:</programlisting>
 
-        <para>That is it.  You can type <command>lpr plain.text</command> and
-          <filename>lpr whatever.ps</filename> and both should print
+        <para>That is it.  You can type <command>lpr <replaceable>plain.text</replaceable></command> and
+          <filename>lpr <replaceable>whatever.ps</replaceable></filename> and both should print
           successfully.</para>
       </sect3>
       
@@ -1940,8 +1940,8 @@
             we convert the DVI file into &postscript;.  The command sequence
             goes like this:</para>
                 
-          <screen>&prompt.user; <userinput>dvips seaweed-analysis.dvi</userinput>
-&prompt.user; <userinput>lpr seaweed-analysis.ps</userinput></screen>
+          <screen>&prompt.user; <userinput>dvips <replaceable>seaweed-analysis.dvi</replaceable></userinput>
+&prompt.user; <userinput>lpr <replaceable>seaweed-analysis.ps</replaceable></userinput></screen>
                 
           <para>By installing a conversion filter for DVI files, we can skip
             the hand conversion step each time by having 
@@ -1949,7 +1949,7 @@
             Now, each time we get a DVI file, we are just one step away from
             printing it:</para>
               
-          <screen>&prompt.user; <userinput>lpr -d seaweed-analysis.dvi</userinput></screen>
+          <screen>&prompt.user; <userinput>lpr -d <replaceable>seaweed-analysis.dvi</replaceable></userinput></screen>
                 
           <para>We got <application>LPD</application> to do the DVI file 
 	    conversion for us by specifying
@@ -3076,7 +3076,7 @@
           <literal>rattan</literal> and <literal>bamboo</literal>.  If, for
           example, a user on <hostid>orchid</hostid> typed:</para>
               
-          <screen>&prompt.user; <userinput>lpr -P bamboo -d sushi-review.dvi</userinput></screen>
+          <screen>&prompt.user; <userinput>lpr -P bamboo -d <replaceable>sushi-review.dvi</replaceable></userinput></screen>
 
         <para>the <application>LPD</application> system on <hostid>orchid</hostid>
 	  would copy the job to the spooling
@@ -3248,7 +3248,7 @@
           multiple times, or from submitting the same file multiple times in
           one job like this:</para>
               
-        <screen>&prompt.user; <userinput>lpr forsale.sign forsale.sign forsale.sign forsale.sign forsale.sign</userinput></screen>
+        <screen>&prompt.user; <userinput>lpr <replaceable>forsale.sign forsale.sign forsale.sign forsale.sign forsale.sign</replaceable></userinput></screen>
               
         <para>There are many ways to prevent this abuse (including ignoring
           it) which you are free to explore.</para>
@@ -3279,7 +3279,7 @@
             
         <para>For example, we will let anyone access the printer
           <literal>rattan</literal>, but only those in group
-          <literal>artists</literal> can use <literal>bamboo</literal>.  Here
+          <groupname>artists</groupname> can use <literal>bamboo</literal>.  Here
           is the familiar <filename>/etc/printcap</filename> for host
           <hostid>rose</hostid>:</para>
 
@@ -3347,7 +3347,7 @@
             
         <para>Let us add limits to our example printers
           <literal>rattan</literal> and <literal>bamboo</literal>.  Since
-          those artists' &postscript; files tend to be large, we will limit them
+          those <groupname>artists</groupname>' &postscript; files tend to be large, we will limit them
           to five megabytes. We will put no limit on the plain text line
           printer:</para>
 
@@ -3586,7 +3586,7 @@
         <para><application>LPD</application> starts <command>lpf</command>
 	  with page width and length
           arguments (from the <literal>pw</literal> and <literal>pl</literal>
-          capabilities).  <command>lpf</command> uses these arguments to
+          capabilities).  The <command>lpf</command> filter uses these arguments to
           determine how much paper will be used.  After sending the file to
           the printer, it then writes an accounting entry in the accounting
           file.  The entries look like this:</para>
@@ -3608,7 +3608,7 @@
             
         <para>When you are ready to charge users for printouts, run the
             &man.pac.8; program.  Just change to the spooling directory for
-          the printer you want to collect on and type <literal>pac</literal>.
+          the printer you want to collect on and type <command>pac</command>.
           You will get a dollar-centric summary like the following:</para>
             
         <screen>  Login               pages/feet   runs    price
@@ -3722,11 +3722,11 @@
           can override this value when you run &man.pac.8; with the
           <option>-p</option> option.  The units for the <option>-p</option>
           option are in dollars, though, not hundredths of cents.  For
-          example,
+          example,</para>
               
           <screen>&prompt.root; <userinput>pac -p1.50</userinput></screen>
               
-          makes each page cost one dollar and fifty cents.  You can really
+        <para>makes each page cost one dollar and fifty cents.  You can really
           rake in the profits by using this option.</para>
 
         <para>Finally, running <command>pac -s</command> will save the summary
@@ -4014,7 +4014,7 @@
 	  available from other hosts. The following command sequence
 	  demonstrates this:</para>
 	      
-	<screen>&prompt.user; <userinput>lpr -P rattan myfile</userinput>
+	<screen>&prompt.user; <userinput>lpr -P rattan <replaceable>myfile</replaceable></userinput>
 &prompt.user; <userinput>rlogin orchid</userinput>
 &prompt.user; <userinput>lpq -P rattan</userinput>
 Rank   Owner	  Job  Files                          Total Size
@@ -4048,10 +4048,10 @@
 	    
         <indexterm><primary>&tex;</primary></indexterm>
 	<para>For example, the following command prints a DVI file (from the
-	  &tex; typesetting system) named <filename>fish-report.dvi</filename>
+	  &tex; typesetting system) named <filename><replaceable>fish-report.dvi</replaceable></filename>
 	  to the printer named <literal>bamboo</literal>:</para>
 	      
-	<screen>&prompt.user; <userinput>lpr -P bamboo -d fish-report.dvi</userinput></screen>
+	<screen>&prompt.user; <userinput>lpr -P bamboo -d <replaceable>fish-report.dvi</replaceable></userinput></screen>
 	      
 	<para>These options apply to every file in the job, so you cannot mix
 	  (say) DVI and ditroff files together in a job. Instead, submit the
@@ -4207,10 +4207,10 @@
 		  Multiple Copies</link>.</para>
 
 	      <para>This example prints three copies of
-		<filename>parser.c</filename> followed by three copies of
-		<filename>parser.h</filename> to the default printer:</para>
+		<filename><replaceable>parser.c</replaceable></filename> followed by three copies of
+		<filename><replaceable>parser.h</replaceable></filename> to the default printer:</para>
 		      
-	      <screen>&prompt.user; <userinput>lpr -#3 parser.c parser.h</userinput></screen>
+	      <screen>&prompt.user; <userinput>lpr -#3 <replaceable>parser.c parser.h</replaceable></userinput></screen>
 	    </listitem>
 	  </varlistentry>
 	  

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#72 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.928 2008/04/25 15:20:29 dfr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.929 2008/04/27 09:49:47 davidxu Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11831,6 +11831,11 @@
 		  </row>
 
 		  <row>
+		    <entry>7.0-STABLE after the MFC of umtx features. </entry>
+		    <entry>700105</entry>
+		  </row>
+
+		  <row>
 		    <entry>7.0-STABLE after the MFC of &man.write.2; support
 		      to &man.psm.4;.</entry>
 		    <entry>700106</entry>

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/install/chapter.sgml#5 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.388
+     Original revision 1.389
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/install/chapter.sgml,v 1.20 2008/03/03 09:17:38 ganbold Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/install/chapter.sgml,v 1.21 2008/05/01 04:31:23 ganbold Exp $
 -->
 
 <chapter id="install">
@@ -155,7 +155,7 @@
       </sect3>
 
       <sect3>
-	<title>&os;/&arch.amd64; архитектур</title>
+	<title>&os;/&arch.amd64;</title>
 
 	<para>&os;/&arch.amd64;-г ажиллуулах боломжтой хоёр ангиллын процессор 
 	  байдаг. Эхнийх нь &amd.athlon;64, &amd.athlon;64-FX, &amd.opteron; 

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/multimedia/chapter.sgml#2 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.128
+     Original revision 1.129
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/multimedia/chapter.sgml,v 1.5 2007/08/10 11:28:25 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/multimedia/chapter.sgml,v 1.6 2008/05/01 04:31:23 ganbold Exp $
 -->
 
 <chapter id="multimedia">
@@ -301,7 +301,7 @@
 
     <screen>&prompt.user; <userinput>cat <replaceable>filename</replaceable> &gt; /dev/dsp</userinput></screen>
 
-    <para>Энд байгаа <replaceable>filename</replaceable> нь ямар ч 
+    <para>Энд байгаа <filename><replaceable>filename</replaceable></filename> нь ямар ч 
 	файл байж болно. Энэ тушаалын мөр нь шуугиан үүсгэх ёстой бөгөөд энэ нь 
 	уг дууны карт ажиллаж байгааг баталж байгаа юм.</para>
 
@@ -494,7 +494,7 @@
 MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
 </screen>
 
-      <para><literal>/dev/dsp1.0</literal>-ийг өөрийн систем дээрх 
+      <para><devicename><replaceable>/dev/dsp1.0</replaceable></devicename>-ийг өөрийн систем дээрх 
 	<devicename>dsp</devicename> төхөөрөмжөөр солих шаардлагатай.</para>
 
     </sect2>
@@ -553,8 +553,8 @@
 	портын модноос олдож болно.</para>
 
       <para>Авсан WAV файлуудыг ашиглан дараах тушаал 
-	<filename>audio01.wav</filename>-г <filename>audio01.mp3</filename> 
-	болгон хөрвүүлнэ:</para>
+	<filename><replaceable>audio01.wav</replaceable></filename>-г 
+	<filename><replaceable>audio01.mp3</replaceable></filename> болгон хөрвүүлнэ:</para>
 
       <screen>&prompt.root; <userinput>lame -h -b <replaceable>128</replaceable> \
 --tt "<replaceable>Foo Song Title</replaceable>" \
@@ -574,7 +574,7 @@
 	бага зэрэг удаан</quote> горимыг идэвхжүүлдэг. 
 	<option>--t</option>-ээр эхэлсэн тохируулгууд ID3 мэдээллүүдийг заадаг 
 	бөгөөд энэ нь MP3 файл дотор оруулах дууны мэдээллийг ихэвчлэн агуулдаг.
-	Нэмэлт кодчилох тохируулгуудыг <application>Lame</application>-ийн гарын авлагын хуудаснаас лавлан 
+	Нэмэлт кодчилох тохируулгуудыг <application>lame</application>-ийн гарын авлагын хуудаснаас лавлан 
 	олж болно.</para>
     </sect2>
 
@@ -641,7 +641,7 @@
       <procedure>
 	<step>
 	  <para><command>mpg123 -s <replaceable>audio01.mp3</replaceable>
-	    &gt; audio01.pcm</command> тушаалыг ажиллуулна</para>
+	    &gt; <replaceable>audio01.pcm</replaceable></command> тушаалыг ажиллуулна</para>
 	</step>
       </procedure>
 
@@ -1054,18 +1054,18 @@
 	зэрэг файлыг тоглуулахын тулд <option>-vo</option> тохируулгаар төрөл бүрийн 
 	видео интерфэйсүүдийн аль нэгийг оруулж өгнө:</para>
 
-	  <screen>&prompt.user; <userinput>mplayer -vo xv testfile.avi</userinput></screen>
-	  <screen>&prompt.user; <userinput>mplayer -vo sdl testfile.avi</userinput></screen>
-	  <screen>&prompt.user; <userinput>mplayer -vo x11 testfile.avi</userinput></screen>
-	  <screen>&prompt.root; <userinput>mplayer -vo dga testfile.avi</userinput></screen>
-	  <screen>&prompt.root; <userinput>mplayer -vo 'sdl:dga' testfile.avi</userinput></screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo xv <replaceable>testfile.avi</replaceable></userinput></screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo sdl <replaceable>testfile.avi</replaceable></userinput></screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo x11 <replaceable>testfile.avi</replaceable></userinput></screen>
+	  <screen>&prompt.root; <userinput>mplayer -vo dga <replaceable>testfile.avi</replaceable></userinput></screen>
+	  <screen>&prompt.root; <userinput>mplayer -vo 'sdl:dga' <replaceable>testfile.avi</replaceable></userinput></screen>
 
 	<para>Эдгээр бүх тохируулгуудыг бүгдийг туршиж үзэх нь зүйтэй. Эдгээрийн 
 	харьцангуй ажиллагаа нь олон хүчин зүйлүүдээс шалтгаалдаг бөгөөд тоног төхөөрөмжөөс 
 	ихээхэн хамаарч өөр өөр байна.</para>
 
-	<para>DVD-ээс тоглуулахын тулд <filename>testfile.avi</filename>-г 
-	<option>dvd://<replaceable>N</replaceable> -dvd-device
+	<para>DVD-ээс тоглуулахын тулд <filename><replaceable>testfile.avi</replaceable></filename>-г 
+	<option>dvd://<replaceable>N</replaceable> -dvd-device 
 	 <replaceable>DEVICE</replaceable></option> мөрөөр солих хэрэгтэй. 
 	Энд байгаа <replaceable>N</replaceable> нь тоглуулах гарчгийн дугаар бөгөөд 
 	<filename><replaceable>DEVICE</replaceable></filename> нь 
@@ -1123,23 +1123,23 @@
 	сайн, муу ажиллагааны хооронд ялгаа гаргаж болох юм. Танд туслах 
 	хэд хэдэн жишээ энд байна. Эхлээд энгийн хуулбар:</para>
 
-	 <screen>&prompt.user; <userinput>mencoder input.avi -oac copy -ovc copy -o output.avi</userinput></screen>
+	 <screen>&prompt.user; <userinput>mencoder <replaceable>input.avi</replaceable> -oac copy -ovc copy -o <replaceable>output.avi</replaceable></userinput></screen>
 
          <para>Тушаалын мөрийн буруу хослолууд нь <command>mplayer</command>-ээр ч 
 		тоглуулах боломжгүй файл гаргахад хүргэж болох юм. Тиймээс 
 		хэрэв та файл уруу гаргаж авахыг хүсвэл <command>mplayer</command>-ийн 
 		<option>-dumpfile</option>-ийг ашиглаарай.</para>
 
-	 <para><filename>input.avi</filename>-г MPEG4 кодек уруу MPEG3 аудио кодчилолтойгоор  
+	 <para><filename><replaceable>input.avi</replaceable></filename>-г MPEG4 кодек уруу MPEG3 аудио кодчилолтойгоор  
 		хөрвүүлэхийн тулд (<filename role="package">audio/lame</filename> шаардлагатай):</para>
 
-	 <screen>&prompt.user; <userinput>mencoder input.avi -oac mp3lame -lameopts br=192 \
-	 -ovc lavc -lavcopts vcodec=mpeg4:vhq -o output.avi</userinput></screen>
+	 <screen>&prompt.user; <userinput>mencoder <replaceable>input.avi</replaceable> -oac mp3lame -lameopts br=192 \
+	 -ovc lavc -lavcopts vcodec=mpeg4:vhq -o <replaceable>output.avi</replaceable></userinput></screen>
 
 	 <para>Энэ нь <command>mplayer</command>
 	 	болон <command>xine</command> тоглуулах боломжтой гаралтыг үүсгэнэ.</para>
 
-	 <para>DVD гарчгийг шууд дахин кодчилохын тулд <filename>input.avi</filename> файлын оронд 
+	 <para>DVD гарчгийг шууд дахин кодчилохын тулд <filename><replaceable>input.avi</replaceable></filename> файлын оронд 
 		<option>dvd://1 -dvd-device /dev/dvd</option> мөрийг тавьж 
 		<username>root</username> эрхээр ажиллуулах хэрэгтэй. Эхний удаадаа 
 		та өөрийн хийсэн зүйлдээ сэтгэл ханамжгүй байх магадлалтай болохоор 
@@ -1185,7 +1185,7 @@
     <para>Өөрөөр, GUI-гүйгээр дараах тушаал ашиглан файлыг нэн даруй тоглуулахаар 
 	ажиллуулж болно:</para>
 
-      <screen>&prompt.user; <userinput>xine -g -p mymovie.avi</userinput></screen>
+      <screen>&prompt.user; <userinput>xine -g -p <replaceable>mymovie.avi</replaceable></userinput></screen>
 
     </sect3>
 
@@ -1213,10 +1213,10 @@
 	тулд DivX файлыг PAL MPEG-1 файл (PAL VCD) уруу хэрхэн хөрвүүлэхийг 
 	харуулах нэг жишээг үзүүлье:</para>
 
-      <screen>&prompt.user; <userinput>transcode -i input.avi -V --export_prof vcd-pal -o output_vcd</userinput>
-&prompt.user; <userinput>mplex -f 1 -o output_vcd.mpg output_vcd.m1v output_vcd.mpa</userinput></screen>
+      <screen>&prompt.user; <userinput>transcode -i <replaceable>input.avi</replaceable> -V --export_prof vcd-pal -o output_vcd</userinput>
+&prompt.user; <userinput>mplex -f 1 -o <replaceable>output_vcd.mpg output_vcd.m1v output_vcd.mpa</replaceable></userinput></screen>
 
-    <para>Гарах MPEG файл <filename>output_vcd.mpg</filename>-г 
+    <para>Гарах MPEG файл <filename><replaceable>output_vcd.mpg</replaceable></filename>-г 
 	<application>MPlayer</application>-ээр тоглуулах боломжтой байна. 
 	Та файлыг бүр Видео CD хийхийн тулд CD-R зөөвөрлөгч уруу шарж болох 
 	бөгөөд энэ тохиолдолд та <filename
@@ -1695,7 +1695,7 @@
 	хандахад унших болон бичих зөвшөөрлүүд хэрэглэгчид хэрэгтэй болно. 
 	Жишээ нь бидний USB скан хийгч <groupname>operator</groupname> 
 	бүлгийн эзэмшдэг <filename>/dev/uscanner0</filename> төхөөрөмжийн 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list