Skip to content

Commit f648b00

Browse files
fredericDelaportehazzik
authored andcommitted
NH-3959 - Fix typos (#566)
1 parent 5f32eb3 commit f648b00

23 files changed

+124
-125
lines changed

doc/reference/modules/architecture.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
The instance was once associated with a persistence
206206
context, but that context was closed, or the instance
207207
was serialized to another process. It has a persistent
208-
identity and, perhaps, a corrsponding row in the database.
208+
identity and, perhaps, a corresponding row in the database.
209209
For detached instances, NHibernate makes no guarantees
210210
about the relationship between persistent identity and
211211
CLR identity.

doc/reference/modules/basic_mapping.xml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<para>
8989
This element has several optional attributes. The <literal>schema</literal> attribute
9090
specifies that tables referred to by this mapping belong to the named schema. If specified,
91-
tablenames will be qualified by the given schema name. If missing, tablenames will be
91+
table names will be qualified by the given schema name. If missing, table names will be
9292
unqualified. The <literal>default-cascade</literal> attribute specifies what cascade style
9393
should be assumed for properties and collections which do not specify a
9494
<literal>cascade</literal> attribute. The <literal>auto-import</literal> attribute lets us
@@ -230,7 +230,7 @@
230230
<callout arearefs="class3">
231231
<para>
232232
<literal>discriminator-value</literal> (optional - defaults to the class name): A value
233-
that distiguishes individual subclasses, used for polymorphic behaviour. Acceptable
233+
that distinguishes individual subclasses, used for polymorphic behaviour. Acceptable
234234
values include <literal>null</literal> and <literal>not null</literal>.
235235
</para>
236236
</callout>
@@ -470,7 +470,7 @@
470470
(unsaved), distinguishing it from transient instances that were saved or loaded
471471
in a previous session.
472472
</para>
473-
</callout>
473+
</callout>
474474
<callout arearefs="id5">
475475
<para>
476476
<literal>access</literal> (optional - defaults to <literal>property</literal>): The
@@ -570,8 +570,8 @@
570570
use this generator with a user-supplied connection.</emphasis>
571571
</para>
572572
<para>
573-
You can use the "where" parameter to specify the row to use in a table. This is useful
574-
if you want to use a single tabel for your identifiers, with different rows for each table.
573+
You can use the "where" parameter to specify the row to use in a table. This is useful
574+
if you want to use a single table for your identifiers, with different rows for each table.
575575
</para>
576576
</listitem>
577577
</varlistentry>
@@ -700,7 +700,7 @@
700700
The valid values for <literal>format</literal> are described in the MSDN documentation.
701701
The default <literal>seperator</literal> is <literal>-</literal> and should rarely be
702702
modified. The <literal>format</literal> determines if the configured
703-
<literal>seperator</literal> can replace the default seperator used by
703+
<literal>seperator</literal> can replace the default separator used by
704704
the <literal>format</literal>.
705705
</para>
706706
</sect3>
@@ -776,7 +776,7 @@
776776
<para>Starting with NHibernate release 3.3.0, there are 2 new generators which
777777
represent a re-thinking of 2 different aspects of identifier
778778
generation. The first aspect is database portability; the second is
779-
optimization Optimization means that you do not have to query the
779+
optimization. Optimization means that you do not have to query the
780780
database for every request for a new identifier value. These two new
781781
generators are intended to take the place of some of the named
782782
generators described above, starting in 3.3.x. However, they are
@@ -1013,7 +1013,7 @@
10131013
You must instantiate an instance of the persistent class itself and populate its
10141014
identifier properties before you can <literal>load()</literal> the persistent state
10151015
associated with a composite key. We will describe a much more
1016-
convenient approach where the composite identifier is implemented as a seperate class
1016+
convenient approach where the composite identifier is implemented as a separate class
10171017
in <xref linkend="components-compositeid"/>. The attributes described below apply only
10181018
to this alternative approach:
10191019
</para>
@@ -1367,7 +1367,7 @@
13671367
<para>
13681368
<literal>lazy</literal> (optional - defaults to <literal>false</literal>):
13691369
Specifies that this property is lazy. A lazy property is not loaded when
1370-
the object is initially loaded, unless the fetch mode has been overriden
1370+
the object is initially loaded, unless the fetch mode has been overridden
13711371
in a specific query. Values for lazy properties are loaded when any lazy
13721372
property of the object is accessed.
13731373
</para>
@@ -1673,7 +1673,7 @@
16731673
specifies that the mapped columns should be included in SQL <literal>UPDATE</literal>
16741674
and/or <literal>INSERT</literal> statements. Setting both to <literal>false</literal>
16751675
allows a pure "derived" association whose value is initialized from some other
1676-
property that maps to the same colum(s) or by a trigger or other application.
1676+
property that maps to the same column(s) or by a trigger or other application.
16771677
</para>
16781678
</callout>
16791679
<callout arearefs="manytoone8">
@@ -1699,7 +1699,7 @@
16991699
<para>
17001700
<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>):
17011701
Specifies that updates to this property do or do not require acquisition of the
1702-
optimistic lock. In other words, dertermines if a version increment should occur when
1702+
optimistic lock. In other words, determines if a version increment should occur when
17031703
this property is dirty.
17041704
</para>
17051705
</callout>
@@ -1889,8 +1889,8 @@
18891889
</class>]]></programlisting>
18901890

