diff --git a/source/release-notes/2.0.txt b/source/release-notes/2.0.txt index e8918b8b05a..45219846798 100644 --- a/source/release-notes/2.0.txt +++ b/source/release-notes/2.0.txt @@ -25,7 +25,7 @@ for handling CSV input/output. This may break existing import/export workflows that relied on the previous behavior. For more information see :issue:`SERVER-1097`. -:wiki:`Journaling` is **enabled by default** in 2.0 for 64-bit builds. +:doc:`Journaling ` is **enabled by default** in 2.0 for 64-bit builds. If you still prefer to run without journaling, start :program:`mongod` with the :option:`--nojournal ` run-time option. Otherwise, MongoDB creates journal files during startup. The first time you start :program:`mongod` with @@ -216,8 +216,7 @@ would say: which would succeed if it fulfilled the conditions the DBA defined for "very important write". -For more information, see -:wiki:`Tagging `. +For more information, see :doc:`/data-center-awareness`. Drivers may also support tag-aware reads. Instead of specifying ``slaveOk``, you specify ``slaveOk`` with tags indicating @@ -287,7 +286,7 @@ objects, embedded either inline or in nested sub-documents. Additional command options are also supported, allowing results to return with not only distance but the location used to generate the distance. -For more information, see :wiki:`Multi-location Documents `. +For more information, see :ref:`geospatial-indexes-multi-location`. Polygon searches ```````````````` @@ -323,7 +322,7 @@ command will report whether any inserts have failed, not just the last one. If multiple errors occur, the client will only receive the most recent :dbcommand:`getLastError` results. -See :wiki:`OP_INSERT `. +See :meta-driver:`OP_INSERT `. .. include:: /includes/note-bulk-inserts-on-sharded-clusters.rst @@ -338,8 +337,8 @@ map/reduce to a sharded collection. Combined with the ``reduce`` or ``merge`` flags, it is possible to keep adding data to very large collections from map/reduce jobs. -For more information, see :wiki:`MapReduce Output Options ` -and the :dbcommand:`mapReduce` reference. +For more information, see :doc:`/core/map-reduce/` and the +:dbcommand:`mapReduce` reference. Performance Improvements ```````````````````````` @@ -362,8 +361,7 @@ Additional regex options: ``s`` ``````````````````````````````` Allows the dot (``.``) to match all characters including new lines. This is -in addition to the currently supported ``i``, ``m`` and ``x``. See -:wiki:`Regular Expressions ` and :query:`$regex`. +in addition to the currently supported ``i``, ``m`` and ``x``. See :query:`$regex`. $and ```` @@ -387,7 +385,7 @@ Custom Prompt You can define a custom prompt for the :program:`mongo` shell. You can change the prompt at any time by setting the prompt variable to a string or a custom JavaScript function returning a string. For examples, see -:wiki:`Custom Prompt `. +:ref:`shell-use-a-custom-prompt`. Default Shell Init Script ````````````````````````` diff --git a/source/release-notes/2.2.txt b/source/release-notes/2.2.txt index 4a73b1bf90d..116221b6c79 100644 --- a/source/release-notes/2.2.txt +++ b/source/release-notes/2.2.txt @@ -195,15 +195,10 @@ on specific shards. For example, with tag aware sharding, you can ensure that data is closest to the application servers that use that data most frequently. -.. todo When draft/core/write-operations.txt goes live, change this below: - write-concern - to - write-operations-write-concern - Shard tagging controls data location, and is complementary but separate from replica set tagging, which controls :doc:`read preference ` and :ref:`write concern -`. For example, shard tagging can pin all +`. For example, shard tagging can pin all "USA" data to one or more logical shards, while replica set tagging can control which :program:`mongod` instances (e.g. "``production``" or "``reporting``") the application uses to service requests. diff --git a/source/tutorial/getting-started-with-the-mongo-shell.txt b/source/tutorial/getting-started-with-the-mongo-shell.txt index c4dce2deb02..69d763dd1aa 100644 --- a/source/tutorial/getting-started-with-the-mongo-shell.txt +++ b/source/tutorial/getting-started-with-the-mongo-shell.txt @@ -159,6 +159,8 @@ Evaluate a JavaScript File .. include:: /includes/fact-execute-javascript-from-shell.rst +.. _shell-use-a-custom-prompt: + Use a Custom Prompt -------------------