Skip to content

Commit f177fb5

Browse files
author
Sam Kleinman
committed
DOCS-390: edits
1 parent ea64116 commit f177fb5

File tree

2 files changed

+34
-33
lines changed

2 files changed

+34
-33
lines changed

draft/release-notes/2.0.txt

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ If you create new indexes in 2.0, then downgrading to 1.8 is possible
2727
but you must reindex the new collections. For more information on 2.0
2828
indexes and on rollback, see :wiki:`Index Versions`.
2929

30-
``mongoimport`` and ``mongoexport`` now correctly adhere to the CSV spec
30+
:program:`mongoimport` and :program:`mongoexport` now correctly adhere to the CSV spec
3131
for handling CSV input/output. This may break existing import/export
3232
workflows that relied on the previous behavior. For more information see
3333
:issue:`SERVER-1097`.
3434

3535
:wiki:`Journaling` is **enabled by default** in 2.0 for 64-bit builds.
3636
If you still prefer to run without journaling, start :program:`mongod`
37-
with the ``--nojournal`` option. Otherwise, the journal files are
38-
created on startup. The first time you start :program:`mongod` with
39-
journaling, you will see a delay while the new files are created.
37+
with the :option:`--nojournal <mongod --nojournal>` run-time option.
38+
Otherwise, MongoDB creates journal files during startup. The first time you start :program:`mongod` with
39+
journaling, you will see a delay the :program:`mongod` creates new files.
4040
In addition, you may see reduced write throughput.
4141

4242
2.0 processes can talk to 1.8 processes and vice versa, so you can
@@ -103,8 +103,8 @@ repair the entire database.
103103
Concurrency Improvements
104104
~~~~~~~~~~~~~~~~~~~~~~~~
105105

106-
When going to disk, the server will yield the write lock if the data
107-
being acted upon isn't likely to be in memory. The initial
106+
When going to disk, the server will yield the write lock when writing
107+
data that is not likely to be in memory. The initial
108108
implementation of this feature now exists:
109109

110110
See :issue:`SERVER-2563` for more information.
@@ -120,11 +120,11 @@ The specific operations yield in 2.0 are:
120120
Default Stack Size
121121
~~~~~~~~~~~~~~~~~~
122122

123-
The default stack size has been reduced. This can reduce total memory
123+
MongoDB 2.0 reduces the default stack size. This change can reduce total memory
124124
usage when there are many (e.g., 1000+) client connections, as there is
125125
a thread per connection. While portions of a thread's stack can be
126126
swapped out if unused, some operating systems do this slowly enough that
127-
it might be an issue. The stack size will be set to the lesser of the
127+
it might be an issue. The default stack size is lesser of the
128128
system setting or 1MB.
129129

130130
Index Performance Enhancements
@@ -145,7 +145,7 @@ re-index of any indexes created using 2.0.
145145
Sharding Authentication
146146
~~~~~~~~~~~~~~~~~~~~~~~
147147

148-
Authentication can now be used with :term:`shard clusters <shard cluster>`.
148+
Applications can now use authentication with :term:`shard clusters <shard cluster>`.
149149

150150
Replica Sets
151151
~~~~~~~~~~~~
@@ -168,10 +168,10 @@ For example, suppose you have a replica set with three members, ``A``, ``B``, an
168168

169169
- ``C``'s priority is ``1``.
170170

171-
During normal operation, ``B`` will always be chosen as primary. If ``B`` goes
172-
down, ``A`` will be elected primary.
171+
During normal operation, the set will always chose ``B`` as
172+
primary. If ``B`` becomes unavailable, the set will elect ``A`` as primary.
173173

174-
For more information, see the :ref:`Node Priority` documentation.
174+
For more information, see the :ref:`Member Priority <replica-set-member-priority>` documentation.
175175

176176
Data-Center Awareness
177177
``````````````````````
@@ -181,8 +181,8 @@ location. You can use these tags to design custom :ref:`write rules <write-conce
181181
across data centers, racks, specific servers, or any other architecture
182182
choice.
183183

184-
For example, a DBA could define rules such as "very important write" or
185-
"customerData" or "audit-trail" to be replicated to certain servers,
184+
For example, an administrator can define rules such as "very important write" or
185+
``customerData`` or "audit-trail" to replicate to certain servers,
186186
racks, data centers, etc. Then in the application code, the developer
187187
would say:
188188

@@ -196,18 +196,18 @@ which would succeed if it fulfilled the conditions the DBA defined for
196196
For more information, see
197197
:wiki:`Tagging <Data+Center+Awareness#DataCenterAwareness-Tagging%28version2.0%29>`.
198198

