many doc and handbook changes

Jeremy C. Reed reed at
Fri Jun 17 13:14:38 PDT 2005

Please carbon-copy me on replies.

On Fri, 17 Jun 2005 justin at xxxxxxxxxxxxxxxxxx wrote:

> Send things to submit@ - Whomever's available can jump on them, including
> me once I'm able to turn on more than two lights in my house at the same
> time.

17 patches below. (And I have more to do. By the way, I have a nice
formatted 7x9 book with headers, index, bottom-of-page footnotes that
looks almost ready to print. But at 828 pages it is too long. If
interested please discuss on docs@ list.)

1) glossary is not FreeBSD. Not verified yet.

Index: en/books/handbook/Makefile
RCS file: /home/dcvs/doc/en/books/handbook/Makefile,v
retrieving revision 1.1
diff -I\$DragonFly.*\$ -b -u -r1.1 Makefile
--- en/books/handbook/Makefile	25 Jun 2004 15:24:33 -0000	1.1
+++ en/books/handbook/Makefile	17 Jun 2005 19:07:37 -0000
@@ -189,7 +189,7 @@

 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 .if defined(WITH_GLOSSARY) && !empty(WITH_GLOSSARY)
-SGMLFLAGS+= -i chap.freebsd-glossary
+SGMLFLAGS+= -i chap.dragonfly-glossary

 # XXX The Handbook build currently overflows some internal, hardcoded

2) glossary again and get rid of note about Hard copy versions :)

Index: en/books/handbook/book.sgml
RCS file: /home/dcvs/doc/en/books/handbook/book.sgml,v
retrieving revision 1.1
diff -I\$DragonFly.*\$ -b -u -r1.1 book.sgml
--- en/books/handbook/book.sgml	25 Jun 2004 15:24:33 -0000	1.1
+++ en/books/handbook/book.sgml	17 Jun 2005 19:07:37 -0000
@@ -55,7 +55,7 @@
 <!ENTITY % chap.eresources "IGNORE">
 <!ENTITY % chap.pgpkeys "IGNORE">
 <!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
+<!ENTITY % chap.dragonfly-glossary "IGNORE">

 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
@@ -142,7 +142,7 @@
         this document is always available from the <ulink
         url="">&os; web site</ulink>
         or <link linkend="mirrors-ftp">mirror sites</link>,
-        in a variety of formats.  Hard copy versions are not yet available.
+        in a variety of formats.

       <para>Portions of this document originally documented use of the <ulink
@@ -247,7 +247,7 @@
     <![ %chap.eresources;               [ &chap.eresources;           ]]>
     <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
-  <![ %chap.freebsd-glossary;         [ &bookinfo.freebsd-glossary; ]]>
+  <![ %chap.dragonfly-glossary;         [ &bookinfo.dragonfly-glossary; ]]>
   <![ %chap.index;                    [ &chap.index;                ]]>


3) Not FreeBSD. Yes, I know this is getting father from FreeBSD's versions
but there is not going back.

Index: en/books/handbook/chapters.ent
RCS file: /home/dcvs/doc/en/books/handbook/chapters.ent,v
retrieving revision 1.1
diff -I\$DragonFly.*\$ -b -u -r1.1 chapters.ent
--- en/books/handbook/chapters.ent	25 Jun 2004 15:24:33 -0000	1.1
+++ en/books/handbook/chapters.ent	17 Jun 2005 19:07:37 -0000
@@ -1,5 +1,5 @@
-     Creates entities for each chapter in the FreeBSD Handbook. Each entity
+     Creates entities for each chapter in the Handbook. Each entity
      is named, where foo is the value of the id attribute on that
      chapter, and corresponds to the name of the directory in which that
      chapter's .sgml file is stored.

4) Add pkgsrc and sort alphabetically.

Index: en/books/handbook/basics/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/basics/chapter.sgml,v
retrieving revision 1.3
diff -I\$DragonFly.*\$ -b -u -r1.3 chapter.sgml
--- en/books/handbook/basics/chapter.sgml	7 Oct 2004 20:03:22 -0000	1.3
+++ en/books/handbook/basics/chapter.sgml	17 Jun 2005 19:07:44 -0000
@@ -727,6 +727,11 @@

+	      <entry><filename class="directory">/usr/dfports</filename></entry>
+	      <entry>The &os; ports collection (optional).</entry>
+	    </row>
+	    <row>
 	      <entry><filename class="directory">/usr/include/</filename></entry>
 	      <entry>Standard C include files.</entry>
@@ -772,13 +777,23 @@

-	      <entry><filename class="directory">/usr/ports</filename></entry>
-	      <entry>The FreeBSD ports collection (optional).</entry>
+	      <entry><filename class="directory">/usr/pkg</filename></entry>
+	      <entry>Used as
+	        the default destination for the files installed via the
+		&pkgsrc; framework or &pkgsrc; packages. The configuration
+		directory is tunable, but the default location is
+		<filename>/usr/pkg/etc</filename>.
+	      </entry>

-	      <entry><filename class="directory">/usr/dfports</filename></entry>
-	      <entry>The &os; ports collection (optional).</entry>
+	      <entry><filename class="directory">/usr/pkgsrc</filename></entry>
+	      <entry>The &pkgsrc; collection for installing packages (optional).</entry>
+	    </row>
+	    <row>
+	      <entry><filename class="directory">/usr/ports</filename></entry>
+	      <entry>The FreeBSD ports collection (optional).</entry>

