Imported recent updates in Maneage, minor conflicts fixed

Some very minor conflicts came up and were easily corrected. They were
mostly in parts that are also shared with the demonstration in the core
Maneage branch.

1 files changed, 23 insertions, 14 deletions

diff --git a/reproduce/analysis/config/INPUTS.conf b/reproduce/analysis/config/INPUTS.conf
index ee52abb..7d8bb50 100644
--- a/reproduce/analysis/config/INPUTS.conf
+++ b/reproduce/analysis/config/INPUTS.conf
@@ -5,30 +5,34 @@
 #
 # Necessary variables for each input dataset are listed below. Its good
 # that all the variables of each file have the same base-name (in the
-# example below 'WFPC2') with descriptive suffixes, also put a short
-# comment above each group of variables for each dataset, shortly
-# explaining what it is.
+# example below 'DEMO') with descriptive suffixes, also put a short comment
+# above each group of variables for each dataset, shortly explaining what
+# it is.
 #
-#  1) Local file name ('WFPC2IMAGE' below): this is the name of the dataset
+#  1) Local file name ('DEMO-DATA' below): this is the name of the dataset
 #     on the local system (in 'INDIR', given at configuration time). It is
 #     recommended that it be the same name as the online version of the
-#     file like the case here (note how this variable is used in 'WFPC2URL'
+#     file like the case here (note how this variable is used in 'DEMO-URL'
 #     for the dataset's full URL). However, this is not always possible, so
 #     the local and server filenames may be different. Ultimately, the file
 #     name is irrelevant, we check the integrity with the checksum.
 #
-#  2) The MD5 checksum of the file ('WFPC2MD5' below): this is very
+#  2) The MD5 checksum of the file ('DEMO-MD5' below): this is very
 #     important for an automatic verification of the file. You can
-#     calculate it by running 'md5sum' on your desired file.
+#     calculate it by running 'md5sum' on your desired file. You can also
+#     use any other checksum tool that you prefer, just be sure to correct
+#     the respective command in 'reproduce/analysis/make/download.mk'.
 #
-#  3) The human-readable size of the file ('WFPC2SIZE' below): this is an
-#     optional feature which you can use for in the script that is loaded
-#     at configure time ('reproduce/software/shell/configure.sh'). When
-#     asking for the input-data directory, you can print some basic
-#     information of the files for users to get a better feeling of the
-#     volume. See that script for an example using this demo dataset.
+#  3) The human-readable size of the file ('DEMO-SIZE' below): this is an
+#     optional variable, mainly to help a reader of your project get a
+#     sense of the volume they need to download if they don't already have
+#     the dataset. So it is highly recommended to add it (future readers of
+#     your project's source will appreciate it!). You can get it from the
+#     output of 'ls -lh' command on the file. Optionally you can use it in
+#     messages during the configuration phase (when Maneage asks for the
+#     input data directory), along with other info about the file(s).
 #
-#  4) The full dataset URL ('WFPC2URL' below): this is the full URL
+#  4) The full dataset URL ('DEMO-URL' below): this is the full URL
 #     (including the file-name) that can be used to download the dataset
 #     when necessary. Also, see the description above on local filename.
 #
@@ -39,6 +43,11 @@
 # this notice are preserved.  This file is offered as-is, without any
 # warranty.
 
+
+
+
+
+# Dataset used in this analysis and its checksum for integrity checking.
 MK20DATA = menke20.xlsx
 MK20MD5  = 8e4eee64791f351fec58680126d558a0
 MK20SIZE = 1.9MB