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 @@
Comparison Of Motion vs MotionPlus
- Limited |
- Feature Enhancements |
+ None |
+ Enhancements |
Yes |
@@ -142,7 +142,7 @@ Comparison Of Motion vs MotionPlus
- |
- Direct libcamera support |
+ Pi camera controls |
Yes |
@@ -157,12 +157,16 @@ Comparison Of Motion vs MotionPlus
- |
- Download/Play movies via web page |
- Yes |
-
-
- - |
- Add/Delete cameras via web page |
+ Enhanced webcontrol
+ - Download/Play movies
+ - Ability to change configuration parameters
+ - Optional user developed web page
+ - Add/delete cameras
+ - Consolidated single image stream of all cameras
+ - MpegTS video stream feeds
+ - Execution of custom events/actions
+ - Live feed of Motionplus log messages
+ |
Yes |
@@ -199,6 +203,10 @@ Documentation For Prior Releases
+
+ Version 4.6.0 |
+ Version 0.2.0 |
+
Version 4.5.1 |
Version 0.1.0 |
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"