na

bin/builddata/htaccess.yaml

@@ -3130,4 +3130,12 @@ type: 'redirect'
 code: 303
 outputs:
   - 'v2.2'
+---
+redirect-path: '/reference/operator/mul'
+url-base: '/reference/operators/#update'
+type: 'redirect'
+code: 303
+outputs:
+  - 'v2.2'
+  - 'v2.4'
 ...

source/core/replica-set-elections.txt

@@ -150,12 +150,14 @@ distributed replica set
 adjust priorities so that only members in a specific data center can
 become primary.
 
-The first member to receive the majority of votes becomes primary. By
-default, all members have a single vote, unless you modify the
-:data:`~local.system.replset.members[n].votes`
-setting. :doc:`Non-voting members
-</tutorial/configure-a-non-voting-replica-set-member>` have
-:data:`~local.system.replset.members[n].votes` value of ``0``.
+The first member to receive the majority of votes becomes primary.
+By default, all members have a single vote, unless you modify the
+:data:`~local.system.replset.members[n].votes` setting. :doc:`Non-voting
+members </tutorial/configure-a-non-voting-replica-set-member>` have
+:data:`~local.system.replset.members[n].votes` value of ``0``. All
+other members have ``1`` vote.
+
+.. include:: /includes/members-used-to-allow-multiple-votes.rst
 
 The :data:`~replSetGetStatus.members.state` of a member also affects
 its eligibility to vote. Only members in the following states can

source/faq/developers.txt

@@ -460,6 +460,47 @@ for additional information.
    The :source:`jsobj.h <src/mongo/db/jsobj.h>` source
    file for the definition of ``MinKey`` and ``MaxKey``.
 
+.. _faq-developers-multiplication-type-conversion:
+
+When multiplying values of mixed types, what type conversion rules apply?
+-------------------------------------------------------------------------
+
+The :operator:`$mul` multiplies the numeric value of a field by a
+number. For multiplication with values of mixed numeric types (32-bit
+integer, 64-bit integer, float), the following type conversion rules
+apply:
+
+.. list-table:: 
+   :header-rows: 1
+
+   * - 
+     - 32-bit Integer
+     - 64-bit Integer
+     - Float
+
+   * - **32-bit Integer**
+     - 32-bit or 64-bit Integer
+     - 64-bit Integer
+     - Float
+
+   * - **64-bit Integer**
+     - 64-bit Integer
+     - 64-bit Integer
+     - Float
+
+   * - **Float**
+     - Float
+     - Float
+     - Float
+
+.. note::
+
+   - If the product of two 32-bit integers exceeds the maximum value
+     for a 32-bit integer, the result is a 64-bit integer.
+
+   - Integer operations of any type that exceed the maximum value for a
+     64-bit integer produce an error.
+
 .. _faq-developers-query-for-nulls:
 
 How do I query for fields that have null values?

source/includes/admonition-mongodb-enterprise-windows-ldap.rst

@@ -0,0 +1,2 @@
+.. note:: MongoDB Enterprise for Windows does **not** include LDAP
+   support for authentication.

source/includes/members-used-to-allow-multiple-votes.rst

@@ -0,0 +1,11 @@
+.. note::
+
+   .. deprecated:: 2.5.3
+      :data:`~local.system.replset.members[n].votes` values greater
+      than ``1``.
+
+   Earlier versions of MongoDB allowed a member
+   to have more than ``1`` vote by setting
+   :data:`~local.system.replset.members[n].votes` to a value greater
+   than ``1``. Setting :data:`~local.system.replset.members[n].votes` 
+   to value greater than ``1`` now produces a warning message.

source/includes/note-max-conns-max.rst

@@ -1,2 +1,5 @@
-.. note:: You cannot set :setting:`maxConns` to a value higher
-   than `20000`.
+.. note:: 
+
+   .. versionchanged:: 2.5.0
+      MongoDB removed the upward limit on the :setting:`maxConns`
+      setting.

source/includes/ref-toc-operator-update-field.yaml

@@ -2,6 +2,10 @@ name: ":operator:`$inc`"
 file: /reference/operator/inc
 description: "Increments the value of the field by the specified amount."
 ---
+name: ":operator:`$mul`"
+file: /reference/operator/mul
+description: "Multiplies the value of the field by the specified amount."
+---
 name: ":operator:`$rename`"
 file: /reference/operator/rename
 description: "Renames a field."

source/reference/operator/mul.txt

