Reverse four instances in previous spelling-fix commit:
* out takes -> outtakes * blinking lights -> Blinkenlights * hard coding -> hardcoding * place holder -> place holder Pointed out by: des
This commit is contained in:
parent
a203f41404
commit
fac4584d62
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=11137
4 changed files with 7 additions and 7 deletions
en_US.ISO8859-1
articles
books
|
@ -522,11 +522,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You will almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.88 2001-10-31 23:10:30 chern Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.89 2001-11-05 19:13:01 chern Exp $</literal> (or in FreeBSD's case,
|
||||
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
|
||||
the file to resolve the conflict (remove the marker lines and
|
||||
the second <literal>$Id: article.sgml,v 1.88 2001-10-31 23:10:30 chern Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.88 2001-10-31 23:10:30 chern Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.89 2001-11-05 19:13:01 chern Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.89 2001-11-05 19:13:01 chern Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -566,7 +566,7 @@
|
|||
file the differences are and how many lines they span. This
|
||||
is followed by a number of lines; some (preceded by a blank)
|
||||
are context; some (preceded by a <literal>-</literal> sign)
|
||||
are out takes and some (preceded by a <literal>+</literal>) are
|
||||
are outtakes and some (preceded by a <literal>+</literal>) are
|
||||
additions.</para>
|
||||
|
||||
<para>You can also diff against a different version
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
either have a software routing component (a PPP daemon, specifically)
|
||||
that can do some filtering or can be combined with a filter on the
|
||||
machine running the link. But with DSL you only get a little white
|
||||
box with some blinking lights on it and an Ethernet port that takes
|
||||
box with some Blinkenlights on it and an Ethernet port that takes
|
||||
your traffic back and forth from the Internet and nothing else (to
|
||||
some extent the same can be said of other mass-market high speed
|
||||
connectivity methods, like cable modems or high speed wireless links
|
||||
|
|
|
@ -2648,7 +2648,7 @@ This is the approach we will use in our program because it is very easy to do in
|
|||
</programlisting>
|
||||
|
||||
<para>
|
||||
This is possibly faster than hard coding the address in the code
|
||||
This is possibly faster than hardcoding the address in the code
|
||||
because the microprocessor does not have to fetch the address from
|
||||
the memory—it is already stored in one of its registers. I said
|
||||
<emphasis>possibly</emphasis> because with the caching modern
|
||||
|
|
|
@ -967,7 +967,7 @@ for a response of "OK", </para>
|
|||
string to the modem. The "ATDT" portion of the statement is the
|
||||
standard modem prefix to dial using tone-dialing; if you do not have
|
||||
touch-tone service on your local phone line, replace the "ATDT" with
|
||||
"ATDP". The "\\T" string is a place holder for the actual phone number
|
||||
"ATDP". The "\\T" string is a placeholder for the actual phone number
|
||||
(which will be automatically inserted as specified by the "set dial
|
||||
123-4567").</para>
|
||||
</listitem>
|
||||
|
|
Loading…
Reference in a new issue