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, 10 insertions, 1 deletions

diff --git a/README.md b/README.md
index a12770c..748a791 100644
--- a/README.md
+++ b/README.md
@@ -322,7 +322,11 @@ MB), not the full TeXLive collection!
 
  5. **Configure the project:** With this line, the Docker image will
     configure the project (build all its necessary software). This will
-    usually take about an hour on an 8-core system.
+    usually take about an hour on an 8-core system. You can also optionally
+    avoid putting this step (and the next) in the `Dockerfile` and simply
+    execute them in the Docker image in interactive mode (as explained in
+    the sub-section below, in this case don't forget to preserve the build
+    container after you are done).
 
     ```shell
     # Configure project (build full software environment).
@@ -404,6 +408,11 @@ docker commit XXXXXXX NEW-IMAGE-NAME
 ```
 
 
+
+
+
+
+
 ### Copyright information
 
 This file and `.file-metadata` (a binary file, used by Metastore to store