Skip to content

Commit aacfab9

Browse files
github-actions[bot]github-actions[bot]
committed
update help files
1 parent 00f5593 commit aacfab9

File tree

4 files changed

+79
-46
lines changed

4 files changed

+79
-46
lines changed

‎GSASII/help/anchorIndex.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ datatree.html: DataTreeOverview
55
image.html: IMG, IMG_parent, IMG_Comments, IMG_Image_Controls, IMG_Masks, makemask, IMG_StressStrain, IMG_Stress/Strain
66
index.html: HelpIntro, Index
77
mainmenu.html: main_menu, File_menu, openproject, Data_menu, Calculate_menu, ParmLogging, Import_menu, FPA_menuitem, Export_menu, Help_menu, Help_addpkgs
8-
others.html: Mac, MacOS, config, Preferences, RTFM, Origin_1, _Origin_1, Origin1, FPA, FPAinput, CorrectionCode
8+
others.html: Mac, MacOS, Windows, config, Preferences, RTFM, Origin_1, _Origin_1, Origin1, FPA, FPAinput, CorrectionCode
99
pairdistribution.html: PDF, PDF_Controls, PDF_I_Q, PDF_S_Q, PDF_F_Q, PDF_G_R
1010
peaks.html: PKS, PKS_Comments, PKS_Limits, PKS_Instrument_Parameters, PKS_Index_Peak_List, PKS_Unit_Cells_List
1111
phaseRB.html: Phase-RB_Models

‎GSASII/help/others.html‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1528,6 +1528,17 @@
15281528
</span>
15291529
</a>
15301530

1531+
</li>
1532+
1533+
<li class="md-nav__item">
1534+
<a href="#windows-notes" class="md-nav__link">
1535+
<span class="md-ellipsis">
1536+
1537+
Windows notes:
1538+
1539+
</span>
1540+
</a>
1541+
15311542
</li>
15321543

15331544
<li class="md-nav__item">
@@ -1706,6 +1717,17 @@
17061717
</span>
17071718
</a>
17081719

1720+
</li>
1721+
1722+
<li class="md-nav__item">
1723+
<a href="#windows-notes" class="md-nav__link">
1724+
<span class="md-ellipsis">
1725+
1726+
Windows notes:
1727+
1728+
</span>
1729+
</a>
1730+
17091731
</li>
17101732

