Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Nov 2009 22:16:33 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 170754 for review
Message-ID:  <200911172216.nAHMGXsR086347@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=170754

Change 170754 by rene@rene_self on 2009/11/17 22:16:07

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#22 integrate

Differences ...

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.468 2009/11/03 07:50:59 brueffer Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.469 2009/11/17 21:47:13 bcr Exp $
 -->
 
 <appendix id="mirrors">
@@ -483,7 +483,8 @@
 	<itemizedlist>
 	  <listitem>
 	    <para><ulink 
-		url="http://www.csc.calpoly.edu/~dbutler/tutorials/winter96/cvs/">CVS Tutorial</ulink> from Cal Poly.</para>
+		url="http://users.csc.calpoly.edu/~gfisher/classes/205/handouts/cvs-basics.html">CVS Tutorial</ulink> from California 
+		Polytechnic State University.</para>
 	  </listitem>
 
 	  <listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.21 2009/11/08 15:43:41 bcr Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.22 2009/11/17 21:50:11 bcr Exp $
 -->
 
 <chapter id="virtualization">
@@ -36,21 +36,21 @@
       </listitem>
 
       <listitem>
-	<para>How to install FreeBSD on an &intel;-based &apple; &macintosh;
+	<para>How to install &os; on an &intel;-based &apple; &macintosh;
 	  computer.</para>
       </listitem>
 
       <listitem>
-	<para>How to install FreeBSD on Linux with <application>&xen;</application>.</para>
+	<para>How to install &os; on Linux with <application>&xen;</application>.</para>
       </listitem>
 
       <listitem>
-	<para>How to install FreeBSD on &microsoft.windows; with
+	<para>How to install &os; on &microsoft.windows; with
 	  <application>Virtual PC</application>.</para>
       </listitem>
 
       <listitem>
-	<para>How to tune a FreeBSD system for best performance under
+	<para>How to tune a &os; system for best performance under
 	  virtualization.</para>
       </listitem>
 
@@ -60,11 +60,11 @@
 
     <itemizedlist>
       <listitem>
