5 files changed, 64 insertions, 35 deletions
diff --git a/system/rmw/README b/system/rmw/README
index 98a86c6d44..fc7ef5356f 100644
--- a/system/rmw/README
+++ b/system/rmw/README
@@ -1,5 +1,7 @@
-rmw (Remove to Waste) functions as a command line recycle bin/trash can
-utility. Optionally, it can ReMove files to Desktop trash and has been
-tested on GNOME, KDE, and Xfce. It features quick and easy restoration
-from the command line, duplication protection, and can purge files after
-x amount of days.
+Rmw is a program written in C, designed to help manage your files and
+prevent accidents at the command line. Rmw can send files to your "Desktop"
+trash, or a completely separate folder. It can also: restore files; permanently
+delete files that were rmw'ed more than xx number of days ago; skip files or
+directories that have a "PROTECT" directive in the configuration file; and
+append a unique string to the filenames so they won't get overwritten
+(duplication protection).
diff --git a/system/rmw/README.Slackware b/system/rmw/README.Slackware
index 03b0584414..1ae90e2390 100644
--- a/system/rmw/README.Slackware
+++ b/system/rmw/README.Slackware
@@ -1,10 +1,19 @@
-rmw (ReMove to Waste) functions as a command line recycle bin/trash can
-utility. Optionally, it can ReMove files to Desktop trash, restore files,
-list files to be selected for restore, and purge (permanently delete)
-files that were trashed x number of days ago.
+Rmw is a program written in C, designed to help manage your files and
+prevent accidents at the command line. Rmw can send files to your "Desktop"
+trash, or a completely separate folder. It can also: restore files; permanently
+delete files that were rmw'ed more than xx number of days ago; skip files or
+directories that have a "PROTECT" directive in the configuration file; and
+append a unique string to the filenames so they won't get overwritten
+(duplication protection).
 
 Web site: https://github.com/andy5995/rmw/wiki
 
+See the NEWS file for details about new options for your existing
+rmw configuration file. The two new options are:
+
+force_not_required
+,removable (the leading comma is mandatory)
+
 After rmw is installed, create the user configuration directory by typing
 'rmw' and hitting enter. Afterward, it's recommended to copy /etc/rmwrc (or
 /usr/local/etc/rmwrc) to $HOME/.config/rmw and then rename it to 'config':
@@ -29,36 +38,54 @@ $HOME/trash.rmw
 $HOME/trash.rmw/files
 $HOME/trash.rmw/info
 
+If one of the WASTE folder is on removable media, then the user has the
+option of appending ',removable' (More info about that in rmwrc, included
+with the rmw package).
+
 == Purging ==
 
 If purging is 'on', rmw will permanently delete files from the folders
 specified in the configuration file after 'x' number of days. Purging
