From 14719cabdc3e5a187ba7de8336b0f496b3bfd87b Mon Sep 17 00:00:00 2001 From: Andrew Aldridge Date: Mon, 14 Dec 2015 14:17:39 -0500 Subject: [PATCH] DOCS-6792: Reorg installation --- config/sphinx_local.yaml | 3 +- source/administration/install-community.txt | 11 +++++ .../install-enterprise-linux.txt | 9 +++++ source/administration/install-enterprise.txt | 10 +++-- source/administration/install-on-linux.txt | 10 ++--- .../toc-installation-community-landing.yaml | 4 ++ .../includes/toc-installation-community.yaml | 12 ++++++ .../toc-installation-enterprise-landing.yaml | 5 +-- .../toc-installation-enterprise-linux.yaml | 24 +++++++++++ .../includes/toc-installation-enterprise.yaml | 32 ++++----------- source/includes/toc-installation-linux.yaml | 12 +++--- source/includes/toc-installation-osx.yaml | 4 -- source/includes/toc-installation-windows.yaml | 4 -- source/includes/toc-spec-installation.yaml | 40 ++++++++++++------- source/installation.txt | 13 ++---- source/tutorial/install-mongodb-on-amazon.txt | 22 +++++----- source/tutorial/install-mongodb-on-debian.txt | 22 +++++----- source/tutorial/install-mongodb-on-linux.txt | 19 ++++----- source/tutorial/install-mongodb-on-os-x.txt | 34 ++++++++-------- .../tutorial/install-mongodb-on-red-hat.txt | 22 +++++----- source/tutorial/install-mongodb-on-suse.txt | 26 ++++++------ source/tutorial/install-mongodb-on-ubuntu.txt | 24 +++++------ .../tutorial/install-mongodb-on-windows.txt | 34 ++++++++-------- 23 files changed, 217 insertions(+), 179 deletions(-) create mode 100644 source/administration/install-community.txt create mode 100644 source/administration/install-enterprise-linux.txt create mode 100644 source/includes/toc-installation-community-landing.yaml create mode 100644 source/includes/toc-installation-community.yaml create mode 100644 source/includes/toc-installation-enterprise-linux.yaml delete mode 100644 source/includes/toc-installation-osx.yaml delete mode 100644 source/includes/toc-installation-windows.yaml diff --git a/config/sphinx_local.yaml b/config/sphinx_local.yaml index 99ea8d13e91..0a4854bc7a5 100644 --- a/config/sphinx_local.yaml +++ b/config/sphinx_local.yaml @@ -16,7 +16,6 @@ theme: - /core/replica-set-architectures - /core/replica-set-high-availability - /applications/geospatial-indexes - - /administration/install-on-linux - /core/sharded-cluster-components - /security - /core/authentication @@ -41,4 +40,4 @@ theme: sidebars: '**': - 'pagenav.html' -... \ No newline at end of file +... diff --git a/source/administration/install-community.txt b/source/administration/install-community.txt new file mode 100644 index 00000000000..f5d35014196 --- /dev/null +++ b/source/administration/install-community.txt @@ -0,0 +1,11 @@ +================================= +Install MongoDB Community Edition +================================= + +.. default-domain:: mongodb + +These documents provide instructions to install MongoDB Community Edition. + +.. include:: /includes/toc/dfn-list-installation-community.rst + +.. include:: /includes/toc/installation-community.rst diff --git a/source/administration/install-enterprise-linux.txt b/source/administration/install-enterprise-linux.txt new file mode 100644 index 00000000000..67bb2b8cdc0 --- /dev/null +++ b/source/administration/install-enterprise-linux.txt @@ -0,0 +1,9 @@ +=================================== +Install MongoDB Enterprise on Linux +=================================== + +.. default-domain:: mongodb + +.. include:: /includes/toc/dfn-list-installation-enterprise-landing.rst + +.. include:: /includes/toc/installation-enterprise-linux.rst diff --git a/source/administration/install-enterprise.txt b/source/administration/install-enterprise.txt index 02c9e8ebe74..2133805d78d 100644 --- a/source/administration/install-enterprise.txt +++ b/source/administration/install-enterprise.txt @@ -4,9 +4,13 @@ Install MongoDB Enterprise .. default-domain:: mongodb -These documents provide instructions to install MongoDB Enterprise for -Linux and Windows Systems. +These documents provide instructions to install MongoDB Enterprise. -.. include:: /includes/toc/dfn-list-installation-enterprise.rst +MongoDB Enterprise is available for MongoDB Enterprise subscribers +and includes several additional features including support for SNMP +monitoring, LDAP authentication, Kerberos authentication, and System +Event Auditing. + +.. include:: /includes/toc/dfn-list-installation-enterprise-landing.rst .. include:: /includes/toc/installation-enterprise.rst diff --git a/source/administration/install-on-linux.txt b/source/administration/install-on-linux.txt index 2718b30c4c8..4bbcbe7fa56 100644 --- a/source/administration/install-on-linux.txt +++ b/source/administration/install-on-linux.txt @@ -1,11 +1,11 @@ -================ -Install on Linux -================ +========================================== +Install MongoDB Community Edition on Linux +========================================== .. default-domain:: mongodb -These documents provide instructions to install MongoDB for various -Linux systems. +These documents provide instructions to install MongoDB Community Edition for +various Linux systems. .. note:: .. include:: /includes/fact-deprecated-32bit.rst diff --git a/source/includes/toc-installation-community-landing.yaml b/source/includes/toc-installation-community-landing.yaml new file mode 100644 index 00000000000..867354541f2 --- /dev/null +++ b/source/includes/toc-installation-community-landing.yaml @@ -0,0 +1,4 @@ +file: /administration/install-community +description: | + Install MongoDB Community Edition. +... diff --git a/source/includes/toc-installation-community.yaml b/source/includes/toc-installation-community.yaml new file mode 100644 index 00000000000..d54f2969351 --- /dev/null +++ b/source/includes/toc-installation-community.yaml @@ -0,0 +1,12 @@ +file: /administration/install-on-linux +name: Install on Linux +description: "Install MongoDB Community Edition and required dependencies on Linux." +--- +file: /tutorial/install-mongodb-on-os-x +name: Install on OS X +description: "Install MongoDB Community Edition on OS X systems from Homebrew packages or from MongoDB archives." +--- +file: /tutorial/install-mongodb-on-windows +name: Install on Windows +description: "Install MongoDB Community Edition on Windows systems and optionally start MongoDB as a Windows service." +... diff --git a/source/includes/toc-installation-enterprise-landing.yaml b/source/includes/toc-installation-enterprise-landing.yaml index 3a05be65555..3bcbf7e4655 100644 --- a/source/includes/toc-installation-enterprise-landing.yaml +++ b/source/includes/toc-installation-enterprise-landing.yaml @@ -1,7 +1,4 @@ file: /administration/install-enterprise description: | - MongoDB Enterprise is available for MongoDB Enterprise subscribers - and includes several additional features including support for SNMP - monitoring, LDAP authentication, Kerberos authentication, and System - Event Auditing. + Install MongoDB Enterprise. ... diff --git a/source/includes/toc-installation-enterprise-linux.yaml b/source/includes/toc-installation-enterprise-linux.yaml new file mode 100644 index 00000000000..eb2cd022503 --- /dev/null +++ b/source/includes/toc-installation-enterprise-linux.yaml @@ -0,0 +1,24 @@ +file: /tutorial/install-mongodb-enterprise-on-red-hat +name: Install on Red Hat +description: "Install the MongoDB Enterprise build and required dependencies on Red Hat Enterprise or CentOS Systems using packages." +--- +file: /tutorial/install-mongodb-enterprise-on-ubuntu +name: Install on Ubuntu +description: "Install the MongoDB Enterprise build and required dependencies on Ubuntu Linux Systems using packages." +--- +file: /tutorial/install-mongodb-enterprise-on-debian +name: Install on Debian +description: "Install the MongoDB Enterprise build and required dependencies on Debian Linux Systems using packages." +--- +file: /tutorial/install-mongodb-enterprise-on-suse +name: Install on SUSE +description: "Install the MongoDB Enterprise build and required dependencies on SUSE Enterprise Linux." +--- +file: /tutorial/install-mongodb-enterprise-on-amazon +name: Install on Amazon AMI +description: "Install the MongoDB Enterprise build and required dependencies on Amazon Linux AMI." +--- +file: /tutorial/install-mongodb-enterprise-on-linux +name: Install From Tarball +description: "Install the official build of MongoDB Enterprise from a tarball." +... diff --git a/source/includes/toc-installation-enterprise.yaml b/source/includes/toc-installation-enterprise.yaml index ca90d57c165..0130dc7fb02 100644 --- a/source/includes/toc-installation-enterprise.yaml +++ b/source/includes/toc-installation-enterprise.yaml @@ -1,28 +1,10 @@ -file: /tutorial/install-mongodb-enterprise-on-red-hat -name: Install MongoDB Enterprise on Red Hat -description: "Install the MongoDB Enterprise build and required dependencies on Red Hat Enterprise or CentOS Systems using packages." ---- -file: /tutorial/install-mongodb-enterprise-on-ubuntu -name: Install MongoDB Enterprise on Ubuntu -description: "Install the MongoDB Enterprise build and required dependencies on Ubuntu Linux Systems using packages." ---- -file: /tutorial/install-mongodb-enterprise-on-debian -name: Install MongoDB Enterprise on Debian -description: "Install the MongoDB Enterprise build and required dependencies on Debian Linux Systems using packages." ---- -file: /tutorial/install-mongodb-enterprise-on-suse -name: Install MongoDB Enterprise on SUSE -description: "Install the MongoDB Enterprise build and required dependencies on SUSE Enterprise Linux." ---- -file: /tutorial/install-mongodb-enterprise-on-amazon -name: Install MongoDB Enterprise on Amazon AMI -description: "Install the MongoDB Enterprise build and required dependencies on Amazon Linux AMI." ---- -file: /tutorial/install-mongodb-enterprise-on-linux -name: Install MongoDB Enterprise From Tarball -description: "Install the official build of MongoDB Enterprise from MongoDB archives." +file: /administration/install-enterprise-linux +name: Install on Linux +description: | + Install the official builds of MongoDB Enterprise on Linux-based systems. --- file: /tutorial/install-mongodb-enterprise-on-windows -name: Install MongoDB Enterprise on Windows -description: "Install the MongoDB Enterprise build and required dependencies using the ``.msi`` installer." +name: Install on Windows +description: | + Install MongoDB Enterprise on Windows using the ``.msi`` installer. ... diff --git a/source/includes/toc-installation-linux.yaml b/source/includes/toc-installation-linux.yaml index 467927db043..6ff0acdd674 100644 --- a/source/includes/toc-installation-linux.yaml +++ b/source/includes/toc-installation-linux.yaml @@ -1,24 +1,24 @@ file: /tutorial/install-mongodb-on-red-hat name: Install on Red Hat -description: Install MongoDB on Red Hat Enterprise and related Linux systems using ``.rpm`` packages. +description: Install MongoDB Community Edition on Red Hat Enterprise and related Linux systems using ``.rpm`` packages. --- file: /tutorial/install-mongodb-on-suse name: Install on SUSE -description: Install MongoDB on SUSE Linux systems using ``.rpm`` packages. +description: Install MongoDB Community Edition on SUSE Linux systems using ``.rpm`` packages. --- file: /tutorial/install-mongodb-on-amazon name: Install on Amazon Linux -description: Install MongoDB on Amazon Linux systems using ``.rpm`` packages. +description: Install MongoDB Community Edition on Amazon Linux systems using ``.rpm`` packages. --- file: /tutorial/install-mongodb-on-ubuntu name: Install on Ubuntu -description: Install MongoDB on Ubuntu Linux systems using ``.deb`` packages. +description: Install MongoDB Community Edition on Ubuntu Linux systems using ``.deb`` packages. --- file: /tutorial/install-mongodb-on-debian name: Install on Debian -description: Install MongoDB on Debian systems using ``.deb`` packages. +description: Install MongoDB Community Edition on Debian systems using ``.deb`` packages. --- file: /tutorial/install-mongodb-on-linux name: Install MongoDB From Tarball -description: Install the official build of MongoDB on other Linux systems from MongoDB archives. +description: Install the official build of MongoDB Community Edition on other Linux systems from MongoDB archives. ... diff --git a/source/includes/toc-installation-osx.yaml b/source/includes/toc-installation-osx.yaml deleted file mode 100644 index f547ab79823..00000000000 --- a/source/includes/toc-installation-osx.yaml +++ /dev/null @@ -1,4 +0,0 @@ -file: /tutorial/install-mongodb-on-os-x -name: Install on OS X -description: "Install the official build of MongoDB on OS X systems from Homebrew packages or from MongoDB archives." -... diff --git a/source/includes/toc-installation-windows.yaml b/source/includes/toc-installation-windows.yaml deleted file mode 100644 index 3c49391e583..00000000000 --- a/source/includes/toc-installation-windows.yaml +++ /dev/null @@ -1,4 +0,0 @@ -file: /tutorial/install-mongodb-on-windows -name: Install on Windows -description: "Install MongoDB on Windows systems and optionally start MongoDB as a Windows service." -... diff --git a/source/includes/toc-spec-installation.yaml b/source/includes/toc-spec-installation.yaml index 8ca3ad80a1b..640287517bf 100644 --- a/source/includes/toc-spec-installation.yaml +++ b/source/includes/toc-spec-installation.yaml @@ -1,46 +1,51 @@ level: 1 +source: + file: toc-installation-community-landing.yaml + ref: /administration/install-community +--- +level: 2 source: file: toc-install-on-linux-landing.yaml ref: /administration/install-on-linux --- -level: 2 +level: 3 source: file: toc-installation-linux.yaml ref: /tutorial/install-mongodb-on-red-hat --- -level: 2 +level: 3 source: file: toc-installation-linux.yaml ref: /tutorial/install-mongodb-on-amazon --- -level: 2 +level: 3 source: file: toc-installation-linux.yaml ref: /tutorial/install-mongodb-on-suse --- -level: 2 +level: 3 source: file: toc-installation-linux.yaml ref: /tutorial/install-mongodb-on-ubuntu --- -level: 2 +level: 3 source: file: toc-installation-linux.yaml ref: /tutorial/install-mongodb-on-debian --- -level: 2 +level: 3 source: file: toc-installation-linux.yaml ref: /tutorial/install-mongodb-on-linux --- -level: 1 +level: 2 source: - file: toc-installation-osx.yaml + file: toc-installation-community.yaml ref: /tutorial/install-mongodb-on-os-x --- -level: 1 +level: 2 source: - file: toc-installation-windows.yaml + file: toc-installation-community.yaml ref: /tutorial/install-mongodb-on-windows --- level: 1 @@ -50,17 +55,22 @@ source: --- level: 2 source: - file: toc-installation-enterprise.yaml + file: toc-installation-enterprise-linux.yaml + ref: /tutorial/install-mongodb-enterprise-on-linux +--- +level: 3 +source: + file: toc-installation-enterprise-linux.yaml ref: /tutorial/install-mongodb-enterprise-on-red-hat --- -level: 2 +level: 3 source: - file: toc-installation-enterprise.yaml + file: toc-installation-enterprise-linux.yaml ref: /tutorial/install-mongodb-enterprise-on-ubuntu --- -level: 2 +level: 3 source: - file: toc-installation-enterprise.yaml + file: toc-installation-enterprise-linux.yaml ref: /tutorial/install-mongodb-enterprise-on-amazon --- level: 2 diff --git a/source/installation.txt b/source/installation.txt index f1a6e3b00d3..dd18ff24730 100644 --- a/source/installation.txt +++ b/source/installation.txt @@ -9,9 +9,6 @@ Install MongoDB .. index:: installation guides .. index:: installation -MongoDB runs on most platforms and supports 64-bit architecture for -production use and both 64-bit and 32-bit architectures for testing. - Supported Platforms ------------------- @@ -28,11 +25,7 @@ of MongoDB. .. include:: /includes/toc/dfn-list-spec-installation.rst -.. include:: /includes/toc/install-on-linux-landing.rst - -.. include:: /includes/toc/installation-osx.rst - -.. include:: /includes/toc/installation-windows.rst +.. include:: /includes/toc/installation-community-landing.rst .. include:: /includes/toc/installation-enterprise-landing.rst @@ -41,8 +34,8 @@ of MongoDB. First Steps with MongoDB ------------------------ -Once you have installed MongoDB, consider the :ref:`Getting Started -Guides ` to learn about MongoDB. The :ref:`guides +Once you have installed MongoDB, consider the :ref:`Getting +Started Guides ` to learn about MongoDB. The :ref:`guides ` are available in various driver editions. .. include:: /includes/unicode-checkmark.rst diff --git a/source/tutorial/install-mongodb-on-amazon.txt b/source/tutorial/install-mongodb-on-amazon.txt index 2449500d38b..5db8cc3628a 100644 --- a/source/tutorial/install-mongodb-on-amazon.txt +++ b/source/tutorial/install-mongodb-on-amazon.txt @@ -1,14 +1,14 @@ -=============================== -Install MongoDB on Amazon Linux -=============================== +================================================= +Install MongoDB Community Edition on Amazon Linux +================================================= .. default-domain:: mongodb Overview -------- -Use this tutorial to install MongoDB on Amazon Linux from ``.rpm`` -packages. +Use this tutorial to install MongoDB Community Edition on Amazon Linux from +``.rpm`` packages. .. include:: /includes/fact-installation-64bit.rst @@ -28,13 +28,13 @@ Considerations .. include:: /includes/note-package-change.rst -Install MongoDB ---------------- +Install MongoDB Community Edition +--------------------------------- .. include:: /includes/steps/install-mongodb-on-amazon.rst -Run MongoDB ------------ +Run MongoDB Community Edition +----------------------------- .. |mongod-user| replace:: ``mongod`` .. |mongod-datadir| replace:: ``/var/lib/mongo`` @@ -43,8 +43,8 @@ Run MongoDB .. include:: /includes/steps/run-mongodb-on-a-linux-distribution.rst -Uninstall MongoDB ------------------ +Uninstall MongoDB Community Edition +----------------------------------- .. include:: /includes/fact-uninstall.rst diff --git a/source/tutorial/install-mongodb-on-debian.txt b/source/tutorial/install-mongodb-on-debian.txt index 1b7d57fbe74..42be8a827f3 100644 --- a/source/tutorial/install-mongodb-on-debian.txt +++ b/source/tutorial/install-mongodb-on-debian.txt @@ -1,15 +1,15 @@ -========================= -Install MongoDB on Debian -========================= +=========================================== +Install MongoDB Community Edition on Debian +=========================================== .. default-domain:: mongodb Overview -------- -Use this tutorial to install MongoDB from ``.deb`` packages on +Use this tutorial to install MongoDB Community Edition from ``.deb`` packages on Debian 7 "Wheezy". While Debian includes its own MongoDB packages, the -official MongoDB packages are more up to date. +official MongoDB Community Edition packages are more up to date. MongoDB only provides packages for 64-bit Debian "Wheezy". These packages may work with other Debian releases, but this is not a supported configuration. @@ -33,8 +33,8 @@ your release of Debian may include. .. include:: /includes/note-package-change.rst -Install MongoDB ---------------- +Install MongoDB Community Edition +--------------------------------- The Debian package management tools (i.e. ``dpkg`` and ``apt``) ensure package consistency and authenticity by requiring that distributors @@ -42,8 +42,8 @@ sign packages with GPG keys. .. include:: /includes/steps/install-mongodb-on-debian.rst -Run MongoDB ------------ +Run MongoDB Community Edition +----------------------------- .. |mongod-user| replace:: ``mongodb`` .. |mongod-datadir| replace:: ``/var/lib/mongodb`` @@ -52,8 +52,8 @@ Run MongoDB .. include:: /includes/steps/run-mongodb-on-debian.rst -Uninstall MongoDB ------------------ +Uninstall MongoDB Community Edition +----------------------------------- .. include:: /includes/fact-uninstall.rst diff --git a/source/tutorial/install-mongodb-on-linux.txt b/source/tutorial/install-mongodb-on-linux.txt index 9e1bd59dcc1..1976278f50a 100644 --- a/source/tutorial/install-mongodb-on-linux.txt +++ b/source/tutorial/install-mongodb-on-linux.txt @@ -1,6 +1,6 @@ -============================ -Install MongoDB From Tarball -============================ +============================================== +Install MongoDB Community Edition From Tarball +============================================== .. default-domain:: mongodb @@ -8,16 +8,17 @@ Install MongoDB From Tarball Overview -------- -Compiled versions of MongoDB for Linux provide a simple option for -installing MongoDB for other Linux systems without supported packages. +Compiled versions of MongoDB Community Edition for Linux provide a simple +option for installing MongoDB Community Edition for other Linux systems without +supported packages. Considerations -------------- For production deployments, always run MongoDB on 64-bit systems. -Install MongoDB ---------------- +Install MongoDB Community Edition +--------------------------------- MongoDB provides archives for both 64-bit and 32-bit Linux. Follow the installation procedure appropriate for your system. @@ -38,7 +39,7 @@ Install for 32-bit Linux .. include:: /includes/steps/install-mongodb-on-linux-32.rst -Run MongoDB ------------ +Run MongoDB Community Edition +----------------------------- .. include:: /includes/steps/run-mongodb-on-linux.rst diff --git a/source/tutorial/install-mongodb-on-os-x.txt b/source/tutorial/install-mongodb-on-os-x.txt index eb68427d282..bd97a8dd33a 100644 --- a/source/tutorial/install-mongodb-on-os-x.txt +++ b/source/tutorial/install-mongodb-on-os-x.txt @@ -1,45 +1,45 @@ -======================= -Install MongoDB on OS X -======================= +========================================= +Install MongoDB Community Edition on OS X +========================================= .. default-domain:: mongodb Overview -------- -Use this tutorial to install MongoDB on OS X systems. +Use this tutorial to install MongoDB Community Edition on OS X systems. .. admonition:: Platform Support Starting in version 3.0, MongoDB only supports OS X versions 10.7 (Lion) on Intel x86-64 and later. -MongoDB is available through the popular OS X package manager `Homebrew -`_ or through the `MongoDB Download site +MongoDB Community Edition is available through the popular OS X package manager +`Homebrew `_ or through the `MongoDB Download site `_. -Install MongoDB ---------------- +Install MongoDB Community Edition +--------------------------------- -You can install MongoDB with `Homebrew `_ or manually. -This section describes both. +You can install MongoDB Community Edition with `Homebrew `_ or +manually. This section describes both methods. .. _install-with-homebrew: -Install MongoDB with Homebrew -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Install MongoDB Community Edition with Homebrew +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ `Homebrew `_ installs binary packages based on published "formulae." This section describes how to update ``brew`` to the latest -packages and install MongoDB. Homebrew requires some initial setup and -configuration, which is beyond the scope of this document. +packages and install MongoDB Community Edition. Homebrew requires some initial +setup and configuration, which is beyond the scope of this document. .. include:: /includes/steps/install-mongodb-on-osx-with-homebrew.rst -Install MongoDB Manually -~~~~~~~~~~~~~~~~~~~~~~~~ +Install MongoDB Community Edition Manually +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Only install MongoDB using this procedure if you cannot use +Only install MongoDB Community Edition using this procedure if you cannot use :ref:`homebrew `. .. include:: /includes/steps/install-mongodb-on-osx-manually.rst diff --git a/source/tutorial/install-mongodb-on-red-hat.txt b/source/tutorial/install-mongodb-on-red-hat.txt index f49dc8da879..8743b5e0be7 100644 --- a/source/tutorial/install-mongodb-on-red-hat.txt +++ b/source/tutorial/install-mongodb-on-red-hat.txt @@ -1,16 +1,16 @@ -===================================================== -Install MongoDB on Red Hat Enterprise or CentOS Linux -===================================================== +======================================================================= +Install MongoDB Community Edition on Red Hat Enterprise or CentOS Linux +======================================================================= .. default-domain:: mongodb Overview -------- -Use this tutorial to install MongoDB on Red Hat Enterprise Linux or +Use this tutorial to install MongoDB Community Edition on Red Hat Enterprise Linux or CentOS Linux versions 5, 6, and 7 using ``.rpm`` packages. While some of these distributions include their own MongoDB packages, the official MongoDB -packages are generally more up to date. +Community Edition packages are generally more up to date. .. admonition:: Platform Support @@ -32,13 +32,13 @@ Considerations .. include:: /includes/note-package-change.rst -Install MongoDB ---------------- +Install MongoDB Community Edition +--------------------------------- .. include:: /includes/steps/install-mongodb-on-red-hat.rst -Run MongoDB ------------ +Run MongoDB Community Edition +----------------------------- Prerequisites ~~~~~~~~~~~~~ @@ -67,8 +67,8 @@ Procedure .. include:: /includes/steps/run-mongodb-on-a-linux-distribution.rst -Uninstall MongoDB ------------------ +Uninstall MongoDB Community Edition +----------------------------------- .. include:: /includes/fact-uninstall.rst diff --git a/source/tutorial/install-mongodb-on-suse.txt b/source/tutorial/install-mongodb-on-suse.txt index 1abbaa80471..c8e2ca99886 100644 --- a/source/tutorial/install-mongodb-on-suse.txt +++ b/source/tutorial/install-mongodb-on-suse.txt @@ -1,16 +1,16 @@ -======================= -Install MongoDB on SUSE -======================= +========================================= +Install MongoDB Community Edition on SUSE +========================================= .. default-domain:: mongodb Overview -------- -Use this tutorial to install MongoDB on SUSE Linux from ``.rpm`` -packages. While SUSE distributions include their own MongoDB -packages, the official MongoDB packages are generally more up to -date. +Use this tutorial to install MongoDB Community Edition on SUSE Linux from +``.rpm`` packages. While SUSE distributions include their own MongoDB Community +Edition packages, the official MongoDB Community Edition packages are generally +more up to date. .. admonition:: Platform Support @@ -34,13 +34,13 @@ Considerations .. include:: /includes/note-suse-ulimit.rst -Install MongoDB ---------------- +Install MongoDB Community Edition +--------------------------------- .. include:: /includes/steps/install-mongodb-on-suse.rst -Run MongoDB ------------ +Run MongoDB Community Edition +----------------------------- .. |mongod-user| replace:: ``mongod`` .. |mongod-datadir| replace:: ``/var/lib/mongo`` @@ -55,8 +55,8 @@ Procedure .. include:: /includes/steps/run-mongodb-on-a-linux-distribution.rst -Uninstall MongoDB ------------------ +Uninstall MongoDB Community Edition +----------------------------------- .. include:: /includes/fact-uninstall.rst diff --git a/source/tutorial/install-mongodb-on-ubuntu.txt b/source/tutorial/install-mongodb-on-ubuntu.txt index 06302fa4e81..0b380ea5698 100644 --- a/source/tutorial/install-mongodb-on-ubuntu.txt +++ b/source/tutorial/install-mongodb-on-ubuntu.txt @@ -1,15 +1,15 @@ -========================= -Install MongoDB on Ubuntu -========================= +=========================================== +Install MongoDB Community Edition on Ubuntu +=========================================== .. default-domain:: mongodb Overview -------- -Use this tutorial to install MongoDB on LTS Ubuntu Linux systems from ``.deb`` -packages. While Ubuntu includes its own MongoDB packages, the official MongoDB -packages are generally more up-to-date. +Use this tutorial to install MongoDB Community Edition on LTS Ubuntu Linux systems from +``.deb`` packages. While Ubuntu includes its own MongoDB packages, the official +MongoDB Community Edition packages are generally more up-to-date. .. admonition:: Platform Support @@ -34,13 +34,13 @@ You cannot install these packages concurrently with the ``mongodb``, .. include:: /includes/note-package-change.rst -Install MongoDB ---------------- +Install MongoDB Community Edition +--------------------------------- .. include:: /includes/steps/install-mongodb-on-ubuntu.rst -Run MongoDB ------------ +Run MongoDB Community Edition +----------------------------- .. |mongod-user| replace:: ``mongodb`` .. |mongod-datadir| replace:: ``/var/lib/mongodb`` @@ -49,8 +49,8 @@ Run MongoDB .. include:: /includes/steps/run-mongodb-on-debian.rst -Uninstall MongoDB ------------------ +Uninstall MongoDB Community Edition +----------------------------------- .. include:: /includes/fact-uninstall.rst diff --git a/source/tutorial/install-mongodb-on-windows.txt b/source/tutorial/install-mongodb-on-windows.txt index dc3d46abbee..4e887620f3c 100644 --- a/source/tutorial/install-mongodb-on-windows.txt +++ b/source/tutorial/install-mongodb-on-windows.txt @@ -1,13 +1,13 @@ -========================== -Install MongoDB on Windows -========================== +============================================ +Install MongoDB Community Edition on Windows +============================================ .. default-domain:: mongodb Overview -------- -Use this tutorial to install MongoDB on Windows systems. +Use this tutorial to install MongoDB Community Edition on Windows systems. .. admonition:: Platform Support @@ -22,18 +22,18 @@ Use this tutorial to install MongoDB on Windows systems. Requirements ------------ -On Windows MongoDB requires Windows Server 2008 R2, Windows Vista, or +MongoDB Community Edition requires Windows Server 2008 R2, Windows Vista, or later. The ``.msi`` installer includes all other software dependencies and will automatically upgrade any older version of MongoDB installed using an ``.msi`` file. -Get MongoDB ------------ +Get MongoDB Community Edition +----------------------------- .. include:: /includes/steps/get-mongodb-for-windows.rst -Install MongoDB ---------------- +Install MongoDB Community Edition +--------------------------------- Interactive Installation ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -43,13 +43,13 @@ Interactive Installation Unattended Installation ~~~~~~~~~~~~~~~~~~~~~~~ -You may install MongoDB unattended on Windows from the command line +You may install MongoDB Community unattended on Windows from the command line using ``msiexec.exe``. .. include:: /includes/steps/install-mongodb-on-windows-unattended.rst -Run MongoDB ------------ +Run MongoDB Community Edition +----------------------------- .. warning:: @@ -62,18 +62,18 @@ Run MongoDB .. _manually-create-windows-service: -Configure a Windows Service for MongoDB ---------------------------------------- +Configure a Windows Service for MongoDB Community Edition +--------------------------------------------------------- .. include:: /includes/steps/configure-windows-service-for-mongodb.rst -Manually Create a Windows Service for MongoDB ---------------------------------------------- +Manually Create a Windows Service for MongoDB Community Edition +--------------------------------------------------------------- You can set up the MongoDB server as a :guilabel:`Windows Service` that starts automatically at boot time. -The following procedure assumes you have installed MongoDB using the +The following procedure assumes you have installed MongoDB Community using the ``.msi`` installer with the path ``C:\mongodb\``. If you have installed in an alternative directory, you will need to