Attachment 221389 Details for Bug 252519 – It's a patch

[patch] It's a patch

books.diff (text/plain), 28.35 KB, created by Ceri Davies on 2021-01-08 15:31:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ceri Davies

Created: 2021-01-08 15:31:24 UTC

Size: 28.35 KB

patch

obsolete

>diff --git a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
>index 65f8c6cfd0..798b7bc6d9 100644
>--- a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
>+++ b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
>@@ -404,7 +404,7 @@ FreeBSD clang version 3.3 (tags/RELEASE_33/final 183502) 20130610</screen></entr
>       jmp main-0x7c00+0x600	# Jump to relocated code</programlisting>
>     </figure>
> 
>-    <para>Because <filename>boot0</filename> is loaded by the
>+    <para>As <filename>boot0</filename> is loaded by the
>       <acronym>BIOS</acronym> to address <literal>0x7C00</literal>, it
>       copies itself to address <literal>0x600</literal> and then
>       transfers control there (recall that it was linked to execute at
>@@ -1021,7 +1021,7 @@ main.3:
>       bytes of <filename>boot</filename> and, because
>       <filename>boot</filename> is written to the first sector of the
>       &os; slice, <filename>boot1</filename> fits exactly in this
>-      first sector.  Because <literal>nread</literal> reads the first
>+      first sector.  When <literal>nread</literal> reads the first
>       16 sectors of the &os; slice, it effectively reads the entire
>       <filename>boot</filename> file
>       <footnote>
>@@ -1440,7 +1440,7 @@ init:		cli				# Disable interrupts
>       flags in the EFLAGS register.  Note that the
>       <literal>popfl</literal> instruction pops out a doubleword (4
>       bytes) from the stack and places it in the EFLAGS register.
>-      Because the value actually popped is <literal>2</literal>, the
>+      As the value actually popped is <literal>2</literal>, the
>       EFLAGS register is effectively cleared (IA-32 requires that bit
>       2 of the EFLAGS register always be 1).</para>
> 
>@@ -1583,7 +1583,7 @@ init.3:		lea 0x8(%di),%di		# Next entry
>       abstraction.  The IA-32 architecture demands the creation and
>       use of <emphasis>at least</emphasis> one <acronym>TSS</acronym>
>       if multitasking facilities are used or different privilege
>-      levels are defined.  Because the <filename>boot2</filename>
>+      levels are defined.  Since the <filename>boot2</filename>
>       client is executed in privilege level 3, but the
>       <acronym>BTX</acronym> server does in privilege level 0, a
>       <acronym>TSS</acronym> must be defined:</para>
>diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
>index 6e5551873b..9826e3a1d9 100644
>--- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
>+++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
>@@ -397,10 +397,10 @@ Closing device "echo".</screen>
>     <para>For this reason, no serious applications rely on block
>       devices, and in fact, almost all applications which access
>       disks directly take great pains to specify that character
>-      (or <quote>raw</quote>) devices should always be used.  Because
>+      (or <quote>raw</quote>) devices should always be used.  As
>       the implementation of the aliasing of each disk (partition) to
>       two devices with different semantics significantly complicated
>-      the relevant kernel code &os; dropped support for cached disk
>+      the relevant kernel code, &os; dropped support for cached disk
>       devices as part of the modernization of the disk I/O
>       infrastructure.</para>
>   </sect1>
>diff --git a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
>index 97bd2822c5..04de498a3f 100644
>--- a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
>+++ b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
>@@ -375,7 +375,7 @@
>         with PnP. This feature is not implemented in any existing
>         driver and is not considered further in this document.</para>
> 
>-      <para>Because the PnP devices are disabled when probing the
>+      <para>As the PnP devices are disabled when probing the
>         legacy devices they will not be attached twice (once as legacy
>         and once as PnP).  But in case of device-dependent identify
>         routines it is the responsibility of the driver to make sure
>@@ -1019,7 +1019,7 @@
>               Free the memory allocated by
>               <function>bus_dmamem_alloc()</function>. At present,
>               freeing of the memory allocated with ISA restrictions is
>-              not implemented.  Because of this the recommended model
>+              not implemented.  Due to this the recommended model
>               of use is to keep and re-use the allocated areas for as
>               long as possible. Do not lightly free some area and then
>               shortly allocate it again. That does not mean that
>@@ -1322,11 +1322,11 @@
>           Before calling the callback function from
>           <function>bus_dmamap_load()</function> the segment array is
>           stored in the stack. And it gets pre-allocated for the
>-          maximal number of segments allowed by the tag. Because of
>+          maximal number of segments allowed by the tag. As a result of
>           this the practical limit for the number of segments on i386
>           architecture is about 250-300 (the kernel stack is 4KB minus
>           the size of the user structure, size of a segment array
>-          entry is 8 bytes, and some space must be left). Because the
>+          entry is 8 bytes, and some space must be left). Since the
>           array is allocated based on the maximal number this value
>           must not be set higher than really needed. Fortunately, for
>           most of hardware the maximal supported number of segments is
>@@ -2192,7 +2192,7 @@
>           int error = 0;</programlisting>
> 
>         <para>Then allocate and activate all the necessary
>-          resources. Because normally the port range will be released
>+          resources. As normally the port range will be released
>           before returning from probe, it has to be allocated
>           again. We expect that the probe routine had properly set all
>           the resource ranges, as well as saved them in the structure
>diff --git a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
>index a9a2753d9a..59261a9568 100644
>--- a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
>+++ b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
>@@ -52,7 +52,7 @@
>       <indexterm><primary>Linksys</primary></indexterm>
>       <indexterm><primary>D-Link</primary></indexterm>
> 
>-      <para>Because of this practice, FreeBSD drivers usually rely on
>+      <para>Due to this practice, FreeBSD drivers usually rely on
> 	numeric IDs for device identification.  Using numeric IDs and
> 	a centralized database complicates adding IDs and support for
> 	cards to the system.  One must carefully check to see who
>diff --git a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
>index c325840bed..7de627b5b9 100644
>--- a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
>+++ b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
>@@ -103,7 +103,7 @@
>       then also converting the SCSI commands to the native commands of
>       the hardware).</para>
> 
>-    <para>Because we are interested in writing a SCSI adapter driver
>+    <para>As we are interested in writing a SCSI adapter driver
>       here, from this point on we will consider everything from the
>       SIM standpoint.</para>
> 
>@@ -1076,7 +1076,7 @@
> 	  the timeout to make sure that the target is not sleeping
> 	  forever.  If the command would not get aborted in some
> 	  reasonable time like 10 seconds the timeout routine would go
>-	  ahead and reset the whole SCSI bus.  Because the command
>+	  ahead and reset the whole SCSI bus.  Since the command
> 	  will be aborted in some reasonable time we can just return
> 	  the abort request now as successfully completed, and mark
> 	  the aborted CCB as aborted (but not mark it as done
>@@ -1116,7 +1116,7 @@
>     return;</programlisting>
> 
> 	<para>That is all for the ABORT request, although there is one
>-	  more issue.  Because the ABORT message cleans all the
>+	  more issue.  As the ABORT message cleans all the
> 	  ongoing transactions on a LUN we have to mark all the other
> 	  active transactions on this LUN as aborted.  That should be
> 	  done in the interrupt routine, after the transaction gets
>@@ -1634,7 +1634,7 @@
>       routine (or the other way around, the poll routine may be doing
>       the real action and the interrupt routine would just call the
>       poll routine).  Why bother about a separate function then?
>-      Because of different calling conventions.  The
>+      Due to different calling conventions.  The
>       <function>xxx_poll</function> routine gets the struct cam_sim
>       pointer as its argument when the PCI interrupt routine by common
>       convention gets pointer to the struct
>diff --git a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
>index 6fa02b2d59..8d3558e5c7 100644
>--- a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
>+++ b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
>@@ -668,7 +668,7 @@ This part is unclear, is it an unformatted code example?
> 
>     <para>Example: Firmware download Many devices that have been
>       developed are based on a general purpose processor with an
>-      additional USB core added to it.  Because the development of
>+      additional USB core added to it.  As the development of
>       drivers and firmware for USB devices is still very new, many
>       devices require the downloading of the firmware after they have
>       been connected.</para>
>diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
>index 568cc8ba35..713b9f59eb 100644
>--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
>+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
>@@ -822,13 +822,13 @@ fe80:2::%ep0/64               link#2                    UC          ep0</screen>
> 	  packet processing code in the way BSD IPv4 code is
> 	  implemented, kernel stack may overflow due to long function
> 	  call chain.  sys/netinet6 code is carefully designed to
>-	  avoid kernel stack overflow.  Because of this, sys/netinet6
>+	  avoid kernel stack overflow, so sys/netinet6
> 	  code defines its own protocol switch structure, as "struct
> 	  ip6protosw" (see
> 	  <filename>netinet6/ip6protosw.h</filename>).  There is no
> 	  such update to IPv4 part (sys/netinet) for compatibility,
> 	  but small change is added to its pr_input() prototype.  So
>-	  "struct ipprotosw" is also defined.  Because of this, if you
>+	  "struct ipprotosw" is also defined.  As a result, if you
> 	  receive IPsec-over-IPv4 packet with massive number of IPsec
> 	  headers, kernel stack may blow up.  IPsec-over-IPv6 is okay.
> 	  (Off-course, for those all IPsec headers to be processed,
>diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
>index 8fd50f0d68..793d728368 100644
>--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
>+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
>@@ -679,7 +679,7 @@ options 	DIAGNOSTIC</programlisting>
> 	&man.dcons.4; provides similar functionality as a serial
> 	console.  It emulates two serial ports, one for the console
> 	and <acronym>DDB</acronym>, the other for
>-	<acronym>GDB</acronym>.  Because remote memory access is fully
>+	<acronym>GDB</acronym>.  Since remote memory access is fully
> 	handled by the hardware, the &man.dcons.4; buffer is
> 	accessible even when the system crashes.</para>
> 
>diff --git a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
>index 8e00147c82..02b062f20c 100644
>--- a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
>+++ b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
>@@ -310,7 +310,7 @@ int main() {
>       <indexterm><primary>seteuid</primary></indexterm>
> 
>       <para>There are at least 6 different IDs associated with any
>-      given process.  Because of this you have to be very careful with
>+      given process, and you must therefore be very careful with
>       the access that your process has at any given time.  In
>       particular, all seteuid applications should give up their
>       privileges as soon as it is no longer required.</para>
>diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
>index 6173905a07..43b32f9b78 100644
>--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
>+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
>@@ -101,7 +101,7 @@
>       computer at speeds approaching the speed of light, it often
>       travels considerably slower between two computers.</para>
> 
>-    <para>Because the languages used in data communications are so
>+    <para>As the languages used in data communications are so
>       terse, we usually refer to them as
>       <emphasis>protocols</emphasis> rather than languages.</para>
> 
>@@ -337,7 +337,7 @@
>       extract the <emphasis><acronym>PNG</acronym> file</emphasis>
>       from it.</para>
> 
>-    <para>Because of the complexity of internetworking, we cannot just
>+    <para>Due to the complexity of internetworking, we cannot just
>       use the <function role="syscall">open</function> system call, or
>       the <function>open()</function> C function.  Instead, we need to
>       take several steps to <quote>opening</quote> a socket.</para>
>@@ -1381,7 +1381,7 @@ int main() {
> 
> 	  <para>Not all protocols are that simple.  Many receive a
> 	    request from the client, reply to it, then receive another
>-	    request from the same client.  Because of that, they do
>+	    request from the same client.  As a result, they do
> 	    not know in advance how long they will be serving the
> 	    client.  Such servers usually start a new process for each
> 	    client.  While the new process is serving its client, the
>diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
>index 11ebe38646..5942b54a38 100644
>--- a/en_US.ISO8859-1/books/faq/book.xml
>+++ b/en_US.ISO8859-1/books/faq/book.xml
>@@ -2404,7 +2404,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
> 	    (&man.make.1;, &man.system.3;, &man.popen.3;, and
> 	    analogues in higher-level scripting languages like Perl
> 	    and Tcl) are specified to use the Bourne shell to
>-	    interpret commands.  Because the Bourne shell is so often
>+	    interpret commands.  As the Bourne shell is so often
> 	    and widely used, it is important for it to be quick to
> 	    start, be deterministic in its behavior, and have a small
> 	    memory footprint.</para>
>@@ -5037,7 +5037,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
> 	</question>
> 
> 	<answer>
>-	  <para>Because a packet is coming from outside the network
>+	  <para>A packet is coming from outside the network
> 	    unexpectedly.  To disable them, set
> 	    <varname>net.link.ether.inet.log_arp_wrong_iface</varname>
> 	    to <literal>0</literal>.</para>
>diff --git a/en_US.ISO8859-1/books/fdp-primer/manpages/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/manpages/chapter.xml
>index b2a78f8dc1..c951cbd85e 100644
>--- a/en_US.ISO8859-1/books/fdp-primer/manpages/chapter.xml
>+++ b/en_US.ISO8859-1/books/fdp-primer/manpages/chapter.xml
>@@ -289,7 +289,7 @@ information.</programlisting>
> 	</callout>
> 
> 	<callout arearefs="co-manpages-macro-example-ls-8">
>-	  <para>A final optional argument is defined.  Because no name
>+	  <para>A final optional argument is defined.  Since no name
> 	    is specified for the argument, the default of
> 	    <literal>file ...</literal> is used.</para>
> 	</callout>
>diff --git a/en_US.ISO8859-1/books/fdp-primer/po-translations/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/po-translations/chapter.xml
>index e89c3bde73..cc5681e7a5 100644
>--- a/en_US.ISO8859-1/books/fdp-primer/po-translations/chapter.xml
>+++ b/en_US.ISO8859-1/books/fdp-primer/po-translations/chapter.xml
>@@ -472,7 +472,7 @@ A         pgpkeys</screen>
> A         Makefile</screen>
> 
> 	  <para>Check the contents of the
>-	    <filename>Makefile</filename>.  Because this is a simple
>+	    <filename>Makefile</filename>.  As this is a simple
> 	    article, in this case the <filename>Makefile</filename>
> 	    can be used unchanged.  The <literal>$&os;...$</literal>
> 	    version string on the second line will be replaced by the
>@@ -744,7 +744,7 @@ DOC_PREFIX?=    ${.CURDIR}/../../..
> 
>       <procedure>
> 	<step>
>-	  <para>Build the translated document.  Because the original
>+	  <para>Build the translated document.  As the original
> 	    is a book, the generated document is
> 	    <filename>book.xml</filename>.</para>
> 
>@@ -892,8 +892,8 @@ property 'svn:keywords' set on 'ko_KR.po'</screen>
> 
> 	<step>
> 	  <para>Set the <acronym>MIME</acronym> types of the files.
>-	    Because these files use the <acronym>UTF-8</acronym>
>-	    character set, that is also specified.  To prevent the
>+	    These files use the <acronym>UTF-8</acronym>
>+	    character set, so that is also specified.  To prevent the
> 	    version control system from mistaking these files for
> 	    binary data, the <literal>fbsd:notbinary</literal>
> 	    property is also set:</para>
>diff --git a/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
>index 96d2c60d0a..14f02b2f2e 100644
>--- a/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
>+++ b/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
>@@ -214,7 +214,7 @@
> 
>     <para>A tag is used to identify where a particular element starts,
>       and where the element ends.  <emphasis>The tag is not part of
>-      the element itself</emphasis>.  Because each grammar was
>+      the element itself</emphasis>.  As each grammar was
>       normally written to mark up specific types of information, each
>       one will recognize different elements, and will therefore have
>       different names for the tags.</para>
>@@ -596,7 +596,7 @@ example.xml:5: element head: validity error : Element head content does not foll
> 	      council delegated this to the American National
> 	      Standards Institute (<acronym>ANSI</acronym>).</para>
> 
>-	    <para>Because the &os; Project has not been registered,
>+	    <para>Since the &os; Project has not been registered,
> 	      the owner string is <literal>-//&os;</literal>.  As seen
> 	      in the example, the <acronym>W3C</acronym> are not a
> 	      registered owner either.</para>
>diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
>index bc31008871..1be3270b7e 100644
>--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
>+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
>@@ -2867,7 +2867,7 @@ Swap: 2048M Total, 2048M Free
> 	</step>
> 
> 	<step>
>-	  <para>Use &man.kill.1; to send the signal.  Because
>+	  <para>Use &man.kill.1; to send the signal.  As
> 	    &man.inetd.8; is owned by
> 	    <systemitem class="username">root</systemitem>, use
> 	    &man.su.1; to become
>@@ -3218,8 +3218,8 @@ Swap: 2048M Total, 2048M Free
>       <primary>editors</primary>
>     </indexterm>
> 
>-    <para>Most &os; configuration is done by editing text files.
>-      Because of this, it is a good idea to become familiar with a
>+    <para>Most &os; configuration is done by editing text files, so
>+      it is a good idea to become familiar with a
>       text editor.  &os; comes with a few as part of the base system,
>       and many more are available in the Ports Collection.</para>
> 
>diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.xml b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
>index aa0c741acb..2eead109e5 100644
>--- a/en_US.ISO8859-1/books/handbook/boot/chapter.xml
>+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
>@@ -217,7 +217,7 @@ Default: F2</screen>
>       <title>Stage One and Stage Two</title>
> 
>       <para>Conceptually, the first and second stages are part of the
>-	same program on the same area of the disk.  Because of space
>+	same program on the same area of the disk.  Due to space
> 	constraints, they have been split into two, but are always
> 	installed together.  They are copied from the combined
> 	<filename>/boot/boot</filename> by the &os; installer or
>diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml
>index dd0a3d7bc3..f7f24a65f4 100644
>--- a/en_US.ISO8859-1/books/handbook/config/chapter.xml
>+++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml
>@@ -748,7 +748,7 @@ linuxemu/chapter.xml -->
> 	  Network Driver Interface Specification
> 	  (<acronym>NDIS</acronym>).  It includes &man.ndisgen.8;
> 	  which can be used to convert a &windowsxp; driver into a
>-	  format that can be used on &os;.  Because the &man.ndis.4;
>+	  format that can be used on &os;.  As the &man.ndis.4;
> 	  driver uses a &windowsxp; binary, it only runs on &i386;
> 	  and amd64 systems.  <acronym>PCI</acronym>, CardBus,
> 	  <acronym>PCMCIA</acronym>, and <acronym>USB</acronym>
>@@ -2344,7 +2344,7 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
> 	  referred to as <emphasis>journaling</emphasis>.
> 	  Meta-data updates are still written synchronously, but only
> 	  into a small region of the disk.  Later on, they are moved
>-	  to their proper location.  Because the logging area is a
>+	  to their proper location.  Since the logging area is a
> 	  small, contiguous region on the disk, there are no long
> 	  distances for the disk heads to move, even during heavy
> 	  operations, so these operations are quicker than synchronous
>diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
>index dcb1e12e3c..64f5d92205 100644
>--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
>+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
>@@ -331,7 +331,7 @@ Done.</screen>
>       <screen>&prompt.root; <userinput>gmirror clear ada8</userinput></screen>
> 
>       <para>&man.gmirror.8; stores one block of metadata at the end of
>-	the disk.  Because <acronym>GPT</acronym> partition schemes
>+	the disk.  As <acronym>GPT</acronym> partition schemes
> 	also store metadata at the end of the disk, mirroring entire
> 	<acronym>GPT</acronym> disks with &man.gmirror.8; is not
> 	recommended.  <acronym>MBR</acronym> partitioning is used here
>@@ -451,7 +451,7 @@ Done.</screen>
>       <para>Reboot the system to test the new mirror and verify that
> 	all data has been copied.  The <acronym>BIOS</acronym> will
> 	see the mirror as two individual drives rather than a mirror.
>-	Because the drives are identical, it does not matter which is
>+	Since the drives are identical, it does not matter which is
> 	selected to boot.</para>
> 
>       <para>See <xref linkend="gmirror-troubleshooting"/> if there are
>@@ -1431,9 +1431,9 @@ ggate0
> 
>     <para>A better solution is to use <command>glabel</command> to
>       label the disk devices and use the labels in
>-      <filename>/etc/fstab</filename>.  Because
>+      <filename>/etc/fstab</filename>.
>       <command>glabel</command> stores the label in the last sector of
>-      a given provider, the label will remain persistent across
>+      a given provider, so the label will remain persistent across
>       reboots.  By using this label as a device, the file system may
>       always be mounted regardless of what device node it is accessed
>       through.</para>
>diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
>index 53dc3c06b2..8e5c6e8ef2 100644
>--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
>+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
>@@ -839,7 +839,7 @@ kern.ipc.shmall=32768</programlisting>
> 	    an <application>&xorg;</application> extension which
> 	    allows a program to bypass the
> 	    <application>&xorg;</application> server and directly
>-	    alter the framebuffer.  Because it relies on a low level
>+	    alter the framebuffer.  As it relies on a low level
> 	    memory mapping, programs using it must be run as
> 	    <systemitem class="username">root</systemitem>.  The
> 	    <acronym>DGA</acronym> extension can be tested and
>diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.xml b/en_US.ISO8859-1/books/handbook/security/chapter.xml
>index 4bc3279737..d3b277a978 100644
>--- a/en_US.ISO8859-1/books/handbook/security/chapter.xml
>+++ b/en_US.ISO8859-1/books/handbook/security/chapter.xml
>@@ -696,7 +696,7 @@ cat changed
>       The authentication system keeps track of the last one-time
>       password used, and the user is authenticated if the hash of the
>       user-provided password is equal to the previous password.
>-      Because a one-way hash is used, it is impossible to generate
>+      Since a one-way hash is used, it is impossible to generate
>       future one-time passwords if a successfully used password is
>       captured.  The iteration count is decremented after each
>       successful login to keep the user and the login program in sync.
>@@ -1196,7 +1196,7 @@ sendmail : PARANOID : deny</programlisting>
> 	<quote>trusted third party</quote> of the system.  It is the
> 	computer that issues <application>Kerberos</application>
> 	tickets, which are used for clients to authenticate to
>-	servers.  Because the <acronym>KDC</acronym> is considered
>+	servers.  As the <acronym>KDC</acronym> is considered
> 	trusted by all other computers in the
> 	<application>Kerberos</application> realm, it has heightened
> 	security concerns.  Direct access to the KDC should be
>diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
>index 9913ad3755..db13e71ef6 100644
>--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
>+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
>@@ -1031,7 +1031,7 @@ ttyu5   "/usr/libexec/getty std.19200"  vt100  on insecure</programlisting>
>       device provides a 16-character buffer, which allows for better
>       system performance.  Bugs in plain 16550 devices prevent the use
>       of the 16-character buffer, so use 16550A devices if possible.
>-      Because single-character-buffer devices require more work by the
>+      As single-character-buffer devices require more work by the
>       operating system than the 16-character-buffer devices,
>       16550A-based serial interface cards are preferred.  If the
>       system has many active serial ports or will have a heavy load,
>@@ -1081,7 +1081,7 @@ ttyu5   "/usr/libexec/getty std.19200"  vt100  on insecure</programlisting>
> 
>       <para>The second method is to configure the
> 	<acronym>RS-232</acronym> interface to vary its speed based on
>-	the remote user's connection speed.  Because
>+	the remote user's connection speed.  As
> 	<command>getty</command> does not understand any particular
> 	modem's connection speed reporting, it gives a
> 	<prompt>login:</prompt> message at an initial speed and
>diff --git a/en_US.ISO8859-1/books/handbook/zfs/chapter.xml b/en_US.ISO8859-1/books/handbook/zfs/chapter.xml
>index c6d89f091a..ef1064a438 100644
>--- a/en_US.ISO8859-1/books/handbook/zfs/chapter.xml
>+++ b/en_US.ISO8859-1/books/handbook/zfs/chapter.xml
>@@ -1282,7 +1282,7 @@ errors: No known data errors</screen>
> 	2&nbsp;TB drive.  The usable space is 1&nbsp;TB.  When the
> 	1&nbsp;TB drive is replaced with another 2&nbsp;TB drive, the
> 	resilvering process copies the existing data onto the new
>-	drive.  Because
>+	drive.  As
> 	both of the devices now have 2&nbsp;TB capacity, the mirror's
> 	available space can be grown to 2&nbsp;TB.</para>
> 
>@@ -4045,7 +4045,7 @@ vfs.zfs.vdev.cache.size="5M"</programlisting>
> 	      Clones can be <emphasis>promoted</emphasis>, reversing
> 	      this dependency and making the clone the parent and the
> 	      previous parent the child.  This operation requires no
>-	      additional space.  Because the amount of space used by
>+	      additional space.  Since the amount of space used by
> 	      the parent and child is reversed, existing quotas and
> 	      reservations might be affected.</entry>
> 	  </row>
>@@ -4201,7 +4201,7 @@ vfs.zfs.vdev.cache.size="5M"</programlisting>
> 	      blocks will be checked byte-for-byte to ensure it is
> 	      actually identical.  If the data is not identical, the
> 	      hash collision will be noted and the two blocks will be
>-	      stored separately.  Because <acronym>DDT</acronym> must
>+	      stored separately.  As <acronym>DDT</acronym> must
> 	      store the hash of each unique block, it consumes a very
> 	      large amount of memory.  A general rule of thumb is
> 	      5-6&nbsp;GB of ram per 1&nbsp;TB of deduplicated data).

Actions: View | Diff

Attachments on bug 252519: 221389