17111733
<li class="md-nav__item">
@@ -1863,9 +1885,20 @@ <h1 id="miscellaneous-information">Miscellaneous information</h1>
18631885
<p><a name="Mac"></a>
18641886
<a name="MacOS"></a></p>
18651887
<h2 id="macintosh-notes">Macintosh notes:</h2>
1866-
<p>GSAS-II can be run on Windows, Linux and Macintosh/OS X computers, but the GUI follows the native style of Mac OS X. On Windows and some versions of Linux, the menu bars appears on top of the main window. On the Mac, the menu appears at the location that has been configured for menus (usually at the top of the screen).
1867-
At present, two versions of GSAS-II are provided. One is for older, Intel CPUs and the other for "Apple Silicon" (ARM or M1, M2,...) CPUs. Eventually only ye ARM CPUs will be supported. At present, the Intel version will run on ARM machines under Rosetta, but eventually that too will go away. </p>
1868-
<p>GSAS-II defines actions for both the left and right and middle buttons assuming that a three-button mouse is available. If a two or three-button mouse is used with a Mac, the "extra" mouse buttons will work as intended. If using a Mac touchpad or single-button mouse, clicking the touchpad or mouse button will generate a "left button" click. Hold down the control-key to generate a "right button" click or for a right-button drag, hold down control while pressing on the mouse button or touchpad. I do not know how to generate a middle-button click or drag with a single-button mouse, but with a MacBook touchpad, pressing with two fingers generates the equivalent of a right-mouse drag and moving two fingers without pressure is the equivalent of a middle-button drag action. </p>
1888+
<p>GSAS-II can be run on Windows, Linux and Macintosh/OS X computers, but the GUI follows the native style of the window manager where it is run, so GSAS-II will look more like a Mac application on that platform and more like a Windows application there. On Windows and some versions of Linux, the menu bars appears on top of the main window. On the Mac, the menu appears at the location that has been configured for menus (usually at the top of the screen).
1889+
At present, two versions of GSAS-II are provided. One is for older, Intel CPUs and the other for "Apple Silicon" (ARM or M1, M2,...) CPUs. Eventually only ARM CPUs will be supported. At present, the Intel version will run on ARM machines under Rosetta, but eventually Rosetta will also go away. </p>
1890+
<p>GSAS-II defines actions for both the left and right and middle buttons assuming that a three-button mouse is available. If a two or three-button mouse is used with a Mac, the "extra" mouse buttons will work as intended. If using a Mac touchpad or single-button mouse, clicking the touchpad or pressing the mouse button will generate a "left button" click. Hold down the control-key to generate a "right button" click or for a right-button drag, hold down control while pressing on the mouse button or touchpad. I do not know how to generate a middle-button click or drag with a single-button mouse, but with a MacBook touchpad, pressing with two fingers generates the equivalent of a right-mouse drag and moving two fingers without pressure is the equivalent of a middle-button drag action. </p>
1891+
<p><a name="Windows"></a></p>
1892+
<h2 id="windows-notes">Windows notes:</h2>
1893+
<p>When GSAS-II is installed through most of the conventional installation methods, the <code>GSASII\install\MakeBat.py</code> file is run and this creates two "Windows .bat" files that can be used to make running GSAS-II easier as well as making some minor Windows registry changes. This script can be run manually by people who are installing GSAS-II directly from GitHub. </p>
1894+
<p>The <code>MakeBat.py</code> script creates a file named <code>RunGSASII.bat</code> file, which is placed in the directory where GSAS-II is installed and a shortcut to this file is placed on the Windows desktop. The shortcut can be moved, renamed etc. Clicking on this file or shortcut will start GSAS-II. </p>
1895+
<p>Another file, <code>2Reset2FreshGSASII.bat</code> is created in the same directory.
1896+
Ideally, this will not be needed, but might be of use if GSAS-II cannot be started due
1897+
to changes made in the files locally or because we have put out a bad version.
1898+
By double-clicking on the <code>2Reset2FreshGSASII.bat</code> file, the <code>gitstrap.py</code>
1899+
script that is used to install GSAS-II will be updated to the latest version and then
1900+
run that in a mode that will reset any changes that have been made to the GSAS-II
1901+
files on your computer. It will also rerun the <code>MakeBat.py</code> script.</p>
18691902
<p><a name="config"></a>
18701903
<a name="Preferences"></a></p>
18711904
<h2 id="configuration-variables">Configuration Variables:</h2>

