From c7fa552e72982beb47cf478209fd623fb5e95727 Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Fri, 12 Apr 2013 12:28:04 -0400 Subject: [PATCH 1/4] minor typo cleanup --- source/core/update.txt | 2 +- source/data-modeling.txt | 2 +- source/reference/aggregation/concat.txt | 2 +- source/reference/server-status.txt | 2 +- source/reference/ulimit.txt | 6 +----- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/source/core/update.txt b/source/core/update.txt index 8144f937326..84b91d992c2 100644 --- a/source/core/update.txt +++ b/source/core/update.txt @@ -359,7 +359,7 @@ and a ```` argument with an ``_id`` field. .. example:: - Consider the following psudocode explanation of + Consider the following pseudocode explanation of :method:`~db.collection.save()` as an illustration of its behavior: diff --git a/source/data-modeling.txt b/source/data-modeling.txt index 70ce8bd23c0..2e16acffb1f 100644 --- a/source/data-modeling.txt +++ b/source/data-modeling.txt @@ -8,7 +8,7 @@ may be able to use different structures for a single data set in MongoDB, different data models may have significant impacts on MongoDB and applications performance. Consider :doc:`/core/data-modeling` for a conceptual overview of data modeling problems in MongoDB, and the -:ref:`data-modeling-patterns` documents for exaples of different +:ref:`data-modeling-patterns` documents for examples of different approaches to data models. .. seealso:: :doc:`/use-cases` for overviews of application design, diff --git a/source/reference/aggregation/concat.txt b/source/reference/aggregation/concat.txt index 83d695dda3b..5d397d4131a 100644 --- a/source/reference/aggregation/concat.txt +++ b/source/reference/aggregation/concat.txt @@ -37,7 +37,7 @@ $concat (aggregation) { _id: 4, item: { sec: "main", category: "pie", type: "chicken pot" } } The following operation uses :expression:`$concat` to concatenate - the ``type`` field from the sub-document ``item``, a space `` ``, + the ``type`` field from the sub-document ``item``, a space, and the ``category`` field from the sub-document ``item`` to project a new ``food`` field: diff --git a/source/reference/server-status.txt b/source/reference/server-status.txt index 27f8673e090..cc9a8a1244b 100644 --- a/source/reference/server-status.txt +++ b/source/reference/server-status.txt @@ -1278,7 +1278,7 @@ metrics members of a replica set to acknowledge the write operation (i.e. greater than ``1``.) -.. data:: serverStatus.metrics.getLastError.wtime.totalMillis` +.. data:: serverStatus.metrics.getLastError.wtime.totalMillis :data:`~serverStatus.metrics.getLastError.wtime.totalMillis` reports the total amount of time in milliseconds that the :program:`mongod` diff --git a/source/reference/ulimit.txt b/source/reference/ulimit.txt index d5a93efe886..590ea567d5a 100644 --- a/source/reference/ulimit.txt +++ b/source/reference/ulimit.txt @@ -65,11 +65,7 @@ For :program:`mongos`, consider the following behaviors: fulfill requests without needing to create new connections. - You can limit the number of incoming connections using - the :setting:`maxConns` run-time option: - - .. code-block:: javascript - - :option:`--maxConns ` + the :option:`maxConns ` run-time option. By restricting the number of incoming connections you can prevent a cascade effect where the :program:`mongos` creates too many From 04df576eb8ccc2de6e4e9dcb2e7b54924c6f4788 Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Fri, 12 Apr 2013 12:28:57 -0400 Subject: [PATCH 2/4] DOCS-1382 remove note that cd is not implemented --- source/reference/method/cd.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/reference/method/cd.txt b/source/reference/method/cd.txt index c9d4ef2bb18..0a2a904db80 100644 --- a/source/reference/method/cd.txt +++ b/source/reference/method/cd.txt @@ -12,5 +12,3 @@ cd() This function returns with output relative to the current shell session, and does not impact the server. - - .. note:: This feature is not yet implemented. From e312feb7145b0cede48bb245b4f409a7a20e73db Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Fri, 12 Apr 2013 12:41:05 -0400 Subject: [PATCH 3/4] typo c/Mongo DB/MongoDB --- source/tutorial/isolate-sequence-of-operations.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/tutorial/isolate-sequence-of-operations.txt b/source/tutorial/isolate-sequence-of-operations.txt index 37c21363938..862d06d8102 100644 --- a/source/tutorial/isolate-sequence-of-operations.txt +++ b/source/tutorial/isolate-sequence-of-operations.txt @@ -112,7 +112,7 @@ as: reasons: First, in sharded environments, distributed locks could be expensive and slow. MongoDB's goal is to be lightweight and fast. We dislike the concept of deadlocks. We want the system to be simple and - predictable without these sort of surprises. We want Mongo DB to work + predictable without these sort of surprises. We want MongoDB to work well for realtime problems. If an operation may execute which locks large amounts of data, it might stop some small light queries for an extended period of time." From 7b11367d508067e7c5cba2ed68052b47f60afd9c Mon Sep 17 00:00:00 2001 From: Ed Costello Date: Fri, 12 Apr 2013 13:14:19 -0400 Subject: [PATCH 4/4] minor: extra backtick --- source/reference/mongoimport.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/reference/mongoimport.txt b/source/reference/mongoimport.txt index de8c8c85e29..deac183e176 100644 --- a/source/reference/mongoimport.txt +++ b/source/reference/mongoimport.txt @@ -163,7 +163,7 @@ Options .. option:: --fieldFile As an alternative to :option:`--fields` the :option:`--fieldFile` - option allows you to specify a file (e.g. `````) to that + option allows you to specify a file (e.g. ````) to that holds a list of field names if your :term:`csv` or :term:`tsv` file does not include field names in the first (i.e. header) line of the file. Place one field per line.