5 files changed, 65 insertions, 27 deletions
diff --git a/system/f3/README b/system/f3/README
index 17efcaa091956..052de2d81a74e 100644
--- a/system/f3/README
+++ b/system/f3/README
@@ -1,14 +1,15 @@
 F3 (Fix Fake Flash) is an open source Linux software to test flash
 memory capacity. There are two programs, one to read and one to
 write files to the item being tested.
+
 ALL of these programs should probably be run as root !
 
 Also  included are experimental programs f3probe, f3brew, and f3fix.
 To include f3probe, f3brew, and f3fix in the SlackBuild Package:
 
-   EXPERIMENTAL=YES ./f3.Slackbuild
+   EXTRA=YES ./f3.Slackbuild
 
 The author also included two shell script wrappers that
-will be installed as /usr/doc/f3-6.0/{log-f3wr,f3write.h2w}
+will be installed as /usr/doc/f3-7.0/{log-f3wr,f3write.h2w}
 
 In order to use these scripts as is, they must be moved to /usr/bin/
diff --git a/system/f3/README.SBo b/system/f3/README.SBo
index 409dfbb2a9f31..1908419a726e4 100644
--- a/system/f3/README.SBo
+++ b/system/f3/README.SBo
@@ -1,27 +1,63 @@
-## Use example of f3write/f3read
+Testing performance with f3read / f3write
+=========================================
 
-```
-$ ./f3write /media/michel/5EBD-5C80/
-$ ./f3read /media/michel/5EBD-5C80/
-```
+f3read / f3write assume your USB Drive is mounted.
 
-Please replace "/media/michel/5EBD-5C80/" with the appropriate path.
-USB devices are mounted in "/Volumes" on Macs.
+NOTE: Change /dev/sdX1 on the command line for your USB Drive.
+NOTE: Change /mnt/usb  on the command line for your mount point.
+
+   # mkdir /mnt/usb
+   # mount /dev/sdX1 /mnt/usb
+
+WARNING: f3write may destroy any previously stored data on /dev/sdX
+
+   $ f3write /mnt/usb/5EBD-5C80/
+   $ f3read  /mnt/usb/5EBD-5C80/
 
 For more information see http://oss.digirati.com.br/f3/
 
-### Bash scripts
+
+Bash scripts
+============
 
 Although the simple scripts listed in this section are ready for use,
 they are really meant to help you to write your own scripts.
 So you can personalize F3 to your specific needs.
 
-    f3write.h2w - Script to create files exactly like H2testw.
-        Use example: `f3write.h2w /media/michel/5EBD-5C80/`
+   f3write.h2w - Script to create files exactly like H2testw.
+
+   Use example:  f3write.h2w /mnt/usb/5EBD-5C80/
 
-    log-f3wr    - Script that runs f3write and f3read, and records
-                  their output into a log file.
-        Use example: `log-f3wr log-filename /media/michel/5EBD-5C80/`
+   log-f3wr    - Script that runs f3write and f3read, and records
+                 their output into a log file.
 
-Please notice that all scripts and use examples above assume that
+   Use example:  log-f3wr log-filename /mnt/usb/5EBD-5C80/
+
+The two example template scripts are in /usr/doc/f3-${VERSION}/
+
+Please note that the scripts and use examples above assume that
 f3write, f3read, and the scripts are in the same folder.
+
+
+Quick capacity tests with f3probe
+=================================
+
+f3probe is the fastest drive test and suitable for large disks because
+it only writes what?s necessary to test the drive. It operates directly
+on the (unmounted) block device and needs to be run as a privileged user:
+
+NOTE:  Change /dev/sdX on the command line for your USB Drive.
+
+WARNING: f3probe will destroy any previously stored data on /dev/sdX
+
+   # ./f3probe --destructive --time-ops /dev/sdX
+
+
+Correcting capacity to actual size with f3fix
+=============================================
+
+f3fix creates a partition that fits the actual size of the fake drive.
+
+Use f3probe?s output to determine the parameters for i3fix:
+
+   # ./f3fix --last-sec=16477878 /dev/sdX
diff --git a/system/f3/f3.SlackBuild b/system/f3/f3.SlackBuild
index 560dbc217dd76..60368eeffaf59 100644
--- a/system/f3/f3.SlackBuild
+++ b/system/f3/f3.SlackBuild
@@ -5,7 +5,7 @@
 # adapted by Konrad J Hambrick <kjhambrick@gmail.com>
 
 PRGNAM="f3"
-VERSION=${VERSION:-6.0}
+VERSION=${VERSION:-7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -60,13 +60,14 @@ make install PREFIX=$PKG/usr
 #
 # optionally make f3probe, f3brew and f3fix
 #
-if [ "$EXPERIMENTAL" = "YES" ]; then
-   make experimental PREFIX=$PKG/usr && make install-experimental PREFIX=$PKG/usr
+if [ "$EXTRA" = "YES" ]; then
+   make extra PREFIX=$PKG/usr && make install-extra PREFIX=$PKG/usr
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-install -m 0644 changelog README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 0644 changelog README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 install -m 0755 log-f3wr f3write.h2w $PKG/usr/doc/$PRGNAM-$VERSION
+cp -pR doc $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SBo   > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 
diff --git a/system/f3/f3.info b/system/f3/f3.info
index 07b67ad204020..b12bc741f6e3c 100644
--- a/system/f3/f3.info
+++ b/system/f3/f3.info
@@ -1,8 +1,8 @@
 PRGNAM="f3"
-VERSION="6.0"
+VERSION="7.0"
 HOMEPAGE="http://oss.digirati.com.br/f3/"
-DOWNLOAD="https://github.com/AltraMayor/f3/archive/v6.0/f3-6.0.zip"
-MD5SUM="b38abfb1c35996e4d193d3be694b4448"
+DOWNLOAD="https://github.com/AltraMayor/f3/archive/v7.0/f3-7.0.tar.gz"
+MD5SUM="d3501d47064c28ac962f4043e582c144"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/f3/slack-desc b/system/f3/slack-desc
index 8253002b41e27..b795520c4df72 100644
--- a/system/f3/slack-desc
+++ b/system/f3/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
   |-----handy-ruler------------------------------------------------------|
-f3: f3 (Fix Fake Flash)
+f3: f3 (Fight Flash Fraud)
 f3:
 f3: F3 is an open source Linux software to test flash memory capacity.
 f3:
 f3: F3 is composed of two binaries: f3write, and f3read. f3write fills a
-f3: file system up with 1GB files named NNNN.fff, where N is a number.
-f3: Whereas, f3read validates those files.  If the content of all NNNN.fff
+f3: file system up with 1GB files named NNNN.fff, where N is a number,
+f3: whereas, f3read validates those files.  If the content of all NNNN.fff
 f3: files is valid, the memory is fine.  The last file may be less than
 f3: 1GB since f3write takes all available space for data.
 f3: