PERFORCE change 166606 for review
Rene Ladan
rene at FreeBSD.org
Mon Jul 27 09:09:40 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166606
Change 166606 by rene at rene_self on 2009/07/27 09:08:44
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#31 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#39 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#7 integrate
.. //depot/projects/docproj_nl/share/sgml/man-refs.ent#20 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#31 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.869 2009/07/20 14:55:34 yzlin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.870 2009/07/26 12:55:29 bsam Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -1712,6 +1712,11 @@
</listitem>
<listitem>
+ <para>Christopher Key
+ <email>chris at chacal.cjkey.org.uk</email></para>
+ </listitem>
+
+ <listitem>
<para>Christopher N. Harrell
<email>cnh at ivmg.net</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#9 (text+ko) ====
@@ -1,6 +1,6 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.87 2009/04/10 10:08:43 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.89 2009/07/25 10:03:35 blackend Exp $
-->
<chapter id="desktop">
@@ -119,7 +119,7 @@
<para>If you are looking for light-weight browsers, you should
investigate the Ports Collection for
- <filename role="package">www/dillo</filename>,
+ <filename role="package">www/dillo2</filename>,
<filename role="package">www/links</filename>, or
<filename role="package">www/w3m</filename>.</para>
@@ -247,23 +247,57 @@
exists. This wrapper also supports &adobe; &acrobat; plugin,
&realplayer; plugin and more.</para>
- <warning>
- <para>The following text covers the installation of &flash;
- 9.X on recent -STABLE branch, &os; 7.1-RELEASE and above.
- If you run an older version of &os; or encounter issues, you
- should install <filename
- role="package">www/linux-flashplugin7</filename> and skip
- the &man.linprocfs.5; part.</para>
- </warning>
+ <para>According to the version of &os; you run various steps are
+ required:</para>
+
+ <procedure>
+ <step>
+ <title>Under &os; 7.X</title>
+
+ <para>Install the <filename
+ role="package">www/nspluginwrapper</filename> port. This
+ port requires <filename
+ role="package">emulators/linux_base-fc4</filename> which
+ is a large port.</para>
+
+ <para>The next step is to install the <filename
+ role="package">www/linux-flashplugin9</filename>
+ port. This will install &flash; 9.X, this version is
+ known to run correctly under &os; 7.X.</para>
+
+ <note>
+ <para>On &os; versions older than &os; 7.1-RELEASE you have
+ to install <filename
+ role="package">www/linux-flashplugin7</filename> and
+ skip the &man.linprocfs.5; part below.</para>
+ </note>
+ </step>
+
+ <step>
+ <title>Under &os; 8.X</title>
+
+ <para>Install the <filename
+ role="package">www/nspluginwrapper</filename> port. This
+ port requires <filename
+ role="package">emulators/linux_base-f10</filename> which
+ is a large port.</para>
+
+ <para>The next step is to install the <filename
+ role="package">www/linux-f10-flashplugin10</filename>
+ port. This will install &flash; 10.X, this version is
+ known to run correctly under &os; 8.X.</para>
+
+ <para>This version will require the following link to be
+ created:</para>
- <para>Install the <filename role="package">www/nspluginwrapper</filename>
- port. This port requires
- <filename role="package">emulators/linux_base-fc4</filename> which is a
- large port.</para>
+ <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \
+ /usr/local/lib/browser_plugins/</userinput></screen>
+ </step>
+ </procedure>
- <para>The next step is to install the <filename
- role="package">www/linux-flashplugin9</filename> port. Once
- this port is installed, the plugin must be installed by each
+ <para>Once the right &flash; port, according to the &os; version
+ you run,
+ is installed, the plugin must be installed by each
user with <command>nspluginwrapper</command>:</para>
<screen>&prompt.user; <userinput>nspluginwrapper -v -a -i</userinput></screen>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#6 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.290 2008/12/24 13:30:35 hrs Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.291 2009/07/26 11:49:01 blackend Exp $
-->
<chapter id="disks">
@@ -745,6 +745,7 @@
device pass
device uhci
device ohci
+device ehci
device usb
device umass</programlisting>
@@ -752,8 +753,10 @@
to the USB storage devices, your USB device will be seen as a
SCSI device by the system. Depending on the USB chipset on
your motherboard, you only need either <literal>device
- uhci</literal> or <literal>device ohci</literal>, however
- having both in the kernel configuration file is harmless. Do
+ uhci</literal> or <literal>device ohci</literal> for USB 1.X support, however
+ having both in the kernel configuration file is harmless.
+ Support for USB 2.0 controllers is provided by the
+ &man.ehci.4; driver (the <literal>device ehci</literal> line). Do
not forget to compile and install the new kernel if you added
any lines.</para>
@@ -768,15 +771,6 @@
&man.atapicam.4; should not be used in the kernel
configuration.</para>
</note>
-
- <para>Support for USB 2.0 controllers is provided on
- &os;; however, you must add:</para>
-
- <programlisting>device ehci</programlisting>
-
- <para>to your configuration file for USB 2.0 support. Note
- &man.uhci.4; and &man.ohci.4; drivers are still needed if you
- want USB 1.X support.</para>
</sect2>
<sect2>
@@ -891,7 +885,7 @@
Disks</link> and <link linkend="mount-unmount">Mounting and
Unmounting File Systems</link> sections, reading various
manual pages may be also useful: &man.umass.4;,
- &man.camcontrol.8;, and &man.usbdevs.8;.</para>
+ &man.camcontrol.8;, and &man.usbconfig.8; under &os; 8.X or &man.usbdevs.8; under earlier versions of &os;.</para>
</sect2>
</sect1>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#39 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1022 2009/07/22 00:00:46 miwi Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1023 2009/07/24 18:39:45 jhb Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -13218,12 +13218,45 @@
<entry>8.0-CURRENT after SYSVIPC ABI change.</entry>
</row>
<row>
+ <entry>800101</entry>
+ <entry>June 29, 2009</entry>
+ <entry>8.0-CURRENT after the removal of the
+ /dev/net/* per-interface character
+ devices.</entry>
+ </row>
+ <row>
+ <entry>800102</entry>
+ <entry>July 12, 2009</entry>
+ <entry>8.0-CURRENT after padding was added to
+ struct sackhint, struct tcpcb, and struct
+ tcpstat.</entry>
+ </row>
+ <row>
+ <entry>800103</entry>
+ <entry>July 13, 2009</entry>
+ <entry>8.0-CURRENT after replacing struct tcpopt
+ with struct toeopt in the TOE driver interface
+ to the TCP syncache.</entry>
+ </row>
+ <row>
+ <entry>800104</entry>
+ <entry>July 14, 2009</entry>
+ <entry>8.0-CURRENT after the addition of the
+ linker-set based per-vnet allocator.</entry>
+ </row>
+ <row>
<entry>800105</entry>
<entry>July 19, 2009</entry>
<entry>8.0-CURRENT after version bump for all
shared libraries that do not have symbol versioning
turned on.</entry>
</row>
+ <row>
+ <entry>800106</entry>
+ <entry>July 24, 2009</entry>
+ <entry>8.0-CURRENT after introduction of OBJT_SG
+ VM object type.</entry>
+ </row>
</tbody>
</tgroup>
</table>
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#10 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.4 2008/09/15 19:30:44 remko Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.5 2009/07/24 19:13:28 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
%SRCID% 1.19
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#7 (text+ko) ====
@@ -9,7 +9,7 @@
Houd dit bestand alstublieft gesorteerd.
- $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/trademarks.ent,v 1.3 2009/06/08 18:54:12 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/trademarks.ent,v 1.4 2009/07/24 19:13:28 rene Exp $
%SOURCE% share/sgml/trademarks.ent
%SRCID% 1.46
-->
==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#20 (text+ko) ====
@@ -20,7 +20,7 @@
lexicographical order by the entity (i.e., the dots used in place of
special characters should not be expanded when comparing).
- $FreeBSD: doc/share/sgml/man-refs.ent,v 1.488 2009/06/16 10:28:11 hrs Exp $
+ $FreeBSD: doc/share/sgml/man-refs.ent,v 1.489 2009/07/26 11:48:34 blackend Exp $
-->
<!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -4601,6 +4601,7 @@
<!ENTITY man.umount.8 "<citerefentry/<refentrytitle/umount/<manvolnum/8//">
<!ENTITY man.unstr.8 "<citerefentry/<refentrytitle/unstr/<manvolnum/8//">
<!ENTITY man.updatedb.8 "<citerefentry/<refentrytitle/updatedb/<manvolnum/8//">
+<!ENTITY man.usbconfig.8 "<citerefentry vendor='current'/<refentrytitle/usbconfig/<manvolnum/8//">
<!ENTITY man.usbd.8 "<citerefentry/<refentrytitle/usbd/<manvolnum/8//">
<!ENTITY man.usbdevs.8 "<citerefentry/<refentrytitle/usbdevs/<manvolnum/8//">
<!ENTITY man.uuchk.8 "<citerefentry/<refentrytitle/uuchk/<manvolnum/8//">
More information about the p4-projects
mailing list