From eagle@gioria.dyndns.org  Tue Feb 19 07:12:04 2002
Return-Path: <eagle@gioria.dyndns.org>
Received: from gioria.dyndns.org (AFontenayssB-104-1-5-167.abo.wanadoo.fr [80.13.76.167])
	by hub.freebsd.org (Postfix) with ESMTP id 4521537B404
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Feb 2002 07:12:03 -0800 (PST)
Received: by gioria.dyndns.org (Postfix, from userid 42)
	id B6B13374B8; Tue, 19 Feb 2002 16:12:55 +0000 (GMT)
Message-Id: <20020219161255.B6B13374B8@gioria.dyndns.org>
Date: Tue, 19 Feb 2002 16:12:55 +0000 (GMT)
From: Sebastien Gioria <gioria@FreeBSD.ORG>
Reply-To: Sebastien Gioria <gioria@FreeBSD.ORG>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml be consistent with  the differents docs files
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         35115
>Category:       docs
>Synopsis:       src/release/doc/en_US.ISO8859-1/installation/common/install.sgml be consistent with  the differents docs files
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 19 07:20:04 PST 2002
>Closed-Date:    Fri Mar 1 15:49:29 PST 2002
>Last-Modified:  Fri Mar 01 15:50:03 PST 2002
>Originator:     Sebastien Gioria <gioria@FreeBSD.ORG>
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
FreeBSD.ORG
>Environment:
System: FreeBSD gioria.dyndns.org 4.5-STABLE FreeBSD 4.5-STABLE #5: Fri Feb 8 20:52:18 GMT 2002 root@gioria.dyndns.org:/space/space1/srcs/src/sys/compile/gw i386



>Description:

Replace FreeBSD word by the &os; SGML entities

>How-To-Repeat:

>Fix:

--- install.sgml.orig	Tue Feb 19 16:05:27 2002
+++ install.sgml	Tue Feb 19 16:06:26 2002
@@ -17,9 +17,9 @@
   the process of obtaining the &os; &release.current; distribution and
   to beginning the installation procedure.  The <ulink
   url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html"><quote>Installing
-  FreeBSD</quote></ulink>
+  &os;</quote></ulink>
   chapter of the <ulink
-  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD
+  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">&os;
   Handbook</ulink> provides more in-depth information about the
   installation program itself, including a guided walkthrough with
   screenshots.</para>
@@ -43,7 +43,7 @@
     <para>Note that on-line versions of the &os; <ulink
     url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</ulink> and <ulink
     url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">Handbook</ulink> are also
-    available from the <ulink url="http://www.FreeBSD.org/">FreeBSD
+    available from the <ulink url="http://www.FreeBSD.org/">&os;
     Project Web site</ulink>, if you have an Internet
     connection.</para>
 
@@ -85,7 +85,7 @@
     described in <filename>HARDWARE.TXT</filename>.</para>
 
     <para arch="alpha">You will need a dedicated disk for
-    FreeBSD/alpha. It is not possible to share a disk with another
+    &os;/alpha. It is not possible to share a disk with another
     operating system at this time. This disk will need to be attached
     to a SCSI controller which is supported by the SRM firmware or an
     IDE disk assuming the SRM in your machine supports booting from
@@ -210,7 +210,7 @@
       support booting from CDROM) and would like to simply install
       over the net using PPP, SLIP or a dedicated connection.
       You should start the installation by building
-      a set of FreeBSD boot floppy from the files
+      a set of &os; boot floppy from the files
       <filename>floppies/kern.flp</filename> and
       <filename>floppies/mfsroot.flp</filename> using the instructions
       found in <xref linkend="floppies">.  Restart your computer using
@@ -220,8 +220,8 @@
       via FTP or NFS.</para>
 
       <para arch="alpha">The easiest type of installation is from
-      CDROM.  If you have a supported CDROM drive and a FreeBSD
-      installation CDROM, you can boot FreeBSD directly from the
+      CDROM.  If you have a supported CDROM drive and a &os;
+      installation CDROM, you can boot &os; directly from the
       CDROM. Insert the CDROM into the drive and type the following
       command to start the installation (substituting the name of the
       appropriate CDROM drive if necessary):</para>
