Imported recent work in Maneage, minor conflicts fixed

Some minor conflicts (all expected from the commit messages in the Maneage
branch) occurred but were easily fixed.

1 files changed, 18 insertions, 3 deletions

diff --git a/reproduce/analysis/config/metadata.conf b/reproduce/analysis/config/metadata.conf
index 470e429..b1f657b 100644
--- a/reproduce/analysis/config/metadata.conf
+++ b/reproduce/analysis/config/metadata.conf
@@ -1,6 +1,19 @@
-# Project meta-data that can be used in a project's output datasets and
+# Project meta-data that will be used in a project's output datasets and
 # final paper. Please set the values here and use them in your analysis or
-# paper, don't repeat them
+# paper, don't repeat them.
+#
+# These variables are used in 'reproduce/analysis/make/initialize.mk': 1)
+# to create a Make variable called 'print-general-metadata'. You can simply
+# print this variable's value in any plain-text output.
+#
+# Why add a Copyright for the data? people need to know if they can "use"
+# the dataset (i.e., modify it), or possibly re-distribute it and their
+# derived products. They also need to know how they can contact the creator
+# of the datset (who is usually also the copyright owner). So take this
+# seriously and add your name and email-address (or the name of the person
+# and email of the person who was in charge of that part of the project),
+# and the copyright license name and standard link to the fully copyright
+# license.
 #
 # Copyright (C) 2020-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 #
@@ -12,7 +25,9 @@
 # Project information
 metadata-title = Towards Long-term and Archivable Reproducibility
 
-# DOIs and identifiers.
+# DOIs and identifiers (don't include fixed URL prefixes like
+# 'https://doi.org/' or 'https://arxiv.org/abs'), they will be added
+# automatically where necessary.
 metadata-arxiv          = 2006.03018
 metadata-doi-zenodo     = 10.5281/zenodo.4291207
 metadata-doi-journal    = 10.1109/MCSE.2021.3072860