18911891
<para>
1892-
A newly saved instance of <literal>Person</literal> is then assigned the same primar
1893-
key value as the <literal>Employee</literal> instance refered with the <literal>Employee</literal>
1892+
A newly saved instance of <literal>Person</literal> is then assigned the same primary
1893+
key value as the <literal>Employee</literal> instance referred with the <literal>Employee</literal>
18941894
property of that <literal>Person</literal>.
18951895
</para>
18961896

@@ -2027,7 +2027,7 @@
20272027

20282028
<para>
20292029
The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;parent&gt;</literal>
2030-
subelement that maps a property of the component class as a reference back to the
2030+
sub-element that maps a property of the component class as a reference back to the
20312031
containing entity.
20322032
</para>
20332033

@@ -2178,19 +2178,19 @@
21782178
<para>
21792179
<literal>name</literal>: The fully qualified .NET class name of the
21802180
subclass, including its assembly name.
2181-
</para>
2182-
</callout>
2181+
</para>
2182+
</callout>
21832183
<callout arearefs="subclass2">
21842184
<para>
21852185
<literal>discriminator-value</literal> (optional - defaults to the class name): A
2186-
value that distiguishes individual subclasses.
2187-
</para>
2186+
value that distinguishes individual subclasses.
2187+
</para>
21882188
</callout>
21892189
<callout arearefs="subclass3">
21902190
<para>
21912191
<literal>proxy</literal> (optional): Specifies a class or interface to use for
21922192
lazy initializing proxies.
2193-
</para>
2193+
</para>
21942194
</callout>
21952195
<callout arearefs="subclass4">
21962196
<para>
@@ -2247,21 +2247,21 @@
22472247
<callout arearefs="joinedsubclass1">
22482248
<para>
22492249
<literal>name</literal>: The fully qualified class name of the subclass.
2250-
</para>
2251-
</callout>
2250+
</para>
2251+
</callout>
22522252
<callout arearefs="joinedsubclass2">
22532253
<para>
2254-
<literal>proxy</literal> (optional): Specifies a class or interface to use
2254+
<literal>proxy</literal> (optional): Specifies a class or interface to use
22552255
for lazy initializing proxies.
2256-
</para>
2256+
</para>
22572257
</callout>
22582258
<callout arearefs="joinedsubclass3">
22592259
<para>
2260-
<literal>lazy</literal> (optional): Setting <literal>lazy="true"</literal> is a shortcut
2261-
equalivalent to specifying the name of the class itself as the <literal>proxy</literal>
2260+
<literal>lazy</literal> (optional): Setting <literal>lazy="true"</literal> is a shortcut
2261+
equivalent to specifying the name of the class itself as the <literal>proxy</literal>
22622262
interface.
22632263
</para>
2264-
</callout>
2264+
</callout>
22652265
</calloutlist>
22662266
</programlistingco>
22672267

@@ -3096,9 +3096,9 @@
30963096
<title>SQL quoted identifiers</title>
30973097
<para>
30983098
You may force NHibernate to quote an identifier in the generated SQL by enclosing the table or
3099-
column name in backticks in the mapping document. NHibernate will use the correct quotation
3099+
column name in back-ticks in the mapping document. NHibernate will use the correct quotation
31003100
style for the SQL <literal>Dialect</literal> (usually double quotes, but brackets for SQL
3101-
Server and backticks for MySQL).
3101+
Server and back-ticks for MySQL).
31023102
</para>
31033103