@@ -1922,7 +1937,7 @@
       variables.  &os; comes with a set of shells, such as
       <command>sh</command>, the Bourne Shell, and <command>tcsh</command>,
       the improved C-shell.  Many other shells are available
-      from the FreeBSD Ports Collection, such as
+      from &pkgsrc; and the FreeBSD Ports collections, such as
       <command>zsh</command> and <command>bash</command>.</para>

     <para>Which shell do you use?  It is really a matter of taste.  If you
@@ -2166,7 +2181,7 @@
     <para>&os; also comes with more powerful text editors such as
       <command>vi</command> as part of the base system, while other editors, like
       <command>emacs</command> and <command>vim</command>,
-      are part of the FreeBSD Ports Collection.  These editors offer much
+      are part of the &pkgsrc; and FreeBSD Ports collections.  These editors offer much
       more functionality and power at the expense of being a little more
       complicated to learn.  However if you plan on doing a lot of text
       editing, learning a more powerful editor such as

5) Not FreeBSD. And check boot loader menu option F2.

Index: en/books/handbook/boot/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/boot/chapter.sgml,v
retrieving revision 1.2
diff -I\$DragonFly.*\$ -b -u -r1.2 chapter.sgml
--- en/books/handbook/boot/chapter.sgml	2 Aug 2004 18:47:42 -0000	1.2
+++ en/books/handbook/boot/chapter.sgml	17 Jun 2005 19:07:46 -0000
@@ -92,7 +92,7 @@
     <para>If you have installed multiple operating systems on your disks then
       you can install a different MBR, one that can display a list of
       different operating systems, and allows you to choose the one to boot
-      from.  FreeBSD comes with one such MBR which can be installed, and other
+      from.  &os; comes with one such MBR which can be installed, and other
       operating system vendors also provide alternative MBRs.</para>

     <para>The remainder of the &os; bootstrap system is divided into three
@@ -139,6 +139,7 @@
       <example id="boot-boot0-example">
 	<title><filename>boot0</filename> Screenshot</title>

+	<!-- todo: reed: what should be here? -->
 	<screen>F1 DOS
 F2 FreeBSD
 F3 Linux

6) Fix link to mirror sites.

Index: en/books/handbook/cutting-edge/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/cutting-edge/chapter.sgml,v
retrieving revision 1.2
diff -I\$DragonFly.*\$ -b -u -r1.2 chapter.sgml
--- en/books/handbook/cutting-edge/chapter.sgml	2 Aug 2004 18:47:43 -0000	1.2
+++ en/books/handbook/cutting-edge/chapter.sgml	17 Jun 2005 19:07:46 -0000
@@ -75,7 +75,7 @@

       <para><userinput>hostname</userinput> should be the closest mirror to you.  A
       list of mirrors sites can be found on the
-      <ulink url="">FreeBSD website</ulink>.</para>
+      <ulink url="">&os; website</ulink>.</para>

   <sect1 id="updating-before-building">

7) Add "FreeBSD" for index entry. Remove two index entries that aren't even
covered in this chapter.

Index: en/books/handbook/introduction/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/introduction/chapter.sgml,v
retrieving revision 1.5
diff -I\$DragonFly.*\$ -b -u -r1.5 chapter.sgml
--- en/books/handbook/introduction/chapter.sgml	31 Dec 2004 03:47:05 -0000	1.5
+++ en/books/handbook/introduction/chapter.sgml	17 Jun 2005 19:07:48 -0000
@@ -232,6 +232,9 @@
       <para>&os; is based on the 4.4BSD-Lite release from Computer
         Systems Research Group (CSRG) at the University of California at
 	Berkeley, along with later development of FreeBSD by the FreeBSD
+	<indexterm><primary>FreeBSD</primary></indexterm>
 	Project.  It carries on the distinguished tradition of BSD
 	systems development.  In addition to the fine work provided by
 	CSRG, the &os; Project has put in many thousands of hours in
@@ -401,8 +404,6 @@
       code base was taken from the 4.8 release of FreeBSD, which offered
       better performance and more complete features.  </para>

-      <indexterm><primary>Greenman, David</primary></indexterm>
-      <indexterm><primary>Walnut Creek CDROM</primary></indexterm>
       <para>Development has proceeded at a very quick rate since then, with
       Matt Dillon and a small group of developers fixing longstanding
       BSD bugs and modernizing the new &os; system.</para>

8) This is DragonFly. This chapter needs to be reviewed and many parts probably removed as it has many FreeBSD references still. And add a footnote.

Index: en/books/handbook/linuxemu/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/linuxemu/chapter.sgml,v
retrieving revision 1.3
diff -I\$DragonFly.*\$ -b -u -r1.3 chapter.sgml
--- en/books/handbook/linuxemu/chapter.sgml	2 Aug 2004 18:47:44 -0000	1.3
+++ en/books/handbook/linuxemu/chapter.sgml	17 Jun 2005 19:07:57 -0000
@@ -190,10 +190,10 @@
 	  and the runtime linker.  Also, you will need to create a
 	  <quote>shadow root</quote> directory,
 	  <filename>/compat/linux</filename>, for Linux libraries on your
