svn commit: r45696 - in head/en_US.ISO8859-1: articles/explaining-bsd books/handbook/virtualization books/handbook/x11

[Gavin Atkinson]

Author: gavin
Date: Mon Sep 29 17:47:53 2014
New Revision: 45696
URL: http://svnweb.freebsd.org/changeset/doc/45696

Log:
  Macintosh -> Mac where appropriate.

Modified:
  head/en_US.ISO8859-1/articles/explaining-bsd/article.xml
  head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
  head/en_US.ISO8859-1/books/handbook/x11/chapter.xml

Modified: head/en_US.ISO8859-1/articles/explaining-bsd/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/explaining-bsd/article.xml	Mon Sep 29 17:35:07 2014	(r45695)
+++ head/en_US.ISO8859-1/articles/explaining-bsd/article.xml	Mon Sep 29 17:47:53 2014	(r45696)
@@ -466,8 +466,8 @@
 	<listitem>
 	  <para><link xlink:href="http://www.apple.com/macosx/server/">&macos;
 	      X</link> is the latest version of the operating system for
-	    <link xlink:href="http://www.apple.com/">Apple Computer Inc.'s</link>
-	      &macintosh; line.  The BSD core of this operating
+	      &apple;'s
+	      &mac; line.  The BSD core of this operating
 	      system, <link xlink:href="http://developer.apple.com/darwin/">Darwin</link>,
 	      is available as a fully functional open source operating
 	      system for x86 and PPC computers.  The Aqua/Quartz

Modified: head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Sep 29 17:35:07 2014	(r45695)
+++ head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Sep 29 17:47:53 2014	(r45696)
@@ -51,7 +51,7 @@
 
       <listitem>
 	<para>How to install &os; on an &intel;-based &apple;
-	  &macintosh; computer.</para>
+	  &mac; computer.</para>
       </listitem>
 
 <!--

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Mon Sep 29 17:35:07 2014	(r45695)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Mon Sep 29 17:47:53 2014	(r45696)
@@ -580,8 +580,8 @@ dbus_enable="YES"</programlisting>
 	example,
 	<filename>/usr/local/lib/X11/fonts/TrueType</filename>) and
 	copy all of the &truetype; fonts into this directory.  Keep in
-	mind that &truetype; fonts cannot be directly taken from a
-	&macintosh;; they must be in &unix;/&ms-dos;/&windows; format
+	mind that &truetype; fonts cannot be directly taken from an
+	&apple; &mac;; they must be in &unix;/&ms-dos;/&windows; format
 	for use by <application>&xorg;</application>.  Once the
 	files have been copied into this directory, use
 	<application>ttmkfdir</application> to create a