31043104
<programlisting><![CDATA[<class name="LineItem" table="`Line Item`">
@@ -3113,8 +3113,8 @@
31133113
<title>Modular mapping files</title>
31143114
<para>
31153115
It is possible to define <literal>subclass</literal> and <literal>joined-subclass</literal>
3116-
mappings in seperate mapping documents, directly beneath <literal>hibernate-mapping</literal>.
3117-
This allows you to extend a class hierachy just by adding a new mapping file. You must
3116+
mappings in separate mapping documents, directly beneath <literal>hibernate-mapping</literal>.
3117+
This allows you to extend a class hierarchy just by adding a new mapping file. You must
31183118
specify an <literal>extends</literal> attribute in the subclass mapping, naming a previously
31193119
mapped superclass. Use of this feature makes the ordering of the mapping documents important!
31203120
</para>
@@ -3141,7 +3141,7 @@
31413141
issues a select afterwards to retrieve the generated values.
31423142
</para>
31433143
<para>
3144-
Properties marked as generated must additionally be non-insertable and non-updateable.
3144+
Properties marked as generated must additionally be non-insertable and non-updatable.
31453145
Only <xref linkend="mapping-declaration-version">versions</xref>,
31463146
<xref linkend="mapping-declaration-timestamp">timestamps</xref>, and
31473147
<xref linkend="mapping-declaration-property">simple properties</xref> can be marked as

doc/reference/modules/batch.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ session.Close();]]></programlisting>
3232

3333
<para id="disablebatching" revision="1">
3434
Note that NHibernate disables insert batching at the ADO level transparently if you
35-
use an <literal>identiy</literal> identifier generator.
35+
use an <literal>identity</literal> identifier generator.
3636
</para>
3737

3838
<para>
@@ -160,7 +160,7 @@ session.Close();]]></programlisting>
160160
<para>
161161
No <link linkend="queryhql-joins">joins</link> (either implicit or explicit)
162162
can be specified in a bulk HQL query. Sub-queries may be used in the where-clause;
163-
the subqueries, themselves, may contain joins.
163+
the sub-queries, themselves, may contain joins.
164164
</para>
165165
</listitem>
166166
<listitem>
@@ -236,7 +236,7 @@ session.Close();]]></programlisting>
236236
number indicates the number of actual entities affected by the statement. Going back to the
237237
example of joined-subclass, a delete against one of the subclasses may actually result
238238
in deletes against not just the table to which that subclass is mapped, but also the "root"
239-
table and potentially joined-subclass tables further down the inheritence hierarchy.
239+
table and potentially joined-subclass tables further down the inheritance hierarchy.
240240
</para>
241241

242242
<para>
@@ -251,9 +251,9 @@ session.Close();]]></programlisting>
251251
Only the INSERT INTO ... SELECT ... form is supported; not the INSERT INTO ... VALUES ... form.
252252
</para>
253253
<para>
254-
The properties_list is analogous to the <literal>column speficiation</literal>
254+
The properties_list is analogous to the <literal>column specification</literal>
255255
in the SQL <literal>INSERT</literal> statement. For entities involved in mapped
256-
inheritence, only properties directly defined on that given class-level can be
256+
inheritance, only properties directly defined on that given class-level can be
257257
used in the properties_list. Superclass properties are not allowed; and subclass
258258
properties do not make sense. In other words, <literal>INSERT</literal>
259259
statements are inherently non-polymorphic.

doc/reference/modules/best_practices.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@
122122
<listitem>
123123
<para>
124124
Database Transactions have to be as short as possible for best scalability. However, it is often
125-
neccessary to implement long running Application Transactions, a single unit-of-work from the
125+
necessary to implement long running Application Transactions, a single unit-of-work from the
126126
point of view of a user. This Application Transaction might span several client requests and
127127
response cycles. Either use Detached Objects or, in two tiered architectures, simply disconnect
128128
the NHibernate Session from the ADO.NET connection and reconnect it for each subsequent request.
129-
Never use a single Session for more than one Application Transaction usecase, otherwise, you
129+
Never use a single Session for more than one Application Transaction use-case, otherwise, you
130130
will run into stale data.
131131
</para>
132132
</listitem>
@@ -162,7 +162,7 @@
162162
<para>
163163
Hide (NHibernate) data-access code behind an interface. Combine the <emphasis>DAO</emphasis> and
164164
<emphasis>Thread Local Session</emphasis> patterns. You can even have some classes persisted by
165-
handcoded ADO.NET, associated to NHibernate via an <literal>IUserType</literal>. (This advice is
165+
hand-coded ADO.NET, associated to NHibernate via an <literal>IUserType</literal>. (This advice is
166166
intended for "sufficiently large" applications; it is not appropriate for an application with
167167
five tables!)
168168
</para>
@@ -189,11 +189,11 @@
189189
<term>Don't use exotic association mappings.</term>
190190
<listitem>
191191
<para>
192-
Good usecases for a real many-to-many associations are rare. Most of the time you need
192+
Good use-cases for a real many-to-many associations are rare. Most of the time you need
193193
additional information stored in the "link table". In this case, it is much better to
194194
use two one-to-many associations to an intermediate link class. In fact, we think that
195195
most associations are one-to-many and many-to-one, you should be careful when using any
196-
other association style and ask yourself if it is really neccessary.
196+
other association style and ask yourself if it is really necessary.
197197
</para>
198198
</listitem>
199199
</varlistentry>

0 commit comments

Comments
 (0)