PERFORCE change 185419 for review

Rene Ladan rene at FreeBSD.org
Fri Nov 5 22:23:20 UTC 2010


http://p4web.freebsd.org/@@185419?ac=10

Change 185419 by rene at rene_acer on 2010/11/05 22:22:34

	Pre-7.X cleanup:
	- remove Alpha references from the kernelconig chapter
	- Add COMPAT_FREEBSD6 and COMPAT_FREEBSD7 to the kernelconfig chapter
	- 8.0 has been released :)
	- devfs is obligatory, also for the multimedia chapter
	- no more XFree86

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#10 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#8 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#10 (text+ko) ====

@@ -276,7 +276,7 @@
       will edit your custom kernel configuration, and
       <filename>compile</filename>, which is the staging area where your
       kernel will be built.  <replaceable>arch</replaceable> represents
-      one of <filename>i386</filename>, <filename>alpha</filename>,
+      one of <filename>i386</filename>,
       <filename>amd64</filename>, <filename>ia64</filename>,
       <filename>powerpc</filename>, <filename>sparc64</filename>, or
       <filename>pc98</filename> (an alternative development branch of PC
@@ -469,7 +469,7 @@
 	<author>
 	  <firstname>Joel</firstname>
 	  <surname>Dahl</surname>
-	  <contrib>Updated for &os; 6.X by </contrib>
+	  <contrib>Updated by </contrib>
 	</author>
       </authorgroup>
     </sect1info>
@@ -497,7 +497,7 @@
       architecture independent options, see
       <filename>/usr/src/sys/conf/NOTES</filename>.</para>
 
-    <para>As of &os; 5.0, a new <literal>include</literal> directive is
+    <para>An <literal>include</literal> directive is
       available for use in configuration files.  This allows another
       configuration file to be logically included in the current one, making
       it easy to maintain small changes relative to an existing file.  For
@@ -552,7 +552,7 @@
     <programlisting>machine		i386</programlisting>
 
     <para>This is the machine architecture.  It must be either
-      <literal>alpha</literal>, <literal>amd64</literal>,
+      <literal>amd64</literal>,
       <literal>i386</literal>, <literal>ia64</literal>,
       <literal>pc98</literal>, <literal>powerpc</literal>, or
       <literal>sparc64</literal>.</para>
@@ -726,7 +726,7 @@
 
     <programlisting>options          PSEUDOFS          # Pseudo-filesystem framework</programlisting>
 
-      <para>6.X kernels making use of <literal>PROCFS</literal> must also
+      <para>Kernels making use of <literal>PROCFS</literal> must also
         include support for <literal>PSEUDOFS</literal>.</para>
 
     <programlisting>options          GEOM_GPT          # GUID Partition Tables.</programlisting>
@@ -741,19 +741,31 @@
 
     <programlisting>options          COMPAT_FREEBSD4   # Compatible with &os;4</programlisting>
 
-    <para>This option is required on &os;&nbsp;5.X &i386; and Alpha systems
+    <para>This option is required
       to support applications compiled on older versions of &os;
       that use older system call interfaces.  It is recommended that
-      this option be used on all &i386; and Alpha systems that may
+      this option be used on all &i386; systems that may
       run older applications; platforms that gained support only in
       5.X, such as ia64 and &sparc64;, do not require this option.</para>
 
     <programlisting>options          COMPAT_FREEBSD5   # Compatible with &os;5</programlisting>
 
-    <para>This option is required on &os;&nbsp;6.X and above to
+    <para>This option is required to
       support applications compiled on &os;&nbsp;5.X versions that use
       &os;&nbsp;5.X system call interfaces.</para>
 
+    <programlisting>options          COMPAT_FREEBSD6   # Compatible with &os;6</programlisting>
+
+    <para>This option is required to
+      support applications compiled on &os;&nbsp;6.X versions that use
+      &os;&nbsp;6.X system call interfaces.</para>
+
+    <programlisting>options          COMPAT_FREEBSD7   # Compatible with &os;7</programlisting>
+
+    <para>This option is required on &os;&nbsp;8 and above to
+      support applications compiled on &os;&nbsp;7.X versions that use
+      &os;&nbsp;7.X system call interfaces.</para>
+
     <programlisting>options          SCSI_DELAY=5000  # Delay (in ms) before probing SCSI</programlisting>
 
     <para>This causes the kernel to pause for 5 seconds before probing
@@ -817,7 +829,7 @@
       leave this in.</para>
 
     <note>
-      <para>Note that on &os; 8.0-CURRENT and later versions, all mutexes are
+      <para>Note that on &os; 8.0-RELEASE and later versions, all mutexes are
 	adaptive by default, unless explicitly set to non-adaptive by
 	compiling with the <literal>NO_ADAPTIVE_MUTEXES</literal> option.  As
 	a result, Giant is adaptive by default now, and the

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

@@ -120,7 +120,7 @@
         <author>
 	 <firstname>Marc</firstname>
 	 <surname>Fonvieille</surname>
-	 <contrib>Enhanced for &os;&nbsp;5.X by </contrib>
+	 <contrib>Enhanced by </contrib>
 	 <!-- 13 September 2004 -->
         </author>
       </authorgroup>
@@ -399,12 +399,8 @@
 	device, such as music players or sound daemons.</para>
     </note>
 
-    <para>If you are not using &man.devfs.5;, you will have to point
-      your applications at
-      <filename>/dev/dsp0</filename>.<replaceable>x</replaceable>,
-      where <replaceable>x</replaceable> is 0 to 3 if
-      <varname>dev.pcm.0.rec.vchans</varname> is set to 4 as in the
-      above example.  On a system using &man.devfs.5;, the above will
+    <para>
+      The above will
       automatically be allocated transparently to a program
       that requests <filename>/dev/dsp0</filename>.</para>
    </sect2>
@@ -687,7 +683,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>&xorg;</application> and <application>&xfree86;</application> support a
+      card you have and the chip it uses.  While <application>&xorg;</application> supports 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
@@ -735,7 +731,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>&xorg;</application>, or of <application>&xfree86;</application>, there may be significant improvement.</para>
+      version of <application>&xorg;</application>, there may be significant improvement.</para>
 
     <para>A list of common video interfaces:</para>
 
@@ -761,7 +757,7 @@
     <sect3 id="video-interface-xvideo">
     <title>XVideo</title>
 
-      <para><application>&xorg;</application> and <application>&xfree86; 4.X</application> have an extension called
+      <para><application>&xorg;</application> has 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


More information about the p4-projects mailing list