-	<para>Understand the basics of &unix; and FreeBSD (<xref
+	<para>Understand the basics of &unix; and &os; (<xref
 	    linkend="basics">).</para>
       </listitem>
 
-      <listitem><para>Know how to install FreeBSD (<xref
+      <listitem><para>Know how to install &os; (<xref
       linkend="install">).</para></listitem>
 
       <listitem><para>Know how to set up your network connection (<xref
@@ -79,25 +79,25 @@
 
 
   <sect1 id="virtualization-guest">
-    <title>FreeBSD as a Guest OS</title>
+    <title>&os; as a Guest OS</title>
 
     <sect2 id="virtualization-guest-parallels">
       <title>Parallels on MacOS</title>
 
       <para><application>Parallels Desktop</application> for &mac; is a
 	commercial software product available for &intel; based &apple;
-	&mac; computers running &macos; 10.4.6 or higher.  FreeBSD is a
+	&mac; computers running &macos; 10.4.6 or higher.  &os; is a
 	fully supported guest operating system.
 	Once <application>Parallels</application> has been installed on &macos;
         X, the user must configure a virtual machine and then install
         the desired guest operating system.</para>
 
 	<sect3 id="virtualization-guest-parallels-install">
-	  <title>Installing FreeBSD on Parallels/&macos; X</title>
+	  <title>Installing &os; on Parallels/&macos; X</title>
 
-	  <para>The first step in installing FreeBSD on &macos;
+	  <para>The first step in installing &os; on &macos;
 	    X/<application>Parallels</application> is to create a new virtual
-	    machine for installing FreeBSD.  Select <guimenuitem>FreeBSD</guimenuitem>
+	    machine for installing &os;.  Select <guimenuitem>&os;</guimenuitem>
 	    as the <guimenu>Guest OS Type</guimenu> when prompted:</para>
 
 	  <mediaobject>
@@ -107,9 +107,9 @@
           </mediaobject>
 
 	  <para>And choose a reasonable amount of disk and
-	    memory depending on your plans for this virtual FreeBSD
-	    instance.  4GB of disk space and 512MB of RAM work well for most uses of
-	    FreeBSD under <application>Parallels</application>:</para>
+	    memory depending on your plans for this virtual &os;
+	    instance.  4GB of disk space and 512MB of RAM work well for most
+	    uses of &os; under <application>Parallels</application>:</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -164,13 +164,13 @@
             </imageobject>
           </mediaobject>
 
-	  <para>After your FreeBSD virtual machine has been created,
-	    you will need to install FreeBSD on it.  This is best done
-	    with an official FreeBSD CDROM or with an ISO image
+	  <para>After your &os; virtual machine has been created,
+	    you will need to install &os; on it.  This is best done
+	    with an official &os; CDROM or with an ISO image
 	    downloaded from an official FTP site.  When you have the
 	    appropriate ISO image on your local &mac; filesystem or a
 	    CDROM in your &mac;'s CD drive, click on the disc icon in the
-	    bottom right corner of your FreeBSD
+	    bottom right corner of your &os;
 	    <application>Parallels</application> window.  This
 	    will bring up a window that allows you to associate the
 	    CDROM drive in your virtual machine with an ISO file on
@@ -183,7 +183,7 @@
 	  </mediaobject>
 
 	  <para>Once you have made this association with your CDROM
-	    source, reboot your FreeBSD virtual machine as normal by
+	    source, reboot your &os; virtual machine as normal by
 	    clicking the reboot icon.
 	    <application>Parallels</application> will reboot with a
 	    special BIOS that first checks if you have a CDROM just as a
@@ -195,7 +195,7 @@
 	    </imageobject>
 	  </mediaobject>
 
-	  <para>In this case it will find the FreeBSD installation media
+	  <para>In this case it will find the &os; installation media
 	    and begin a normal <application>sysinstall</application> based
 	    installation as described in <xref linkend="install">.  You
 	    may install, but do not attempt to configure X11 at
@@ -208,7 +208,7 @@
 	  </mediaobject>
 
 	  <para>When you have finished the installation, reboot
-	    into your newly installed FreeBSD virtual machine.</para>
+	    into your newly installed &os; virtual machine.</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -218,9 +218,9 @@
 	</sect3>
 
 	<sect3 id="virtualization-guest-parallels-configure">
-	  <title>Configuring FreeBSD on &macos; X/Parallels</title>
+	  <title>Configuring &os; on &macos; X/Parallels</title>
 
-	  <para>After FreeBSD has been successfully installed on &macos;
+	  <para>After &os; has been successfully installed on &macos;
 	    X with <application>Parallels</application>, there are a number
 	    of configuration steps that can be taken to optimize the system
 	    for virtualized operation.</para>
@@ -231,13 +231,13 @@
 
 	      <para>The most important step is to reduce the
 	        <option>kern.hz</option> tunable to reduce the CPU utilization
-		of FreeBSD under the <application>Parallels</application>
+		of &os; under the <application>Parallels</application>
 		environment.  This is accomplished by adding the following
 		line to <filename>/boot/loader.conf</filename>:</para>
 
 	  	<programlisting>kern.hz=100</programlisting>
 
-	      <para>Without this setting, an idle FreeBSD
+	      <para>Without this setting, an idle &os;
 	        <application>Parallels</application> guest
 		OS will use roughly 15% of the CPU of a single
 		processor &imac;.  After this change the usage will be
@@ -286,13 +286,13 @@
         <!-- Mar/Apr 2007 -->
       </sect2info>
 
-      <title>FreeBSD with &xen; on Linux</title>
+      <title>&os; with &xen; on Linux</title>
 
 	<para>The <application>&xen;</application> hypervisor is an open
 	  source paravirtualization product which is now supported by the
 	  commercial XenSource company.  Guest operating systems are known
 	  as domU domains, and the host operating system is known as dom0.
-	  The first step in running a virtual FreeBSD instance under Linux
+	  The first step in running a virtual &os; instance under Linux
 	  is to install <application>&xen;</application> for Linux dom0.
 	  The host operating system will be a Slackware Linux
 	  distribution.</para>
@@ -367,9 +367,9 @@
         </sect3>
 
         <sect3>
-          <title>FreeBSD 7-CURRENT domU</title>
+          <title>&os; 7-CURRENT domU</title>
 
-          <para>Download the FreeBSD domU kernel for <application>&xen; 3.0</application> and
+          <para>Download the &os; domU kernel for <application>&xen; 3.0</application> and
 	    disk image from <ulink
             url="http://www.fsmware.com/">http://www.fsmware.com/</ulink></para>;
 
@@ -580,11 +580,11 @@
 	system.</para>
 
 	<sect3 id="virtualization-guest-virtualpc-install">
-	  <title>Installing FreeBSD on Virtual PC/&microsoft.windows;</title>
+	  <title>Installing &os; on Virtual PC/&microsoft.windows;</title>
 
-	  <para>The first step in installing FreeBSD on &microsoft.windows;
+	  <para>The first step in installing &os; on &microsoft.windows;
 	    /<application>Virtual PC</application> is to create a new virtual
-	    machine for installing FreeBSD.  Select <guimenuitem>Create a
+	    machine for installing &os;.  Select <guimenuitem>Create a
 	    virtual machine</guimenuitem> when prompted:</para>
 
 	  <mediaobject>
@@ -609,9 +609,9 @@
 	  </mediaobject>
 	  
 	  <para>Then, choose a reasonable amount of disk and
-	    memory depending on your plans for this virtual FreeBSD
-	    instance.  4GB of disk space and 512MB of RAM work well for most uses of
-	    FreeBSD under <application>Virtual PC</application>:</para>
+	    memory depending on your plans for this virtual &os;
+	    instance.  4GB of disk space and 512MB of RAM work well for most
+	    uses of &os; under <application>Virtual PC</application>:</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -633,7 +633,7 @@
 	    </imageobject>
 	  </mediaobject>
 
-	  <para>Select your FreeBSD virtual machine and click
+	  <para>Select your &os; virtual machine and click
 	    <guimenu>Settings</guimenu>, then set the type of networking and a
 	    network interface:</para>
 
@@ -649,12 +649,12 @@
             </imageobject>
           </mediaobject>
 
-	  <para>After your FreeBSD virtual machine has been created,
-	    you will need to install FreeBSD on it.  This is best done
-	    with an official FreeBSD CDROM or with an ISO image
+	  <para>After your &os; virtual machine has been created,
+	    you will need to install &os; on it.  This is best done
+	    with an official &os; CDROM or with an ISO image
 	    downloaded from an official FTP site.  When you have the
 	    appropriate ISO image on your local &windows; filesystem or a
-	    CDROM in your CD drive, double click on your FreeBSD
+	    CDROM in your CD drive, double click on your &os;
 	    virtual machine to boot.  Then, click <guimenu>CD</guimenu> and
 	    choose <guimenu>Capture ISO Image...</guimenu> on
 	    <application>Virtual PC</application> window.  This
@@ -675,7 +675,7 @@
 	  </mediaobject>
 
 	  <para>Once you have made this association with your CDROM
-	    source, reboot your FreeBSD virtual machine as normal by
+	    source, reboot your &os; virtual machine as normal by
 	    clicking the <guimenu>Action</guimenu> and
 	    <guimenu>Reset</guimenu>.  <application>Virtual PC</application>
 	    will reboot with a special BIOS that first checks if you have a
@@ -687,7 +687,7 @@
 	    </imageobject>
 	  </mediaobject>
 
-	  <para>In this case it will find the FreeBSD installation media
+	  <para>In this case it will find the &os; installation media
 	    and begin a normal <application>sysinstall</application> based
 	    installation as described in <xref linkend="install">.  You
 	    may install, but do not attempt to configure X11 at
@@ -701,7 +701,7 @@
 
 	  <para>When you have finished the installation, remember to eject
 	    CDROM or release ISO image. Finally, reboot into your newly
-	    installed FreeBSD virtual machine.</para>
+	    installed &os; virtual machine.</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -711,9 +711,9 @@
 	</sect3>
 
 	<sect3 id="virtualization-guest-virtualpc-configure">
-	  <title>Configuring FreeBSD on &microsoft.windows;/Virtual PC</title>
+	  <title>Configuring &os; on &microsoft.windows;/Virtual PC</title>
 
-	  <para>After FreeBSD has been successfully installed on
+	  <para>After &os; has been successfully installed on
 	    &microsoft.windows; with <application>Virtual PC</application>,
 	    there are a number of configuration steps that can be taken to
 	    optimize the system for virtualized operation.</para>
@@ -724,13 +724,13 @@
 
 	      <para>The most important step is to reduce the
 	        <option>kern.hz</option> tunable to reduce the CPU utilization
-		of FreeBSD under the <application>Virtual PC</application>
+		of &os; under the <application>Virtual PC</application>
 		environment.  This is accomplished by adding the following
 		line to <filename>/boot/loader.conf</filename>:</para>
 
 	  	<programlisting>kern.hz=100</programlisting>
 
-	      <para>Without this setting, an idle FreeBSD
+	      <para>Without this setting, an idle &os;
 	        <application>Virtual PC</application> guest
 		OS will use roughly 40% of the CPU of a single
 		processor computer.  After this change the usage will be
@@ -772,14 +772,14 @@
 
       <para><application>VMware Fusion</application> for &mac; is a
 	commercial software product available for &intel; based &apple;
-	&mac; computers running &macos; 10.4.9 or higher.  FreeBSD is a
+	&mac; computers running &macos; 10.4.9 or higher.  &os; is a
 	fully supported guest operating system.  Once
 	<application>VMware Fusion</application> has been installed on
 	&macos; X, the user must configure a virtual machine and then
 	install the desired guest operating system.</para>
 
 	<sect3 id="virtualization-guest-vmware-install">
-	  <title>Installing FreeBSD on VMware/&macos; X</title>
+	  <title>Installing &os; on VMware/&macos; X</title>
 
 	  <para>The first step is to start VMware Fusion, the Virtual
 	    Machine Library will load.  Click "New" to create the VM:</para>
@@ -801,8 +801,8 @@
 
 	  <para>Select <guimenuitem>Other</guimenuitem> as the
 	    <guimenuitem>Operating System</guimenuitem> and
-	    <guimenuitem>FreeBSD</guimenuitem> or
-	    <guimenuitem>FreeBSD 64-bit</guimenuitem>, depending on if
+	    <guimenuitem>&os;</guimenuitem> or
+	    <guimenuitem>&os; 64-bit</guimenuitem>, depending on if
 	    you want 64-bit support, as the <guimenu>Version</guimenu>
 	    when prompted:</para>
 
@@ -902,13 +902,13 @@
 	  </mediaobject>
 
 	  <para>After you have finished modifying the settings, boot the
-	    newly installed FreeBSD virtual machine.</para>
+	    newly installed &os; virtual machine.</para>
         </sect3>
 
 	<sect3 id="virtualization-guest-vmware-configure">
-	  <title>Configuring FreeBSD on &macos; X/VMware</title>
+	  <title>Configuring &os; on &macos; X/VMware</title>
 
-	  <para>After FreeBSD has been successfully installed on &macos;
+	  <para>After &os; has been successfully installed on &macos;
 	    X with <application>VMware</application>, there are a number
 	    of configuration steps that can be taken to optimize the system
 	    for virtualized operation.</para>
@@ -919,13 +919,13 @@
 
 	      <para>The most important step is to reduce the
 	        <option>kern.hz</option> tunable to reduce the CPU utilization
-		of FreeBSD under the <application>VMware</application>
+		of &os; under the <application>VMware</application>
 		environment.  This is accomplished by adding the following
 		line to <filename>/boot/loader.conf</filename>:</para>
 
 	  	<programlisting>kern.hz=100</programlisting>
 
-	      <para>Without this setting, an idle FreeBSD
+	      <para>Without this setting, an idle &os;
 	        <application>VMware</application> guest
 		OS will use roughly 15% of the CPU of a single
 		processor &imac;.  After this change the usage will be
@@ -961,7 +961,7 @@
   </sect1>
 
   <sect1 id="virtualization-host">
-    <title>FreeBSD as a Host OS</title>
+    <title>&os; as a Host OS</title>
 
     <para>For a number of years, &os; was not officially supported as a host
       OS by any of the available virtualization solutions.  Some people were

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#22 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.23 2009/11/07 21:32:41 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.24 2009/11/17 19:37:32 rene Exp $
      %SOURCE%	en_US.ISO8859-1/books/handbook/x11/chapter.sgml
      %SRCID%	1.197
 -->



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911172216.nAHMGXsR086347>