|
1 | 1 | # GSAS-II |
2 | | - |
3 | | -<!-- commented out for now |
4 | | -
|
5 | | -[![Actions Status][actions-badge]][actions-link] |
6 | 2 | [![Documentation Status][rtd-badge]][rtd-link] |
| 3 | +[![Actions Status][actions-badge]][actions-link] |
7 | 4 |
|
| 5 | +<!-- commented out for now |
8 | 6 | [![PyPI version][pypi-version]][pypi-link] |
9 | 7 | [![Conda-Forge][conda-badge]][conda-link] |
10 | 8 | [![PyPI platforms][pypi-platforms]][pypi-link] |
11 | | -
|
12 | 9 | [![GitHub Discussion][github-discussions-badge]][github-discussions-link] |
13 | 10 | --!> |
14 | 11 |
|
@@ -39,22 +36,20 @@ GSAS-II is free open source software. |
39 | 36 |
|
40 | 37 | ## URLs |
41 | 38 | * The |
42 | | - [home page for GSAS-II](https://advancedphotonsource.github.io/GSAS-II-tutorials) |
43 | | - has recently been moved to GitHub, but some content may still be |
44 | | - only at |
45 | | - [the old location](https://subversion.xray.aps.anl.gov/trac/pyGSAS). |
46 | | - Note the new [installation instructions](https://advancedphotonsource.github.io/GSAS-II-tutorials/install.html). |
| 39 | + [home page for GSAS-II](https://advancedphotonsource.github.io/GSAS-II-tutorials) has |
| 40 | + [installation instructions](https://advancedphotonsource.github.io/GSAS-II-tutorials/install.html) and a link |
| 41 | + to [the downloads location](https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/latest). |
| 42 | + (There might be some content only at |
| 43 | + [the home page](https://subversion.xray.aps.anl.gov/trac/pyGSAS), but I hope not.) |
47 | 44 |
|
48 | | -* This repo is the main repository for the GSAS-II source code, but |
49 | | - note that there is a separate repo for the |
50 | | - [GSAS-II installation tools](https://github.com/AdvancedPhotonSource/GSAS-II-buildtools) |
51 | | - and another for |
52 | | - [GSAS-II web content](https://github.com/AdvancedPhotonSource/GSAS-II-tutorials) (including tutorials). The |
| 45 | +* [This repo](https://github.com/AdvancedPhotonSource/GSAS-II) is the main repository for the GSAS-II source code (replacing the |
53 | 46 | [old subversion site](https://subversion.xray.aps.anl.gov/pyGSAS) |
54 | | - and its |
55 | | - [associated web site](https://subversion.xray.aps.anl.gov/trac/pyGSAS/browser) |
56 | | - will be maintained for the immediate future. |
57 | | -* Code documentation: https://gsas-ii.readthedocs.io. |
| 47 | + and the [trac web site](https://subversion.xray.aps.anl.gov/trac/pyGSAS/browser)), but there are two additional repo's associated with GSAS-II |
| 48 | + * [GSAS-II installation tools](https://github.com/AdvancedPhotonSource/GSAS-II-buildtools) that includes [downloads](https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/latest) as well as [automated build/test scripts](https://github.com/AdvancedPhotonSource/GSAS-II/actions) |
| 49 | + and |
| 50 | + * [GSAS-II web content](https://github.com/AdvancedPhotonSource/GSAS-II-tutorials) that includes [tutorials](https://advancedphotonsource.github.io/GSAS-II-tutorials/tutorials.html). |
| 51 | + |
| 52 | +* Code documentation: https://gsas-ii.readthedocs.io and scripting documentation: https://gsas-ii-scripting.readthedocs.io (subset of full documentation) |
58 | 53 |
|
59 | 54 | ## Please Cite |
60 | 55 | If you use GSAS-II in any part of your project, please cite it in your |
@@ -113,7 +108,7 @@ single refinement with subsequent parametric fitting. |
113 | 108 |
|
114 | 109 | GSAS-II is freely distributed as open source software; see the license file for |
115 | 110 | more details. GSAS-II runs on Windows, |
116 | | -MacOS, Linux and Raspberry Pi computers. It currently receives >600 |
| 111 | +MacOS, Linux and Raspberry Pi computers. It currently receives >950 |
117 | 112 | citations/year. |
118 | 113 |
|
119 | 114 | <!-- commented out for now |
|
0 commit comments