Merge branch 'develop' of github.com:sleuthkit/autopsy into AUT-2465-betterFeedback

Core/nbproject/project.properties

@@ -85,8 +85,8 @@ file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSH
 file.reference.serializer-2.7.2.jar=release/modules/ext/serializer-2.7.2.jar
 file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar
 file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
-file.reference.sleuthkit-4.12.0.jar=release/modules/ext/sleuthkit-4.12.0.jar
-file.reference.sleuthkit-caseuco-4.12.0.jar=release/modules/ext/sleuthkit-caseuco-4.12.0.jar
+file.reference.sleuthkit-4.12.1.jar=release/modules/ext/sleuthkit-4.12.1.jar
+file.reference.sleuthkit-caseuco-4.12.1.jar=release/modules/ext/sleuthkit-caseuco-4.12.1.jar
 file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
 file.reference.snakeyaml-2.0.jar=release/modules/ext/snakeyaml-2.0.jar
 file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar

Core/nbproject/project.xml

@@ -718,12 +718,12 @@
                 <binary-origin>release/modules/ext/sevenzipjbinding.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sleuthkit-4.12.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sleuthkit-4.12.0.jar</binary-origin>
+                <runtime-relative-path>ext/sleuthkit-4.12.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-4.12.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sleuthkit-caseuco-4.12.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sleuthkit-caseuco-4.12.0.jar</binary-origin>
+                <runtime-relative-path>ext/sleuthkit-caseuco-4.12.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-caseuco-4.12.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path>

TSKVersion.xml

@@ -1,3 +1,3 @@
 <project name="TSK_VERSION">
-    <property name="TSK_VERSION" value="4.12.0"/>
+    <property name="TSK_VERSION" value="4.12.1"/>
 </project>

docs/doxygen-user/ct_malware_scanner.dox

@@ -18,9 +18,12 @@ Configuration
 Once you have a license, you must add it on the Options panel.  Choose the 'Cyber Triage' tab and choose 'Add License'.
 
 
-\image html Malware-scanner-global-options-panel-no-license.png
+\image html malware-scanner-global-options-panel-no-license.png
 
-After you enter the license number that you should have received from your email, you will then need to review and agree to the license terms. 
+After you enter the license number that you should have received from your email, you will then need to review and agree to the license terms. Example license formats include:
+
+* X
+* Y
 
 
 The options panel should now display information about the lookup limits. You can always refer back to here about what your limits are and when they reset. 

release_scripts/update_sleuthkit_version.pl

@@ -33,7 +33,7 @@ sub main {
 	update_core_project_xml();
     update_unix_setup();
     
-	print "Files updated.  You need to commit and push them\n";
+	print "Files updated and added to git. You need to commit (no -a) and push.\n";
 }
 
 

unix_setup.sh

@@ -5,7 +5,7 @@
 
 # NOTE: update_sleuthkit_version.pl updates this value and relies
 # on it keeping the same name and whitespace.  Don't change it.
-TSK_VERSION=4.12.0
+TSK_VERSION=4.12.1
 
 
 usage() {