update install web pages (admin & command-line)

Author: briantoby

webdocs/install-g2f-linux.rst

@@ -64,3 +64,17 @@ there the meson instructions.
 
    Clicking on the icon will open GSAS-II. Likewise a GSAS-II project (.gpx) file can be dragged onto the icon to open that file in GSAS-II.
 
+
+Command-line options
+----------------------
+
+The bash installation command above uses two options:
+
+* `-b` for batch mode, so that no questions are asked and
+* `-p <path>` which specifies where GSAS-II will be installed.
+
+One other option is available:
+
+* `-f` for force, which will cause the GSAS-II installation to proceed
+  even when there are files in the installation location. This should
+  only be used to reinstall GSAS-II if needed. 

webdocs/install-g2f-mac.rst

@@ -108,3 +108,16 @@ MacOS: Detailed GSAS2MAIN Installation Instructions
 
 Note: When the icon is first used, you will likely see one or more Mac security warnings asking you to confirm that you do want to give GSAS-II access to components in your computer, as shown to the right. GSAS-II will not run properly unless you press "Allow". Each warning should only be shown once. 
 
+Command-line options
+----------------------
+
+The bash installation command above uses two options:
+
+* `-b` for batch mode, so that no questions are asked and
+* `-p <path>` which specifies where GSAS-II will be installed.
+
+One other option is available:
+
+* `-f` for force, which will cause the GSAS-II installation to proceed
+  even when there are files in the installation location. This should
+  only be used to reinstall GSAS-II if needed. 

webdocs/install-g2f-win.rst

@@ -30,7 +30,10 @@ Windows: Detailed GSAS2MAIN Installation Instructions
 
 	    <div class="clear"></div>
 
-#. I needed to then rename the file to end in .exe (the rest of the name is not important) so that I could run it. Double-clicking on the file causes the window to the right to be displayed briefly and then the window below it opens.
+#. I needed to then rename the file to end in .exe (the rest of the
+   name is not important) so that I could run it. Double-clicking on
+   the file causes the window to the right to be displayed briefly and
+   then the window below it opens. 
 
    .. image:: ./win_inst_images/3a.png
       :scale: 40 %
@@ -52,7 +55,10 @@ Windows: Detailed GSAS2MAIN Installation Instructions
 
 	    <div class="clear"></div>
 
-#. Click on next to start the installation process. You will be shown information on the installation process and software licensing. Please review it. You must click on "I Agree" to continue.
+#. Click on next to start the installation process. You will be shown
+   information on the installation process and software
+   licensing. Please review it. You must click on "I Agree" to
+   continue. 
 
    .. image:: ./win_inst_images/3.png
       :scale: 25 %
@@ -63,7 +69,8 @@ Windows: Detailed GSAS2MAIN Installation Instructions
 
 	    <div class="clear"></div>
 
-#. Select "Just Me" for the installation type. It is not clear if "All Users" will even work for  computers shared between multiple users. 
+#. Select "Just Me" for the installation type. It is not clear if "All
+   Users" will even work for  computers shared between multiple users.  
 
    .. image:: ./win_inst_images/4.png
       :scale: 25 %
@@ -74,7 +81,10 @@ Windows: Detailed GSAS2MAIN Installation Instructions
 
 	    <div class="clear"></div>
 
-#. The default installation folder is usually fine, but I often prefer to change this to ``C:\G2`` or something short. Some compters have been set so you must place the GSAS-II files within your account, however.
+#. The default installation folder is usually fine, but I often prefer
+   to change this to ``C:\G2`` or something short. Some computers have
+   been set so you must place the GSAS-II files within your account,
+   however. 
 
    .. image:: ./win_inst_images/5.png
       :scale: 25 %
@@ -85,7 +95,10 @@ Windows: Detailed GSAS2MAIN Installation Instructions
 
 	    <div class="clear"></div>
 
-#. For the "Advanced Install Options", I recommend unselecting the first option, leaving the first three options unchecked. Note that the start menu choice offered in the first option creates shortcuts for starting Python, not GSAS-II.
+#. For the "Advanced Install Options", I recommend unselecting the
+   first option, leaving the first three options unchecked. Note that
+   the start menu choice offered in the first option creates shortcuts
+   for starting Python, not GSAS-II. 
 
    .. image:: ./win_inst_images/6.png
       :scale: 25 %
@@ -96,7 +109,10 @@ Windows: Detailed GSAS2MAIN Installation Instructions
 
 	    <div class="clear"></div>
 
-   Installation then starts and may take at least a few minutes to complete, depending on computer speed and in one section, internet speed (as GSAS-II is updated). You may see a cmd.exe screen briefly as some GSAS-II Python commands are executed. 
+   Installation then starts and may take at least a few minutes to
+   complete, depending on computer speed and in one section, internet
+   speed (as GSAS-II is updated). You may see a cmd.exe screen briefly
+   as some GSAS-II Python commands are executed.  
 
     .. image:: ./win_inst_images/7.png
        :scale: 25 %
@@ -118,7 +134,7 @@ Windows: Detailed GSAS2MAIN Installation Instructions
 
 	 <div class="clear"></div>
 
-	 Clicking on "Next" causes the window below it to open. Press "Finish" there. 
+    Clicking on "Next" causes the window below it to open. Press "Finish" there. 
     The GSAS-II installation is now complete. If the computer has internet access, 
     then GSAS-II should have been updated to the most recent version. If not, no warning 
     message is displayed, but GSAS-II can still be updated later, when internet access is 
@@ -157,26 +173,55 @@ If GSAS-II has already been installed in a separate location, the icon will be n
 
 	 <div class="clear"></div>
 
+Installing as admin
+---------------------------------------------------------------
+
+It is not necessary to install GSAS-II from an admin account. As long
+as the user has write access to the location where the files will be
+written, it should be possible to install GSAS-II from an ordinary
+user account and this is what we recommend. 
+
+Some users or system managers might prefer to install GSAS-II from an
+admin account, so they can write the files to an area of their disk
+where a normal user account my not have access or to prevent
+accidental modification of GSAS-II files. This strategy will usually
+work fine and does have some good reasoning behind it, but this choice
+will require that some options that require
+changing installed files, such as updating GSAS-II, installation of a
+GSASIIscriptable shortcut, or installing optional Python packages will
+fail unless run from the admin account as well. 
+
 
-Notes on GSAS2MAIN Installation for Windows
+GSAS2MAIN installation for servers/classrooms
 ---------------------------------------------------------------
 
-If you want to install on multiple Windows computerss, you can install GSAS-II
+If you want to install on multiple Windows computers, you can install GSAS-II
 into shared directory or a file server, but the path where the
-software is installed is recorded in the files that are
+software is installed is recorded in files that are
 installed. This means that the path used to access GSAS-II
 should be the same on all systems
 where GSAS-II will be used. Likewise, it is possible to install GSAS-II
-on one computer and then copy the directory contents where GSAS-II has been
+on one computer and then copy the directory contents from where GSAS-II has been
 installed to other computers, but again the full path for installation
 should be the same on all computers. E.g., if GSAS-II is installed
 in ``C:\software\GSASII`` it can be copied to a directory with the
 same name on other computers and used from that location, but not to 
 ``E:\software\GSASII`` or ``C:\Users\someone\GSASII``. A supplied
-script (`...\GSASII\installl\makeBat.py`) can be run to register the
+script (`...\GSASII\install\makeBat.py`) can be run to register the
 `.gpx` extension so that clicking on a GSAS-II project will open it in GSAS-II. 
 
+
+Command-line options
+----------------------
+
 It should be possible to run the GSAS-II self-installer in NSIS "silent
 mode," which would allow it to be run inside a script, but that does
 not seem to work and I am not sure why. Ref: 
 https://github.com/conda/constructor/blob/main/CONSTRUCT.md#installer_type
+
+Potentially useful commands would be:
+
+* `/S` for "silent" (batch) mode, so that no questions are asked and
+* `/D=<path>` which specifies the location where GSAS-II will be
+  installed (`/D=E:\software\GSASII`)
+* `/?` displays the available options. 

webdocs/install.rst

@@ -38,11 +38,13 @@ GSAS2MAIN installer for Windows
 ==================================
 
 For Windows download file https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/gsas2main-Latest-Windows-x86_64.exe and run it.
-After the installer is started 
-You will have a choice for where to install the software (the default is usually OK, but something like ``c:\software`` might be better, if your computer security allows that.)
+After the installer is started, you will have a choice for where to
+install the software (the default is usually OK, but something like
+``c:\software`` might be better, if your computer security allows that.)
 
 You do not need to have administrator access to your computer to
-install GSAS-II, but apparently the newest windows security makes it
+install GSAS-II, and installing from an admin account is not
+recommended, but apparently the newest windows security makes it
 hard to install software that is not registered with Microsoft: I am
 told you have to first right click, go to Properties, and check the “Unblock” box.