merge: DOCS-79

Author: Sam Kleinman

draft/administration/vulnerability-notification.txt

@@ -31,7 +31,7 @@ In particular, please include the following:
 - Contact information, including an email address and/or phone number,
   if applicable.
 
-10gen guarantees a response to all vulnerability notifications within
+10gen will respond to all vulnerability notifications within
 48 hours.
 
 Jira

draft/core/security.txt

@@ -267,11 +267,12 @@ authentication system:
   functionality, such as :dbcommand:`listDatabases`.
 
 - The following issues track ongoing improvements to the authorization
-  system:
+  or authentication system:
 
   - :issue:`SERVER-3198`
   - :issue:`SERVER-7122`
   - :issue:`SERVER-7124`
+  - :issue:`SERVER-7115`
 
 - Once authenticated a "normal" user has full read and write access to
   a database.
@@ -284,14 +285,14 @@ authentication system:
   #. add the first user to the ``admin`` database when connected to
      the :program:`mongod` instance from a ``localhost`` connection. [#sharded-localhost]_
 
-.. version added:: 2.0
+.. versionadded:: 2.0
    Support for authentication with sharded clusters. Before 2.0
    sharded clusters *had* to run with trusted applications and a
    trusted networking configuration. 
 
 Consider the
 :doc:`/tutorial/use-authentication-to-control-access-to-mongodb`
-document which outlines procedures for configuraing and maintaing
+document which outlines procedures for configuring and maintaining
 users and access with MongoDB's authentication system.
 
 .. [#sharded-localhost] Becasue of :issue:`SERVER-6591`, you cannot
@@ -304,8 +305,8 @@ users and access with MongoDB's authentication system.
 Interfaces
 ----------
 
-Simply limiting access to a :program:`mongod` is not a sufficent for
-totally controling risk expsorure. Consider the recomendaitons in the
+Simply limiting access to a :program:`mongod` is not sufficent for
+totally controling risk exposure. Consider the recommendations in the
 following section, for limiting exposure other interface-related
 risks.
 
@@ -338,12 +339,12 @@ a variety of operational data, logs, and status reports regarding the
 :program:`mongod` or :program:`mongos` instance. The HTTP interface is
 always avalible on the the port numbered ``1000`` greater than the
 primary :program:`mongod` port. By default this is ``28017``, but is
-indirectly using the :setting:`port` option which allows you to
+indirectly set using the :setting:`port` option which allows you to
 configure the primary :program:`mongod` port.
 
 Without the :setting:`rest` setting, this interface is entirely
 read-only, and limited in scope; nevertheless, this iterface may
-represent an exposure. To diable the HTTP interface, set the
+represent an exposure. To disable the HTTP interface, set the
 :setting:`nohttpinterface` run time option or the
 :option:`--nohttpinterface <mongod --nohttpinterface>` command line
 option.
@@ -372,7 +373,7 @@ the REST API interface:
 Data Encryption
 ---------------
 
-To support audit requirements, you may need to envrypt data stored in
+To support audit requirements, you may need to encrypt data stored in
 MongoDB. For best results you can encrypt this data in the application
 layer, by encrytping the content of fields that hold secure data. 
 

draft/tutorial/configure-linux-iptables-firewall.txt

@@ -202,7 +202,6 @@ policy:
 
    iptables -P OUTPUT DROP
 
-
 Manage and Maintain ``iptables`` Configuration
 ----------------------------------------------
 
@@ -211,7 +210,7 @@ using ``iptables``. There are various front end tools that automate
 some aspects of ``iptables`` configuration, but at the core all
 ``iptables`` front ends provide the same basic functionality: 
 
-.. _iptables-make-all-rules-persistent: 
+.. _iptables-make-all-rules-persistent:
 
 Make all ``iptables`` Rules Persistent
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

draft/tutorial/configure-windows-netsh-firewall.txt

@@ -45,16 +45,14 @@ To reset the Windows Firewall rules:
 
    netsh advfirewall reset
 
-   iptables -A OUTPUT -d <ip-address> -p tcp --source-port 27018 -m state --state ESTABLISHED -j ACCEPT
-
 To save administration, you can export or import firewall (from
 different servers) rules very easily on Windows:
 
 .. code-block:: sh
 
    netsh advfirewall export "C:\temp\MongoDBfw.wfw"
 
-   netsh advfirewall import "C:\temp\ MongoDBfw.wfw"
+   netsh advfirewall import "C:\temp\MongoDBfw.wfw"
 
 It is also possible to configure the Windows Firewall through a
 GUI, however, this is not within scope for this tutorial.