From b99a985bbe279a149500fdb65f0b3f46a9426682 Mon Sep 17 00:00:00 2001
From: Sebastian Bublitz <sebastian.bublitz@muenchen.de>
Date: Thu, 19 Oct 2023 13:33:27 +0200
Subject: [PATCH] Update Puppet Smart-Proxy compatibility

Smart-Proxy compatibility changed in Foreman 3.4 to only support Puppet
>=6.
I also copied #2103 to the docs for 3.8 and nightly, which were missing
in the original PR.
---
 _includes/manuals/3.4/3.1.3_puppet_versions.md     | 14 +-------------
 _includes/manuals/3.5/3.1.3_puppet_versions.md     | 14 +-------------
 _includes/manuals/3.6/3.1.3_puppet_versions.md     | 14 +-------------
 _includes/manuals/3.7/3.1.3_puppet_versions.md     | 10 ++--------
 _includes/manuals/3.8/3.1.3_puppet_versions.md     | 12 +++---------
 _includes/manuals/nightly/3.1.3_puppet_versions.md | 12 +++---------
 6 files changed, 11 insertions(+), 65 deletions(-)

diff --git a/_includes/manuals/3.4/3.1.3_puppet_versions.md b/_includes/manuals/3.4/3.1.3_puppet_versions.md
index 1affa335b8..0ec9d53c1e 100644
--- a/_includes/manuals/3.4/3.1.3_puppet_versions.md
+++ b/_includes/manuals/3.4/3.1.3_puppet_versions.md
@@ -8,23 +8,11 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a
     <th>Smart Proxy</th>
   </tr>
   <tr>
-    <td>0.x-4.3</td>
+    <td>0.x-5.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Not supported</td>
   </tr>
-  <tr>
-    <td>4.4-4.10</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
-  <tr>
-    <td>5.x</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
   <tr>
     <td>6.x - 7.x</td>
     <td>Supported</td>
diff --git a/_includes/manuals/3.5/3.1.3_puppet_versions.md b/_includes/manuals/3.5/3.1.3_puppet_versions.md
index 1affa335b8..0ec9d53c1e 100644
--- a/_includes/manuals/3.5/3.1.3_puppet_versions.md
+++ b/_includes/manuals/3.5/3.1.3_puppet_versions.md
@@ -8,23 +8,11 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a
     <th>Smart Proxy</th>
   </tr>
   <tr>
-    <td>0.x-4.3</td>
+    <td>0.x-5.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Not supported</td>
   </tr>
-  <tr>
-    <td>4.4-4.10</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
-  <tr>
-    <td>5.x</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
   <tr>
     <td>6.x - 7.x</td>
     <td>Supported</td>
diff --git a/_includes/manuals/3.6/3.1.3_puppet_versions.md b/_includes/manuals/3.6/3.1.3_puppet_versions.md
index ed4abcc684..e76559b182 100644
--- a/_includes/manuals/3.6/3.1.3_puppet_versions.md
+++ b/_includes/manuals/3.6/3.1.3_puppet_versions.md
@@ -8,23 +8,11 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a
     <th>Smart Proxy</th>
   </tr>
   <tr>
-    <td>0.x-4.3</td>
+    <td>0.x-5.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Not supported</td>
   </tr>
-  <tr>
-    <td>4.4-4.10</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
-  <tr>
-    <td>5.x</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
   <tr>
     <td>6.x</td>
     <td>Deprecated</td>
diff --git a/_includes/manuals/3.7/3.1.3_puppet_versions.md b/_includes/manuals/3.7/3.1.3_puppet_versions.md
index bbe71e53a1..2e82ad6231 100644
--- a/_includes/manuals/3.7/3.1.3_puppet_versions.md
+++ b/_includes/manuals/3.7/3.1.3_puppet_versions.md
@@ -8,19 +8,13 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a
     <th>Smart Proxy</th>
   </tr>
   <tr>
-    <td>0.x-4.3</td>
+    <td>0.x-5.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Not supported</td>
   </tr>
   <tr>
-    <td>4.4-4.10</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
-  <tr>
-    <td>5.x - 6.x</td>
+    <td>6.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Deprecated</td>
diff --git a/_includes/manuals/3.8/3.1.3_puppet_versions.md b/_includes/manuals/3.8/3.1.3_puppet_versions.md
index 1affa335b8..2e82ad6231 100644
--- a/_includes/manuals/3.8/3.1.3_puppet_versions.md
+++ b/_includes/manuals/3.8/3.1.3_puppet_versions.md
@@ -8,25 +8,19 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a
     <th>Smart Proxy</th>
   </tr>
   <tr>
-    <td>0.x-4.3</td>
+    <td>0.x-5.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Not supported</td>
   </tr>
   <tr>
-    <td>4.4-4.10</td>
+    <td>6.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Deprecated</td>
   </tr>
   <tr>
-    <td>5.x</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
-  <tr>
-    <td>6.x - 7.x</td>
+    <td>7.x</td>
     <td>Supported</td>
     <td>Untested</td>
     <td>Supported</td>
diff --git a/_includes/manuals/nightly/3.1.3_puppet_versions.md b/_includes/manuals/nightly/3.1.3_puppet_versions.md
index 1affa335b8..2e82ad6231 100644
--- a/_includes/manuals/nightly/3.1.3_puppet_versions.md
+++ b/_includes/manuals/nightly/3.1.3_puppet_versions.md
@@ -8,25 +8,19 @@ Foreman integrates with Puppet and Facter in a few places, but generally using a
     <th>Smart Proxy</th>
   </tr>
   <tr>
-    <td>0.x-4.3</td>
+    <td>0.x-5.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Not supported</td>
   </tr>
   <tr>
-    <td>4.4-4.10</td>
+    <td>6.x</td>
     <td>Not supported</td>
     <td>Not supported</td>
     <td>Deprecated</td>
   </tr>
   <tr>
-    <td>5.x</td>
-    <td>Not supported</td>
-    <td>Not supported</td>
-    <td>Deprecated</td>
-  </tr>
-  <tr>
-    <td>6.x - 7.x</td>
+    <td>7.x</td>
     <td>Supported</td>
     <td>Untested</td>
     <td>Supported</td>