-can be disabled by using 'purgeDays = 0' in configuration file. rmw will
-only check once per day if it's time to purge. Use -g to force a check.
+can be disabled by using 'purge_after = 0' in configuration file. rmw will
+only check once per day if it's time to purge (use -g to check more often).
+Purge requires -f (--force) to run (in your rmw configuration file, add
+the line 'force_not_required' if you'd rather not use --force when purging).
+
 The day of the last purge is stored in $HOME/config/rmw/lastpurge
 
-== Options ==:
+== Features and Options ==
 
+-h, --help
 -c, --config filename     use an alternate configuration
 -l, --list                list waste directories
 -p, --pause               wait for a keypress before exiting
 -g, --purge               run purge even if it's been run today
--z, --restore <wildcard filename(s) pattern>
--s, --select              select files from list to restore
--u, --undo-last           undo last ReMove
+-f, --force               allow purge to run
+-i, --interactive         not implemented
+-r, --recurse             not implemented
 -B, --bypass              bypass directory protection
 -v, --verbose             increase output messages
 -w, --warranty            display warranty
 -V, --version             display version and license information
 
+
+	===] Restoring [===
+
+-z, --restore <wildcard filename(s) pattern>
+-s, --select              select files from list to restore
+-u, --undo-last           undo last ReMove
+
+
 == -z option ==
 
-While -z can restore files at the command line, you have to specify
-the full path (wildcards ok).
-Example: rmw -z ~/.trash.rmw/files/*.iso
+To restore a file, or multiple files, specify the path to them in in the
+<WASTE>/files folder (wildcards ok).
+e.g. 'rmw -z ~/.local/share/Trash/files/foo*'
 
-The other way is be in the WASTE/files/ folder; then using only
-the basename will work.
+Files can also be restored using only the basename, from within any directory.
+NOTE: That feature will not process wildcards unless the user is in a
+<WASTE>/files folder and the filespec actually exists in the present
+working directory.
 
 == Protected directories ==
 
@@ -75,4 +102,4 @@ WASTE folders and the rmw configuration/data directory are protected by
 default (there is no need to add a 'PROTECT =' line for them.
 
 
-This file was last updated 2016-09-03
+This file was last updated 2016-09-19
diff --git a/system/rmw/rmw.SlackBuild b/system/rmw/rmw.SlackBuild
index c589eb450e..e06594d0f2 100644
--- a/system/rmw/rmw.SlackBuild
+++ b/system/rmw/rmw.SlackBuild
@@ -2,10 +2,10 @@
 
 # Slackware build script for rmw
 
-# Written by (Andy Alt) (andyqwerty@users.sourceforge.net)
+# Written by (Andy Alt) (andy400-dev@yahoo.com)
 
 PRGNAM=rmw
-VERSION=${VERSION:-2016.09.04.01a}
+VERSION=${VERSION:-2016.09.19.01a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,7 +55,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --mandir=/usr/man \
+  --sysconfdir=/etc \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
diff --git a/system/rmw/rmw.info b/system/rmw/rmw.info
index d4e66a975c..4855b7ad3a 100644
--- a/system/rmw/rmw.info
+++ b/system/rmw/rmw.info
@@ -1,10 +1,10 @@
 PRGNAM="rmw"
-VERSION="2016.09.04.01a"
+VERSION="2016.09.19.01a"
 HOMEPAGE="https://github.com/andy5995/rmw/wiki"
-DOWNLOAD="https://sourceforge.net/projects/rmw/files/rmw-2016.09.04.01a.tar.gz"
-MD5SUM="1198ce118ee22fffc0d1a4d47657cc14"
+DOWNLOAD="https://sourceforge.net/projects/rmw/files/rmw-2016.09.19.01a.tar.gz"
+MD5SUM="f6d5389674e81fb5d523d142a1e63c1a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Andy Alt"
-EMAIL="andyqwerty@users.sourceforge.net"
+EMAIL="andy400-dev@yahoo.com"
diff --git a/system/rmw/slack-desc b/system/rmw/slack-desc
index f0f7f4a94c..600845b117 100644
--- a/system/rmw/slack-desc
+++ b/system/rmw/slack-desc
@@ -8,12 +8,12 @@
    |-----handy-ruler------------------------------------------------------|
 rmw: rmw (command line trash can/recycle bin)
 rmw:
-rmw: rmw (ReMove to Waste) functions
-rmw: as a command line recycle bin/trash can utility. Optionally,
-rmw: it can ReMove files to Desktop trash and has been tested
-rmw: on GNOME, KDE, and Xfce. It features quick and easy restoration
-rmw: from the command line, duplication protection, and can purge
-rmw: files after x amount of days.
+rmw: Rmw is a program written in C, designed to help manage your files and
+rmw: prevent accidents at the command line. Rmw can send files to your
+rmw: "Desktop" trash, or a completely separate folder. It can also:
+rmw: restore files; permanently delete files that were rmw'ed more than xx
+rmw: number of days ago; skip files or directories that have a "PROTECT"
+rmw: directive in the configuration file; and append a unique string to
+rmw: the filenames so they won't get overwritten (duplication protection)
 rmw:
 rmw: Homepage: https://github.com/andy5995/rmw/wiki
-rmw: