Skip to content

Commit 795c15f

Browse files
author
Anthony Sansone
committed
Updated per @steveren review.
1 parent 15cad66 commit 795c15f

8 files changed

+70
-26
lines changed

source/includes/fact-install-windows-prereq.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Install on Windows 7 / Server 2008 R2 or Later
1818

1919
.. code-block:: powershell
2020
21-
PS C:\> systeminfo | findstr /B /C:"OS Name" /C:"OS Version" /C:"System Type"
21+
systeminfo | findstr /B /C:"OS Name" /C:"OS Version" /C:"System Type"
2222
2323
.. code-block:: powershell
2424
:copyable: false
@@ -62,5 +62,5 @@ Security
6262
.. warning::
6363

6464
Do not expose :binary:`~bin.mongod.exe` to a public network without
65-
configuring authentication. MongoDB is designed to be run in
66-
trusted environments.
65+
:docs:`configuring authentication </core/authentication>`. MongoDB
66+
is designed to be run in trusted environments.

source/includes/steps-create-manually-windows-service-for-mongodb.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,19 @@ content: |
5656
5757
.. code-block:: bat
5858
59-
sc.exe create MongoDB ^
60-
binPath= "\"C:\Program Files\MongoDB\Server\{+version+}\bin\mongod.exe\" ^
61-
--service --config=\"C:\Program Files\MongoDB\Server\{+version+}\mongod.cfg\"" ^
62-
DisplayName= "MongoDB" start= "auto"
59+
sc.exe create MongoDB binPath= "\"C:\Program Files\MongoDB\Server\{+version+}\bin\mongod.exe\" ^
60+
--service --config=\"C:\Program Files\MongoDB\Server\{+version+}\mongod.cfg\""DisplayName= "MongoDB" start= "auto"
6361
6462
.. note::
6563
``sc.exe`` requires a space between "``=`` " and the
66-
configuration values (i.e. ``binPath= ``) as well as using
64+
configuration values (i.e. ``binPath= `` ) as well as using
6765
`` "\"`` and ``\""`` to escape a double-quoted string.
6866
6967
If successfully created, the following message is written to the
7068
log:
7169
7270
.. code-block:: bat
71+
:copyable: false
7372
7473
[SC] CreateService SUCCESS
7574
---
@@ -99,12 +98,11 @@ title: Connect to the MongoDB server.
9998
stepnum: 6
10099
ref: connect
101100
content: |
102-
To connect to MongoDB through the
103-
:binary:`mongo.exe <~bin.mongo>`
101+
To connect to MongoDB through the :binary:`mongo.exe <bin.mongo>`
104102
shell, open another :guilabel:`Command Interpreter`.
105103
106104
.. code-block:: bat
107105
108-
"C:\Program Files\MongoDB\Server\{+version+}\bin\mongo.exe"
106+
"C:\Program Files\MongoDB\Server\{+version+}\bin\mongo.exe"
109107
110108
...

source/includes/steps-install-mongodb-enterprise-on-windows-unattended.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ content: |
66
a. Open a web browser and visit the |mdb-download-link|.
77
88
#. The Download Center should display the
9-
:guilabel:`Current Stable Release` and have the :icon:`windows`
10-
:guilabel:`Windows` tab selected. If that tab is not selected,
11-
click that tab.
9+
:guilabel:`Release`. From the :guilabel:`Platforms` menu, click
10+
:guilabel:`Windows x64`.
1211
13-
#. Click :guilabel:`Download (msi)`.
12+
#. Click :guilabel:`Download`.
13+
14+
#. When the :guilabel:`Install MongoDB Enterprise` modal appears,
15+
click the :guilabel:`msi` link.
1416
---
1517
stepnum: 2
1618
level: 4
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
title: "Download |mdb-edition|."
2+
stepnum: 1
3+
level: 4
4+
ref: download-mongodb
5+
content: |
6+
a. Open a web browser and visit the |mdb-download-link|.
7+
8+
#. The Download Center should display the
9+
:guilabel:`Release`. From the :guilabel:`Platforms` menu, click
10+
:guilabel:`Windows x64`.
11+
12+
#. Click :guilabel:`Download`.
13+
14+
#. When the :guilabel:`Install MongoDB Enterprise` modal appears,
15+
click the :guilabel:`msi` link.
16+
---
17+
title: "Open Windows Explorer."
18+
stepnum: 2
19+
level: 4
20+
ref: open-windows-explorer
21+
---
22+
title: "Navigate to the directory in which you downloaded the MongoDB installer."
23+
stepnum: 3
24+
inherit:
25+
file: steps-install-mongodb-on-windows-interactive.yaml
26+
ref: change-to-download-directory
27+
---
28+
title: "Double-click the ``.msi`` file."
29+
stepnum: 4
30+
level: 4
31+
ref: run-windows-installer
32+
---
33+
title: "Follow the |mdb-edition| installation wizard."
34+
stepnum: 5
35+
level: 4
36+
inherit:
37+
file: steps-install-mongodb-on-windows-interactive.yaml
38+
ref: follow-install-wizard
39+
...