‎GSASII/help/sitemap.xml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,253 +2,253 @@
22
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
33
<url>
44
<loc>index.html</loc>
5-
<lastmod>2026-01-28</lastmod>
5+
<lastmod>2026-01-29</lastmod>
66
<changefreq>daily</changefreq>
77
<xhtml:link rel="alternate" hreflang="en" href="index.html"/>
88
</url>
99
<url>
1010
<loc>applicationwindow.html</loc>
11-
<lastmod>2026-01-28</lastmod>
11+
<lastmod>2026-01-29</lastmod>
1212
<changefreq>daily</changefreq>
1313
<xhtml:link rel="alternate" hreflang="en" href="applicationwindow.html"/>
1414
</url>
1515
<url>
1616
<loc>cluster.html</loc>
17-
<lastmod>2026-01-28</lastmod>
17+
<lastmod>2026-01-29</lastmod>
1818
<changefreq>daily</changefreq>
1919
<xhtml:link rel="alternate" hreflang="en" href="cluster.html"/>
2020
</url>
2121
<url>
2222
<loc>commontreeitems.html</loc>
23-
<lastmod>2026-01-28</lastmod>
23+
<lastmod>2026-01-29</lastmod>
2424
<changefreq>daily</changefreq>
2525
<xhtml:link rel="alternate" hreflang="en" href="commontreeitems.html"/>
2626
</url>
2727
<url>
2828
<loc>datatree.html</loc>
29-
<lastmod>2026-01-28</lastmod>
29+
<lastmod>2026-01-29</lastmod>
3030
<changefreq>daily</changefreq>
3131
<xhtml:link rel="alternate" hreflang="en" href="datatree.html"/>
3232
</url>
3333
<url>
3434
<loc>image.html</loc>
35-
<lastmod>2026-01-28</lastmod>
35+
<lastmod>2026-01-29</lastmod>
3636
<changefreq>daily</changefreq>
3737
<xhtml:link rel="alternate" hreflang="en" href="image.html"/>
3838
</url>
3939
<url>
4040
<loc>mainmenu.html</loc>
41-
<lastmod>2026-01-28</lastmod>
41+
<lastmod>2026-01-29</lastmod>
4242
<changefreq>daily</changefreq>
4343
<xhtml:link rel="alternate" hreflang="en" href="mainmenu.html"/>
4444
</url>
4545
<url>
4646
<loc>others.html</loc>
47-
<lastmod>2026-01-28</lastmod>
47+
<lastmod>2026-01-29</lastmod>
4848
<changefreq>daily</changefreq>
4949
<xhtml:link rel="alternate" hreflang="en" href="others.html"/>
5050
</url>
5151
<url>
5252
<loc>pairdistribution.html</loc>
53-
<lastmod>2026-01-28</lastmod>
53+
<lastmod>2026-01-29</lastmod>
5454
<changefreq>daily</changefreq>
5555
<xhtml:link rel="alternate" hreflang="en" href="pairdistribution.html"/>
5656
</url>
5757
<url>
5858
<loc>peaks.html</loc>
59-
<lastmod>2026-01-28</lastmod>
59+
<lastmod>2026-01-29</lastmod>
6060
<changefreq>daily</changefreq>
6161
<xhtml:link rel="alternate" hreflang="en" href="peaks.html"/>
6262
</url>
6363
<url>
6464
<loc>phaseRB.html</loc>
65-
<lastmod>2026-01-28</lastmod>
65+
<lastmod>2026-01-29</lastmod>
6666
<changefreq>daily</changefreq>
6767
<xhtml:link rel="alternate" hreflang="en" href="phaseRB.html"/>
6868
</url>
6969
<url>
7070
<loc>phaseRMC.html</loc>
71-
<lastmod>2026-01-28</lastmod>
71+
<lastmod>2026-01-29</lastmod>
7272
<changefreq>daily</changefreq>
7373
<xhtml:link rel="alternate" hreflang="en" href="phaseRMC.html"/>
7474
</url>
7575
<url>
7676
<loc>phaseatoms.html</loc>
77-
<lastmod>2026-01-28</lastmod>
77+
<lastmod>2026-01-29</lastmod>
7878
<changefreq>daily</changefreq>
7979
<xhtml:link rel="alternate" hreflang="en" href="phaseatoms.html"/>
8080
</url>
8181
<url>
8282
<loc>phasedata.html</loc>
83-
<lastmod>2026-01-28</lastmod>
83+
<lastmod>2026-01-29</lastmod>
8484
<changefreq>daily</changefreq>
8585
<xhtml:link rel="alternate" hreflang="en" href="phasedata.html"/>
8686
</url>
8787
<url>
8888
<loc>phasedrawatoms.html</loc>
89-
<lastmod>2026-01-28</lastmod>
89+
<lastmod>2026-01-29</lastmod>
9090
<changefreq>daily</changefreq>
9191
<xhtml:link rel="alternate" hreflang="en" href="phasedrawatoms.html"/>
9292
</url>
9393
<url>
9494
<loc>phasedrawopts.html</loc>
95-
<lastmod>2026-01-28</lastmod>
95+
<lastmod>2026-01-29</lastmod>
9696
<changefreq>daily</changefreq>
9797
<xhtml:link rel="alternate" hreflang="en" href="phasedrawopts.html"/>
9898
</url>
9999
<url>
100100
<loc>phasedysnomia.html</loc>
101-
<lastmod>2026-01-28</lastmod>
101+
<lastmod>2026-01-29</lastmod>
102102
<changefreq>daily</changefreq>
103103
<xhtml:link rel="alternate" hreflang="en" href="phasedysnomia.html"/>
104104
</url>
105105
<url>
106106
<loc>phasegeneral.html</loc>
107-
<lastmod>2026-01-28</lastmod>
107+
<lastmod>2026-01-29</lastmod>
108108
<changefreq>daily</changefreq>
109109
<xhtml:link rel="alternate" hreflang="en" href="phasegeneral.html"/>
110110
</url>
111111
<url>
112112
<loc>phaseisodistort.html</loc>
113-
<lastmod>2026-01-28</lastmod>
113+
<lastmod>2026-01-29</lastmod>
114114
<changefreq>daily</changefreq>
115115
<xhtml:link rel="alternate" hreflang="en" href="phaseisodistort.html"/>
116116
</url>
117117
<url>
118118
<loc>phaselayers.html</loc>
119-
<lastmod>2026-01-28</lastmod>
119+
<lastmod>2026-01-29</lastmod>
120120
<changefreq>daily</changefreq>
121121
<xhtml:link rel="alternate" hreflang="en" href="phaselayers.html"/>
122122
</url>
123123
<url>
124124
<loc>phasemappeaks.html</loc>
125-
<lastmod>2026-01-28</lastmod>
125+
<lastmod>2026-01-29</lastmod>
126126
<changefreq>daily</changefreq>
127127
<xhtml:link rel="alternate" hreflang="en" href="phasemappeaks.html"/>
128128
</url>
129129
<url>
130130
<loc>phasemcsa.html</loc>
131-
<lastmod>2026-01-28</lastmod>
131+
<lastmod>2026-01-29</lastmod>
132132
<changefreq>daily</changefreq>
133133
<xhtml:link rel="alternate" hreflang="en" href="phasemcsa.html"/>
134134
</url>
135135
<url>
136136
<loc>phaseoverview.html</loc>
137-
<lastmod>2026-01-28</lastmod>
137+
<lastmod>2026-01-29</lastmod>
138138
<changefreq>daily</changefreq>
139139
<xhtml:link rel="alternate" hreflang="en" href="phaseoverview.html"/>
140140
</url>
141141
<url>
142142
<loc>phasepawley.html</loc>
143-
<lastmod>2026-01-28</lastmod>
143+
<lastmod>2026-01-29</lastmod>
144144
<changefreq>daily</changefreq>
145145
<xhtml:link rel="alternate" hreflang="en" href="phasepawley.html"/>
146146
</url>
147147
<url>
148148
<loc>phasetexture.html</loc>
149-
<lastmod>2026-01-28</lastmod>
149+
<lastmod>2026-01-29</lastmod>
150150
<changefreq>daily</changefreq>
151151
<xhtml:link rel="alternate" hreflang="en" href="phasetexture.html"/>
152152
</url>
153153
<url>
154154
<loc>phasewave.html</loc>
155-
<lastmod>2026-01-28</lastmod>
155+
<lastmod>2026-01-29</lastmod>
156156
<changefreq>daily</changefreq>
157157
<xhtml:link rel="alternate" hreflang="en" href="phasewave.html"/>
158158
</url>
159159
<url>
160160
<loc>powder.html</loc>
161-
<lastmod>2026-01-28</lastmod>
161+
<lastmod>2026-01-29</lastmod>
162162
<changefreq>daily</changefreq>
163163
<xhtml:link rel="alternate" hreflang="en" href="powder.html"/>
164164
</url>
165165
<url>
166166
<loc>powderbkg.html</loc>
167-
<lastmod>2026-01-28</lastmod>
167+
<lastmod>2026-01-29</lastmod>
168168
<changefreq>daily</changefreq>
169169
<xhtml:link rel="alternate" hreflang="en" href="powderbkg.html"/>
170170
</url>
171171
<url>
172172
<loc>powdercells.html</loc>
173-
<lastmod>2026-01-28</lastmod>
173+
<lastmod>2026-01-29</lastmod>
174174
<changefreq>daily</changefreq>
175175
<xhtml:link rel="alternate" hreflang="en" href="powdercells.html"/>
176176
</url>
177177
<url>
178178
<loc>powdercomments.html</loc>
179-
<lastmod>2026-01-28</lastmod>
179+
<lastmod>2026-01-29</lastmod>
180180
<changefreq>daily</changefreq>
181181
<xhtml:link rel="alternate" hreflang="en" href="powdercomments.html"/>
182182
</url>
183183
<url>
184184
<loc>powderindexppeaks.html</loc>
185-
<lastmod>2026-01-28</lastmod>
185+
<lastmod>2026-01-29</lastmod>
186186
<changefreq>daily</changefreq>
187187
<xhtml:link rel="alternate" hreflang="en" href="powderindexppeaks.html"/>
188188
</url>
189189
<url>
190190
<loc>powderinst.html</loc>
191-
<lastmod>2026-01-28</lastmod>
191+
<lastmod>2026-01-29</lastmod>
192192
<changefreq>daily</changefreq>
193193
<xhtml:link rel="alternate" hreflang="en" href="powderinst.html"/>
194194
</url>
195195
<url>
196196
<loc>powderlimits.html</loc>
197-
<lastmod>2026-01-28</lastmod>
197+
<lastmod>2026-01-29</lastmod>
198198
<changefreq>daily</changefreq>
199199
<xhtml:link rel="alternate" hreflang="en" href="powderlimits.html"/>
200200
</url>
201201
<url>
202202
<loc>powderparent.html</loc>
203-
<lastmod>2026-01-28</lastmod>
203+
<lastmod>2026-01-29</lastmod>
204204
<changefreq>daily</changefreq>
205205
<xhtml:link rel="alternate" hreflang="en" href="powderparent.html"/>
206206
</url>
207207
<url>
208208
<loc>powderpeaks.html</loc>
209-
<lastmod>2026-01-28</lastmod>
209+
<lastmod>2026-01-29</lastmod>
210210
<changefreq>daily</changefreq>
211211
<xhtml:link rel="alternate" hreflang="en" href="powderpeaks.html"/>
212212
</url>
213213
<url>
214214
<loc>powderrefs.html</loc>
215-
<lastmod>2026-01-28</lastmod>
215+
<lastmod>2026-01-29</lastmod>
216216
<changefreq>daily</changefreq>
217217
<xhtml:link rel="alternate" hreflang="en" href="powderrefs.html"/>
218218
</url>
219219
<url>
220220
<loc>powdersample.html</loc>
221-
<lastmod>2026-01-28</lastmod>
221+
<lastmod>2026-01-29</lastmod>
222222
<changefreq>daily</changefreq>
223223
<xhtml:link rel="alternate" hreflang="en" href="powdersample.html"/>
224224
</url>
225225
<url>
226226
<loc>preface.html</loc>
227-
<lastmod>2026-01-28</lastmod>
227+
<lastmod>2026-01-29</lastmod>
228228
<changefreq>daily</changefreq>
229229
<xhtml:link rel="alternate" hreflang="en" href="preface.html"/>
230230
</url>
231231
<url>
232232
<loc>reflectometry.html</loc>
233-
<lastmod>2026-01-28</lastmod>
233+
<lastmod>2026-01-29</lastmod>
234234
<changefreq>daily</changefreq>
235235
<xhtml:link rel="alternate" hreflang="en" href="reflectometry.html"/>
236236
</url>
237237
<url>
238238
<loc>sequential.html</loc>
239-
<lastmod>2026-01-28</lastmod>
239+
<lastmod>2026-01-29</lastmod>
240240
<changefreq>daily</changefreq>
241241
<xhtml:link rel="alternate" hreflang="en" href="sequential.html"/>
242242
</url>
243243
<url>
244244
<loc>singlecrystal.html</loc>
245-
<lastmod>2026-01-28</lastmod>
245+
<lastmod>2026-01-29</lastmod>
246246
<changefreq>daily</changefreq>
247247
<xhtml:link rel="alternate" hreflang="en" href="singlecrystal.html"/>
248248
</url>
249249
<url>
250250
<loc>smallanglescattering.html</loc>
251-
<lastmod>2026-01-28</lastmod>
251+
<lastmod>2026-01-29</lastmod>
252252
<changefreq>daily</changefreq>
253253
<xhtml:link rel="alternate" hreflang="en" href="smallanglescattering.html"/>
254254
</url>

‎GSASII/help/sitemap.xml.gz‎

-1 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)