Merge branch 'master' of git://github.com/mongodb/docs into DOCS-576-production

Conflicts:
	conf.py
	makefile
	source/use-cases/storing-log-data.txt

Author: Ed Costello

bin/makefile.compatibility

@@ -0,0 +1,18 @@
+# Fixing `sed` for OS X
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), Linux)
+SED_ARGS_FILE = -i -r
+SED_ARGS_REGEX = -r
+endif
+
+ifeq ($(UNAME), Darwin)
+SED_ARGS_FILE = -i "" -E
+SED_ARGS_REGEX = -E
+endif
+
+ifeq ($(shell test -f /etc/arch-release && echo arch || echo Linux),arch)
+PYTHONBIN = python2
+else
+PYTHONBIN = python
+endif

makefile

@@ -3,6 +3,9 @@ MAKEFLAGS += -j
 MAKEFLAGS += -r
 MAKEFLAGS += --no-print-directory
 
+# includes
+include bin/makefile.compatibility 
+
 # Build directory tweaking.
 output = build
 public-output = $(output)/public
@@ -15,31 +18,21 @@ manual-branch = master
 current-branch := $(shell git symbolic-ref HEAD 2>/dev/null | cut -d "/" -f "3" )
 last-commit := $(shell git rev-parse --verify HEAD)
 
+timestamp := $(shell date +%Y%m%d%H%M)
+
 ifeq ($(current-branch),$(manual-branch))
 current-if-not-manual = $(manual-branch)
 else
 current-if-not-manual = $(current-branch)
 endif
 
-# Fixing `sed` for OS X
-UNAME := $(shell uname)
-ifeq ($(UNAME), Linux)
-SED_ARGS_FILE = -i -r
-SED_ARGS_REGEX = -r
-endif
-ifeq ($(UNAME), Darwin)
-SED_ARGS_FILE = -i "" -E
-SED_ARGS_REGEX = -E
-endif
-
 # Sphinx variables.
 SPHINXOPTS = -c ./
 SPHINXBUILD = sphinx-build
 
 ifdef NITPICK
 timestamp := $(shell date +%Y%m%d%H%M)
-SPHINXOPTS += -n
-SPHINXOPTS += -w $(branch-output)/build.$(timestamp).log
+SPHINXOPTS += -n -w $(branch-output)/build.$(timestamp).log
 endif
 
 PAPER = letter
@@ -299,12 +292,6 @@ epub:
 #
 ######################################################################
 
-ifeq ($(shell test -f /etc/arch-release && echo arch || echo Linux),arch)
-PYTHONBIN = python2
-else
-PYTHONBIN = python
-endif
-
 $(branch-output)/sitemap.xml.gz:$(branch-output)/dirhtml
 
 SITEMAPBUILD = $(PYTHONBIN) bin/sitemap_gen.py
@@ -444,8 +431,7 @@ PDFLATEXCOMMAND = TEXINPUTS=".:$(branch-output)/latex/:" pdflatex --interaction
 #
 ##########################################################################
 
-ARCHIVE_DATE := $(shell date +%s)
-archive:$(public-output).$(ARCHIVE_DATE).tar.gz
+archive:$(public-output).$(timestamp).tar.gz
 	@echo [archive]: created $< archive.
 $(public-output).$(ARCHIVE_DATE).tar.gz:$(public-output)
 	tar -czvf $@ $<

source/administration/backups.txt

@@ -447,7 +447,7 @@ With ":option:`--oplog <mongodump --oplog>`" , :program:`mongodump`
 copies all the data from the source database, as well as all of the
 :term:`oplog` entries from the beginning of the backup procedure to
 until the backup procedure completes. This backup procedure, in
-conjunction with :option:`mongorestore --oplogReplay`, allows you to
+conjunction with :option:`mongorestore --oplogReplay <mongorestore --oplogReplay>`, allows you to
 restore a backup that reflects a consistent and specific moment in
 time.
 
@@ -491,7 +491,7 @@ the ``dump-2011-10-25`` directory to the :program:`mongod` instance
 running on the localhost interface. By default, :program:`mongorestore`
 will look for a database dump in the ``dump/`` directory and restore
 that. If you wish to restore to a non-default host, the
-":option:`--host <mongod>`" and ":option:`--port <mongod --port>`"
+":option:`--host <mongorestore --host>`" and ":option:`--port <mongorestore --port>`"
 options allow you to specify a non-local host to connect to capture
 the dump. Consider the following example:
 
@@ -504,8 +504,9 @@ username and password credentials as above.
 
 If you created your database dump using the :option:`--oplog
 <mongodump --oplog>` option to ensure a point-in-time snapshot, call
