install-guide fedora-install-guide-intro-en.xml, 1.8, 1.9 fedora-install-guide-other-instmethods-en.xml, 1.9, 1.10 fedora-install-guide-timezone-en.xml, 1.5, 1.6 fedora-install-guide-upgrading-en.xml, 1.7, 1.8

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943

Modified Files:
	fedora-install-guide-intro-en.xml 
	fedora-install-guide-other-instmethods-en.xml 
	fedora-install-guide-timezone-en.xml 
	fedora-install-guide-upgrading-en.xml 
Log Message:
Only need to announce trademark once in the document


Index: fedora-install-guide-intro-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-install-guide-intro-en.xml	17 May 2005 22:32:26 -0000	1.8
+++ fedora-install-guide-intro-en.xml	20 May 2005 02:16:08 -0000	1.9
@@ -242,9 +242,9 @@
 	Some corporate networks include a <firstterm>directory
 	  service</firstterm> that manages user accounts for the
 	organization.  &FC; systems can join a Kerberos, NIS, Hesiod or
-	<trademark class="registered">Windows</trademark> domain as part
-	of the installation process.  &FC; can also use LDAP
-	directories.
+	<trademark class="registered">Microsoft</trademark> <trademark
+	  class="registered">Windows</trademark> domain as part of the
+	installation process.  &FC; can also use LDAP directories.
       </para>
 
 	<!--


Index: fedora-install-guide-other-instmethods-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-other-instmethods-en.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-install-guide-other-instmethods-en.xml	20 May 2005 02:03:37 -0000	1.9
+++ fedora-install-guide-other-instmethods-en.xml	20 May 2005 02:16:08 -0000	1.10
@@ -199,12 +199,10 @@
       <para>
 	In &FED;, <systemitem class="filesystem">vfat</systemitem>
 	represents a range of file systems found on most removable
-	media.  Some <trademark class="registered">Microsoft</trademark>
-	<trademark class="registered">Windows</trademark> systems also
-	use <systemitem class="filesystem">vfat</systemitem> file
-	systems on hard disk partitions.  To check a partition's file
-	system under Windows, use the <application>Disk
-	  Administrator</application> tool.
+	media.  Some Microsoft Windows systems also use <systemitem
+	  class="filesystem">vfat</systemitem> file systems on hard disk
+	partitions.  To check a partition's file system under Windows,
+	use the <application>Disk Administrator</application> tool.
       </para>
     </note>
 


Index: fedora-install-guide-timezone-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-timezone-en.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-timezone-en.xml	15 May 2005 14:40:57 -0000	1.5
+++ fedora-install-guide-timezone-en.xml	20 May 2005 02:16:08 -0000	1.6
@@ -76,16 +76,12 @@
     </para>
 
     <caution>
-      <title><trademark class="registered">Windows</trademark>and the
-	System Clock</title>
+      <title>Windows and the System Clock</title>
       <para>
 	Do not enable the <guilabel>System clock uses UTC</guilabel>
-	option if your machine also runs <trademark
-	  class="registered">Microsoft</trademark> <trademark
-	  class="registered">Windows</trademark>. <trademark
-	  class="registered">Microsoft</trademark> operating systems
-	change the hardware clock to match local time rather than UTC.
-	This may cause unexpected behavior under &FC;.
+	option if your machine also runs Microsoft Windows. Microsoft
+	operating systems change the hardware clock to match local time
+	rather than UTC. This may cause unexpected behavior under &FC;.
       </para>
     </caution>
 


Index: fedora-install-guide-upgrading-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-upgrading-en.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-install-guide-upgrading-en.xml	20 May 2005 01:22:31 -0000	1.7
+++ fedora-install-guide-upgrading-en.xml	20 May 2005 02:16:08 -0000	1.8
@@ -109,13 +109,11 @@
     <para>
       If your machine uses another boot loader, such as
       <trademark>BootMagic</trademark>, <trademark>System
-	Commander</trademark>,  or the loader installed by <trademark
-	class="registered">Microsoft</trademark> <trademark
-	class="registered">Windows</trademark>, then the &FED;
-      installation system cannot update it.  In this case, select
-      <guilabel>Skip boot loader updating</guilabel>.  When the
-      installation process completes, refer to the documentation for
-      your product for assistance.
+	Commander</trademark>,  or the loader installed by Microsoft
+      Windows, then the &FED; installation system cannot update it.  In
+      this case, select <guilabel>Skip boot loader updating</guilabel>.
+      When the installation process completes, refer to the
+      documentation for your product for assistance.
     </para>
 
     <para>