Package: boost
Severity: normal
Tags: patch
The source code and documentation spells "referred" as "refered" and
"preferred" and "prefered". This is not correct English, and is not
found in either British or American dictionaries. This is included
in e.g. boost::program_options error messages, and does not look
very good. It's also used in type and variable names.
I have attached patches against the current unstable sources and
upstream CVS. Please could you forward upstream?
Thanks,
Roger
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (990, 'unstable')
Architecture: powerpc (ppc)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16.17
Locale: LANG=en_GB.UTF8, LC_CTYPE=en_GB.UTF8 (charmap=UTF-8)
diff -urN boost-1.33.1.original/boost/format/exceptions.hpp boost-1.33.1/boost/format/exceptions.hpp
--- boost-1.33.1.original/boost/format/exceptions.hpp 2004-01-24 17:30:23.000000000 +0000
+++ boost-1.33.1/boost/format/exceptions.hpp 2006-07-12 17:09:22.115743236 +0100
@@ -56,7 +56,7 @@
std::size_t get_expected() const { return expected_; }
virtual const char *what() const throw() {
return "boost::too_few_args: "
- "format-string refered to more arguments than were passed";
+ "format-string referred to more arguments than were passed";
}
};
@@ -70,7 +70,7 @@
std::size_t get_expected() const { return expected_; }
virtual const char *what() const throw() {
return "boost::too_many_args: "
- "format-string refered to less arguments than were passed";
+ "format-string referred to less arguments than were passed";
}
};
diff -urN boost-1.33.1.original/boost/numeric/ublas/matrix_expression.hpp boost-1.33.1/boost/numeric/ublas/matrix_expression.hpp
--- boost-1.33.1.original/boost/numeric/ublas/matrix_expression.hpp 2005-07-13 06:57:37.000000000 +0100
+++ boost-1.33.1/boost/numeric/ublas/matrix_expression.hpp 2006-07-12 17:09:23.379373164 +0100
@@ -42,7 +42,7 @@
typedef typename boost::mpl::if_<boost::is_const<E>,
typename E::const_reference,
typename E::reference>::type reference;
- typedef E refered_type;
+ typedef E referred_type;
typedef const self_type const_closure_type;
typedef const_closure_type closure_type;
typedef typename E::orientation_category orientation_category;
@@ -50,7 +50,7 @@
// Construction and destruction
BOOST_UBLAS_INLINE
- explicit matrix_reference (refered_type &e):
+ explicit matrix_reference (referred_type &e):
e_ (e) {}
// Accessors
@@ -66,11 +66,11 @@
public:
// Expression accessors - const correct
BOOST_UBLAS_INLINE
- const refered_type &expression () const {
+ const referred_type &expression () const {
return e_;
}
BOOST_UBLAS_INLINE
- refered_type &expression () {
+ referred_type &expression () {
return e_;
}
@@ -269,7 +269,7 @@
}
private:
- refered_type &e_;
+ referred_type &e_;
};
diff -urN boost-1.33.1.original/boost/numeric/ublas/vector_expression.hpp boost-1.33.1/boost/numeric/ublas/vector_expression.hpp
--- boost-1.33.1.original/boost/numeric/ublas/vector_expression.hpp 2005-07-13 06:57:36.000000000 +0100
+++ boost-1.33.1/boost/numeric/ublas/vector_expression.hpp 2006-07-12 17:09:22.159869996 +0100
@@ -43,14 +43,14 @@
typedef typename boost::mpl::if_<boost::is_const<E>,
typename E::const_reference,
typename E::reference>::type reference;
- typedef E refered_type;
+ typedef E referred_type;
typedef const self_type const_closure_type;
typedef const_closure_type closure_type;
typedef typename E::storage_category storage_category;
// Construction and destruction
BOOST_UBLAS_INLINE
- explicit vector_reference (refered_type &e):
+ explicit vector_reference (referred_type &e):
e_ (e) {}
// Accessors
@@ -62,11 +62,11 @@
public:
// Expression accessors - const correct
BOOST_UBLAS_INLINE
- const refered_type &expression () const {
+ const referred_type &expression () const {
return e_;
}
BOOST_UBLAS_INLINE
- refered_type &expression () {
+ referred_type &expression () {
return e_;
}
@@ -227,7 +227,7 @@
}
private:
- refered_type &e_;
+ referred_type &e_;
};
diff -urN boost-1.33.1.original/boost/regex/v4/basic_regex.hpp boost-1.33.1/boost/regex/v4/basic_regex.hpp
--- boost-1.33.1.original/boost/regex/v4/basic_regex.hpp 2005-09-14 13:20:41.000000000 +0100
+++ boost-1.33.1/boost/regex/v4/basic_regex.hpp 2006-07-12 17:09:22.131789331 +0100
@@ -342,7 +342,7 @@
//
// getflags:
// retained for backwards compatibility only, "flags"
- // is now the prefered name:
+ // is now the preferred name:
flag_type BOOST_REGEX_CALL getflags()const
{
return flags();
diff -urN boost-1.33.1.original/doc/html/get.html boost-1.33.1/doc/html/get.html
--- boost-1.33.1.original/doc/html/get.html 2005-12-04 17:26:40.000000000 +0000
+++ boost-1.33.1/doc/html/get.html 2006-07-12 17:09:22.103708665 +0100
@@ -79,7 +79,7 @@
While visitation via
<code class="computeroutput"><a href="apply_visitor.html" title="Function apply_visitor">apply_visitor</a></code>
- is generally prefered due to its greater safety, <code class="computeroutput">get</code> may
+ is generally preferred due to its greater safety, <code class="computeroutput">get</code> may
may be more convenient in some cases due to its straightforward
usage.</p>
</div>
diff -urN boost-1.33.1.original/libs/iostreams/doc/home.html boost-1.33.1/libs/iostreams/doc/home.html
--- boost-1.33.1.original/libs/iostreams/doc/home.html 2005-12-02 05:29:45.000000000 +0000
+++ boost-1.33.1/libs/iostreams/doc/home.html 2006-07-12 17:09:21.598256694 +0100
@@ -95,11 +95,11 @@
namespace <CODE>boost::iostreams</CODE>, unless otherwise indicated. Namespace qualification is usually omitted.
</P>
<P>
- Specializations of <CODE>std::basic_istream</CODE> will be refered to as
+ Specializations of <CODE>std::basic_istream</CODE> will be referred to as
<SPAN CLASS="term">standard input streams</SPAN>, specializations of <CODE>std::basic_ostream</CODE>
as <SPAN CLASS="term">standard output streams</SPAN>, specializations of <CODE>std::basic_iostream</CODE>
as <SPAN CLASS="term">standard i/o streams</SPAN>, and specializations of <CODE>std::basic_streambuf</CODE>
- as <SPAN CLASS="term">standard stream buffers</SPAN>. Together, standard input streams, standard output streams and standard i/o streams will be refered to as <SPAN CLASS="term">standard streams</SPAN>. Sometimes the qualifier <I>standard</I> will be omitted.
+ as <SPAN CLASS="term">standard stream buffers</SPAN>. Together, standard input streams, standard output streams and standard i/o streams will be referred to as <SPAN CLASS="term">standard streams</SPAN>. Sometimes the qualifier <I>standard</I> will be omitted.
</P>
<!-- <UL>
@@ -107,11 +107,11 @@
All classes, functions and templates introduced in the documentation are in the namespace <CODE>boost::iostreams</CODE> unless otherwise indicated. Namespace qualification will usually be omitted.
</LI>
<LI CLASS="square">
- Specializations of <CODE>std::basic_istream</CODE> will be refered to as
+ Specializations of <CODE>std::basic_istream</CODE> will be referred to as
<SPAN CLASS="term">standard input streams</SPAN>, specializations of <CODE>std::basic_ostream</CODE>
as <SPAN CLASS="term">standard output streams</SPAN>, specializations of <CODE>std::basic_iostream</CODE>
as <SPAN CLASS="term">standard i/o streams</SPAN>, and specializations of <CODE>std::basic_streambuf</CODE>
- as <SPAN CLASS="term">standard stream buffers</SPAN>. Together, standard input streams, standard output streams and standard i/o streams will be refered to as <SPAN CLASS="term">standard streams</SPAN>. The qualifier <I>standard</I> will usually be omitted.
+ as <SPAN CLASS="term">standard stream buffers</SPAN>. Together, standard input streams, standard output streams and standard i/o streams will be referred to as <SPAN CLASS="term">standard streams</SPAN>. The qualifier <I>standard</I> will usually be omitted.
</LI>
</UL> -->
diff -urN boost-1.33.1.original/libs/regex/doc/index.html boost-1.33.1/libs/regex/doc/index.html
--- boost-1.33.1.original/libs/regex/doc/index.html 2005-01-13 17:05:18.000000000 +0000
+++ boost-1.33.1/libs/regex/doc/index.html 2006-07-12 17:09:21.822902015 +0100
@@ -31,7 +31,7 @@
and setup</a> <dt><a href="install.html">Installation</a>
<dd>
<dl class="index">
- <dt><a href="install.html#bjam">Building with bjam (prefered)</a>
+ <dt><a href="install.html#bjam">Building with bjam (preferred)</a>
<dt><a href="install.html#unicode">Building with Unicode/ICU support</a>
<dt><a href="install.html#make">Building via Makefiles</a>
<dd><dl class="index">
diff -urN boost-1.33.1.original/libs/variant/doc/reference/get.xml boost-1.33.1/libs/variant/doc/reference/get.xml
--- boost-1.33.1.original/libs/variant/doc/reference/get.xml 2003-12-23 22:50:05.000000000 +0000
+++ boost-1.33.1/libs/variant/doc/reference/get.xml 2006-07-12 17:09:21.935224675 +0100
@@ -136,7 +136,7 @@
<rationale>
<simpara>While visitation via
<code><functionname>apply_visitor</functionname></code>
- is generally prefered due to its greater safety, <code>get</code> may
+ is generally preferred due to its greater safety, <code>get</code> may
may be more convenient in some cases due to its straightforward
usage.</simpara>
</rationale>
diff -urN boost-1.33.1.original/tools/quickbook/doc/html/quickbook/syntax.html boost-1.33.1/tools/quickbook/doc/html/quickbook/syntax.html
--- boost-1.33.1.original/tools/quickbook/doc/html/quickbook/syntax.html 2005-07-12 08:46:58.000000000 +0100
+++ boost-1.33.1/tools/quickbook/doc/html/quickbook/syntax.html 2006-07-12 17:09:21.979351434 +0100
@@ -197,7 +197,7 @@
<tbody><tr><td class="blurb">
<span class="inlinemediaobject"><img src="../images/note.png"></span>
Note that we simply enclose the code with the tick: <tt class="literal">"`"</tt>, not the
-single quote: <tt class="computeroutput"><span class="string">"'"</span></tt>. Note too that <tt class="literal">`some code`</tt> is prefered over
+single quote: <tt class="computeroutput"><span class="string">"'"</span></tt>. Note too that <tt class="literal">`some code`</tt> is preferred over
<tt class="literal">[^some code]</tt>.
</td></tr></tbody>
</table></div>
diff -urN boost-1.33.1.original/tools/quickbook/doc/quickbook.qbk boost-1.33.1/tools/quickbook/doc/quickbook.qbk
--- boost-1.33.1.original/tools/quickbook/doc/quickbook.qbk 2005-04-30 02:48:44.000000000 +0100
+++ boost-1.33.1/tools/quickbook/doc/quickbook.qbk 2006-07-12 17:09:21.959293817 +0100
@@ -175,7 +175,7 @@
[blurb __note__
Note that we simply enclose the code with the tick: [^'''"`"'''], not the
-single quote: `"'"`. Note too that [^'''`some code`'''] is prefered over
+single quote: `"'"`. Note too that [^'''`some code`'''] is preferred over
[^'''[^some code]'''].
]
diff -urN boost-1.33.1.original/tools/quickbook/doc/quickbook.xml boost-1.33.1/tools/quickbook/doc/quickbook.xml
--- boost-1.33.1.original/tools/quickbook/doc/quickbook.xml 2005-02-14 06:36:16.000000000 +0000
+++ boost-1.33.1/tools/quickbook/doc/quickbook.xml 2006-07-12 17:09:22.087662571 +0100
@@ -199,7 +199,7 @@
<entry role="blurb">
<inlinemediaobject><imageobject><imagedata fileref="images/note.png"></imagedata></imageobject></inlinemediaobject>
Note that we simply enclose the code with the tick: <literal>"`"</literal>, not the
-single quote: <code><phrase role="string">"'"</phrase></code>. Note too that <literal>`some code`</literal> is prefered over
+single quote: <code><phrase role="string">"'"</phrase></code>. Note too that <literal>`some code`</literal> is preferred over
<literal>[^some code]</literal>.
</entry>
</row>
Index: boost/format/exceptions.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/format/exceptions.hpp,v
retrieving revision 1.5
diff -u -r1.5 exceptions.hpp
--- boost/format/exceptions.hpp 24 Jan 2004 17:30:23 -0000 1.5
+++ boost/format/exceptions.hpp 12 Jul 2006 16:16:45 -0000
@@ -56,7 +56,7 @@
std::size_t get_expected() const { return expected_; }
virtual const char *what() const throw() {
return "boost::too_few_args: "
- "format-string refered to more arguments than were passed";
+ "format-string referred to more arguments than were passed";
}
};
@@ -70,7 +70,7 @@
std::size_t get_expected() const { return expected_; }
virtual const char *what() const throw() {
return "boost::too_many_args: "
- "format-string refered to less arguments than were passed";
+ "format-string referred to less arguments than were passed";
}
};
Index: boost/numeric/ublas/matrix_expression.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/numeric/ublas/matrix_expression.hpp,v
retrieving revision 1.64
diff -u -r1.64 matrix_expression.hpp
--- boost/numeric/ublas/matrix_expression.hpp 6 Nov 2005 14:57:13 -0000 1.64
+++ boost/numeric/ublas/matrix_expression.hpp 12 Jul 2006 16:16:51 -0000
@@ -42,7 +42,7 @@
typedef typename boost::mpl::if_<boost::is_const<E>,
typename E::const_reference,
typename E::reference>::type reference;
- typedef E refered_type;
+ typedef E referred_type;
typedef const self_type const_closure_type;
typedef self_type closure_type;
typedef typename E::orientation_category orientation_category;
@@ -50,7 +50,7 @@
// Construction and destruction
BOOST_UBLAS_INLINE
- explicit matrix_reference (refered_type &e):
+ explicit matrix_reference (referred_type &e):
e_ (e) {}
// Accessors
@@ -66,11 +66,11 @@
public:
// Expression accessors - const correct
BOOST_UBLAS_INLINE
- const refered_type &expression () const {
+ const referred_type &expression () const {
return e_;
}
BOOST_UBLAS_INLINE
- refered_type &expression () {
+ referred_type &expression () {
return e_;
}
@@ -269,7 +269,7 @@
}
private:
- refered_type &e_;
+ referred_type &e_;
};
Index: boost/numeric/ublas/vector_expression.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/numeric/ublas/vector_expression.hpp,v
retrieving revision 1.68
diff -u -r1.68 vector_expression.hpp
--- boost/numeric/ublas/vector_expression.hpp 6 Nov 2005 14:57:13 -0000 1.68
+++ boost/numeric/ublas/vector_expression.hpp 12 Jul 2006 16:16:53 -0000
@@ -43,14 +43,14 @@
typedef typename boost::mpl::if_<boost::is_const<E>,
typename E::const_reference,
typename E::reference>::type reference;
- typedef E refered_type;
+ typedef E referred_type;
typedef const self_type const_closure_type;
typedef self_type closure_type;
typedef typename E::storage_category storage_category;
// Construction and destruction
BOOST_UBLAS_INLINE
- explicit vector_reference (refered_type &e):
+ explicit vector_reference (referred_type &e):
e_ (e) {}
// Accessors
@@ -62,11 +62,11 @@
public:
// Expression accessors - const correct
BOOST_UBLAS_INLINE
- const refered_type &expression () const {
+ const referred_type &expression () const {
return e_;
}
BOOST_UBLAS_INLINE
- refered_type &expression () {
+ referred_type &expression () {
return e_;
}
@@ -227,7 +227,7 @@
}
private:
- refered_type &e_;
+ referred_type &e_;
};
Index: boost/regex/v4/basic_regex.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/regex/v4/basic_regex.hpp,v
retrieving revision 1.19
diff -u -r1.19 basic_regex.hpp
--- boost/regex/v4/basic_regex.hpp 27 Oct 2005 10:24:50 -0000 1.19
+++ boost/regex/v4/basic_regex.hpp 12 Jul 2006 16:16:56 -0000
@@ -343,7 +343,7 @@
//
// getflags:
// retained for backwards compatibility only, "flags"
- // is now the prefered name:
+ // is now the preferred name:
flag_type BOOST_REGEX_CALL getflags()const
{
return flags();
Index: libs/iostreams/doc/home.html
===================================================================
RCS file: /cvsroot/boost/boost/libs/iostreams/doc/home.html,v
retrieving revision 1.13
diff -u -r1.13 home.html
--- libs/iostreams/doc/home.html 12 Aug 2005 13:02:34 -0000 1.13
+++ libs/iostreams/doc/home.html 12 Jul 2006 16:16:59 -0000
@@ -95,11 +95,11 @@
namespace <CODE>boost::iostreams</CODE>, unless otherwise indicated. Namespace qualification is usually omitted.
</P>
<P>
- Specializations of <CODE>std::basic_istream</CODE> will be refered to as
+ Specializations of <CODE>std::basic_istream</CODE> will be referred to as
<SPAN CLASS="term">standard input streams</SPAN>, specializations of <CODE>std::basic_ostream</CODE>
as <SPAN CLASS="term">standard output streams</SPAN>, specializations of <CODE>std::basic_iostream</CODE>
as <SPAN CLASS="term">standard i/o streams</SPAN>, and specializations of <CODE>std::basic_streambuf</CODE>
- as <SPAN CLASS="term">standard stream buffers</SPAN>. Together, standard input streams, standard output streams and standard i/o streams will be refered to as <SPAN CLASS="term">standard streams</SPAN>. Sometimes the qualifier <I>standard</I> will be omitted.
+ as <SPAN CLASS="term">standard stream buffers</SPAN>. Together, standard input streams, standard output streams and standard i/o streams will be referred to as <SPAN CLASS="term">standard streams</SPAN>. Sometimes the qualifier <I>standard</I> will be omitted.
</P>
<!-- <UL>
@@ -107,11 +107,11 @@
All classes, functions and templates introduced in the documentation are in the namespace <CODE>boost::iostreams</CODE> unless otherwise indicated. Namespace qualification will usually be omitted.
</LI>
<LI CLASS="square">
- Specializations of <CODE>std::basic_istream</CODE> will be refered to as
+ Specializations of <CODE>std::basic_istream</CODE> will be referred to as
<SPAN CLASS="term">standard input streams</SPAN>, specializations of <CODE>std::basic_ostream</CODE>
as <SPAN CLASS="term">standard output streams</SPAN>, specializations of <CODE>std::basic_iostream</CODE>
as <SPAN CLASS="term">standard i/o streams</SPAN>, and specializations of <CODE>std::basic_streambuf</CODE>
- as <SPAN CLASS="term">standard stream buffers</SPAN>. Together, standard input streams, standard output streams and standard i/o streams will be refered to as <SPAN CLASS="term">standard streams</SPAN>. The qualifier <I>standard</I> will usually be omitted.
+ as <SPAN CLASS="term">standard stream buffers</SPAN>. Together, standard input streams, standard output streams and standard i/o streams will be referred to as <SPAN CLASS="term">standard streams</SPAN>. The qualifier <I>standard</I> will usually be omitted.
</LI>
</UL> -->
Index: libs/regex/doc/index.html
===================================================================
RCS file: /cvsroot/boost/boost/libs/regex/doc/index.html,v
retrieving revision 1.7
diff -u -r1.7 index.html
--- libs/regex/doc/index.html 13 Jan 2005 17:05:18 -0000 1.7
+++ libs/regex/doc/index.html 12 Jul 2006 16:17:03 -0000
@@ -31,7 +31,7 @@
and setup</a> <dt><a href="install.html">Installation</a>
<dd>
<dl class="index">
- <dt><a href="install.html#bjam">Building with bjam (prefered)</a>
+ <dt><a href="install.html#bjam">Building with bjam (preferred)</a>
<dt><a href="install.html#unicode">Building with Unicode/ICU support</a>
<dt><a href="install.html#make">Building via Makefiles</a>
<dd><dl class="index">
Index: libs/variant/doc/reference/get.xml
===================================================================
RCS file: /cvsroot/boost/boost/libs/variant/doc/reference/get.xml,v
retrieving revision 1.4
diff -u -r1.4 get.xml
--- libs/variant/doc/reference/get.xml 23 Dec 2003 22:50:05 -0000 1.4
+++ libs/variant/doc/reference/get.xml 12 Jul 2006 16:17:07 -0000
@@ -136,7 +136,7 @@
<rationale>
<simpara>While visitation via
<code><functionname>apply_visitor</functionname></code>
- is generally prefered due to its greater safety, <code>get</code> may
+ is generally preferred due to its greater safety, <code>get</code> may
may be more convenient in some cases due to its straightforward
usage.</simpara>
</rationale>
Index: libs/xpressive/test/test_cycles.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/test/test_cycles.cpp,v
retrieving revision 1.4
diff -u -r1.4 test_cycles.cpp
--- libs/xpressive/test/test_cycles.cpp 2 Jan 2006 07:03:04 -0000 1.4
+++ libs/xpressive/test/test_cycles.cpp 12 Jul 2006 16:17:08 -0000
@@ -21,7 +21,7 @@
///////////////////////////////////////////////////////////////////////////////
// test_main
-// regexes refered to by other regexes are kept alive via reference counting.
+// regexes referred to by other regexes are kept alive via reference counting.
// but cycles are handled naturally. the following works as expected and doesn't leak.
int test_main( int, char*[] )
{
Index: tools/build/v2/build/targets.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/targets.jam,v
retrieving revision 1.196
diff -u -r1.196 targets.jam
--- tools/build/v2/build/targets.jam 19 May 2006 13:38:57 -0000 1.196
+++ tools/build/v2/build/targets.jam 12 Jul 2006 16:17:09 -0000
@@ -953,7 +953,7 @@
local current = $(raw) ;
# It's assumed that ordinary conditional requirements can't add
- # <indirect-conditional> properties, and that rules refered
+ # <indirect-conditional> properties, and that rules referred
# by <indirect-conditional> properties can't add new
# <indirect-conditional> properties. So the list of indirect conditionals
# does not change.
Index: tools/quickbook/doc/quickbook.qbk
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/doc/quickbook.qbk,v
retrieving revision 1.43
diff -u -r1.43 quickbook.qbk
--- tools/quickbook/doc/quickbook.qbk 10 Jul 2006 11:03:48 -0000 1.43
+++ tools/quickbook/doc/quickbook.qbk 12 Jul 2006 16:17:11 -0000
@@ -300,7 +300,7 @@
syntax highlighted.
[note We simply enclose the code with the tick: [^'''"`"'''], not the
-single quote: `"'"`. Note too that [^'''`some code`'''] is prefered over
+single quote: `"'"`. Note too that [^'''`some code`'''] is preferred over
[^'''[^some code]''']. ]
[endsect]
Index: tools/quickbook/doc/quickbook.xml
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/doc/quickbook.xml,v
retrieving revision 1.29
diff -u -r1.29 quickbook.xml
--- tools/quickbook/doc/quickbook.xml 19 Jan 2006 06:11:02 -0000 1.29
+++ tools/quickbook/doc/quickbook.xml 12 Jul 2006 16:17:12 -0000
@@ -399,7 +399,7 @@
</inlinemediaobject> Note that we simply enclose the code with the
tick: <literal>"`"</literal>, not the single quote: <code><phrase
role="string">"'"</phrase></code>. Note too that <literal>`some
- code`</literal> is prefered over <literal>[^some code]</literal>.
+ code`</literal> is preferred over <literal>[^some code]</literal>.
</entry>
</row>
</tbody>
Index: tools/quickbook/doc/html/quickbook/syntax/phrase.html
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/doc/html/quickbook/syntax/phrase.html,v
retrieving revision 1.14
diff -u -r1.14 phrase.html
--- tools/quickbook/doc/html/quickbook/syntax/phrase.html 10 Jul 2006 11:03:48 -0000 1.14
+++ tools/quickbook/doc/html/quickbook/syntax/phrase.html 12 Jul 2006 16:17:12 -0000
@@ -273,7 +273,7 @@
<tr><td colspan="2" align="left" valign="top"><p>
We simply enclose the code with the tick: <tt class="literal">"`"</tt>, not the
single quote: <tt class="computeroutput"><span class="string">"'"</span></tt>.
- Note too that <tt class="literal">`some code`</tt> is prefered over <tt class="literal">[^some code]</tt>.
+ Note too that <tt class="literal">`some code`</tt> is preferred over <tt class="literal">[^some code]</tt>.
</p></td></tr>
</table></div>
</div>
Index: tools/quickbook/test/quickbook-manual.gold
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/test/quickbook-manual.gold,v
retrieving revision 1.4
diff -u -r1.4 quickbook-manual.gold
--- tools/quickbook/test/quickbook-manual.gold 2 Jun 2006 16:48:36 -0000 1.4
+++ tools/quickbook/test/quickbook-manual.gold 12 Jul 2006 16:17:14 -0000
@@ -409,7 +409,7 @@
</textobject>
</inlinemediaobject> Note that we simply enclose the code with the tick:
<literal><!--quickbook-escape-prefix-->"`"<!--quickbook-escape-postfix--></literal>, not the single quote: <code><phrase role="string">"'"</phrase></code>.
- Note too that <literal><!--quickbook-escape-prefix-->`some code`<!--quickbook-escape-postfix--></literal> is prefered over <literal><!--quickbook-escape-prefix-->[^some code]<!--quickbook-escape-postfix--></literal>.
+ Note too that <literal><!--quickbook-escape-prefix-->`some code`<!--quickbook-escape-postfix--></literal> is preferred over <literal><!--quickbook-escape-prefix-->[^some code]<!--quickbook-escape-postfix--></literal>.
</para>
</section>
<section id="quickbook.syntax.phrase.code_blocks">
Index: tools/quickbook/test/quickbook-manual.quickbook
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/test/quickbook-manual.quickbook,v
retrieving revision 1.2
diff -u -r1.2 quickbook-manual.quickbook
--- tools/quickbook/test/quickbook-manual.quickbook 3 Feb 2006 09:42:17 -0000 1.2
+++ tools/quickbook/test/quickbook-manual.quickbook 12 Jul 2006 16:17:15 -0000
@@ -297,7 +297,7 @@
[blurb __note__
Note that we simply enclose the code with the tick: [^'''"`"'''], not the
-single quote: `"'"`. Note too that [^'''`some code`'''] is prefered over
+single quote: `"'"`. Note too that [^'''`some code`'''] is preferred over
[^'''[^some code]'''].
]