-	  FreeBSD system.  Any shared libraries opened by Linux programs
-	  run under FreeBSD will look in this tree first.  So, if a Linux
+	  &os; system.  Any shared libraries opened by Linux programs
+	  run under &os; will look in this tree first.  So, if a Linux
 	  program loads, for example, <filename>/lib/</filename>,
-	  FreeBSD will first try to open
+	  &os; will first try to open
 	  <filename>/compat/linux/lib/</filename>, and if that does
 	  not exist, it will then try <filename>/lib/</filename>.
 	  Shared libraries should be installed in the shadow tree
@@ -384,7 +384,7 @@
     <para>The Linux version of <application>&mathematica;</application>
       runs perfectly under &os;
       however the binaries shipped by Wolfram need to be branded so that
-      FreeBSD knows to use the Linux ABI to execute them.</para>
+      &os; knows to use the Linux ABI to execute them.</para>

     <para>The Linux version of <application>&mathematica;</application>
       or <application>&mathematica; for Students</application> can
@@ -1226,7 +1226,7 @@
 	<application>&sap.r3; System</application>
 	with <application>&oracle; Database</application>
 	for Linux onto a &os; machine, including the installation
-	of FreeBSD and <application>&oracle;</application>. Two different
+	of &os; and <application>&oracle;</application>. Two different
 	configurations will be described:</para>

@@ -1573,6 +1573,7 @@

     <sect2 id="installation">
       <title>Installation of FreeBSD</title>
+      <!-- reed: todo: this all needs to be removed or fixed for DragonFly -->

       <para>First you have to install FreeBSD.</para>

@@ -1729,7 +1730,7 @@
 	  relinking during <application>&oracle;</application> installation
 	  will not work).  There are some other issues regarding
 	  relinking of <application>&oracle;</application>, but that is
-	  a <application>&oracle;</application> Linux issue, not FreeBSD specific.</para>
+	  a <application>&oracle;</application> Linux issue, not &os; specific.</para>


@@ -3228,11 +3229,11 @@
       <title>How Does It Work?</title>
       <indexterm><primary>execution class loader</primary></indexterm>

-      <para>FreeBSD has an abstraction called an <quote>execution class
+      <para>&os; has an abstraction called an <quote>execution class
 	loader</quote>.  This is a wedge into the &man.execve.2; system

-      <para>What happens is that FreeBSD has a list of loaders, instead of
+      <para>What happens is that &os; has a list of loaders, instead of
 	a single loader with a fallback to the <literal>#!</literal>
 	loader for running any shell interpreters or shell scripts.</para>

@@ -3253,14 +3254,15 @@
 	invoked the &man.csh.1; shell instead (we believe SCO first made
 	this hack).</para>

-      <para>What FreeBSD does now is go through a list of loaders, with a
+      <para>What &os; does now is go through a list of loaders, with a
 	generic <literal>#!</literal> loader that knows about interpreters
 	as the characters which follow to the next whitespace next to
 	last, followed by a fallback to

-      <para>For the Linux ABI support, FreeBSD sees the magic number as an
+      <!-- reed: todo: is this FreeBSD okay? -->
+      <para>For the Linux ABI support, &os; sees the magic number as an
 	ELF binary (it makes no distinction between FreeBSD, &solaris;,
 	Linux, or any other OS which has an ELF image type, at this
@@ -3301,7 +3303,7 @@
       <para>When a system call is called by the Linux binary, the trap
 	code dereferences the system call function pointer off the
 	<literal>proc</literal> structure, and gets the Linux, not the
-	FreeBSD, system call entry points.</para>
+	&os;, system call entry points.</para>

       <para>In addition, the Linux mode dynamically
 	<emphasis>reroots</emphasis> lookups; this is, in effect, what the
@@ -3315,19 +3317,19 @@
 	directory.  This makes sure that binaries that require other
 	binaries can run (e.g., the Linux toolchain can all run under
 	Linux ABI support).  It also means that the Linux binaries can
-	load and execute FreeBSD binaries, if there are no corresponding
+	load and execute &os; binaries, if there are no corresponding
 	Linux binaries present, and that you could place a &man.uname.1;
 	command in the <filename>/compat/linux</filename> directory tree
 	to ensure that the Linux binaries could not tell they were not
 	running on Linux.</para>

-      <para>In effect, there is a Linux kernel in the FreeBSD kernel; the
+      <para>In effect, there is a Linux kernel in the &os; kernel; the
 	various underlying functions that implement all of the services
-	provided by the kernel are identical to both the FreeBSD system
+	provided by the kernel are identical to both the &os; system
 	call table entries, and the Linux system call table entries: file
 	system operations, virtual memory operations, signal delivery,
-	System V IPC, etc…  The only difference is that FreeBSD
-	binaries get the FreeBSD <emphasis>glue</emphasis> functions, and
+	System V IPC, etc…  The only difference is that &os;
+	binaries get the &os; <emphasis>glue</emphasis> functions, and
 	Linux binaries get the Linux <emphasis>glue</emphasis> functions
 	(most older OS's only had their own <emphasis>glue</emphasis>
 	functions: addresses of functions in a static global
@@ -3336,10 +3338,10 @@
 	the <literal>proc</literal> structure of the process making the

-      <para>Which one is the native FreeBSD ABI?  It does not matter.
+      <para>Which one is the native &os; ABI?  It does not matter.
 	Basically the only difference is that (currently; this could
 	easily be changed in a future release, and probably will be after
-	this) the FreeBSD <emphasis>glue</emphasis> functions are
+	this) the &os; <emphasis>glue</emphasis> functions are
 	statically linked into the kernel, and the Linux <emphasis>glue</emphasis> functions
 	can be statically linked, or they can be accessed via a kernel
@@ -3349,13 +3351,24 @@
 	simulator, to cut off the next question) involved.</para>

       <para>So why is it sometimes called <quote>Linux emulation</quote>?
