From ae152ad8a6cdfa5335dc0412776a7fcd499a6716 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Wed, 21 Aug 2024 13:51:04 -0600
Subject: [PATCH] Version 4.7.0

---
 doc/CHANGELOG         |  8 ++++++++
 doc/motion_guide.html | 26 +++++++++++++++++---------
 scripts/version.sh    |  6 +++---
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 4e08ff20..e05ef056 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,11 @@
+Summary of changes for version 4.7.0 are below
+    * Documentation updates
+    * Remove outdated MMAL camera source.
+    * Fix reaping of zombie processes from Motion.
+    * Allow for network cameras that are not completely standards compliant
+    * Fix v4l2M2M encoding.
+    * Fix fps conversion specifier.
+    * Allow for large date time and event numbers.
 Summary of changes for version 4.6.0 are below
     * Documentation updates
     * Fix segfault on vaapi decoding
diff --git a/doc/motion_guide.html b/doc/motion_guide.html
index be56081b..7186f56e 100644
--- a/doc/motion_guide.html
+++ b/doc/motion_guide.html
@@ -106,8 +106,8 @@ <h3><a name="Comparison"></a>Comparison Of Motion vs MotionPlus</h3>
         </thead>
         <tbody>
           <tr>
-            <td bgcolor="#edf4f9" word-wrap:break-word >Limited</td>
-            <td bgcolor="#edf4f9" word-wrap:break-word >Feature Enhancements</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >None</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Enhancements</td>
             <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
           </tr>
           <tr>
@@ -142,7 +142,7 @@ <h3><a name="Comparison"></a>Comparison Of Motion vs MotionPlus</h3>
           </tr>
           <tr>
             <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
-            <td bgcolor="#edf4f9" word-wrap:break-word >Direct libcamera support</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Pi camera controls</td>
             <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
           </tr>
           <tr>
@@ -157,12 +157,16 @@ <h3><a name="Comparison"></a>Comparison Of Motion vs MotionPlus</h3>
           </tr>
           <tr>
             <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
-            <td bgcolor="#edf4f9" word-wrap:break-word >Download/Play movies via web page</td>
-            <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
-          </tr>
-          <tr>
-            <td bgcolor="#edf4f9" word-wrap:break-word >-</td>
-            <td bgcolor="#edf4f9" word-wrap:break-word >Add/Delete cameras via web page</td>
+            <td bgcolor="#edf4f9" word-wrap:break-word >Enhanced webcontrol<ul>
+             <li> Download/Play movies</li>
+             <li> Ability to change configuration parameters</li>
+             <li> Optional user developed web page</li>
+             <li> Add/delete cameras</li>
+             <li> Consolidated single image stream of all cameras</li>
+             <li> MpegTS video stream feeds</li>
+             <li> Execution of custom events/actions</li>
+             <li> Live feed of Motionplus log messages</li>
+             </ul></td>
             <td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
           </tr>
           <tr>
@@ -199,6 +203,10 @@ <h3><a name="Prior"></a>Documentation For Prior Releases</h3>
           </tr>
         </thead>
         <tbody>
+          <tr>
+            <td word-wrap:break-word > <a href="4.6.0/motion_config.html"> Version 4.6.0</a> </td>
+            <td word-wrap:break-word > <a href="mp0.1.0/motionplus_config.html"> Version 0.2.0</a></td>
+          </tr>
           <tr>
             <td word-wrap:break-word > <a href="4.5.1/motion_config.html"> Version 4.5.1</a> </td>
             <td word-wrap:break-word > <a href="mp0.1.0/motionplus_config.html"> Version 0.1.0</a></td>
diff --git a/scripts/version.sh b/scripts/version.sh
index 215c62d1..ba23ba7c 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-BASE_VERSION="4.6.0"
+BASE_VERSION="4.7.0"
 if [ -d .git ]; then
     if test "`git diff --name-only`" = "" ; then
         GIT_COMMIT="git"
@@ -13,6 +13,6 @@ if [ -d .git ]; then
 else
     GIT_COMMIT="gitUNKNOWN"
 fi
-#printf "$BASE_VERSION"
-printf "$BASE_VERSION+$GIT_COMMIT"
+printf "$BASE_VERSION"
+#printf "$BASE_VERSION+$GIT_COMMIT"