@@ -123,7 +123,7 @@ resources for background on the aggregation framework and its use:
123
123
TTL Collections
124
124
```````````````
125
125
126
- TTL collections remove stale data from a collection, using a special
126
+ TTL collections remove expired data from a collection, using a special
127
127
index and a background thread that deletes expired documents every
128
128
minute. These collections are useful as an alternative to
129
129
:term:`capped collections <capped collection>` in some cases, for data
@@ -136,19 +136,18 @@ For more information, see the :doc:`/tutorial/expire-data` tutorial.
136
136
Concurrency Improvements
137
137
````````````````````````
138
138
139
- In 2.2 MongoDB increases the database 's capability for concurrent
140
- operations using with two key improvements:
139
+ In 2.2 MongoDB increases the server 's capacity for concurrent
140
+ operations with two key improvements:
141
141
142
142
#. :issue:`DB Level Locking <SERVER-4328>`
143
143
#. :issue:`Improved Yielding on Page Faults <SERVER-3357>`
144
144
145
- To reflect these changes, MognODB now provides changed and improved
145
+ To reflect these changes, MongoDB now provides changed and improved
146
146
reporting for concurrency and use, see the :ref:`locks` and
147
147
:ref:`server-status-record-stats` in :doc:`server status
148
148
</reference/server-status>` and in the output of
149
149
:func:`db.currentOp()` as well as :doc:`mongotop
150
- </reference/mongotop>` and :doc:`mongostat </reference/mongostat>` and
151
- in .
150
+ </reference/mongotop>` and :doc:`mongostat </reference/mongostat>`.
152
151
153
152
.. TODO add links to current op output documentation when it happens.
154
153
@@ -167,8 +166,8 @@ preferences <replica-set-read-preference>` including consistent
167
166
support for a full range of :ref:`read preference modes
168
167
<replica-set-read-preference-modes>` and :ref:`tag sets
169
168
<replica-set-read-preference-tag-sets>`. This support extends to the
170
- :program:`mongos` and applies similarly to both single replica sets,
171
- and replica sets that provide components of a shard cluster.
169
+ :program:`mongos` and applies identically to single replica sets, and
170
+ the replica sets for each shard in a :term:` shard cluster` .
172
171
173
172
Additional read preference support now exists in the :program:`mongo`
174
173
shell using the :func:`reaPref() <cursor.readPref()>` cursor method.
@@ -185,14 +184,17 @@ In order to provide more reliable and robust support for
185
184
authentication clients, including drivers and :program:`mongos`
186
185
instances.
187
186
188
- If your :program:`mongod` instances or cluster is running with
187
+ If your :program:`mongod` instances or cluster runs with
189
188
authentication:
190
189
191
190
- In sharded environments, 2.0 version :program:`mongos` instances are
192
191
**not** compatible with 2.2 shard clusters running with
193
- authentication. Use the :ref:`upgrade procedure for shard clusters
192
+ authentication.
193
+
194
+ You **must** use the :ref:`upgrade procedure for shard clusters
194
195
<2.2-upgrade-shard-cluster>` and upgrade all :program:`mongos`
195
- instances to prevent operational difficulty.
196
+ instances *before* upgrading the shard to prevent rendering your
197
+ cluster non-operational.
196
198
197
199
- For all drivers, use the latest release of your driver and check
198
200
its release notes.
0 commit comments