-	To make it hard to sell FreeBSD!  Really, it
+	To make it hard to sell &os;!  Really, it
 	is because the historical implementation was done at a time when
 	there was really no word other than that to describe what was
-	going on; saying that FreeBSD ran Linux binaries was not true, if
+	going on; saying that FreeBSD
+	<footnote>
+          <indexterm><primary>FreeBSD</primary></indexterm>
+	  <para>FreeBSD's original Linux compatibility code was
+	    committed in June 1995. It fulfilled milestone number one:
+	    running DOOM.</para> </footnote>
+	ran Linux binaries was not true, if
 	you did not compile the code in or load a module, and there needed
 	to be a word to describe what was being loaded—hence
 	<quote>the Linux emulator</quote>.</para>

9) This is DragonFly. And also mention pkgsrc.

Index: en/books/handbook/mail/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/mail/chapter.sgml,v
retrieving revision 1.4
diff -I\$DragonFly.*\$ -b -u -r1.4 chapter.sgml
--- en/books/handbook/mail/chapter.sgml	9 Feb 2005 03:58:54 -0000	1.4
+++ en/books/handbook/mail/chapter.sgml	17 Jun 2005 19:08:03 -0000
@@ -237,8 +237,8 @@
       <para>You may view the MX records for any domain by using the
 	&; command, as seen in the example below:</para>

-      <screen>&prompt.user; <userinput>host -t mx</userinput> mail is handled (pri=10) by</screen>
+      <screen>&prompt.user; <userinput>host -t mx</userinput> mail is handled (pri=10) by</screen>

     <sect2 id="mail-receive">
@@ -390,7 +390,7 @@

     <para>&man.sendmail.8; is the default Mail Transfer Agent (MTA) in
-      FreeBSD.  <application>sendmail</application>'s job is to accept
+      &os;.  <application>sendmail</application>'s job is to accept
       mail from Mail User Agents (<acronym>MUA</acronym>) and deliver it
       to the appropriate mailer as defined by its configuration file.
       <application>sendmail</application> can also accept network
@@ -680,6 +680,7 @@

       <para>You have a wide choice of MTAs available.  A good
 	starting point is the
+	&pkgsrc; collection or
 	<link linkend="ports">FreeBSD Ports Collection</link> where
 	you will be able to find many.  Of course you are free to use
 	any MTA you want from any location, as long as you can make
@@ -741,10 +742,10 @@
       <title>Running Your New MTA on Boot</title>

       <para>You may have a choice of two methods for running your
-	new MTA on boot, again depending on what version of FreeBSD
+	new MTA on boot, again depending on what version of &os;
 	you are running.</para>

-      <para>With later versions of FreeBSD, you can use the
+      <para>With later versions of &os;, you can use the
 	above method or you can set</para>

@@ -1072,7 +1073,7 @@
         hosts as long as you have set up
 	<filename>/etc/resolv.conf</filename> or are running your own
 	name server.  If you would like to have mail for your host
-	delivered to the MTA (e.g., <application>sendmail</application>) on your own FreeBSD host, there are two methods:</para>
+	delivered to the MTA (e.g., <application>sendmail</application>) on your own &os; host, there are two methods:</para>

@@ -1702,7 +1703,7 @@
       way they interact with email; this gives users increased
       functionality and flexibility.  &os; contains support for
       numerous mail user agents, all of which can be easily installed
-      using the <link linkend="ports">FreeBSD Ports Collection</link>.
+      using the &pkgsrc; or <link linkend="ports">FreeBSD Ports</link> collections.
       Users may choose between graphical email clients such as
       <application>evolution</application> or
       <application>balsa</application>, console based clients such as

10) Add BSD-Systems (from Wiki). Should Crescent Anchor entry be moved
(and where is their DragonFly CD link)? Add paragraph about FTP
(from FreeBSD Handbook). And use the generated FTP list (via entity).
And this is DragonFly! And add some CVS tags.

Index: en/books/handbook/mirrors/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/mirrors/chapter.sgml,v
retrieving revision 1.2
diff -I\$DragonFly.*\$ -b -u -r1.2 chapter.sgml
--- en/books/handbook/mirrors/chapter.sgml	2 Aug 2004 18:47:45 -0000	1.2
+++ en/books/handbook/mirrors/chapter.sgml	17 Jun 2005 19:08:05 -0000
@@ -16,6 +16,7 @@

       <para>&os; is available as a purchasable CD:</para>

+      <!-- todo: reed: should this section be with following? and where is the CD? -->
@@ -29,7 +30,7 @@
       <title>CD and DVD Sets</title>

-      <para>FreeBSD CD and DVD sets are available from many online
+      <para>DragonFly BSD CD and DVD sets are available from online

@@ -42,10 +43,17 @@
 	  Phone: <phone>+1 800 407-5170</phone>
 	  Fax: <fax>+1 1 801 765-0877</fax>
 	  Email: <email>sales at xxxxxxxxxxx</email>
