From 2b401b4175d86fad5943e13a661da38067f05be4 Mon Sep 17 00:00:00 2001
From: BHT <toby@anl.gov>
Date: Thu, 16 Jan 2025 17:27:43 -0600
Subject: [PATCH] fix mailinglist comments; clean up workflow

---
 scripts/addNewTutorial.sh  |  6 ++++++
 scripts/makeGitTutorial.py |  4 +++-
 webdocs/mailinglist.rst    | 21 ++++++++++++++-------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/scripts/addNewTutorial.sh b/scripts/addNewTutorial.sh
index b472efd..6a09756 100644
--- a/scripts/addNewTutorial.sh
+++ b/scripts/addNewTutorial.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
+###########################
+# this script is obsolete #
+# these actions are done  #
+# in GitHub workflow      #
+###########################
+#
 # to add a new tutorial
 # 1) create new directory in .../GSASII-tutorials
 # 2) add .html file, data/ directory
diff --git a/scripts/makeGitTutorial.py b/scripts/makeGitTutorial.py
index 539d61c..208fc75 100644
--- a/scripts/makeGitTutorial.py
+++ b/scripts/makeGitTutorial.py
@@ -182,7 +182,7 @@ def makeDataIndex(datadir,title):
 </body>
 ''',file=out)
     out.close()
-    print(f"\nTutorials without videos {novideo}")
+    print(f"\nTutorials without videos {novideo}\n")
 
     for l in G2G.tutorialIndex:
         if len(l) != 1:
@@ -192,6 +192,8 @@ def makeDataIndex(datadir,title):
     # loop through directories in Tutorials repository
     for tutdir in glob.glob(os.path.join(TutorialsDir,'*')):
         if not os.path.isdir(tutdir): continue
+        if tutdir in ['scripts','docs','webdocs','MDtutorials']:
+            continue
         d = os.path.split(tutdir)[1]
         if d not in dirList: print(u"Tutorial directory not in GSASIIctrlGUI.tutorialIndex: "+d)
     print(f"\nStatistics: {tutorialcount} total tutorials, {videocount} with videos")
diff --git a/webdocs/mailinglist.rst b/webdocs/mailinglist.rst
index 6d55499..3f30a2c 100644
--- a/webdocs/mailinglist.rst
+++ b/webdocs/mailinglist.rst
@@ -9,16 +9,23 @@ Mailing List
 
 We provide a mailing list for GSAS-II users to ask questions and more
 importantly, **so that we can reach users with news about
-GSAS-II** and for discussion questions. Please do subscribe.
+GSAS-II**. Please do subscribe.
 The level of traffic on this list is
 pretty low (typically 30-60 e-mails/year); Bob and I usually reply to
 directly to senders, unless the
-answer will be valuable to many people. There is an `archive of the
-list here <https://mailman.aps.anl.gov/pipermail/gsas-ii/>`_ while until
-2018 `this site
-<http://www.mail-archive.com/gsas-ii@mailman.aps.anl.gov/>`_  (which
-is searchable) also
-archived the mailing list. We will try to get that restarted. 
+answer will be valuable to many people. There is a searchable
+`mailing list archive <https://mail-archive.com/gsas-ii@aps.anl.gov/>`_ (messages
+prior to 2018 are
+`here <http://www.mail-archive.com/gsas-ii@mailman.aps.anl.gov/>`_. 
+There is also `an archive by the APS here
+<https://mailman.aps.anl.gov/pipermail/gsas-ii/>`_, which allows mass
+downloading of messages, but not searching.
+
+`Bug reports <bug.html>`_ can be posted on this list, but we would greatly prefer
+them posted on the
+`GitHub Issues Tracker
+<https://github.com/AdvancedPhotonSource/GSAS-II/issues>`_, but please 
+`see notes on bug reporting <bug.html>`_ before posting.
 
 .. index:: Subscribe to mailing list