-:program:`mongorestore` with the ":option:`--oplogReplay <mongorestore
---oplogReplay>`" option as in the following example:
+:program:`mongorestore` with the
+:option:`--oplogReplay <mongorestore --oplogReplay>`
+option as in the following example:
 
 .. code-block:: sh
 

source/administration/configuration.txt

@@ -114,9 +114,7 @@ following:
 
 .. code-block:: cfg
 
-   bind_ip = 127.0.0.1
-   bind_ip = 10.8.0.10
-   bind_ip = 192.168.4.24
+   bind_ip = 127.0.0.1,10.8.0.10,192.168.4.24
    nounixsocket = true
    auth = true
 
@@ -342,7 +340,7 @@ needed:
   Each additional level ``v`` adds additional verbosity to the
   logging. The ``verbose`` option  is equal to ``v = true``.
 
-- :setting:`diaglog` enables diagnostic logging. Level ``3``
+- :setting:`diaglog` enables :term:`diagnostic logging <diagnostic log>`. Level ``3``
   logs all read and write options.
 
 - :setting:`objcheck` forces :program:`mongod` to validate all
@@ -352,7 +350,7 @@ needed:
   performance.
 
 - :setting:`cpu` forces :program:`mongod` to report the percentage of
-   the last interval spent in :term:`write-lock`. The interval is
-   typically 4 seconds, and each output line in the log includes both
-   the actual interval since the last report and the percentage of
-   time spent in write lock.
+  the last interval spent in :term:`write-lock`. The interval is
+  typically 4 seconds, and each output line in the log includes both
+  the actual interval since the last report and the percentage of
+  time spent in write lock.

source/administration/import-export.txt

@@ -38,6 +38,14 @@ with the database itself.
    ":wiki:`MongoDB Extended JSON <Mongo+Extended+JSON>`" wiki page for
    more information about Use with care.
 
+.. seealso:: See the ":doc:`/administration/backups`" document for
+   more information on backing up MongoDB instances. Additionally,
+   consider the following references for commands addressed in this
+   document:
+
+   - :doc:`/reference/mongoexport`
+   - :doc:`/reference/mongorestore`
+
 .. _bson-json-type-conversion-fidelity:
 
 Data Type Fidelity
@@ -117,12 +125,12 @@ JSON.
 
 .. seealso:: ":wiki:`MongoDB Extended JSON <Mongo+Extended+JSON>`" wiki page.
 
-Using Database Imports and Exports for Backups
-----------------------------------------------
+Data Import and Export and Backups Operations
+---------------------------------------------
 
-For resilient and non-disruptive backups in most cases you'll want to
+For resilient and non-disruptive backups, 
 use a file system or block-level disk snapshot function, such as the
-method described in the ":doc:`/administration/backups`" document. The
+methods described in the ":doc:`/administration/backups`" document. The
 tools and operations discussed provide functionality that's useful in
 the context of providing some kinds of backups.
 
@@ -169,8 +177,8 @@ portion thereof, to a file in a :term:`JSON` or :term:`CSV` format.
 These tools may also be useful for importing data into a MongoDB database
 from third party applications.
 
-Database Export with :program:`mongoexport`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Collection Export with :program:`mongoexport`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 With the :program:`mongoexport` utility you can create a backup
 file. In the most simple invocation, the command takes the following
@@ -200,10 +208,11 @@ that it does not interact with your shell environment. The resulting
 documents will return on standard output.
 
 By default, :program:`mongoexport` returns one :term:`JSON document`
-per MongoDB document. Specify the ":option:`--jsonArray <mongoexport
---jsonArrray>`" argument to return the export as a single :term:`JSON`
-array. Use the ":option:`--csv <mongoexport --csv>`" file to return
-the result in CSV (comma separated values) format.
+per MongoDB document. Specify the 
+":option:`--jsonArray <mongoexport --jsonArray>`" argument to return
+the export as a single :term:`JSON` array. Use the ":option:`--csv
+<mongoexport --csv>`" file to return the result in CSV (comma
+separated values) format.
 
 If your :program:`mongod` instance is not running, you can use the
 ":option:`--dbpath <mongoexport --dbpath>`" option to specify the
@@ -230,8 +239,8 @@ to connect to capture the export. Consider the following example:
 On any :program:`mongoexport` command you may, as above specify username and
 password credentials as above.
 
-Database Import with :program:`mongoimport`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Collection Import with :program:`mongoimport`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To restore a backup taken with :program:`mongoexport`. Most of the
 arguments to :program:`mongoexport` also exist for
@@ -267,11 +276,3 @@ Use the ":option:`--ignoreBlanks <mongoimport --ignoreBlanks>`" option
 to ignore blank fields. For :term:`CSV` and :term:`TSV` imports, this
 option provides the desired functionality in most cases: it avoids
 inserting blank fields in MongoDB documents.
-
-.. seealso:: See the ":doc:`/administration/backups`" document for
-   more in depth information about backing up MongoDB
-   instances. Additionally, consider the following references for
-   commands addressed in this document:
-
-   - :doc:`/reference/mongoexport`
-   - :doc:`/reference/mongorestore`

source/administration/indexes.txt

@@ -22,7 +22,7 @@ Create an Index
 ~~~~~~~~~~~~~~~
 
 To create an index, use :method:`db.collection.ensureIndex()` or a similar
-:api:`method your driver <>`. For example
+:api:`method from your driver <>`. For example
 the following creates [#ensure]_ an index on the ``phone-number`` field
 of the ``people`` collection:
 
@@ -383,4 +383,4 @@ operation is an index build. The ``msg`` field also indicates the
 percent of the build that is complete.
 
 If you need to terminate an ongoing index build, You can use the
-:method:`db.killOP()` method in the :program:`mongo` shell.
+:method:`db.killOp()` method in the :program:`mongo` shell.