Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Nov 2010 22:19:07 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 185816 for review
Message-ID:  <201011142219.oAEMJ7Hp063567@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@185816?ac=10

Change 185816 by rene@rene_acer on 2010/11/14 22:18:26

	Pre-7.X cleanup:
	- Remove last references to XFree86.
	- Modernize the cutting-edge chapter

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#21 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#18 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#10 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#33 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#6 edit

Differences ...

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

@@ -116,9 +116,8 @@
 	role="package">net/cvsup</filename> (if you do not want to install
 	the graphical <command>cvsup</command> client, you can just install
 	the port <filename>net/cvsup-without-gui</filename>).
-	If you are using
-	&os;&nbsp;6.2-RELEASE or later, you may wish to substitute this
-	with &man.csup.1;, which is now part of the base system.</para>
+	You may wish to substitute this
+	with &man.csup.1;, which is part of the base system.</para>
     </note>
   </sect1>
 
@@ -162,10 +161,8 @@
 
     <note>
       <para>Binary updates are available for all architectures and
-	releases currently supported by the security team; however,
-	some features, such as the &os; operating system upgrades,
-	require the latest release of &man.freebsd-update.8; and &os;&nbsp;6.3 
-	or greater.  Before updating to a new release, the current
+	releases currently supported by the security team.
+	Before updating to a new release, the current
 	release announcements should be reviewed as they may contain
 	important information pertinent to the desired release.  These
 	announcements may be viewed at the following link:
@@ -425,9 +422,9 @@
       <para>Major and minor version updates may be performed by
 	providing <command>freebsd-update</command> with a release
 	version target, for example, the following command will
-	update to &os;&nbsp;6.4:</para>
+	update to &os;&nbsp;8.1:</para>
 
-      <screen>&prompt.root; <userinput>freebsd-update -r 6.4-RELEASE upgrade</userinput></screen>
+      <screen>&prompt.root; <userinput>freebsd-update -r 8.1-RELEASE upgrade</userinput></screen>
 
       <para>After the command has been received,
 	<command>freebsd-update</command> will evaluate the
@@ -437,7 +434,7 @@
 	what components have not been detected.  For example:</para>
 
       <screen>Looking up update.FreeBSD.org mirrors... 1 mirrors found.
-Fetching metadata signature for 6.3-RELEASE from update1.FreeBSD.org... done.
+Fetching metadata signature for 8.0-RELEASE from update1.FreeBSD.org... done.
 Fetching metadata index... done.
 Inspecting system... done.
 
@@ -462,7 +459,7 @@
 	similar to the following:</para>
 
       <screen>WARNING: This system is running a "<replaceable>MYKERNEL</replaceable>" kernel, which is not a
-kernel configuration distributed as part of FreeBSD 6.3-RELEASE.
+kernel configuration distributed as part of FreeBSD 8.0-RELEASE.
 This kernel will not be updated: you MUST update the kernel manually
 before running "/usr/sbin/freebsd-update install"</screen>
 
@@ -2009,12 +2006,6 @@
 	problems.  Hopefully, the current procedure will remain stable for a
 	long time.</para>
 
-      <note>
-	<para>Upgrading from &os; 3.<replaceable>X</replaceable> or earlier
-	  releases is a bit trickier; read <filename>UPDATING</filename>
-	  carefully if you have to perform this sort of upgrade.</para>
-      </note>
-
       <para>To summarize, the currently recommended way of upgrading &os;
 	from sources is:</para>
 
@@ -2133,7 +2124,7 @@
 	<maketarget>installworld</maketarget>.  If your old version of
 	<command>mergemaster</command> does not support <option>-p</option>,
 	use the new version in the source tree when running for the first
-	time:</para>
+	time:</para><!--rene: how old is this mergemaster?-->
 
       <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput>
 &prompt.root; <userinput>./mergemaster.sh -p</userinput></screen>
@@ -2448,8 +2439,8 @@
     <sect2 id="make-installworld">
       <title>Install the New System Binaries</title>
 
-      <para>If you were building a version of &os; recent enough to have
-	used <command>make buildworld</command> then you should now use
+      <para>
+	You should now use
 	<maketarget>installworld</maketarget> to install the new system
 	binaries.</para>
 
@@ -2837,7 +2828,7 @@
 	      process is to remove this directory and start afresh.  In this
 	      case, keeping <filename>/usr/obj</filename> around after you
 	      have finished makes little sense, and will free up a large
-	      chunk of disk space (currently about 340&nbsp;MB).</para>
+	      chunk of disk space (currently about 2&nbsp;GB).</para>
 
 	    <para>However, if you know what you are doing you can have
 	      <command>make buildworld</command> skip this step.  This will

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

@@ -119,7 +119,6 @@
 
 	<indexterm>
 	  <primary>X Window System</primary>
-	  <seealso>XFree86</seealso>
 	</indexterm>
 
 	<listitem>
@@ -351,7 +350,6 @@
 
 	<indexterm>
 	  <primary>X Window System</primary>
-	  <secondary>XFree86</secondary>
 	</indexterm>
 	<indexterm>
 	  <primary>X Window System</primary>

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

@@ -614,9 +614,7 @@
 	<title>Displaying Fonts</title>
 	<indexterm><primary>X11 True Type font server</primary></indexterm>
 	<para>Install <application>&xorg;</application> server
-	  (<filename role="package">x11-servers/xorg-server</filename>)
-	  or <application>&xfree86;</application> server
-	  (<filename role="package">x11-servers/XFree86-4-Server</filename>),
+	  (<filename role="package">x11-servers/xorg-server</filename>),
 	  then install the language &truetype; fonts.  Setting the correct
 	  locale should allow you to view your selected language in menus
 	  and such.</para>

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

@@ -912,7 +912,7 @@
 	<note>
 	  <para>If you are going to be using
 	  <application>CVSup</application> on a machine which will not have
-	  <application>&xfree86;</application> or <application>&xorg;</application> installed, such as a server, be
+	  <application>&xorg;</application> installed, such as a server, be
 	  sure to use the port which does not include the
 	  <application>CVSup</application> <acronym>GUI</acronym>,
 	  <filename role="package">net/cvsup-without-gui</filename>.</para>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#6 (text+ko) ====

@@ -191,7 +191,7 @@
       <listitem>
 	<para><xref linkend="x11"> (<quote>The X Window System</quote>) has been completely
  	rewritten with an emphasis on using modern desktop
-	technologies such as <application>KDE</application> and <application>GNOME</application> on &xfree86; 4.X.</para>
+	technologies such as <application>KDE</application> and <application>GNOME</application> on &xorg;.</para>
       </listitem>
       <listitem>
 	<para><xref linkend="boot"> (<quote>The FreeBSD Booting Process</quote>) has been



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