-	  WWW: <otheraddr><ulink url=""></ulink></otheraddr>
+	  WWW: <otheraddr><ulink url=""></ulink></otheraddr>

+      <listitem>
+        <address>
+	  <otheraddr>BSD-Systems</otheraddr>
+	  Email: <email>sales at xxxxxxxxxxxxxxxxx</email>
+	  WWW: <otheraddr><ulink url=""></ulink></otheraddr>
+        </address>
+      </listitem>

@@ -67,6 +75,21 @@
 	url="">&os; mirror
 	sites list</ulink> is the best, most up-to-date source.</para>

+    <para>Additionally, &os; is available via anonymous FTP from the
+      following mirror sites.  If you choose to obtain &os; via anonymous
+      FTP, please try to use a site near you.  The mirror sites listed as
+      <quote>Primary Mirror Sites</quote> typically have the entire &os; archive (all
+      the currently available versions for each of the architectures) but
+      you will probably have faster download times from a site that is
+      in your country or region.  The regional sites carry the most recent
+      versions for the most popular architecture(s) but might not carry
+      the entire &os; archive.  All sites provide access via anonymous
+      FTP but some sites also provide access via other methods.  The access
+      methods available for each site are provided in parentheses
+      after the hostname.</para>
+   &;

@@ -630,7 +653,7 @@
     <sect2 id="cvsup-mirrors">
     <title>CVSup Sites</title>

-    <para><link linkend="cvsup">CVSup</link> servers for FreeBSD are running
+    <para><link linkend="cvsup">CVSup</link> servers for &os; are running
       at the following sites:</para>

@@ -666,7 +689,22 @@

+	<!-- reed: todo: is this correct? -->
+	<listitem>
+	  <para>&os; 1.0</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>DragonFly_RELEASE_1_2</term>
+	<listitem>
+	  <para>&os; 1.2</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>DragonFly_1_0_REL</term>

 	  <para>&os; 1.0</para>

11) Mention pkgsrc. Add many comments for stuff to fix or check.
Don't specifically mention just XFree86.
Fix section name for The transcode Utilities section (packages is more
generic). Add replace reference of FreeBSD to DragonFly.

Index: en/books/handbook/multimedia/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/multimedia/chapter.sgml,v
retrieving revision 1.3
diff -I\$DragonFly.*\$ -b -u -r1.3 chapter.sgml
--- en/books/handbook/multimedia/chapter.sgml	5 Nov 2004 18:36:35 -0000	1.3
+++ en/books/handbook/multimedia/chapter.sgml	17 Jun 2005 19:08:09 -0000
@@ -24,7 +24,7 @@
       to enjoy high fidelity output from your computer.  This includes
       the ability to record and playback audio in the MPEG Audio Layer
       3 (MP3), WAV, and Ogg Vorbis formats as well as many other
-      formats.  The FreeBSD Ports Collection also contains
+      formats.  The &pkgsrc; and FreeBSD Ports collections also contain
       applications allowing you to edit your recorded audio, add sound
       effects, and control attached MIDI devices.</para>

@@ -37,9 +37,10 @@
       between formats, as there is with <filename
       role="package">audio/sox</filename>.  However, the software
       landscape in this area is changing rapidly.</para>
+      <!-- todo: reed: is the above "no good re-encoding" true? -->

     <para>This chapter will describe the necessary steps to configure
-      your sound card.  The configuration and installation of <application>&xfree86;</application>
+      your sound card.  The configuration and installation of X11
       (<xref linkend="x11">) has already taken care of the
       hardware issues for your video card, though there may be some
       tweaks to apply for better playback.</para>
@@ -66,7 +67,7 @@

-        <para>How video is supported by <application>&xfree86;</application>.</para>
+        <para>How video is supported by the X server.</para>

@@ -93,11 +94,6 @@

-    <para>For the video sections, it is assumed that <application>&xfree86; 4.X</application>
-      (<filename role='package'>x11/XFree86-4</filename>) has been
-      installed.  <application></application> may work, but it has not been tested
-      with what is described in this chapter.  </para>
       <para>Trying to mount audio CDs
         with the &man.mount.8; command will
@@ -237,6 +233,7 @@
 	page for more information.</para>

+	<!-- todo: reed: what about this? -->
 	<para>The Sound Blaster Live is not supported under FreeBSD 4.0
 	  without a patch, which this section will not cover.  It is
 	  recommended that you update to the latest -STABLE before
@@ -404,6 +401,7 @@

     <para>Various applications, such as <filename
       role="package">audio/workman</filename> offer a better
+      <!-- todo: reed: not in pkgsrc -->
       interface.  You may want to install an application such as
       <filename role="package">audio/mpg123</filename> to listen to
       MP3 audio files.</para>
@@ -532,7 +530,7 @@
     <sect2 id="mp3-players">
       <title>MP3 Players</title>

-      <para>By far, the most popular <application>&xfree86;</application> MP3 player is
+      <para>A popular X11 MP3 player is
 	<application>XMMS</application> (X Multimedia System).
 	skins can be used with <application>XMMS</application> since the
@@ -543,6 +541,7 @@

       <para><application>XMMS</application> can be installed from the
 	<filename role="package">multimedia/xmms</filename> port or package.</para>
