Skip to content

Commit dcebfa8

Browse files
committed
Synchronized with the source at 6204217.
1 parent 8c7c191 commit dcebfa8

File tree

15 files changed

+51
-22
lines changed

15 files changed

+51
-22
lines changed

_sources/index.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717

18-
DiffPy - Atomic Structure Analysis in Python
18+
DiffPy - Atomic Structure Analysis in Python
1919
============================================
2020
A free and open source software project to provide python software for
2121
diffraction analysis and the study of the atomic structure of materials.
@@ -29,14 +29,14 @@ diffraction analysis and the study of the atomic structure of materials.
2929
.. include:: abbreviations.txt
3030

3131
DiffPy is the home of the |DiffPyCMI|
32-
Complex Modeling framework, a modular software framework for robust and extensible
33-
modeling of diffraction data. We welcome contributions to this project from the
32+
Complex Modeling framework, a modular software framework for robust and extensible
33+
modeling of diffraction data. We welcome contributions to this project from the
3434
community.
3535

36-
The project is currently centered at `Brookhaven National Laboratory`_, a US `Department of
37-
Energy, Office of Basic Energy Sciences`_ funded laboratory.
36+
The project is currently centered at `Brookhaven National Laboratory`_, a US `Department of
37+
Energy, Office of Basic Energy Sciences`_ funded laboratory.
3838
Many parts of the code were developed under the diffraction part of the DANSE_ project,
39-
a software construction project funded by the `National Science Foundation`_ to provide
39+
a software construction project funded by the `National Science Foundation`_ to provide
4040
data analysis software tools for neutron scattering experiments. This project was previously
4141
centered at Columbia University and, before that, Michigan State University.
4242

@@ -56,7 +56,7 @@ centered at Columbia University and, before that, Michigan State University.
5656
:height: 10
5757

5858
.. figure:: logos/BNL_logo.jpg
59-
:align: left
59+
:align: left
6060
:target: `Brookhaven National Laboratory`_
6161

6262
.. figure:: logos/DOE_logo.png
@@ -80,6 +80,6 @@ centered at Columbia University and, before that, Michigan State University.
8080
products/xPDFsuite
8181
products/pdfgui
8282
products/pdfgetx3
83-
products/pythonpackages
83+
products/pythonpackages
8484
products/SrMise
8585
products/mPDF
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.. this page only contains the LICENSE text for SrMise
22

3+
.. title:: SrMise License
4+
35
.. literalinclude:: SrMise_LICENSE.txt
46
:language: text

_sources/products/diffpycmi/index.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ from http://www.continuum.io/downloads.
4848
conda create --name=py27 python=2.7
4949
source activate py27
5050

51-
5251
Once Anaconda is ready, DiffPy-CMI can be installed from the "diffpy"
5352
channel of Anaconda packages as follows ::
5453

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.. this page only contains the LICENSE text for DiffPy-CMI
22

3+
.. title:: DiffPy-CMI License
4+
35
.. literalinclude:: LICENSE.txt
46
:language: text

_sources/products/mPDF.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Installation
4242
The recommended way to install this package is through conda. For help installing conda,
4343
please visit `https://www.continuum.io/downloads <https://www.continuum.io/downloads>`__.
4444
Once conda is installed, you can follow the simple steps below to install diffpy.mpdf.
45-
You will also install the full diffpy-cmi suite along the way.
45+
You will also install the full diffpy-cmi suite along the way.
4646

4747
*Step 1: Add the appropriate conda channels to your conda configuration.* ::
4848

@@ -59,14 +59,14 @@ find the appropriate software.
5959

6060
Note that you can name the environment anything you choose by passing it a different name
6161
after the --name flag in the first command.
62-
62+
6363
*Step 3: Install diffpy.mpdf.* ::
6464

6565
conda install diffpy.mpdf
6666

6767
Note that this will also install the full diffpy-cmi suite if it has not already been
6868
installed in this environment.
69-
69+
7070
*Alternative option: Install from the python package index.*
7171

7272
If you prefer to use the python package index and have pip installed, please install the

_sources/products/mPDFlicense.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.. this page only contains the LICENSE text for mPDF
22

3+
.. title:: mPDF License
4+
35
.. literalinclude:: mPDF_LICENSE.txt
46
:language: text

_sources/products/pdfgui.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ https://www.continuum.io/downloads.
4848

4949
conda create --name=py27 python=2.7
5050
source activate py27
51-
51+
5252
On Windows use just ``activate py27``. Make sure that *py27*
5353
environment is activated in your shell prior to running
5454
the "install" or "update" commands below.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.. this page only contains the LICENSE text for PDFgui
22

3+
.. title:: PDFgui License
4+
35
.. literalinclude:: PDFgui_LICENSE.txt
46
:language: text

_sources/publications.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ Publications using DiffPy-CMI
2424
The following papers made use of DiffPy developed software for analysis
2525
and/or modeling.
2626

27+
* |citeJensenNc16|
28+
29+
* |citeFrandsenPrl16|
30+
31+
* |citeTerbanCgd16|
32+
2733
* |citePrillAca16|
2834

2935
* |citeTerbanNan15|

products/SrMiselicense.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>&lt;no title&gt; &mdash; DiffPy documentation</title>
9+
<title>SrMise License &mdash; DiffPy documentation</title>
1010

1111
<link rel="stylesheet" href="../_static/basic.css" type="text/css" />
1212
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />

0 commit comments

Comments
 (0)