From a7a15e974e04e7939d08d233174c96db07d3649b Mon Sep 17 00:00:00 2001
From: Andrew Aldridge <i80and@foxquill.com>
Date: Thu, 25 Jun 2015 11:24:54 -0400
Subject: [PATCH] DOCS-5527: Improve Windows installation guide

---
 source/includes/release-base.yaml             |  7 ++
 source/includes/release-specifications.yaml   | 18 +++-
 ...configure-windows-service-for-mongodb.yaml |  2 +-
 ...-manually-windows-service-for-mongodb.yaml | 16 +---
 ...install-mongodb-on-windows-unattended.yaml | 84 +++++++++----------
 5 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/source/includes/release-base.yaml b/source/includes/release-base.yaml
index d64172af387..9d9af7125b2 100644
--- a/source/includes/release-base.yaml
+++ b/source/includes/release-base.yaml
@@ -20,4 +20,11 @@ code: |
   curl -O https://downloads.mongodb.com/{{platform}}/mongodb-{{platform}}-{{builder}}-enterprise-{{distro}}-{{version}}.tgz
   tar -zxvf mongodb-{{platform}}-{{builder}}-enterprise-{{distro}}-{{version}}.tgz
   cp -R -n mongodb-{{platform}}-{{builder}}-enterprise-{{distro}}-{{version}}/ mongodb
+---
+ref: _install-windows
+language: powershell
+code: |
+  msiexec.exe /q /i mongodb-win32-x86_64-2008plus-ssl-{{version}}-signed.msi ^
+              INSTALLLOCATION="{{location}}" ^
+              ADDLOCAL="{{addlocal}}"
 ...
diff --git a/source/includes/release-specifications.yaml b/source/includes/release-specifications.yaml
index a7a1705638c..4cc4dbf8804 100644
--- a/source/includes/release-specifications.yaml
+++ b/source/includes/release-specifications.yaml
@@ -88,4 +88,20 @@ replacement:
   platform: 'linux'
   distro: 'amzn64'
   builder: 'x86_64'
-...
\ No newline at end of file
+---
+ref: install-windows-default
+source:
+  file: release-base.yaml
+  ref: _install-windows
+replacement:
+  location: 'C:\mongodb'
+  addlocal: 'all'
+---
+ref: install-windows-addlocal
+source:
+  file: release-base.yaml
+  ref: _install-windows
+replacement:
+  location: 'C:\mongodb'
+  addlocal: 'MonitoringTools,ImportExportTools,MiscellaneousTools'
+...
diff --git a/source/includes/steps-configure-windows-service-for-mongodb.yaml b/source/includes/steps-configure-windows-service-for-mongodb.yaml
index 6c118e3883a..239b75efa12 100644
--- a/source/includes/steps-configure-windows-service-for-mongodb.yaml
+++ b/source/includes/steps-configure-windows-service-for-mongodb.yaml
@@ -29,7 +29,7 @@ pre: |
      .. important::
 
         Run all of the following commands in :guilabel:`Command Prompt` with
-        "Administrative Privileges:"
+        "Administrative Privileges"
 action:
   - pre: |
       Install the MongoDB service. For :option:`--install <mongod.exe
diff --git a/source/includes/steps-create-manually-windows-service-for-mongodb.yaml b/source/includes/steps-create-manually-windows-service-for-mongodb.yaml
index e924235ab79..905f3bd6beb 100644
--- a/source/includes/steps-create-manually-windows-service-for-mongodb.yaml
+++ b/source/includes/steps-create-manually-windows-service-for-mongodb.yaml
@@ -3,17 +3,9 @@ title:
   character: "~"
 stepnum: 1
 ref: open-command-prompt
-action:
-  - heading:
-      text: Windows 7 / Vista / Server 2008 (and R2)
-      character: "`"
-    pre: |
-      Press ``Win + R``, then type ``cmd``, then press ``Ctrl + Shift + Enter``.
-  - heading:
-      text: Windows 8
-      character: "`"
-    pre: |
-      Press ``Win + X``, then press ``A``.
+pre: |
+  Press the ``Win`` key, type ``cmd.exe``, and press ``Ctrl + Shift + Enter``
+  to run the :guilabel:`Command Prompt` as Administrator.
 post: |
   Execute the remaining steps from the Administrator command prompt.
 ---
@@ -53,7 +45,7 @@ action:
   - pre: "Create the MongoDB service."
     language: powershell
     code: |