+	<!-- todo: reed: under audio category for pkgsrc -->

       <para><application>XMMS'</application> interface is intuitive,
 	with a playlist, graphic equalizer, and more.  Those familiar
@@ -587,6 +586,7 @@
 	the <filename role="package">sysutils/cdrtools</filename>
 	suite, is used for ripping audio information from CDs and the
 	information associated with them.</para>
+	<!-- todo: reed: pkgsrc is still called sysutils/cdrecord -->

       <para>With the audio CD in the drive, the following command can
 	be issued (as <username>root</username>) to rip an entire CD
@@ -629,7 +629,7 @@
       <para>Nowadays, the mp3 encoder of choice is
 	<application>Lame</application> can be found at
-	<filename role="package">audio/lame</filename> in the ports tree.</para>
+	<filename role="package">audio/lame</filename> in the pkgsrc and ports trees.</para>

       <para>Using the ripped WAV files, the following command will
 	convert <filename>audio01.wav</filename> to
@@ -762,7 +762,7 @@
       it did with sound.</para>

     <para>Before you begin, you should know the model of the video
-      card you have and the chip it uses.  While <application>&xfree86;</application> supports a
+      card you have and the chip it uses.  While <application>&xfree86;</application> and <application>&xorg;</application> support a
       wide variety of video cards, fewer give good playback
       performance.  To obtain a list of extensions supported by the
       X server using your card use the command &man.xdpyinfo.1; while
@@ -791,7 +791,7 @@
       <secondary>options USER_LDT</secondary>

-    <para>Some of the ports discussed rely on the following kernel
+    <para>Some of the packages discussed rely on the following kernel
       options to build correctly.  Before attempting to build, add
       these options to the kernel configuration file, build a new kernel, and reboot:</para>

@@ -817,7 +817,7 @@
       method described below will have varying quality across
       different hardware.  Secondly, the rendering of video in X11 is
       a topic receiving a lot of attention lately, and with each
-      version of <application>&xfree86;</application> there may be significant improvement.</para>
+      version of <application>&xorg;</application> or <application>&xfree86;</application> there may be significant improvement.</para>

     <para>A list of common video interfaces:</para>

@@ -843,7 +843,7 @@
     <sect3 id="video-interface-xvideo">

-      <para><application>&xfree86; 4.X</application> has an extension called
+      <para>Both <application>&xfree86; 4.X</application> and <application>&xorg;</application> have an extension called
         <emphasis>XVideo</emphasis> (aka Xvideo, aka Xv, aka xv) which
         allows video to be directly displayed in drawable objects
         through a special acceleration.  This extension provides very
@@ -865,6 +865,7 @@

       <para>If your card is not one of these, do not be disappointed yet.
+      <!-- todo: reed: clean this up -->
       <application>&xfree86; 4.X</application> adds new xv capabilities with each release
         <para>A popular familiar graphics card with generally very good
@@ -978,14 +979,14 @@
       low-level abstraction to the hardware which can sometimes be
       more efficient than the X11 interface.</para>

-    <para>The SDL can be found at <filename role="package">devel/sdl12</filename>.</para>
+    <para>The SDL can be found at <filename role="package">devel/sdl12</filename> (or <filename role="package">pkgsrc/devel/SDL2</filename>).</para>


     <sect3 id="video-interface-DGA">
     <title>Direct Graphics Access</title>

-    <para>Direct Graphics Access is an <application>&xfree86;</application> extension which allows
+    <para>Direct Graphics Access is an X11 extension which allows
       a program to bypass the X server and directly alter the
       framebuffer.  Because it relies on a low level memory mapping to
       effect this sharing, programs using it must be run as
@@ -1000,14 +1001,14 @@


-  <sect2 id="video-ports">
+  <sect2 id="video-packages">
     <title>Ports and Packages Dealing with Video</title>

     <indexterm><primary>video ports</primary></indexterm>
     <indexterm><primary>video packages</primary></indexterm>

     <para>This section discusses the software available from the
-      FreeBSD Ports Collection which can be used for video playback.
+      &pkgsrc; and FreeBSD Ports collections which can be used for video playback.
       Video playback is a very active area of software development,
       and the capabilities of various applications are bound to
       diverge somewhat from the descriptions given here.</para>
@@ -1076,7 +1077,7 @@

-        <para>Software not yet in the FreeBSD Ports Collection
+        <para>Software not yet in the &pkgsrc; or FreeBSD Ports collections
 	  which is commonly used in conjunction with the application.</para>

@@ -1113,6 +1114,7 @@
 	  ports and not to use a binary package.  Additionally, a
 	  number of options can be specified in the <command>make</command>
 	  command line, as described at the start of the build.</para>
+	  <!-- todo: reed: mention pkgsrc here too -->

 	<screen>&prompt.root; <userinput>cd /usr/ports/multimedia/mplayer</userinput>
 &prompt.root; <userinput>make</userinput>
@@ -1125,6 +1127,7 @@
 You can enable XAnim DLL support by defining WITH_XANIM.

+	<!-- todo: reed: this is ports specific, could add pkgsrc notes -->
         <para>If you have <filename
           role="package">x11-toolkits/gtk12</filename> installed, then
           you might as well enable the GUI.  Otherwise, it is not
@@ -1289,6 +1292,7 @@
      <application>xine</application> which will play CSS encoded DVD's.  There are third party
      builds which do have modules for this built in them, but none
      of these are in the FreeBSD Ports Collection.</para>