source/includes/steps-run-mongodb-on-linux.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,15 @@ action:
5858
mongod --dbpath <path to data directory>
5959
# End-for-getting-started-guide
6060
---
61-
title: Verify that MongoDB has started successfully
61+
title: "Verify that MongoDB has started successfully."
6262
stepnum: 4
6363
ref: verify
6464
pre: |
6565
Verify that MongoDB has started successfully by
6666
checking the process output for the following line:
6767
action:
6868
language: none
69+
copyable: false
6970
code: |
7071
[initandlisten] waiting for connections on port 27017
7172
post: |

source/includes/steps-run-mongodb-on-windows.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ content: |
1010
Invoke the following command in the :guilabel:`Command Interpreter`
1111
to create these directories:
1212
13-
.. code-block:: powershell
13+
.. code-block:: bat
1414
1515
md "\data\db" "\data\log"
1616
@@ -30,7 +30,7 @@ content: |
3030
3131
From the :guilabel:`Command Interpreter`:
3232
33-
.. code-block:: powershell
33+
.. code-block:: bat
3434
3535
"C:\Program Files\MongoDB\Server\{+version+}\bin\mongod.exe" --dbpath="c:\data\db" --logpath c:\data\log\mongod.log
3636
@@ -43,7 +43,7 @@ content: |
4343
If your path includes spaces, enclose the entire path in double
4444
quotes:
4545
46-
.. code-block:: powershell
46+
.. code-block:: bat
4747
4848
"C:\Program Files\MongoDB\Server\{+version+}\bin\mongod.exe" --dbpath "d:\test\mongo db data"
4949
@@ -75,10 +75,10 @@ stepnum: 3
7575
ref: connect
7676
content: |
7777
To connect to MongoDB through the
78-
:binary:`mongo.exe <~bin.mongo>` shell, open another
78+
:binary:`mongo.exe <bin.mongo>` shell, open another
7979
:guilabel:`Command Interpreter`.
8080
81-
.. code-block:: powershell
81+
.. code-block:: bat
8282
8383
"C:\Program Files\MongoDB\Server\{+version+}\bin\mongo.exe"
8484

source/tutorial/install-mongodb-enterprise-on-windows.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Install MongoDB Enterprise Edition on Windows
1313
.. |mdb-edition| replace:: MongoDB Enterprise Edition
1414
.. |mdb-download-link| replace:: `MongoDB Download Center <https://www.mongodb.com/download-center#enterprise>`__
1515

16-
.. versionadded:: 2.6
17-
1816
Use this tutorial to install |mdb-edition| {+version+}
1917
on Windows hosts.
2018

@@ -37,7 +35,10 @@ with Administrative privileges. Not all commands work in Powershell.
3735

3836
To start ``cmd.exe`` with Administrative privileges:
3937

40-
1. Press the :icon:`windows` key.
38+
1. `Open the Start menu <https://support.microsoft.com/en-us/help/4028294/windows-open-the-start-menu>`__.
39+
- Press the :icon:`windows` key.
40+
- Click on the :guilabel:`Start` :icon:`windows` icon at the left
41+
end of the taskbar.
4142
#. Type ``cmd.exe`` in the search box.
4243
#. Press **Ctrl** + **Shift** + **Enter**.
4344

@@ -71,7 +72,7 @@ Install |mdb-edition|
7172
You may install |mdb-edition| using the Windows Installer and
7273
following its wizard.
7374

74-
.. include:: /includes/steps/install-mongodb-on-windows-interactive.rst
75+
.. include:: /includes/steps/install-mongodb-on-windows-enterprise-interactive.rst
7576

7677
- id: unattended
7778
name: Unattended Installation

source/tutorial/install-mongodb-on-windows.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ with Administrative privileges. Not all commands work in Powershell.
3535

3636
To start ``cmd.exe`` with Administrative privileges:
3737

38-
1. Press the :icon:`windows` key.
38+
1. `Open the Start menu <https://support.microsoft.com/en-us/help/4028294/windows-open-the-start-menu>`__.
39+
- Press the :icon:`windows` key.
40+
- Click on the :guilabel:`Start` :icon:`windows` icon at the left
41+
end of the taskbar.
3942
#. Type ``cmd.exe`` in the search box.
4043
#. Press **Ctrl** + **Shift** + **Enter**.
4144

0 commit comments

Comments
 (0)