Merge pull request #52193 from Ch3LL/bp-47005

Backport #47005 to 2018.3

doc/topics/installation/freebsd.rst

@@ -5,49 +5,31 @@ FreeBSD
 Installation
 ============
 
-Salt is available in binary package form from both the FreeBSD pkgng repository
-or directly from SaltStack. The instructions below outline installation via
-both methods:
+Salt is available in the FreeBSD ports at `sysutils/py-salt. <https://www.freshports.org/sysutils/py-salt/>`__
 
-FreeBSD repo
-============
 
-The FreeBSD pkgng repository is preconfigured on systems 10.x and above. No
-configuration is needed to pull from these repositories.
+FreeBSD binary repo
+===================
 
 .. code-block:: bash
 
     pkg install py27-salt
 
-These packages are usually available within a few days of upstream release.
+FreeBSD ports
+=============
 
-.. _freebsd-upstream:
+By default salt is packaged using python 2.7, but if you build your own packages from FreeBSD ports either by hand or with poudriere you can instead package it with your choice of python. Add a line to /etc/make.conf to choose your python flavour:
 
-SaltStack repo
-==============
+.. code-block:: shell
 
-SaltStack also hosts internal binary builds of the Salt package, available from
-https://repo.saltstack.com/freebsd/. To make use of this repository, add the
-following file to your system:
+    echo "DEFAULT_VERSIONS+= python=3.6" >> /etc/make.conf
 
-**/usr/local/etc/pkg/repos/saltstack.conf:**
-
-.. code-block:: text
-
-    saltstack: {
-      url: "https://repo.saltstack.com/freebsd/${ABI}/",
-      enabled: yes
-    }
-
-You should now be able to install Salt from this new repository:
+Then build the port and install:
 
 .. code-block:: bash
 
-    pkg install py27-salt
-
-These packages are usually available earlier than upstream FreeBSD. Also
-available are release candidates and development releases. Use these pre-release
-packages with caution.
+    cd /usr/ports/sysutils/py-salt
+    make install
 
 Post-installation tasks
 =======================

doc/topics/releases/2015.8.0.rst

@@ -21,7 +21,6 @@ See the following links for instructions:
 - :ref:`Red Hat / CentOS 5, 6, 7 <installation-rhel-repo>`
 - :ref:`Debian 8 <installation-debian-repo>`
 - :ref:`Windows <windows-installer>`
-- :ref:`FreeBSD <freebsd-upstream>`
 
 Send Event on State Completion
 ==============================