199-
Your driver may also support tag-aware reads. Instead of simply
199+
Drivers may also support tag-aware reads. Instead of
200200
specifying ``slaveOk``, you specify ``slaveOk`` with tags indicating
201201
which data-centers to read from. For details, see the
202202
:doc:`/applications/drivers` documentation.
203203

204204
``w`` : ``majority``
205205
````````````````````
206206

207-
You can also set ``w`` to ``majority`` to ensure that a write has been
208-
propagated to a majority of nodes, effectively committing it. The value
209-
for "majority" will automatically be adjusted as you add or remove nodes
210-
from the set.
207+
You can also set ``w`` to ``majority`` to ensure that the write
208+
propagates to a majority of nodes, effectively committing it. The
209+
value for "majority" will automatically adjust as you add or
210+
remove nodes from the set.
211211

212212
For more information, see :ref:`replica-set-write-concern`.
213213

@@ -248,9 +248,9 @@ secondary available.
248248
Maintenance Mode
249249
````````````````
250250

251-
When :dbcommand:`repair` or :dbcommand:`compact` is run on a :term:`secondary`, the
251+
When :dbcommand:`repair` or :dbcommand:`compact` runs on a :term:`secondary`, the
252252
secondary will automatically drop into "recovering" mode until the
253-
operation is finished. This prevents clients from trying to read from it
253+
operation finishes. This prevents clients from trying to read from it
254254
while it's busy.
255255

256256
Geospatial Features
@@ -261,7 +261,7 @@ Multi-Location Documents
261261

262262
Indexing is now supported on documents which have multiple location
263263
objects, embedded either inline or in nested sub-documents. Additional
264-
command options are also supported, allowing results to be returned with
264+
command options are also supported, allowing results to return with
265265
not only distance but the location used to generate the distance.
266266

267267
For more information, see :wiki:`Multi-location Documents <Geospatial+Indexing#GeospatialIndexing-MultilocationDocuments>`.
@@ -284,21 +284,21 @@ Journaling Enhancements
284284
specifying your own group commit interval. 100ms is the default (same as
285285
in 1.8).
286286

287-
- A new :dbcommand:`{ getLastError: { j: true } }<getLastError>` option is
287+
- A new :dbcommand:`{ getLastError: { j: true } } <getLastError>` option is
288288
available to wait for the group commit. The group commit will happen
289289
sooner when a client is waiting on ``{j: true}``. If journaling is
290290
disabled, ``{j: true}`` is a no-op.
291291

292292
New ``ContinueOnError`` Option for Bulk Insert
293293
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
294294

295-
When this flag is set (to set it, see your
296-
:doc:`/applications/drivers` documentation),
297-
bulk insert will continue to insert any remaining documents even if an
298-
insert fails (due, for example, to a duplicate key). The
299-
:dbcommand:`getLastError` command will report whether any doc inserts
300-
have failed (not just the last one). If multiple errors occur, only the
301-
most recent will be reported by :dbcommand:`getLastError`.
295+
Set the ``continueOnError`` option for bulk inserts, in the
296+
:doc:`driver </applications/drivers>`, so that bulk insert will
297+
continue to insert any remaining documents even if an insert fails, as
298+
is the case with duplicate key exceptions or network interruptions. The :dbcommand:`getLastError`
299+
command will report whether any inserts have failed, not just the
300+
last one. If multiple errors occur, the client will only receive the
301+
most recent :dbcommand:`getLastError` results.
302302

303303
See :wiki:`OP_INSERT <Mongo+Wire+Protocol#MongoWireProtocol-OPINSERT>`.
304304

@@ -335,7 +335,7 @@ New Querying Features
335335
Additional regex options: ``s``
336336
```````````````````````````````
337337

338-
Allows the dot (.) to match all characters including new lines. This is
338+
Allows the dot (``.``) to match all characters including new lines. This is
339339
in addition to the currently supported ``i``, ``m`` and ``x``. See
340340
:wiki:`Regular Expressions <Advanced+Queries#AdvancedQueries-RegularExpressions>` and :operator:`$regex`.
341341

source/core/replication.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,10 @@ remain a secondary.
247247

248248
.. index:: replica set; priority
249249
.. _replica-set-node-priority:
250+
.. _replica-set-member-priority:
250251

251-
Node Priority
252-
~~~~~~~~~~~~~
252+
Member Priority
253+
~~~~~~~~~~~~~~~
253254

254255
In a replica set, every node has a "priority," that helps determine
255256
eligibility for :ref:`election <replica-set-elections>` to

0 commit comments

Comments
 (0)