aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-01-29 13:49:57 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-01-29 13:49:57 +0200
commit0fd331b2f1ce974e8428acbd46ec8384da5879e1 (patch)
tree1a326878c883b5812444c3e7c31782bc1995c6fb
parent3c809bc011f331b6e876e542688d4795f2e6bbcb (diff)
Proofreading fixes to documentation
-rw-r--r--doc/manual.xhtml8
-rw-r--r--odb/options.cli12
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/manual.xhtml b/doc/manual.xhtml
index 9209ef0..bd1448f 100644
--- a/doc/manual.xhtml
+++ b/doc/manual.xhtml
@@ -13788,7 +13788,7 @@ t.commit ();
persisted. Similarly, because there is no signed version of the
<code>TINYINT</code> SQL Server type, by default, <code>char</code>
and <code>signed char</code> C++ types are mapped to
- <code>TINYINT</code>. As result, the most significant bit of
+ <code>TINYINT</code>. As a result, the most significant bit of
the value stored by the database for these types will contain the
sign bit of the actual signed value being persisted.</p>
@@ -14036,7 +14036,7 @@ odb::mssql::database dbA ("test",
</pre>
- <p>The forth constructor allows us to pass a custom ODBC connection
+ <p>The fourth constructor allows us to pass a custom ODBC connection
string that provides all the information necessary to connect to
the database. Note also that all the other constructors have the
<code>extra_connect_string</code> argument which can be used to
@@ -15025,7 +15025,7 @@ class person
<p>Note that the <code>DATE</code>, <code>TIME</code>, and
<code>DATETIME2</code> types are only available in SQL Server 2008 and
later. SQL Server 2005 only supports the <code>DATETIME</code> and
- <code>SMALLDATETIME</code> date-time types and the new types are
+ <code>SMALLDATETIME</code> date-time types. The new types are
also unavailable when connecting to an SQL Server 2008 or
later with the SQL Server 2005 Native Client ODBC driver.</p>
@@ -15739,7 +15739,7 @@ class Person
<p>Note that the <code>DATE</code>, <code>TIME</code>, and
<code>DATETIME2</code> types are only available in SQL Server 2008 and
later. SQL Server 2005 only supports the <code>DATETIME</code> and
- <code>SMALLDATETIME</code> date-time types and the new types are
+ <code>SMALLDATETIME</code> date-time types. The new types are
also unavailable when connecting to an SQL Server 2008 or
later with the SQL Server 2005 Native Client ODBC driver.</p>
diff --git a/odb/options.cli b/odb/options.cli
index 1a0d0c1..aa50a9a 100644
--- a/odb/options.cli
+++ b/odb/options.cli
@@ -450,14 +450,14 @@ class options
version-specific optimizations and workarounds in the generated C++
code. The version must be in the \c{\i{major}\b{.}\i{minor}} form, for
example, \cb{9.0} (SQL Server 2005), \cb{10.5} (2008R2), or \cb{11.0}
- (2012). If this options is not specified, then \cb{10.0} (SQL Server 2008)
+ (2012). If this option is not specified, then \cb{10.0} (SQL Server 2008)
or later is assumed."
};
unsigned int --mssql-short-limit = 1024
{
"<size>",
- "Specify the short data size limit. If character, national character, or
+ "Specify the short data size limit. If a character, national character, or
binary data type has a maximum length (in bytes) less than or equal to
this limit, then it is treated as \i{short data}, otherwise it is \i{long
data}. For short data ODB pre-allocates an intermediate buffer of
@@ -467,9 +467,9 @@ class options
in chunks using the \cb{SQLGetData()}/\cb{SQLPutData()} ODBC functions.
While the long data approach reduces the amount of memory used by the
application, it may require greater CPU resources. The default short
- data limit is 1024 bytes. When setting a custom short data limit make
- sure that it is sufficiently large so that no character object id in
- the application is treated as long data."
+ data limit is 1024 bytes. When setting a custom short data limit, make
+ sure that it is sufficiently large so that no object id in the
+ application is treated as long data."
};
//
@@ -497,7 +497,7 @@ class options
generated C++ code will be linked. This information is used to enable
version-specific optimizations and workarounds in the generated C++
code. The version must be in the \c{\i{major}\b{.}\i{minor}} form,
- for example, \cb{11.2}. If this options is not specified, then
+ for example, \cb{11.2}. If this option is not specified, then
\cb{10.1} or later is assumed."
};