Skip to content

Commit 140c050

Browse files
committed
move diffpy-cmi to diffpy.cmi
1 parent e532e6b commit 140c050

File tree

26 files changed

+68
-68
lines changed

26 files changed

+68
-68
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Sphinx sources for the [diffpy.org][site] web page.
99
- [Where to Make Changes](#where-to-make-changes)
1010
- [Adding Citations](#adding-citations)
1111
- [Adding Publications that Describe a DiffPy Project (the "Reference" Section)](#reference-section-1)
12-
- [Adding Other Publications (the "Publication Using DiffPy-CMI" Section)](#reference-section-2)
12+
- [Adding Other Publications (the "Publication Using DiffPy.CMI" Section)](#reference-section-2)
1313
- [New Version of Existing Project](#new-version)
1414
- [New Project](#publishing-new-project)
1515
- [Publishing Changes](#publishing-changes)
@@ -107,8 +107,8 @@ you add the reference to the proper section and do so in descending reverse chro
107107
(i.e., the newest citations should appear at the top of their respective sections).
108108

109109
<a name="reference-section-note">*Note:*</a> In this example, the citation is for a publication
110-
which describes a product of the DiffPy-CMI project (namely, PDFgetN3). For publications which
111-
describe a component of DiffPy-CMI, we provide a link to download the publication directly from
110+
which describes a product of the DiffPy.CMI project (namely, PDFgetN3). For publications which
111+
describe a component of DiffPy.CMI, we provide a link to download the publication directly from
112112
the [diffpy.org][site] website. Here, the link is provided via the `|downloadJuhasJac18|` tag
113113
which is the identifier for another snippet within [abbreviations.txt](https://github.com/diffpy/diffpy.github.io/blob/source/abbreviations.txt#L294) following the definition
114114
of `|citeJuhasJac18|`, seen here as:
@@ -130,10 +130,10 @@ placed within `pdfgetx`'s documentation directory and referenced accordingly wit
130130

131131

132132
<a name="reference-section-2"></a>
133-
### Adding Other Publications (the "Publication Using DiffPy-CMI" Section)
133+
### Adding Other Publications (the "Publication Using DiffPy.CMI" Section)
134134

135-
Adding references to publications that do not describe the release/use of a product within the DiffPy-CMI
136-
project (e.g., papers which use some component of DiffPy-CMI), we simply provide the usual citation text (with
135+
Adding references to publications that do not describe the release/use of a product within the DiffPy.CMI
136+
project (e.g., papers which use some component of DiffPy.CMI), we simply provide the usual citation text (with
137137
appropriate DOI link). To add a citation of this type, refer to the information in [Reference Section](#reference-section-1), but
138138
disregard everything starting at, and following, the [Note](#reference-section-note).
139139

_templates/menu01.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ul class="dropdown-menu menu01"
88
role="menu"
99
aria-labelledby="dLabelMenu01">
10-
<li><a href="{{pathto('products/diffpycmi/index')}}">DiffPy-CMI</a></li>
10+
<li><a href="{{pathto('products/diffpycmi/index')}}">DiffPy.CMI</a></li>
1111
<li><a href="{{pathto('products/xPDFsuite')}}">xPDFsuite</a></li>
1212
<li><a href="{{pathto('products/pdfgetx')}}">PDFgetX3, PDFgetN3 and PDFgetS3</a></li>
1313
<li><a href="{{pathto('products/pdfgui')}}">PDFgui</a></li>

abbreviations.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767

6868
.. |DiffPyCMI| replace::
69-
:doc:`DiffPy-CMI </products/diffpycmi/index>`
69+
:doc:`DiffPy.CMI </products/diffpycmi/index>`
7070

7171
.. |citeShiPRL14| replace:: Chenyang Shi, Majid Beidaghi, Michael
7272
Naguib, Olha Mashtalir, Yury Gogotsi, and Simon J. L. Billinge,

products/diffpycmi/LICENSE.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ Copyright (c) 2014-2019, Brookhaven Science Associates, Brookhaven National
1414
Laboratory
1515

1616

17-
The "DiffPy-CMI" is distributed subject to the following license conditions:
17+
The "DiffPy.CMI" is distributed subject to the following license conditions:
1818

1919

2020
SOFTWARE LICENSE AGREEMENT
2121

22-
Software: DiffPy-CMI
22+
Software: DiffPy.CMI
2323

2424

25-
(1) The "Software", below, refers to the aforementioned DiffPy-CMI (in either
25+
(1) The "Software", below, refers to the aforementioned DiffPy.CMI (in either
2626
source code, or binary form and accompanying documentation).
2727

2828
Part of the software was derived from the DANSE, ObjCryst++ (with permission),

products/diffpycmi/cmi_exchange.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ CMI Exchange
22
=============
33

44
The `CMI Exchange`_ is a collection of community developed scripts,
5-
functions, and IPython plugins that make use of the DiffPy-CMI
6-
framework. If you are new to DiffPy-CMI it is a great place to get
7-
started. If you've been working with DiffPy-CMI for a while and feel
5+
functions, and IPython plugins that make use of the DiffPy.CMI
6+
framework. If you are new to DiffPy.CMI it is a great place to get
7+
started. If you've been working with DiffPy.CMI for a while and feel
88
that others would benefit from seeing your code please contribute!
99

1010
.. _cmi exchange: https://github.com/diffpy/cmi_exchange#cmi-exchange

products/diffpycmi/contents.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.. _contents:
22

3-
DiffPy-CMI Contents
3+
DiffPy.CMI Contents
44
===================
55

6-
The DiffPy-CMI release includes Python and C++ libraries developed by
6+
The DiffPy.CMI release includes Python and C++ libraries developed by
77
the DiffPy team as well as external libraries necessary for functionality.
88

99
Libraries developed by the DiffPy team

products/diffpycmi/contributecode.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
How to Contribute Code
22
======================
33

4-
The DiffPy-CMI bundle consists of the following projects, all hosted on
4+
The DiffPy.CMI bundle consists of the following projects, all hosted on
55
github. To contribute code simply fork the project you'd like to work
66
on and issue a pull request.
77

products/diffpycmi/install.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
.. highlight:: bash
22

3-
DiffPy-CMI installation from sources
3+
DiffPy.CMI installation from sources
44
====================================
55

6-
Downloaded the most recent `DiffPy-CMI tarball
6+
Downloaded the most recent `DiffPy.CMI tarball
77
<https://github.com/diffpy/diffpy-release/releases/latest>`__
88
and follow the steps below.
99

1010
1 Install system software
1111
------------------------------------------------------------------------
1212

13-
DiffPy-CMI requires the :ref:`system software dependencies <dependencies>`
13+
DiffPy.CMI requires the :ref:`system software dependencies <dependencies>`
1414
which can be installed from command line using a suitable package manager.
1515
Here are installation commands for several supported systems.
1616

@@ -43,7 +43,7 @@ Mac OS X
4343
For Mac OS X the system dependencies can be installed using the
4444
`MacPorts <https://www.macports.org>`_ software manager. A similar
4545
package system `Homebrew <https://brew.sh>`_ works as well, but has
46-
been considerably less tested with DiffPy-CMI.
46+
been considerably less tested with DiffPy.CMI.
4747

4848
For best results with MacPorts follow these tips:
4949

@@ -79,10 +79,10 @@ of ``.profile`` or ``.zshenv`` file in your HOME directory ::
7979
export PATH="/opt/local/bin:$PATH"
8080

8181

82-
2 Install DiffPy-CMI
82+
2 Install DiffPy.CMI
8383
------------------------------------------------------------------------
8484

85-
Unzip the DiffPy-CMI tarball into a directory of your choice.
85+
Unzip the DiffPy.CMI tarball into a directory of your choice.
8686
Execute the included :file:`install` script and follow the prompts. ::
8787

8888
# replace VERSION to match the actual filename
@@ -143,7 +143,7 @@ the base diffpy_cmi directory and create the symbolic link with ::
143143

144144
.. note::
145145

146-
The installation of DiffPy-CMI is entirely contained under the
146+
The installation of DiffPy.CMI is entirely contained under the
147147
expanded diffpy_cmi directory. The software can be completely
148148
uninstalled by deleting that directory and removing the symbolic
149149
link.

products/diffpycmi/license.rst

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

55
.. literalinclude:: LICENSE.txt
66
:language: text

products/diffpycmi/updatesources.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ cases, you could use option -n to display the build steps.
4848
other than system Python (e.g. the Enthought Python Distribution) it
4949
may be incompatible with the system boost library and the build may
5050
fail. To resolve the problem, you should rebuild the boost library
51-
against Enthought Python and then rebuild all DiffPy-CMI modules.
51+
against Enthought Python and then rebuild all DiffPy.CMI modules.

0 commit comments

Comments
 (0)