+     <!-- todo: reed: what about pkgsrc? -->

     <para>Compared to <application>MPlayer</application>, <application>xine</application> does more for the user, but at the
       same time, takes some of the more fine-grained control away from
@@ -1308,7 +1312,7 @@


-    <sect3 id="video-ports-transcode">
+    <sect3 id="video-packages-transcode">
     <title>The transcode Utilities</title>

     <para>The software <application>transcode</application> is not a player, but a suite of tools for
@@ -1318,13 +1322,14 @@

     <para>Like <application>MPlayer</application>, <application>transcode</application> is very experimental software which
-      must be build from the port <filename
+      must be build from ports or &pkgsrc; at <filename
       role="package">multimedia/transcode</filename>.  Using a great
       many options to the <command>make</command> command.  I

       <screen>&prompt.root; <userinput>make WITH_LIBMPEG2=yes</userinput></screen>

+    <!-- todo: reed: ports specific, add pkgsrc notes? -->
     <para>If you plan to install <filename
       role="package">multimedia/avifile</filename>, then add the
       <literal>WITH_AVIFILE</literal> option to your
@@ -1365,7 +1370,7 @@
   <sect2 id="video-further-reading">
     <title>Further Reading</title>

-    <para>The various video software packages for FreeBSD are
+    <para>The various video software packages for &os; are
       developing rapidly.  It is quite possible that in the near
       future many of the problems discussed here will have been
       resolved.  In the mean time, those who
@@ -1399,6 +1404,7 @@
 	   is also a port <filename
+       <!-- todo: reed: in pkgsrc-wip currently -->

@@ -1532,7 +1538,8 @@
-	  <para><filename role="package">misc/alevt</filename> decodes
+	  <para><filename role="package">misc/alevt</filename>
+	    (or <filename role="package">pkgsrc/multimedia/alevt</filename>) decodes
 	    and displays Videotext/Teletext.</para>
@@ -1543,11 +1550,12 @@
 	  <para><filename role="package">audio/wmtune</filename>, a handy
 	    desktop application for radio tuners.</para>
+	    <!-- todo: reed: not in pkgsrc? -->

-      <para>More applications are available in the FreeBSD Ports
-	Collection.</para>
+      <para>More applications are available in the &pkgsrc; and FreeBSD Ports
+	collections.</para>
    cvs server: Diffing en/books/handbook/preface

12) This is DragonFly. And add my name (as I expect to work more :)
(Let's make sure we add DragonFly doc team to this list too.)

Index: en/books/handbook/preface/preface.sgml
RCS file: /home/dcvs/doc/en/books/handbook/preface/preface.sgml,v
retrieving revision 1.2
diff -I\$DragonFly.*\$ -b -u -r1.2 preface.sgml
--- en/books/handbook/preface/preface.sgml	2 Aug 2004 18:47:45 -0000	1.2
+++ en/books/handbook/preface/preface.sgml	17 Jun 2005 19:08:10 -0000
@@ -121,7 +121,7 @@
       <term><emphasis><xref linkend="security">, Security</emphasis></term>
 	<para>Describes many different tools available to help keep your
-	FreeBSD system secure, including Kerberos, IPsec, OpenSSH, and
+	&os; system secure, including Kerberos, IPsec, OpenSSH, and
 	network firewalls.</para>
@@ -339,7 +339,7 @@
   <screen><prompt>E:\></prompt> <userinput>tools\fdimage floppies\kern.flp A:</userinput></screen>

   <para>Examples starting with &prompt.root; indicate a command that
-    must be invoked as the superuser in FreeBSD.  You can login as
+    must be invoked as the superuser in &os;.  You can login as
     <username>root</username> to type the command, or login as your
     normal account and use &; to gain
     superuser privileges.</para>
@@ -363,10 +363,10 @@

   <para>The DragonFly Handbook was originally built from an edition of the
     FreeBSD Handbook.  The FreeBSD Handbook was created by the collective
-    hard work of hundreds of people, and the DragonFlyBSD Documentation Team
+    hard work of hundreds of people, and the &os; Documentation Team
     appreciates all their labor.  Included here is a list of all
     individually identified people and corporations that contributed
-    resources to the FreeBSD Handbook.</para>
+    resources to this handbook.</para>

   <para>Eric Anderson, Satoshi Asami, Bojan Bistrovic, Neil Blakey-Milner, Andrew
     Boothman, Harti Brandt, Jim Brown, BSDi, Andrey A. Chernov, Peter Childs, Munish
@@ -381,7 +381,7 @@
     Mock, Marcel Moolenaar, Moses Moore, Bill Moran, Rich Murphey, Mark Murray, Alex
     Nash, Gregory Neil Shapiro, David O'Brien, Eric Ogren, Gary Palmer, Hiten M.
     Pandya, Bill Paul, Dan Pelleg, Steve Peterson, John Polstra, Andy
-    Polyakov, Randy Pratt, Tom Rhodes, Trev Roydhouse, Peter Schultz, Piero Serini,
+    Polyakov, Randy Pratt, Jeremy C. Reed, Tom Rhodes, Trev Roydhouse, Peter Schultz, Piero Serini,
     Christopher Shumway, Marc Silver, Mike Smith, Brian Somers,
     Gennady B. Sorokopud, Wylie Stilwell, Murray Stokely, Greg Sutter, Bill Swingle,
     Valentino Vaschetto, Robert Watson,

13) Mention pkgsrc too.

