Attachment 5414 Details for Bug 12956 – file.diff

[patch] file.diff

file.diff (text/plain), 21.15 KB, created by nbm on 1999-08-04 09:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nbm

Created: 1999-08-04 09:30:00 UTC

Size: 21.15 KB

patch

obsolete

>diff -ru handbook.orig/bibliography/chapter.sgml handbook/bibliography/chapter.sgml
>--- handbook.orig/bibliography/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/bibliography/chapter.sgml	Tue Aug  3 21:33:15 1999
>@@ -394,7 +394,7 @@
>       </listitem>
>       
>       <listitem>
>-	<para>Raymond, Eric S.  <emphasis>The New Hacker's Dictonary, 3rd
>+	<para>Raymond, Eric S.  <emphasis>The New Hacker's Dictionary, 3rd
> 	    edition</emphasis>.  MIT Press, 1996.  ISBN
> 	  0-262-68092-0.  Also known as the <ulink
> 	    URL="http://www.ccil.org/jargon/jargon.html">Jargon
>diff -ru handbook.orig/contrib/chapter.sgml handbook/contrib/chapter.sgml
>--- handbook.orig/contrib/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/contrib/chapter.sgml	Tue Aug  3 21:38:30 1999
>@@ -178,7 +178,7 @@
> 	    <listitem>
> 	      <para>Add authorization infrastructure to the kernel, to allow
> 		different authorization policies.  Part of this could be done
>-		by modifying <literal>suser()</literal>. Coordinatory:
>+		by modifying <literal>suser()</literal>. Coordinator:
> 		&a.eivind;</para>
> 	    </listitem>
> 	    
>diff -ru handbook.orig/eresources/chapter.sgml handbook/eresources/chapter.sgml
>--- handbook.orig/eresources/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/eresources/chapter.sgml	Tue Aug  3 21:59:09 1999
>@@ -623,7 +623,7 @@
> 	    <para><emphasis>Documentation project</emphasis></para>
> 
> 	    <para>This mailing list is for the discussion of issues and
>-	      projects related to the creation of documenation for FreeBSD.
>+	      projects related to the creation of documentation for FreeBSD.
> 	      The members of this mailing list are collectively referred to as
> 	      &ldquo;The FreeBSD Documentation Project&rdquo;.  It is an open
> 	      list; feel free to join and contribute!</para>
>diff -ru handbook.orig/hw/chapter.sgml handbook/hw/chapter.sgml
>--- handbook.orig/hw/chapter.sgml	Tue Aug  3 21:07:07 1999
>+++ handbook/hw/chapter.sgml	Tue Aug  3 21:25:53 1999
>@@ -126,7 +126,7 @@
> 
> 	<note>
> 	  <para>There are two types of 3940 on the market&mdash;the older
>-	    model with AIC 7880 chips on it, and hte newer one with AIC 7895
>+	    model with AIC 7880 chips on it, and the newer one with AIC 7895
> 	    chips.  The newer model requires <ulink
> 	      url="http://www.FreeBSD.org/pub/FreeBSD/development/cam/">CAM</ulink>
> 	    support which is not yet part of FreeBSD&mdash;you have to add it,
>@@ -239,7 +239,7 @@
>       <sect3 id="hw-networking">
> 	<title>Networking</title>
> 	
>-	<para>I can recommend the Intel EtherExpress Pro/100B card first ande
>+	<para>I can recommend the Intel EtherExpress Pro/100B card first and
> 	  foremost, followed by the <ulink
> 	    URL="http://www.smc.com/">SMC</ulink> Ultra 16 controller for any
> 	  ISA application and the SMC EtherPower or Compex ENET32 cards for
>@@ -248,7 +248,7 @@
> 	  Zynx ZX342 or DEC DE435/450, will generally work quite well and can
> 	  frequently be found in 2-port and 4-port version (useful for
> 	  firewalls and routers), though the Pro/100MB card has the edge when
>-	  it comes to providing the best performance with teh lower
>+	  it comes to providing the best performance with lower
> 	  overhead.</para>
> 	    
> 	<para>If what you're looking for is the cheapest possible solution
>@@ -2926,7 +2926,7 @@
> ttyA01  "/usr/libexec/getty std.9600"   vt100   on insecure
> 	</programlisting>
>      
>-	<para>Change the terminal type as approprate. For modems,
>+	<para>Change the terminal type as appropriate. For modems,
> 	  <userinput>dialup</userinput> or <userinput>unknown</userinput> is
> 	  fine.</para>
>       </sect3>
>@@ -5574,7 +5574,7 @@
> 	various audio player software.</para>
> 	  
>       <para>Another area where SCSI CDROM manufacturers are cutting corners is
>-	adhearance to the <link linkend="scsi-further-reading">SCSI
>+	adherence to the <link linkend="scsi-further-reading">SCSI
> 	  specification</link>. Many SCSI CDROMs will respond to <link
> 	  linkend="scsi-rogue-devices">multiple LUNs</link> for its target
> 	address.  Known violators include the 6x Teac CD-56S 1.0D.</para>
>diff -ru handbook.orig/internals/chapter.sgml handbook/internals/chapter.sgml
>--- handbook.orig/internals/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/internals/chapter.sgml	Tue Aug  3 20:12:56 1999
>@@ -892,7 +892,7 @@
> 	      <row>
> 		<entry>0x0d</entry>
> 		<entry>read</entry>
>-		<entry>Termporary Register (not available on newer
>+		<entry>Temporary Register (not available on newer
> 		  versions)</entry>
> 	      </row>
> 	      <row>
>@@ -1106,7 +1106,7 @@
> 	      <row>
> 		<entry>0xda</entry>
> 		<entry>read</entry>
>-		<entry>Termporary Register (not present in Intel
>+		<entry>Temporary Register (not present in Intel
> 		  82374)</entry>
> 	      </row>
> 	      
>@@ -1639,15 +1639,15 @@
> 	flags.</para>
> 	
>       <para>In general terms, each of the paging queues operates in a LRU
>-	fashion.  A page is typicaly placed in a wired or active state
>+	fashion.  A page is typically placed in a wired or active state
> 	initially.  When wired, the page is usually associated with a page
> 	table somewhere.  The VM system ages the page by scanning pages in a
> 	more active paging queue (LRU) in order to move them to a less-active
> 	paging queue.  Pages that get moved into the cache are still
> 	associated with a VM object but are candidates for immediate reuse.
>-	Pages in the free queue are truely free.  FreeBSD attempts to minimize
>+	Pages in the free queue are truly free.  FreeBSD attempts to minimize
> 	the number of pages in the free queue, but a certain minimum number of
>-	truely free pages must be maintained in order to accomodate page
>+	truly free pages must be maintained in order to accommodate page
> 	allocation at interrupt time.</para>
> 	
>       <para>If a process attempts to access a page that does not exist in its
>@@ -1819,7 +1819,7 @@
> 	debugging and optimization flags with the
> 	<literal>makeoptions</literal> directive in the kernel configuration.
> 	Note that you should not use <option>-g</option> unless you can
>-	accomodate the large (typically 7 MB+) kernels that result.</para>
>+	accommodate the large (typically 7 MB+) kernels that result.</para>
> 
>       <programlisting>makeoptions    DEBUG="-g"
> makeoptions     COPTFLAGS="-O2 -pipe"</programlisting>
>@@ -1840,7 +1840,7 @@
> 	lot of memory.  You should also size your swap partition based on the
> 	maximum memory configuration you ever intend to put on the machine so
> 	you do not have to repartition your disks later on. If you want to be
>-	able to accomodate a crash dump, your first swap partition must be at
>+	able to accommodate a crash dump, your first swap partition must be at
> 	least as large as main memory and <filename>/var/crash</filename> must
> 	have sufficient free space to hold the dump.</para>
> 	
>diff -ru handbook.orig/kernelconfig/chapter.sgml handbook/kernelconfig/chapter.sgml
>--- handbook.orig/kernelconfig/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/kernelconfig/chapter.sgml	Tue Aug  3 22:31:28 1999
>@@ -103,7 +103,7 @@
>       but is covered well in many books in the <link
> 	linkend="bibliography">bibliography</link>.  However, FreeBSD does
>       offer an easier editor called &ldquo;ee&rdquo; which, if you are a
>-      beginner, should be your editor of choise.  Feel free to change the
>+      beginner, should be your editor of choice.  Feel free to change the
>       comment lines at the top to reflect your configuration or the changes
>       you have made to differentiate it from
>       <filename>GENERIC</filename>.</para>
>@@ -255,7 +255,7 @@
> 	      </listitem>
> 	    </itemizedlist>
> 
>-	    <para>The values availible for <replaceable>cpu_type</replaceable> 
>+	    <para>The values available for <replaceable>cpu_type</replaceable> 
> 		for Alpha systems include:</para>
> 
> 	    <itemizedlist>
>@@ -975,7 +975,7 @@
> 
> 		<listitem>
> 		  <para>Sets the debug level to <replaceable>N</replaceable>.
>-		    The default value is zero, which supresses all debugging
>+		    The default value is zero, which suppresses all debugging
> 		    output.</para>
> 		</listitem>
> 	      </varlistentry>
>diff -ru handbook.orig/kerneldebug/chapter.sgml handbook/kerneldebug/chapter.sgml
>--- handbook.orig/kerneldebug/chapter.sgml	Tue Aug  3 21:07:09 1999
>+++ handbook/kerneldebug/chapter.sgml	Tue Aug  3 22:33:48 1999
>@@ -293,7 +293,7 @@
> 	
>     <para>If you need to do low-level debugging on your kernel, there is an
>       on-line debugger available called DDB.  It allows to setting
>-      breakpoints, single-steping kernel functions, examining and changing
>+      breakpoints, single-stepping kernel functions, examining and changing
>       kernel variables, etc.  However, it cannot access kernel source files,
>       and only has access to the global and static symbols, not to the full
>       debug information like <command>kgdb</command>.</para>
>diff -ru handbook.orig/l10n/chapter.sgml handbook/l10n/chapter.sgml
>--- handbook.orig/l10n/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/l10n/chapter.sgml	Tue Aug  3 22:35:36 1999
>@@ -85,7 +85,7 @@
> 	</listitem>
> 	
> 	<listitem>
>-	  <para><envar>MM_CHARSET</envar> for applications MIME chararter
>+	  <para><envar>MM_CHARSET</envar> for applications MIME character
> 	    set.</para>
> 	</listitem>
>       </itemizedlist>
>diff -ru handbook.orig/linuxemu/chapter.sgml handbook/linuxemu/chapter.sgml
>--- handbook.orig/linuxemu/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/linuxemu/chapter.sgml	Tue Aug  3 22:38:48 1999
>@@ -824,7 +824,7 @@
>       call.</para>
>     
>     <para>What happens is that FreeBSD has a list of loaders, instead of a
>-      single loader with a failback to the <literal>#!</literal> loader for
>+      single loader with a fallback to the <literal>#!</literal> loader for
>       running any shell interpreters or shell scripts.</para>
>                        
>     <para>Historically, the only loader on the UNIX platform examined the
>@@ -851,7 +851,7 @@
>                        
>     <para>For the Linux binary emulation, FreeBSD sees the magic number as an
>       ELF binary (it makes no distinction between FreeBSD, Solaris, Linux, or
>-      any other OS which has an ELF image tpye, at this point).</para>
>+      any other OS which has an ELF image type, at this point).</para>
>                        
>     <para>The ELF loader looks for a specialized <emphasis>brand</emphasis>,
>       which is a comment section in the ELF image, and which is not present on
>diff -ru handbook.orig/mail/chapter.sgml handbook/mail/chapter.sgml
>--- handbook.orig/mail/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/mail/chapter.sgml	Tue Aug  3 22:40:46 1999
>@@ -309,7 +309,7 @@
>       <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail/cf/cf</userinput>
> &prompt.root; <userinput>make foo.cf</userinput></screen>
> 	  
>-      <para>If you don't have a <filename>/usr/obj</filename> hiearchy,
>+      <para>If you don't have a <filename>/usr/obj</filename> hierarchy,
> 	then:</para>
> 	  
>       <screen>&prompt.root; <userinput>cp foo.cf /etc/sendmail.cf</userinput></screen>
>diff -ru handbook.orig/ports/chapter.sgml handbook/ports/chapter.sgml
>--- handbook.orig/ports/chapter.sgml	Tue Aug  3 21:07:09 1999
>+++ handbook/ports/chapter.sgml	Tue Aug  3 20:01:10 1999
>@@ -1107,7 +1107,7 @@
> 	  <note>
> 	    <para>You should list all the files, but not the name directories,
> 	      in the list.  Also, if the port creates directories for itself
>-	      during installtion, make sure to add <literal>@dirrm</literal>
>+	      during installation, make sure to add <literal>@dirrm</literal>
> 	      lines as necessary to remove them when the port is
> 	      deleted.</para>
> 
>@@ -1422,7 +1422,7 @@
> 	  the first <makevar>MASTER_SITES</makevar>.  This will prevent users
> 	  from getting <errorname>checksum mismatch</errorname> errors, and
> 	  also reduce the workload of maintainers of our ftp site.  Also, if
>-	  there isonly one master site for the port, it is recommended that
>+	  there is only one master site for the port, it is recommended that
> 	  you house a backup at your site and list it as the second
> 	  <makevar>MASTER_SITES</makevar>.</para>
> 	    
>@@ -1737,7 +1737,7 @@
> 	  <note>
> 	    <para>The <replaceable>lib</replaceable> part is an argument given
> 	      to <command>ldconfig -r | grep -wF</command>.  There shall be no
>-	      reqular expressions in this variable.</para>
>+	      regular expressions in this variable.</para>
> 	  </note>
> 	  
> 	  <para>The dependency is checked twice, once from within the
>@@ -2165,7 +2165,7 @@
>       <para>If your port needs to build slightly different versions of
> 	packages by having a variable (for instance, resolution, or paper
> 	size) take different values, create one subdirectory per package to
>-	make it easier forusers to see what to do, but try to share as many
>+	make it easier for users to see what to do, but try to share as many
> 	files as possible between ports.  Typically you only need a very short
> 	<filename>Makefile</filename> in all but one of the directories if you
> 	use variables cleverly.  In the sole <filename>Makefiles</filename>,
>@@ -2206,7 +2206,7 @@
>       <para>(<filename>xdvi240/Makefile</filename> and
> 	<filename>xdvi400/Makefile</filename> are similar).  The
> 	<makevar>MASTERDIR</makevar> definition tells
>-	<filename>bsd.port.mk</filename> that the refulat set of
>+	<filename>bsd.port.mk</filename> that the regular set of
> 	subdirectories like <makevar>PATCHDIR</makevar> and
> 	<makevar>PKGDIR</makevar> are to be found under
> 	<filename>xdvi300</filename>.  The <literal>RESOLUTION=118</literal>
>@@ -3021,7 +3021,7 @@
> 	  place that is guaranteed to be writable during the port build (see
> 	  <link linkend="ports-cd">compiling ports from CDROM</link> for an
> 	  example of building ports from a read-only tree).  If you need to
>-	  modigy some file in <makevar>PKGDIR</makevar>, do so by <link
>+	  modify some file in <makevar>PKGDIR</makevar>, do so by <link
> 	    linkend="porting-pkgsubdir">redefining a variable</link>, not by
> 	  writing over it.</para>
>       </sect3>
>@@ -3657,7 +3657,7 @@
> 	  <command>configure</command>, do not take the diffs of
> 	  <command>configure</command> (it often grows to a few thousand
> 	  lines!); define <literal>USE_AUTOCONF=yes</literal> and take the
>-	  diffsof <filename>configure.in</filename>.</para>
>+	  diffs of <filename>configure.in</filename>.</para>
> 
> 	<para>Also, if you had to delete a file, then you can do it in the
> 	  <maketarget>post-extract</maketarget> target rather than as part of
>@@ -3752,7 +3752,7 @@
> lib/X11/oneko/pixmaps/cat.xpm
> lib/X11/oneko/sounds/cat.au
>  :
>-@dirrm lib/X11/oneko/pixmals
>+@dirrm lib/X11/oneko/pixmaps
> @dirrm lib/X11/oneko/sounds
> @dirrm lib/X11/oneko</programlisting>
> 
>@@ -4213,8 +4213,8 @@
> 	<title>Categories</title>
>       
>       <para>As you already know, ports are classified in several categories.
>-	But for this to wor, it is important that porters and users understand
>-	what each category and how we deicde what to put in each
>+	But for this to work, it is important that porters and users understand
>+	what each category and how we decide what to put in each
> 	category.</para>
> 
>       <sect3>
>@@ -4369,7 +4369,7 @@
> 	      
> 	      <row>
> 		<entry><filename>java</filename></entry>
>-		<entry>Java languge support.</entry>
>+		<entry>Java language support.</entry>
> 	      </row>
> 
> 	      <row>
>@@ -4589,7 +4589,7 @@
> 	
> 	<para>As many of the categories overlap, you often have to choose
> 	  which of the categories should be the primary category of your port.
>-	  There are several rules that govern this usse.  Here is the list of
>+	  There are several rules that govern this issue.  Here is the list of
> 	  priorities, in decreasing order of precedence.</para>
> 	
> 	<itemizedlist>
>diff -ru handbook.orig/ppp-and-slip/chapter.sgml handbook/ppp-and-slip/chapter.sgml
>--- handbook.orig/ppp-and-slip/chapter.sgml	Tue Aug  3 21:07:09 1999
>+++ handbook/ppp-and-slip/chapter.sgml	Tue Aug  3 22:46:17 1999
>@@ -545,12 +545,12 @@
> 		  role="ipaddr">10.0.0.1</hostid>.  Do not use
> 		<literal>0.0.0.0</literal> as the first argument to
> 		<command>set ifaddr</command> as it prevents PPP from setting
>-		up an intial route in <option>-auto</option> mode.</para>
>+		up an initial route in <option>-auto</option> mode.</para>
> 	    </listitem>
> 	  </varlistentry>
> 	</variablelist>
> 	
>-	<para>If you are running version 1.x of PPP, uou will also need to
>+	<para>If you are running version 1.x of PPP, you will also need to
> 	  create an entry in <filename>/etc/ppp/ppp.linkup</filename>.
> 	  <filename>ppp.linkup</filename> is used after a connection has been
> 	  established.  At this point, <command>ppp</command> will know what
>@@ -623,7 +623,7 @@
> 	<para>When you configure <command>ppp</command> to receive incoming
> 	  calls on a machine connected to a LAN, you must decide if you wish
> 	  to forward packets to the LAN.  If you do, you should allocate the
>-	  peer an IP number from your LAN's subet, and use the command
>+	  peer an IP number from your LAN's subnet, and use the command
> 	    
> 	  <programlisting>
> enable proxy</programlisting>
>@@ -888,7 +888,7 @@
> 	  </sect5>
> 	  
> 	  <sect5>
>-	    <title>MS extentions</title>
>+	    <title>MS extensions</title>
> 	    
> 	    <para>It is possible to configure PPP to supply DNS and NetBIOS
> 	      nameserver addresses on demand.</para>
>@@ -913,7 +913,7 @@
> 	      server addresses, and a netbios nameserver host.</para>
> 
> 	    <para>In version 2 and above, if the <literal>set dns</literal>
>-	      line is ommitted, PPP will use the values found in
>+	      line is omitted, PPP will use the values found in
> 	      <filename>/etc/resolv.conf</filename>.</para>
> 	  </sect5>
> 	</sect4>
>diff -ru handbook.orig/printing/chapter.sgml handbook/printing/chapter.sgml
>--- handbook.orig/printing/chapter.sgml	Tue Aug  3 21:07:07 1999
>+++ handbook/printing/chapter.sgml	Tue Aug  3 22:53:15 1999
>@@ -3469,7 +3469,7 @@
> 	  </listitem>
> 	  
> 	  <listitem>
>-	    <para>Install an alternative to LPD, such as LPDng or PLP. Section
>+	    <para>Install an alternative to LPD, such as LPRng or PLP. Section
> 	      <link linkend="printing-lpd-alternatives">Alternatives to the
> 		Standard   Spooler</link> tells more about other spooling
> 	      software you can substitute for LPD.</para>
>@@ -4661,4 +4661,5 @@
>      sgml-parent-document: ("../handbook.sgml" "part" "chapter")
>      End:
> -->
>+
> 
>diff -ru handbook.orig/security/chapter.sgml handbook/security/chapter.sgml
>--- handbook.orig/security/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/security/chapter.sgml	Tue Aug  3 19:59:46 1999
>@@ -326,7 +326,7 @@
> 	trusted machine.  There is a Java S/Key <command>key</command> applet,
> 	<ulink URL="http://www.cs.umd.edu/~harry/jotp/src.html">The Java OTP
> 	  Calculator</ulink>, that you can download and run locally on any
>-	Java supporting brower.</para>
>+	Java supporting browser.</para>
>     </sect2>
>     
>     <sect2>
>diff -ru handbook.orig/serialcomms/chapter.sgml handbook/serialcomms/chapter.sgml
>--- handbook.orig/serialcomms/chapter.sgml	Tue Aug  3 21:07:08 1999
>+++ handbook/serialcomms/chapter.sgml	Tue Aug  3 22:57:33 1999
>@@ -939,7 +939,7 @@
> 	  16-character buffer, so use 16550A's if possible).  Because
> 	  single-character-buffer devices require more work by the operating
> 	  system than the 16-character-buffer devices, 16550A-based serial
>-	  interface cards are much prefered. If the system has many active
>+	  interface cards are much preferred. If the system has many active
> 	  serial ports or will have a heavy load, 16550A-based cards are
> 	  better for low-error-rate communications.</para>
>       </sect3>
>@@ -2056,7 +2056,7 @@
>     
> 	  <para>If your computer complains about the error, but boots anyway,
> 	    then you do not have to do anything special.  (One machine with a
>-	    Phoneix BIOS that I have here merely says <errorname>Keyboard
>+	    Phoenix BIOS that I have here merely says <errorname>Keyboard
> 	      failed</errorname> then continues to boot normally.)</para>
> 
> 	  <para>If your computer refuses to boot without a keyboard attached
>@@ -2230,11 +2230,11 @@
> 		<note>
> 		  <para>Due to space constraints in the current version of the
> 		    boot blocks, the <option>-P</option> option is capable of
>-		    detecing extended keyboards only.  Keyboards with less
>+		    detecting extended keyboards only.  Keyboards with less
> 		    than 101 keys (and without F11 and F12  keys) may not be
> 		    detected.  Keyboards on some laptop computers may not be
> 		    properly found because of this limitation.  If this is to
>-		    be the case with your system, you have to abondan using
>+		    be the case with your system, you have to abandon using
> 		    the <option>-P</option> option.  Unfortunately there is no
> 		    workaround for this problem.</para>
> 		</note>
>@@ -2271,7 +2271,7 @@
> Keyboard: no</screen>
>     
> 	  <para>The second line appears only if you put <option>-P</option> in
>-	    <filename>/boot.config</filename> and indicates presense/absence
>+	    <filename>/boot.config</filename> and indicates presence/absence
> 	    of the keyboard.  These messages go to either serial or internal
> 	    console, or both, depending on the option in
> 	    <filename>/boot.config</filename>.</para>
>@@ -2683,7 +2683,7 @@
> 	  <para>At the moment, the boot loader has no option equivalent to the
> 	    <option>-P</option> option in the boot block, and there is no
> 	    provision to automatically select the internal console and the
>-	    serial console based on the presense of the keyboard.</para>
>+	    serial console based on the presence of the keyboard.</para>
> 	</note>
>       </sect3>

Actions: View | Diff

Attachments on bug 12956: 5414