DOCS-11780, DOCS-11782: s390x rhel for community, ubuntu 18.04 for community and enterprise

kay-kim · kay-kim · commit d5c25869d2a2 · 2018-06-13T14:41:15.000-04:00
diff --git a/source/administration/production-notes.txt b/source/administration/production-notes.txt
@@ -51,8 +51,8 @@ PPC64LE (MongoDB Enterprise Edition)
 
 .. include:: /includes/fact-platform-ppc64le.rst
 
-s390x (MongoDB Enterprise Edition)
-``````````````````````````````````
+s390x
+`````
 
 .. include:: /includes/fact-platform-s390x.rst
 
@@ -71,7 +71,8 @@ systems are recommended for production use:
 - RHEL / CentOS 6.2+
 - SLES 12
 - Ubuntu LTS 16.04
-- Windows Server 2012 & 2012 R2
+- Ubuntu LTS 18.04
+- Windows Server 2012 R2
 
 .. seealso:: :ref:`prod-notes-platform-considerations`
 
diff --git a/source/includes/fact-platform-arm64.rst b/source/includes/fact-platform-arm64.rst
@@ -4,8 +4,11 @@
    :class: compatibility
 
    * - Platform
+     - 4.0 Community & Enterprise
+
      - 3.6 Community & Enterprise
      - 3.4 Community & Enterprise
    * - Ubuntu 16.04
      - |checkmark|
      - |checkmark|
+     - |checkmark|
diff --git a/source/includes/fact-platform-ppc64le.rst b/source/includes/fact-platform-ppc64le.rst
@@ -4,11 +4,14 @@
    :class: compatibility
 
    * - Platform
+     - 4.0 Enterprise
      - 3.6 Enterprise
      - 3.4 Enterprise
-   * - RHEL/CentOS 7.1
+   * - RHEL/CentOS 7
+     - |checkmark|
      - |checkmark|
      - |checkmark|
    * - Ubuntu 16.04
      - |checkmark|
      - |checkmark|
+     - |checkmark|
diff --git a/source/includes/fact-platform-s390x.rst b/source/includes/fact-platform-s390x.rst
@@ -1,29 +1,15 @@
-.. admonition:: Platform Support EOL Notice
-
-   - Support for SLES 11 has been removed in MongoDB 3.2.20+, 3.4.15+, and 3.6.4+.
 
 .. list-table::
    :header-rows: 1
    :stub-columns: 1
    :class: compatibility
 
    * - Platform
-     - 4.0 Enterprise
+     - 4.0 Community & Enterprise
      - 3.6 Enterprise
      - 3.4 Enterprise
-   * - RHEL/CentOS 7.2
-     - |checkmark|
-     - |checkmark|
+   * - RHEL/CentOS 6
      - |checkmark|
-   * - SLES 11
      - 
-     - EOL'd as of 3.6.4.
-     - EOL'd as of 3.4.15.
-   * - SLES 12
-     - |checkmark|
-     - |checkmark|
-     - |checkmark|
-   * - Ubuntu 16.04
-     - |checkmark|
-     - |checkmark|
-     - |checkmark|
+     - 
+
diff --git a/source/includes/fact-platform-x86_64.rst b/source/includes/fact-platform-x86_64.rst
@@ -14,11 +14,13 @@
      - 3.6 Community & Enterprise
      - 3.4 Community & Enterprise
      - 3.2 Community & Enterprise
+
    * - Amazon Linux 2013.03 and later
      - |checkmark|
      - |checkmark|
      - |checkmark|
      - |checkmark|
+
    * - Amazon Linux 2
      - |checkmark|
      -
@@ -80,19 +82,31 @@
      - |checkmark|
      - |checkmark|
      - |checkmark|
+   * - Ubuntu 18.04
+     - |checkmark|
+     - 
+     - 
+     -
 
    * - Windows Vista
      -
      -
      - |checkmark|
      - |checkmark|
 
-   * - Windows 7/Server 2008 R2 and later
+   * - Windows 7/Server 2008 R2
      - |checkmark|
      - |checkmark|
      - |checkmark|
      - |checkmark|
-   * - macOS 10.7 and later
+
+   * - Windows 8/2012 R2 and later
+     - |checkmark|
+     - 
+     - 
+     - 
+
+   * - macOS 10.11 and later
      - |checkmark|
      - |checkmark|
      - |checkmark|
diff --git a/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml b/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml
@@ -24,6 +24,11 @@ action:
 
            echo "deb [ arch=amd64,arm64,ppc64el,s390x ] http://repo.mongodb.com/apt/ubuntu xenial/mongodb-enterprise/{+package-branch+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
 
+      Ubuntu 18.04
+        .. code-block:: sh
+
+           echo "deb [ arch=amd64 ] http://repo.mongodb.com/apt/ubuntu bionic/mongodb-enterprise/{+package-branch+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
+
   - pre: |
       If you'd like to install MongoDB Enterprise packages from a
       particular :ref:`release series <release-version-numbers>` such as
diff --git a/source/includes/steps-install-mongodb-on-ubuntu.yaml b/source/includes/steps-install-mongodb-on-ubuntu.yaml
@@ -31,6 +31,12 @@ action:
       .. code-block:: sh
 
          echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/{+package-branch+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+version+}.list
+
+    Ubuntu 18.04
+      .. code-block:: sh
+
+         echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/{+package-branch+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+version+}.list
+
 ---
 title: Reload local package database.
 stepnum: 3
diff --git a/source/installation.txt b/source/installation.txt
@@ -56,8 +56,8 @@ PPC64LE (MongoDB Enterprise Edition)
 
 .. include:: /includes/fact-platform-ppc64le.rst
 
-s390x (MongoDB Enterprise Edition)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+s390x
+~~~~~
 
 .. include:: /includes/fact-platform-s390x.rst
 
diff --git a/source/release-notes/4.0.txt b/source/release-notes/4.0.txt
@@ -483,11 +483,18 @@ deprecated:
 Platform Support
 ----------------
 
-- MongoDB 4.0 adds support for
-  :doc:`Amazon Linux 2 </tutorial/install-mongodb-on-amazon>` and
-  :doc:`Debian 9 "Stretch" </tutorial/install-mongodb-on-debian>`.
 
-- MongoDB 4.0 binaries for macOS support TLS 1.2.
+- MongoDB 4.0 (Community & Enterprise) adds support for:
+
+  - :doc:`Amazon Linux 2 </tutorial/install-mongodb-on-amazon>`
+ 
+  - :doc:`Debian 9 "Stretch" </tutorial/install-mongodb-on-debian>`
+
+  - :doc:`Ubuntu 18.04 </tutorial/install-mongodb-on-ubuntu>`
+
+- MongoDB 4.0 (Community) adds support for:
+
+  - s390x RHEL 6.x
 
 - MongoDB 4.0 does not support SLES 11.
   Support for SLES 11 has also been removed in MongoDB 3.2.20+,
@@ -500,6 +507,8 @@ Platform Support
 Refer to :ref:`prod-notes-supported-platforms` for the full platform
 support matrix.
 
+- MongoDB 4.0 binaries for macOS support TLS 1.2.
+
 
 General Improvements
 --------------------
diff --git a/source/tutorial/install-mongodb-enterprise-on-os-x.txt b/source/tutorial/install-mongodb-enterprise-on-os-x.txt
@@ -16,8 +16,7 @@ related to security and monitoring.
 
    .. include:: /includes/3.6-osx-platform.rst
 
-   MongoDB only supports macOS versions 10.7 (Lion) and later on Intel x86-64.
-   Versions of MongoDB Enterprise prior to 3.2 did not support macOS.
+   MongoDB only supports macOS versions 10.11 and later on Intel x86-64.
 
 .. note::
 
diff --git a/source/tutorial/install-mongodb-on-os-x.txt b/source/tutorial/install-mongodb-on-os-x.txt
@@ -19,8 +19,7 @@ Use this tutorial to install MongoDB Community Edition on macOS systems.
 
    .. include:: /includes/3.6-osx-platform.rst
 
-   Starting in version 3.0, MongoDB only supports macOS versions 10.7 (Lion)
-   and later on Intel x86-64.
+   MongoDB only supports macOS versions 10.11 and later on Intel x86-64.
 
 You may download MongoDB Community Edition through either the `MongoDB
 Download Center <https://www.mongodb.com/download-center#production>`_ or the