Index: en/books/handbook/x11/chapter.sgml
RCS file: /home/dcvs/doc/en/books/handbook/x11/chapter.sgml,v
retrieving revision 1.3
diff -I\$DragonFly.*\$ -b -u -r1.3 chapter.sgml
--- en/books/handbook/x11/chapter.sgml	19 Jul 2004 15:37:52 -0000	1.3
+++ en/books/handbook/x11/chapter.sgml	17 Jun 2005 19:08:15 -0000
@@ -667,7 +667,9 @@
       knows that these new files have been installed.
       <command>ttmkfdir</command> is available from the FreeBSD
       Ports Collection as
-      <filename role="package">x11-fonts/ttmkfdir</filename>.</para>
+      <filename role="package">x11-fonts/ttmkfdir</filename>
+      or the &pkgsrc; collection at
+      <filename role="package">fonts/ttmkfdir2</filename>.</para>

     <screen>&prompt.root; <userinput>cd /usr/X11R6/lib/X11/fonts/TrueType</userinput>
 &prompt.root; <userinput>ttmkfdir > fonts.dir</userinput></screen>

14) This is DragonFly. This does make it farther from original though,
so this could be skipped for now. But I really think it is too far
to keep both in sync.

RCS file: /home/dcvs/doc/share/sgml/catalog,v
retrieving revision 1.2
diff -I\$DragonFly.*\$ -b -u -r1.2 catalog
--- share/sgml/catalog	25 Jun 2004 15:54:58 -0000	1.2
+++ share/sgml/catalog	17 Jun 2005 19:08:22 -0000
@@ -7,7 +7,7 @@
   -- ...................................................................... --
   -- Language neutral ..................................................... --

-  -- These identifiers are shared across all translations of the FreeBSD
+  -- These identifiers are shared across all translations of the
      documentation, even though the listed language is "EN"

@@ -45,7 +45,7 @@
   -- English specific ..................................................... --

   -- These identifiers should only be used by English language versions of
-     the FreeBSD Documentation.
+     the documentation.

      All other translations should base their FPIs on these, but change the
      final parameter in the FPI to represent the target language, as

15) Add entity for And also this is DragonFly.

Index: share/sgml/dragonfly.ent
RCS file: /home/dcvs/doc/share/sgml/dragonfly.ent,v
retrieving revision 1.4
diff -I\$DragonFly.*\$ -b -u -r1.4 dragonfly.ent
--- share/sgml/dragonfly.ent	2 Jul 2004 13:24:07 -0000	1.4
+++ share/sgml/dragonfly.ent	17 Jun 2005 19:08:22 -0000
@@ -20,11 +20,14 @@
 <!-- Use this entity when refering to 'UNIX' in your document. -->
 <!ENTITY unix "<trademark class='registered'>UNIX</trademark>">

+<!-- This is for because no trademark seen. -->
+<!ENTITY xorg "">
 <!-- This entity should be overridden for the print output case to
      properly render TeX. -->
 <!ENTITY tex 'TeX'>

-<!-- The currently released version of FreeBSD.  This value is used to
+<!-- The currently released version of DragonFly BSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time -->
 <!ENTITY rel.current CDATA "1.1">

16) This didn't read correctly since we have different domains.

Index: share/sgml/mirrors-master.xsl
RCS file: /home/dcvs/doc/share/sgml/mirrors-master.xsl,v
retrieving revision 1.2
diff -I\$DragonFly.*\$ -b -u -r1.2 mirrors-master.xsl
--- share/sgml/mirrors-master.xsl	8 Apr 2004 18:25:51 -0000	1.2
+++ share/sgml/mirrors-master.xsl	17 Jun 2005 19:08:23 -0000
@@ -53,8 +53,8 @@
   <xsl:template name="mirrors-docbook-contact">
     <xsl:param name="email" select="'someone at somewhere'"/>

-    <para>In case of problems, please contact the hostmaster
-      <email><xsl:value-of select="$email" /></email> for this domain.</para>
+    <para>In case of problems, please contact
+      <email><xsl:value-of select="$email" /></email>.</para>

   <!-- template: "mirrors-lastmodified" -->


Index: share/sgml/mirrors.xml

I will provide this separate. A diff doesn't make sense.

18) Add trademark entities for NetBSD and pkgsrc.

Index: share/sgml/trademarks.ent
RCS file: /home/dcvs/doc/share/sgml/trademarks.ent,v
retrieving revision 1.2
diff -I\$DragonFly.*\$ -b -u -r1.2 trademarks.ent
--- share/sgml/trademarks.ent	25 Jun 2004 15:54:59 -0000	1.2
+++ share/sgml/trademarks.ent	17 Jun 2005 19:08:24 -0000
@@ -54,6 +54,8 @@
 <!ENTITY mac "<trademark class='registered'>Mac</trademark>">
 <!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
 <!ENTITY macos "<trademark class='registered'>Mac OS</trademark>">
+<!ENTITY netbsd "<trademark class='registered'>NetBSD</trademark>">
+<!ENTITY pkgsrc "<trademark class='registered'>pkgsrc</trademark>">
 <!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
 <!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">

 Jeremy C. Reed

 	  	 	 Low cost press releases

More information about the Submit mailing list