-      sc.exe create MongoDB binPath= "\"C:\mongodb\bin\mongod.exe\" --service --config=\"C:\mongodb\mongod.cfg\"" DisplayName= "MongoDB" start= "auto"
+      sc.exe create MongoDB binPath= "C:\mongodb\bin\mongod.exe --service --config=\"C:\mongodb\mongod.cfg\"" DisplayName= "MongoDB" start= "auto"
     post: |
       ``sc.exe`` requires a space between "=" and the configuration values
       (eg "binPath= "), and a "\\" to escape double quotes.
diff --git a/source/includes/steps-install-mongodb-on-windows-unattended.yaml b/source/includes/steps-install-mongodb-on-windows-unattended.yaml
index e0c85771970..dedc5164a21 100644
--- a/source/includes/steps-install-mongodb-on-windows-unattended.yaml
+++ b/source/includes/steps-install-mongodb-on-windows-unattended.yaml
@@ -1,52 +1,44 @@
-title: Install MongoDB for Windows.
 stepnum: 1
+inherit:
+  file: steps-create-manually-windows-service-for-mongodb.yaml
+  ref: open-command-prompt
+---
+title: Install MongoDB for Windows.
+stepnum: 2
 ref: install
 action:
   pre: |
-    Open a shell in the directory containing the ``.msi`` installation
-    binary of your choice and invoke:
-  language: powershell
-  code: |
-    msiexec.exe /q /i mongodb-<version>-signed.msi INSTALLLOCATION="<installation directory>"
+    Change to the directory containing the ``.msi`` installation binary of your
+    choice and invoke:
+
+    .. include:: /includes/release/install-windows-default.rst
   post: |
-    By default, this method installs the following MongoDB binaries:
-    ``mongod.exe``, ``mongo.exe``, ``mongodump.exe``,
-    ``mongorestore.exe``, ``mongoimport.exe``, ``mongoexport.exe``,
-    ``mongostat.exe``, and ``mongotop.exe``.
     You can specify the installation location for the executable by
-    modifying the ``<installation directory>`` value. To install specific
-    subsets of the binaries, you may specify an ``ADDLOCAL`` argument:
-
-    .. code-block:: powershell
-
-       msiexec.exe /q /i mongodb-<version>-signed.msi INSTALLLOCATION="<installation directory>" ADDLOCAL=<binary set(s)>
-
-    The ``<binary set(s)>`` value is a comma-separated list including one
-    or more of the following:
-
-    - ``Server`` - includes ``mongod.exe``
-
-    - ``Client`` - includes ``mongo.exe``
-
-    - ``MonitoringTools`` - includes ``mongostat.exe`` and ``mongotop.exe``
-
-    - ``ImportExportTools`` - includes ``mongodump.exe``,
-      ``mongorestore.exe``, ``mongoexport.exe``, and ``mongoimport.exe``)
-
-    - ``MiscellaneousTools`` - includes ``bsondump.exe``,
-      ``mongofiles.exe``, ``mongooplog.exe``, and ``mongoperf.exe``
-
-    For instance, to install *only* the entire set of tools to
-    ``C:\mongodb``, invoke:
-
-    .. code-block:: powershell
-
-       msiexec.exe /q /i mongodb-<version>-signed.msi INSTALLLOCATION="C:\mongodb" ADDLOCAL=MonitoringTools,ImportExportTools,MiscellaneousTools
-
-    You may also specify ``ADDLOCAL=ALL`` to install the complete set of
-    binaries, as in the following:
-
-    .. code-block:: powershell
-
-       msiexec.exe /q /i mongodb-<version>-signed.msi INSTALLLOCATION="C:\mongodb" ADDLOCAL=ALL
-...
\ No newline at end of file
+    modifying the ``INSTALLLOCATION`` value.
+
+    By default, this method installs all MongoDB binaries. To install specific
+    MongoDB component sets, you can specify them in the ``ADDLOCAL`` argument
+    using a comma-separated list including one or more of the following
+    component sets:
+
+    .. list-table::
+       :widths: 20 80
+
+       * - **Component Set**
+         - **Binaries**
+       * - ``Server``
+         - ``mongod.exe``
+       * - ``Router``
+         - ``mongos.exe``
+       * - ``Client``
+         - ``mongo.exe``
+       * - ``MonitoringTools``
+         - ``mongostat.exe``, ``mongotop.exe``
+       * - ``ImportExportTools``
+         - ``mongodump.exe``, ``mongorestore.exe``, ``mongoexport.exe``, ``mongoimport.exe``
+       * - ``MiscellaneousTools``
+         - ``bsondump.exe``, ``mongofiles.exe``, ``mongooplog.exe``, ``mongoperf.exe``
+
+    For instance, to install *only* the MongoDB utilities, invoke:
+
+    .. include:: /includes/release/install-windows-addlocal.rst