@@ -230,7 +230,7 @@
 
       <para arch="alpha">Alternatively you can boot the installation
       from floppy disk. You should start the installation by building
-      a set of FreeBSD boot floppy from the files
+      a set of &os; boot floppy from the files
       <filename>floppies/kern.flp</filename> and
       <filename>floppies/mfsroot.flp</filename> using the instructions
       found in <xref linkend="floppies">. From the SRM console prompt
@@ -600,12 +600,12 @@
         <para>In order for NFS installation to work, the server must
         also support <quote>subdir mounts</quote>, e.g. if your &os;
         distribution directory lives on
-        <filename>wiggy:/usr/archive/stuff/FreeBSD</filename>, then
+        <filename>wiggy:/usr/archive/stuff/&os;</filename>, then
         <hostid role="hostname">wiggy</hostid> will have to allow
-        the direct mounting of <filename>/usr/archive/stuff/FreeBSD</filename>, not just
+        the direct mounting of <filename>/usr/archive/stuff/&os;</filename>, not just
         <filename>/usr</filename> or <filename>/usr/archive/stuff</filename>.</para>
 
-        <para>In FreeBSD's <filename>/etc/exports</filename> file this is controlled by the
+        <para>In &os;'s <filename>/etc/exports</filename> file this is controlled by the
         <option>-alldirs</option> option.  Other NFS servers may have different
         conventions.  If you are getting <literal>Permission Denied</literal> messages
         from the server then it's likely that you don't have this
@@ -627,7 +627,7 @@
         contain a hostname or an IP address, so something like the following would
         work in the absence of a name server:</para>
 
-        <screen>ftp://216.66.64.162/pub/FreeBSD/releases/&arch;/4.2-RELEASE</screen>
+        <screen>ftp://216.66.64.162/pub/&os;/releases/&arch;/4.2-RELEASE</screen>
 
         <para>There are three FTP installation modes you can use:
 	  <itemizedlist>
@@ -660,7 +660,7 @@
               does not go through HTTP, you can specify the URL as
               something like:</para>
 
-              <screen><userinput>ftp://foo.bar.com:<replaceable>port</replaceable>/pub/FreeBSD</userinput></screen>
+              <screen><userinput>ftp://foo.bar.com:<replaceable>port</replaceable>/pub/&os;</userinput></screen>
 
               <para>In the URL above, <replaceable>port</replaceable>
               is the port number of the proxy FTP server.</para>


/tmp/
>Release-Note:
>Audit-Trail:

From: Alexey Zelkin <phantom@ark.cris.net>
To: Sebastien Gioria <gioria@FreeBSD.ORG>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: docs/35115: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml be consistent with  the differents docs files
Date: Tue, 19 Feb 2002 18:13:45 +0200

 hi,
 
 On Tue, Feb 19, 2002 at 04:12:55PM +0000, Sebastien Gioria wrote:
 > 
 > >Number:         35115
 > >Category:       docs
 > >Synopsis:       src/release/doc/en_US.ISO8859-1/installation/common/install.sgml be consistent with  the differents docs files
 > >Description:
 > 
 > Replace FreeBSD word by the &os; SGML entities
 
 Why ?
 

From: "Bruce A. Mah" <bmah@FreeBSD.ORG>
To: Sebastien Gioria <gioria@FreeBSD.ORG>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: docs/35115: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml be consistent with the differents docs files 
Date: Tue, 19 Feb 2002 09:01:29 -0800

 If memory serves me right, Sebastien Gioria wrote:
 
 > >Description:
 > 
 > Replace FreeBSD word by the &os; SGML entities
 
 Some of these are OK as they stand.  In general (at least in RELNOTESng,
 don't know if anyone else in doc/ uses this entity), we don't use the
 &os; entity in pathnames/URLs or where "FreeBSD" is part of the title of
 something such as a book or a Web page.
 
 Bruce.
 
 
State-Changed-From-To: open->closed 
State-Changed-By: bmah 
State-Changed-When: Fri Mar 1 15:49:29 PST 2002 
State-Changed-Why:  
Committed the applicable parts of this patch to -CURRENT and 4-STABLE. 
Thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=35115 
>Unformatted:
