Pārlūkot izejas kodu

Various install page version updates

ScriptAutomate 4 gadi atpakaļ
vecāks
revīzija
7c8330faea

+ 4 - 4
doc/topics/installation/rhel.rst

@@ -8,9 +8,8 @@ RHEL / CentOS / Scientific Linux / Amazon Linux / Oracle Linux
 
 Salt should work properly with all mainstream derivatives of Red Hat Enterprise
 Linux, including CentOS, Scientific Linux, Oracle Linux, and Amazon Linux.
-Report any bugs or issues on the `issue tracker`__.
-
-.. __: https://github.com/saltstack/salt/issues
+Report any bugs or issues on the `issue tracker 
+<https://github.com/saltstack/salt/issues>`__.
 
 Installation from the Official SaltStack Repository
 ===================================================
@@ -74,7 +73,8 @@ Beginning with version 0.9.4, Salt has been available in `EPEL`_.
 
 .. note::
    Packages in this repository are built by community, and it can take a little
-   while until the latest stable SaltStack release become available.
+   while until the latest stable SaltStack release becomes available. Using the
+   SaltStack Repository is highly preferred, instead.
 
 .. _`EPEL`: https://fedoraproject.org/wiki/EPEL
 

+ 3 - 16
doc/topics/installation/suse.rst

@@ -20,7 +20,7 @@ Instructions are at https://repo.saltstack.com/#suse.
 Installation from the SUSE Repository
 =====================================
 
-Since openSUSE 13.2, Salt 2014.1.11 is available in the primary repositories.
+Since openSUSE 13.2, Salt has been available in the primary repositories.
 With the release of SUSE manager 3 a new repository setup has been created.
 The new repo will by systemsmanagement:saltstack, which is the source
 for newer stable packages. For backward compatibility a linkpackage will be
@@ -116,30 +116,17 @@ Unstable Release
 openSUSE
 --------
 
-For openSUSE Tumbleweed run the following as root:
+For openSUSE Leap or Tumbleweed systems, run the following as root:
 
 .. code-block:: bash
 
     zypper install salt salt-minion salt-master
 
 
-For openSUSE 15.0 Leap run the following as root:
-
-.. code-block:: bash
-
-    zypper install salt salt-minion salt-master
-
-
-For openSUSE 15.1 run the following as root:
-
-.. code-block:: bash
-
-    zypper install salt salt-minion salt-master
-
 SUSE Linux Enterprise
 ---------------------
 
-For SLE 15 and above run the following as root:
+For SLES 15 and above run the following as root:
 
 .. code-block:: bash
 

+ 2 - 2
doc/topics/installation/ubuntu.rst

@@ -9,8 +9,8 @@ Ubuntu
 Installation from the Official SaltStack Repository
 ===================================================
 
-Packages for Ubuntu 16 (Xenial), Ubuntu 14 (Trusty), and Ubuntu 12 (Precise)
-are available in the SaltStack repository.
+Packages for Ubuntu 20.04 (Focal), Ubuntu 18.04 (Bionic), and Ubuntu 16
+(Xenial) are available in the SaltStack repository.
 
 Instructions are at https://repo.saltstack.com/#ubuntu.
 

+ 3 - 3
doc/topics/installation/windows.rst

@@ -159,21 +159,21 @@ Here are some examples of using the silent installer:
     # Install the Salt Minion
     # Configure the minion and start the service
 
-    Salt-Minion-2017.7.1-Py2-AMD64-Setup.exe /S /master=yoursaltmaster /minion-name=yourminionname
+    Salt-Minion-3001-Py3-AMD64-Setup.exe /S /master=yoursaltmaster /minion-name=yourminionname
 
 .. code-block:: bat
 
     # Install the Salt Minion
     # Configure the minion but don't start the minion service
 
-    Salt-Minion-2017.7.1-Py3-AMD64-Setup.exe /S /master=yoursaltmaster /minion-name=yourminionname /start-minion=0
+    Salt-Minion-3001-Py3-AMD64-Setup.exe /S /master=yoursaltmaster /minion-name=yourminionname /start-minion=0
 
 .. code-block:: bat
 
     # Install the Salt Minion
     # Configure the minion using a custom config and configuring multimaster
 
-    Salt-Minion-2017.7.1-Py3-AMD64-Setup.exe /S /custom-config=windows_minion /master=prod_master1,prod_master2
+    Salt-Minion-3001-Py3-AMD64-Setup.exe /S /custom-config=windows_minion /master=prod_master1,prod_master2
 
 
 Running the Salt Minion on Windows as an Unprivileged User