@@ -0,0 +1,115 @@
+====
+$mul
+====
+
+.. default-domain:: mongodb
+
+.. operator:: $mul
+
+   .. versionadded:: 2.6
+
+   Multiply the value of a field by a number. To specify a
+   :operator:`$mul` expression, use the following prototype:
+
+   .. code-block:: javascript
+
+      { field: { $mul: <number> } }
+
+   The field to update must contain a numeric value. If the field does
+   not exist in a document, :operator:`$mul` creates the field and sets
+   the value to zero of the same numeric type as the multiplier.
+
+   Multiplication with values of mixed numeric types (32-bit integer,
+   64-bit integer, float) may result in conversion of numeric type. See
+   :ref:`Multiplication Type Conversion Rules
+   <faq-developers-multiplication-type-conversion>` for details.
+
+Examples
+--------
+
+Multiply the Value of a Field
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Consider a collection ``products`` with the following document:
+
+.. code-block:: javascript
+
+   { _id: 1, item: "ABC", price: 10.99 }
+
+The following :method:`db.collection.update()` operation updates the
+document, using the :operator:`$mul` operator to multiply the value in
+the ``price`` field by ``1.25``:
+
+.. code-block:: javascript
+
+   db.products.update(
+                       { _id: 1 },
+                       { $mul: { price: 1.25 } }
+                     )
+
+The operation results in the following document, where the new value of
+the ``price`` field ``13.7375`` reflects the original value ``10.99``
+multiplied by ``1.25``:
+
+.. code-block:: javascript
+
+   { _id: 1, item: "ABC", price: 13.7375 }
+
+Apply ``$mul`` Operator to a Non-existing Field
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Consider a collection ``products`` with the following document:
+
+.. code-block:: javascript
+
+   { _id: 2,  item: "Unknown" }
+
+The following :method:`db.collection.update()` operation updates the
+document, applying the :operator:`$mul` operator to the field ``price``
+that does not exist in the document:
+
+.. code-block:: javascript
+
+    db.products.update(
+                        { _id: 2 },
+                        { $mul: { price: NumberLong(100) } }
+                      )
+
+The operation results in the following document with a ``price`` field
+set to value 0 of numeric type :ref:`shell-type-long`, the same type as
+the multiplier:
+
+.. code-block:: javascript
+
+   { "_id" : 2, "item" : "Unknown", "price" : NumberLong(0) }
+
+Multiply Mixed Numeric Types
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Consider a collection ``products`` with the following document:
+
+.. code-block:: javascript
+
+   { _id: 3,  item: "XYZ", price: NumberLong(10) }
+
+The following :method:`db.collection.update()` operation uses the
+:operator:`$mul` operator to multiply the value in the ``price`` field
+:ref:`NumberLong(10) <shell-type-long>` by :ref:`NumberInt(5)
+<shell-type-int>`:
+
+.. code-block:: javascript
+
+    db.products.update(
+                        { _id: 3 },
+                        { $mul: { price: NumberInt(5) } }
+                      )
+
+The operation results in the following document:
+
+.. code-block:: javascript
+
+   { "_id" : 3, "item" : "XYZ", "price" : NumberLong(50) }
+
+The value in the ``price`` field is of type :ref:`shell-type-long`. See
+:ref:`Multiplication Type Conversion Rules
+<faq-developers-multiplication-type-conversion>` for details.

source/reference/program/mongoimport.txt

@@ -121,6 +121,17 @@ Options
    data directory: as a result, no :program:`mongod` can access the
    same path while the process runs.
 
+.. option:: --collection <collection>, -c <collection>
+
+   Use the :option:`--collection` option to specify the collection
+   that you want :program:`mongoimport` to import.
+
+   .. versionadded:: 2.5.3
+      If you do not specify :option:`--collection`,
+      :program:`mongoimport` takes the collection name from the input
+      filename. MongoDB omits the extension of the file from the
+      collection name, if the input file has an extension.
+
 .. option:: --directoryperdb
 
    Use the :option:`--directoryperdb` in conjunction with the
@@ -142,11 +153,6 @@ Options
    Use the :option:`--db` option to specify a database for
    :program:`mongoimport` to import data.
 
-.. option:: --collection <collection>, -c <collection>
-
-   Use the :option:`--collection` option to specify a collection for
-   :program:`mongoimport` to import.
-
 .. option:: --fields <field1<,field2>>, -f <field1[,field2]>
 
    Specify a comma separated list of field names when importing

source/reference/program/mongorestore.txt

@@ -167,12 +167,14 @@ Options
 
 .. option:: --collection <collection>, -c <collection>
 
-   Use the :option:`--collection` option to specify a collection for
-   :program:`mongorestore` to restore. If you do not specify a
-   ``<collection>``, :program:`mongorestore` imports all collections
-   created. Existing data may be overwritten. Use this option to
-   restore data into a MongoDB instance that already has data, or to
-   restore only some data in the specified imported data set.
+   Use the :option:`--collection` option to specify a single collection
+   for :program:`mongorestore` to restore. :program:`mongorestore` will
+   restore only that single collection.
+
+   If you do not specify :option:`--collection`, :program:`mongorestore`
+   takes the collection name from the input filename. MongoDB omits the
+   extension of the file from the collection name, if the input file has
+   an extension.
 
 .. option:: --objcheck
 

source/reference/replica-configuration.txt

@@ -243,14 +243,13 @@ Configuration Variables
 
    Controls the number of votes a server will cast in a :ref:`replica set
    election <replica-set-elections>`. The number of votes each member
-   has can be any non-negative integer, but it is highly recommended
-   each member has 1 or 0 votes.
+   has can be either ``1`` or ``0``.
 
-   If you need more than 7 members in one replica set, use this setting to add additional
-   non-voting members with a :data:`~local.system.replset.members[n].votes` value of ``0``.
+   If you need more than 7 members in one replica set, set
+   :data:`~local.system.replset.members[n].votes` to ``0`` for
+   the additional non-voting members.
 
-   For most deployments and most members, use the default value,
-   ``1``, for :data:`~local.system.replset.members[n].votes`.
+   .. include:: /includes/members-used-to-allow-multiple-votes.rst
 
 .. data:: local.system.replset.settings