From d5588e5123f2c1b0d7e829d8554fb5c056099702 Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Wed, 28 Nov 2012 17:58:05 -0500 Subject: [PATCH 1/7] CSS changes per comments from dm and others * remove borders from rubrics * standardize font sizes * standard line-heights based on 90% page widths via Google Analytics * background colors for warnings, removed for notes, standard color for code blocks and literals * shrink footer real estate * port over mongodb.org log and leaf background --- themes/mongodb/static/mongodb-docs.css_t | 122 ++++++++++++++++------- 1 file changed, 88 insertions(+), 34 deletions(-) diff --git a/themes/mongodb/static/mongodb-docs.css_t b/themes/mongodb/static/mongodb-docs.css_t index 8acb1b7bf98..3adfc631ea5 100644 --- a/themes/mongodb/static/mongodb-docs.css_t +++ b/themes/mongodb/static/mongodb-docs.css_t @@ -8,7 +8,6 @@ * :license: BSD, see LICENSE for details. * */ - @import url("basic.css"); /* -- page layout ----------------------------------------------------------- */ @@ -45,18 +44,33 @@ div.body { background-color: white; color: black; padding: 0 30px 30px 30px; - font-size: 0.9em; + font-size: 100%; } -div.footer { +div.footerX { color: white; width: 100%; - padding: 13px 0; + padding: 13px 0; + line-height:1.0; + margin:0; text-align: center; font-size: 75%; border-top: 1px solid black; } +div.footer { + color:white; + width:auto; + padding:0; + margin:0; + text-align:center; + font-size:80%; + border:none; + padding:0.5em; + } + +div.footer p {margin:0;padding:0;line-height:1.5;} + div.footer a { color: #989898; text-decoration: underline; @@ -67,7 +81,8 @@ div.related { margin-bottom: 0.9em; /* margin-top: 0.9em;*/ color: #fff; - font-size: 0.9em; + /* font-size: 0.9em; */ + font-size:90%; } @@ -190,6 +205,14 @@ div.body h4 { font-size: 110%; } div.body h5 { font-size: 100%; } div.body h6 { font-size: 100%; } +div.body h1 + p, div.body h2 + p, div.body h3 + p, div.body h4 + p, +div.body h1 + ul, div.body h2 + ul, div.body h3 + ul, div.body h4 + ul, +div.body h1 + dl, div.body h2 + dl, div.body h3 + dl, div.body h4 + dl {padding-top:0;margin-top:0ex;text-indent:0;} + +div.section h1 + p, div.section h2 + p, div.section h3 + p, div.section h4 + p, +div.section h1 + ul, div.section h2 + ul, div.section h3 + ul, div.section h4 + ul, +div.section h1 + dl, div.section h2 + dl, div.section h3 + dl, div.section h4 + dl {padding-top:0;margin-top:0ex;text-indent:0;} + a.headerlink { color: #c60f0f; font-size: 0.8em; @@ -203,7 +226,7 @@ a.headerlink:hover { } div.body p, div.body dd, div.body li { - line-height: 1.5em; + line-height: 1.8; } div.admonition p.admonition-title + p { @@ -222,19 +245,23 @@ div.topic { background-color: #eee; } -div.warning { - background-color: #ffe4e4; - border: 1px solid #f66; -} div.admonition { - margin: 15px; - padding: 7px; + margin:1em; + width:auto; + max-width:80%; + padding:0; + } + + +div.warning { + background-color: #ffff66; + padding:1ex; } + div.note { - background-color: #F3F4EB; - border: 1px solid #ccc; -} + background-color: inherit; + } div.seealso { padding-bottom: 7px; @@ -242,23 +269,25 @@ div.seealso { div.admonition-optional { background-color: #ffffee; - border: 1px solid #dfdfdf; color: #666666; margin: 10px 25px; } div.admonition-example { - background-color: #F3F4EB; - border: 1px solid #ccc; - color: #3E4349; + background-color: #ecf0f3; + color: #000000; } -p.admonition-title { +p.Xadmonition-title { display: inline; + font-weight:900; } +div.admonition p.admonition-title {display:inline; font-weight:900;height:100%;} + p.admonition-title:after { content: ":"; + font-weight:900; } div.admonition pre { @@ -270,19 +299,14 @@ pre { background-color: White; color: #222; line-height: 1.2em; - border: 1px solid #C6C9CB; font-size: 1.1em; margin: 20px; - -webkit-box-shadow: 1px 1px 1px #d8d8d8; - -moz-box-shadow: 1px 1px 1px #d8d8d8; } tt { background-color: #ecf0f3; - color: #222; - /* padding: 1px 2px; */ - font-size: 1.1em; - font-family: monospace; + color: #000; + font-family: "Courier New", Courier, monospace; } .viewcode-back { @@ -420,7 +444,7 @@ div.split { #header-db div#logo { margin-left: 15px; - padding-top: 20px; + padding-top: 15px; } #breadcrumbsback { @@ -479,7 +503,7 @@ div#top-right div.user-right { min-width: 186px; margin: 0; padding: 0 20px 0 0; - font-size: 85%; + font-size: 10pt; background-image: url(http://media.mongodb.org/trans-user-right.png); background-position: top right; background-repeat: no-repeat; @@ -492,7 +516,7 @@ div#top-right div.user-right li.normal { background-image: url(http://media.mongodb.org/trans-user-back.png); background-repeat: repeat-x; list-style-type: none; - font-size: 93%; + font-size: 10pt; color: #c48c55; } @@ -537,7 +561,7 @@ input[type="text"]:disabled { div.search-db { position: absolute; top: 46px; - right: 8px; + right: 10px; width: 246px; height: 31px; background-repeat: no-repeat; @@ -676,11 +700,41 @@ div#header-db {background-repeat: repeat-x;} div#header-db div.split {float:left;} div.gsc-control-cse-en, div.gsc-control-cse {padding:0!important;} .cse .gsc-search-button input.gsc-search-button-v2,input.gsc-search-button-v2 {height:13px;margin-top:0px!important;min-width:13px;padding:6px 27px;width:13px;} -div#etp {position:absolute;background:inherit;margin:0;top:87px;;padding:0;float:right;font-size:13px;right:10px;color:#C48C55} +div#etp {position:absolute;background:inherit;margin:0;top:87px;;padding:0;float:right;right:10px;color:#C48C55} div#etp ul {padding:0;margin:0;} -div#etp ul li {display:inline;list-style-type:none;font-size:13px;color:#C48C55;padding: 8px 1em 0 0;} +div#etp ul li {display:inline;list-style-type:none;font-size:10pt;color:#C48C55;padding: 8px 1em 0 0;} div#etp ul li a {color:#AA814D} div#etp ul li:before {content:"|";padding-right:1em;color:#c48c55} div#etp ul li:first-child:before {content:"";} -input.gsc-input {background:none;} +input.gsc-input {background:none;background-color: #4c3a2c;} +a.reference em {font-style:normal;} + +tt,tt span.pre {font-family:"Courier New", "Courier",monospace; ;} +div.section > h1 + dl.dbcommand > dt {display:none;} +div.section {cursor:default;} + +div#header-db {background-image: url(http://media.mongodb.org/back-header.png)} + +/* +background-color: #f6f4cd; -- house nav style +footer bg: #fdfcf7; font-size 80%; line-height:1.5em; color: #4c3a2c; +logo: http://media.mongodb.org/logo-mongodb.png + +search: accesskey = q color: #DBCAAF background: #4c3a2c +header: http://media.mongodb.org/back-header.png + + +*/ + +/* div.body * {font-size:12pt;font-family:Helvetica,Arial,Sans-Serif;font-weight:normal;line-height:1.0;} */ + +div.body p {line-height:1.6875;} +div.highlight pre {background-color: #ecf0f3;} + +div.section > h2, div.section > h3,div.section > h4 {margin-top:0;padding-top:0;line-height:1.77} +div.admonition p {line-height:1.6875} + +dd > div.admonition {margin-left:0;} +p > div.admonition {margin-left:0;} +li > div.admonition {margin-left:0;} From f1a95aa914c182dcc2d7a3d406b60358f815c03d Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Wed, 28 Nov 2012 18:01:36 -0500 Subject: [PATCH 2/7] Replace logo with leaf logo from www.mongodb.org --- themes/mongodb/layout.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/themes/mongodb/layout.html b/themes/mongodb/layout.html index 61e36b960f0..3237032aef0 100644 --- a/themes/mongodb/layout.html +++ b/themes/mongodb/layout.html @@ -176,9 +176,7 @@
- +
From 183c0a88a0a346df572480ffb108adc17a3e42c7 Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Wed, 28 Nov 2012 18:06:18 -0500 Subject: [PATCH 3/7] DOCS-701 add next/prev links to pages where appropriate --- themes/mongodb/layout.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/themes/mongodb/layout.html b/themes/mongodb/layout.html index 3237032aef0..33568e3e47e 100644 --- a/themes/mongodb/layout.html +++ b/themes/mongodb/layout.html @@ -96,6 +96,21 @@ {%- endfor %} {%- endmacro -%} +{%- macro render_nextprev() %} +
+ +
+{% endmacro -%} {%- block htmltitle %} @@ -199,6 +214,7 @@
{% block body %} {% endblock %} +{{- render_nextprev() -}}
{%- if render_sidebar %}
From b1856ae6c4492a1f5f9614ef266506361b753991 Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Wed, 28 Nov 2012 18:37:51 -0500 Subject: [PATCH 4/7] DOCS-701 create next/prev links at bottom of pages --- themes/mongodb/layout.html | 6 +++--- themes/mongodb/static/mongodb-docs.css_t | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/themes/mongodb/layout.html b/themes/mongodb/layout.html index 33568e3e47e..b3e90cee36f 100644 --- a/themes/mongodb/layout.html +++ b/themes/mongodb/layout.html @@ -100,13 +100,13 @@ diff --git a/themes/mongodb/static/mongodb-docs.css_t b/themes/mongodb/static/mongodb-docs.css_t index 3adfc631ea5..03888047a45 100644 --- a/themes/mongodb/static/mongodb-docs.css_t +++ b/themes/mongodb/static/mongodb-docs.css_t @@ -738,3 +738,11 @@ div.admonition p {line-height:1.6875} dd > div.admonition {margin-left:0;} p > div.admonition {margin-left:0;} li > div.admonition {margin-left:0;} + +div#btnv {padding-top:3em} +div#btnv ul#btnvl {display:block;width:66%;text-align:center;} +div#btnv ul#btnvl li {display:inline;list-item-style:none;font-size:10pt;padding:1em; width:33%} +div#btnv ul#btnvl li#btnvup:before, +div#btnv ul#btnvl li#btnvnx:before {content:" ";padding-left:1em;padding-right:1em;color:#c48c55} + + From eb3d08f78a046b63e351c1eac682cde2d0ced0dd Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Thu, 29 Nov 2012 09:00:00 -0500 Subject: [PATCH 5/7] minor css tweaks --- themes/mongodb/static/mongodb-docs.css_t | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/themes/mongodb/static/mongodb-docs.css_t b/themes/mongodb/static/mongodb-docs.css_t index 03888047a45..90f41bb5cb3 100644 --- a/themes/mongodb/static/mongodb-docs.css_t +++ b/themes/mongodb/static/mongodb-docs.css_t @@ -274,13 +274,8 @@ div.admonition-optional { } div.admonition-example { - background-color: #ecf0f3; - color: #000000; -} - -p.Xadmonition-title { - display: inline; - font-weight:900; + background-color: #ecf0f3; + color: #000000; } div.admonition p.admonition-title {display:inline; font-weight:900;height:100%;} From 15aac1da9171f0cc7c80777c156e63574afe814f Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Fri, 30 Nov 2012 15:43:34 -0500 Subject: [PATCH 6/7] Typo and link cleanup, adding two new methods and one operator Added: db.collection.createIndex.txt but marked as deprecated db.collection.isCapped.txt $natural operator Remaining edits are cleanup of broken links --- source/administration/security.txt | 8 +++--- source/applications/delete.txt | 2 +- source/applications/replication.txt | 2 +- source/core/read-operations.txt | 4 +-- source/core/write-operations.txt | 1 - .../includes/warning-sharding-hostnames.rst | 7 ++--- source/reference/command/applyOps.txt | 3 ++- source/reference/configuration-options.txt | 2 +- source/reference/limits.txt | 8 +++--- .../method/db.collection.createIndex.txt | 20 ++++++++++++++ .../method/db.collection.isCapped.txt | 19 +++++++++++++ source/reference/mongod.txt | 2 +- source/reference/operator/natural.txt | 27 +++++++++++++++++++ source/release-notes/2.0.txt | 2 +- source/tutorial/change-oplog-size.txt | 6 +++-- .../tutorial/install-mongodb-on-windows.txt | 2 +- 16 files changed, 92 insertions(+), 23 deletions(-) create mode 100644 source/reference/method/db.collection.createIndex.txt create mode 100644 source/reference/method/db.collection.isCapped.txt create mode 100644 source/reference/operator/natural.txt diff --git a/source/administration/security.txt b/source/administration/security.txt index 04c5b5f079e..067d4ce4293 100644 --- a/source/administration/security.txt +++ b/source/administration/security.txt @@ -112,8 +112,8 @@ Network Interface Limitation You can limit the network exposure with the following configuration options: -- the :setting:`nohttpinterface` setting for :program:`mongod` and - :program:`mongos` instances. +- the :setting:`nohttpinterface ` setting for + :program:`mongod` and :program:`mongos` instances. Disables the "home" status page, which would run on port ``28017`` by default. The status interface is read-only by default. You may @@ -170,7 +170,7 @@ You can limit the network exposure with the following configuration options: :option:`mongos --bind_ip` option on the command line at run time to limit the network accessibility of a MongoDB program. - .. important:: + .. important:: Make sure that your :program:`mongod` and :program:`mongos` instances are only accessible on trusted @@ -340,7 +340,7 @@ Be aware of the following capabilities and behaviors of the - :program:`mongo` will evaluate a ``.mongorc.js`` file before starting. You can disable this behavior by passing the - :option:`mongo --norc`` option. + :option:`mongo --norc` option. On Linux and Unix systems, :program:`mongo` reads the :file:`.mongorc.js` file from :file:`{$HOME}/.mongorc.js` diff --git a/source/applications/delete.txt b/source/applications/delete.txt index 5c3fd18567d..8a597ec8ec6 100644 --- a/source/applications/delete.txt +++ b/source/applications/delete.txt @@ -36,7 +36,7 @@ following syntax: .. code-block:: javascript - db.collection.delete( , ) + db.collection.remove( , ) .. admonition:: Corresponding operation in SQL diff --git a/source/applications/replication.txt b/source/applications/replication.txt index f5a9bd33716..42d065d1f83 100644 --- a/source/applications/replication.txt +++ b/source/applications/replication.txt @@ -76,7 +76,7 @@ on a majority of the set members before returning: cfg.settings.getLastErrorDefaults = {w: "majority"} rs.reconfig(cfg) -The :data:`getLastErrorDefaults` setting affects only those +The :data:`settings.getLastErrorDefaults` setting affects only those :dbcommand:`getLastError` commands that have *no* other arguments. .. note:: diff --git a/source/core/read-operations.txt b/source/core/read-operations.txt index c13048dd6e3..6353c5c7c4a 100644 --- a/source/core/read-operations.txt +++ b/source/core/read-operations.txt @@ -301,7 +301,7 @@ index can: support and optimize specific queries, sort operations, and allow for more efficient storage utilization. For more information about indexes in MongoDB see: :doc:`/indexes` and :doc:`/core/indexes`. -You can create indexes using the :method:`db.collection.ensureIndex{)` method +You can create indexes using the :method:`db.collection.ensureIndex()` method in the :program:`mongo` shell, as in the following prototype operation: @@ -566,7 +566,7 @@ operations for more basic data aggregation operations: - :method:`group()` -- :dbcommand:`mapReduce() ` (See also :wiki:`MapReduce`.) +- :dbcommand:`mapReduce() ` (See also :wiki:`MapReduce`.) .. index:: read operation; architecture .. _read-operations-architecture: diff --git a/source/core/write-operations.txt b/source/core/write-operations.txt index e130216baf5..5bbfdc4bba7 100644 --- a/source/core/write-operations.txt +++ b/source/core/write-operations.txt @@ -36,7 +36,6 @@ For information on specific methods used to perform write operations in the - :method:`db.collection.save()` - :method:`db.collection.findAndModify()` - :method:`db.collection.remove()` -- :method:`db.collection.delete()` For information on how to perform write operations from within an application, see the :doc:`/applications/drivers` documentation or the diff --git a/source/includes/warning-sharding-hostnames.rst b/source/includes/warning-sharding-hostnames.rst index 5ae3718e072..78ea5b71328 100644 --- a/source/includes/warning-sharding-hostnames.rst +++ b/source/includes/warning-sharding-hostnames.rst @@ -2,8 +2,9 @@ If you use either "localhost" or ``127.0.0.1`` as the hostname portion of any host identifier, for example as the ``host`` argument - to :dbcommand:`addShard` or the value to the :option:`mongos - --configdb` run time option, then you must use "localhost" or + to :dbcommand:`addShard` or the value to the + :option:`--configdb ` + run time option, then you must use "localhost" or ``127.0.0.1`` for *all* host settings for any MongoDB instances in the cluster. If you mix localhost addresses and remote host address, - MongoDB will error. \ No newline at end of file + MongoDB will error. diff --git a/source/reference/command/applyOps.txt b/source/reference/command/applyOps.txt index 06c38008053..a8e0e48b7ff 100644 --- a/source/reference/command/applyOps.txt +++ b/source/reference/command/applyOps.txt @@ -9,7 +9,8 @@ applyOps (internal) :param array operations: an array of operations to perform. :param array preCondition: Optional. Defines one or more conditions that the destination must meet - applying the entries from the ```` array. ``ns`` to + applying the entries from the ```` array. + Use ``ns`` to specify a :term:`namespace`, ``q`` to specify a :term:`query` and ``res`` to specify the result that the query should match. You may specify zero, one, or many ``preCondition`` documents. diff --git a/source/reference/configuration-options.txt b/source/reference/configuration-options.txt index 94dd2c5947d..5cc5dde58ac 100644 --- a/source/reference/configuration-options.txt +++ b/source/reference/configuration-options.txt @@ -854,7 +854,7 @@ Sharding Cluster Options random from this list. The ping time used for a set member compared by the - :option:`--localThreshold` setting is a moving average of recent + :option:`--localThreshold ` setting is a moving average of recent ping times, calculated, at most, every 10 seconds. As a result, some queries may reach members above the threshold until the :program:`mongos` recalculates the average. diff --git a/source/reference/limits.txt b/source/reference/limits.txt index 3f49c5caf36..e3a3c086493 100644 --- a/source/reference/limits.txt +++ b/source/reference/limits.txt @@ -78,9 +78,9 @@ Indexes index name is the concatenation of the field names and index directions. - You can explicitly specify a name to :dbcommand:`createIndex` or - the :method:`db.collection.ensureIndex()` helper if the default - index name is too long. + You can explicitly specific a name to the + :method:`~db.collection.ensureIndex()` + helper if the default index name is too long. .. _limit-sharding-unique-indexes: .. limit:: Unique Indexes in Sharded Collections @@ -122,7 +122,7 @@ Operations .. limit:: Operations Unavailable in Sharded Environments The :dbcommand:`group` does not work with sharding. Use - :dbcommand:`mapreduce` or :dbcommand:`aggregate` instead. + :dbcommand:`mapReduce` or :dbcommand:`aggregate` instead. :method:`db.eval()` is incompatible with sharded collections. You may use :method:`db.eval()` with un-sharded collections in a shard diff --git a/source/reference/method/db.collection.createIndex.txt b/source/reference/method/db.collection.createIndex.txt new file mode 100644 index 00000000000..e0817ccc16c --- /dev/null +++ b/source/reference/method/db.collection.createIndex.txt @@ -0,0 +1,20 @@ +=========================== +db.collection.createIndex() +=========================== + +.. default-domain:: mongodb + +.. deprecated:: + +.. method:: db.collection.createIndex(keys, options) + + :param document keys: A :term:`document` that contains + pairs with the name of the field or + fields to index and order of the index. A + ``1`` specifies ascending and a ``-1`` + specifies descending. + + :param document options: A :term:`document` that controls the creation + of the index. This argument is optional. + + .. seealso:: :method:`~db.collection.ensureIndex()` and :doc:`/indexes` diff --git a/source/reference/method/db.collection.isCapped.txt b/source/reference/method/db.collection.isCapped.txt new file mode 100644 index 00000000000..6aa71fb54e9 --- /dev/null +++ b/source/reference/method/db.collection.isCapped.txt @@ -0,0 +1,19 @@ +========================== +db.collection.isCapped() +========================== + +.. default-domain:: mongodb + +.. method:: db.collection.isCapped() + + Returns ``true`` if the collection is a :term:`capped collection`, + otherwise returns ``false``. + + .. code-block:: javascript + + > db.collection.isCapped() + true + + Change ``collection`` to the name of the collection you want to check. + +.. seealso:: :doc:`/core/capped-collections` diff --git a/source/reference/mongod.txt b/source/reference/mongod.txt index 6bdb691532b..08e7efd4f75 100644 --- a/source/reference/mongod.txt +++ b/source/reference/mongod.txt @@ -57,7 +57,7 @@ Options the amount of output. This option suppresses: - output from :term:`database commands `, - including :dbcommand:`drop`, :dbcommand:`dropIndex`, + including :dbcommand:`drop`, :dbcommand:`dropIndexes`, :dbcommand:`diagLogging`, :dbcommand:`validate`, and :dbcommand:`clean`. diff --git a/source/reference/operator/natural.txt b/source/reference/operator/natural.txt new file mode 100644 index 00000000000..7a1729cb7e0 --- /dev/null +++ b/source/reference/operator/natural.txt @@ -0,0 +1,27 @@ +======== +$natural +======== + +.. default-domain:: mongodb + +.. operator:: $natural + + Use the :operator:`$natural` operator to use :term:`natural order` for + the results of a sort operation. Natural order refers to the + order of documents in the file on disk. + + The :operator:`$natural` operator uses the following syntax to return + documents in the order they exist on disk: + + .. code-block:: javascript + + db.collection.sort( {$natural: 1} ) + + Use ``-1`` to return documents in the reverse order as they occur on + disk: + + .. code-block:: javascript + + db.collection.sort( {$natural: -1} ) + +.. seealso:: :method:`~cursor.sort()` diff --git a/source/release-notes/2.0.txt b/source/release-notes/2.0.txt index 37b43048bab..05d9999b823 100644 --- a/source/release-notes/2.0.txt +++ b/source/release-notes/2.0.txt @@ -383,7 +383,7 @@ user's home directory. The shell will execute this file after connecting to the database and before displaying the prompt. If you would like the shell not to run the ``.mongorc.js`` file -automatically, start the shell with :option:`--norc `. +automatically, start the shell with :option:`--norc `. For more information, see :doc:`/reference/mongo`. diff --git a/source/tutorial/change-oplog-size.txt b/source/tutorial/change-oplog-size.txt index d2e23fb6175..28ebc38203e 100644 --- a/source/tutorial/change-oplog-size.txt +++ b/source/tutorial/change-oplog-size.txt @@ -61,8 +61,10 @@ procedure for every member of the set that may become primary. mongod --dbpath /srv/mongodb --shutdown To restart the instance on a different port and in "standalone" mode - (i.e. without :setting:`replSet` or :option:`--replSet `), use a command that resembles the following: + (i.e. without + :setting:`replSet ` or + :option:`--replSet `), + use a command that resembles the following: .. code-block:: sh diff --git a/source/tutorial/install-mongodb-on-windows.txt b/source/tutorial/install-mongodb-on-windows.txt index 7c6039b7202..548a3d422ee 100644 --- a/source/tutorial/install-mongodb-on-windows.txt +++ b/source/tutorial/install-mongodb-on-windows.txt @@ -270,7 +270,7 @@ Run all of the following commands in :guilabel:`Command Prompt` with operation. You may also specify :option:`--dbpath ` on the command line; however, always prefer the configuration file. - If the :setting:`dbpath`` directory does not exist, + If the :setting:`dbpath` directory does not exist, :program:`mongod.exe` will not be able to start. The default value for :setting:`dbpath` is ``\data\db``. From 757d4672c3bfa789e1f78a5e02a14a63b1de5d46 Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Fri, 30 Nov 2012 16:22:20 -0500 Subject: [PATCH 7/7] Updates to db.collection.createIndex --- .../method/db.collection.createIndex.txt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/source/reference/method/db.collection.createIndex.txt b/source/reference/method/db.collection.createIndex.txt index e0817ccc16c..14720effda2 100644 --- a/source/reference/method/db.collection.createIndex.txt +++ b/source/reference/method/db.collection.createIndex.txt @@ -4,10 +4,10 @@ db.collection.createIndex() .. default-domain:: mongodb -.. deprecated:: - .. method:: db.collection.createIndex(keys, options) + .. deprecated:: 1.8 + :param document keys: A :term:`document` that contains pairs with the name of the field or fields to index and order of the index. A @@ -17,4 +17,14 @@ db.collection.createIndex() :param document options: A :term:`document` that controls the creation of the index. This argument is optional. - .. seealso:: :method:`~db.collection.ensureIndex()` and :doc:`/indexes` + The :method:`~db.collection.ensureIndex()` method is the preferred + way to create indexes on collections. + + .. seealso:: :doc:`/indexes`, + :method:`~db.collection.createIndex()`, + :method:`~db.collection.dropIndex()`, + :method:`~db.collection.dropIndexes()`, + :method:`~db.collection.getIndexes()`, + :method:`~db.collection.reIndex()`, + :method:`~db.collection.totalIndexSize()` +