Skip to content

Commit 4e78481

Browse files
committed
minor corrections
1 parent 2a6f929 commit 4e78481

2 files changed

Lines changed: 8 additions & 13 deletions

File tree

docs/source/index.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ ODM2 Python API
22
===============
33

44
A Python-based application programmer's interface for the `Observations Data Model 2 (ODM2) <http://www.odm2.org>`__.
5-
`List of current and planned functions included in the
6-
API <https://github.com/ODM2/ODM2PythonAPI/blob/master/doc/APIFunctionList.md>`__
7-
85

96
.. toctree::
107
:maxdepth: 2

docs/source/installing.rst

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ system <https://conda.io/docs/>`__ via either
88
`Miniconda <https://conda.io/miniconda.html>`__. To start using
99
conda (if it's not your system default), add conda to the PATH; on
1010
OS X and Linux, it's something like
11-
``export PATH=$HOME/miniconda/bin:$PATH``, but the exact path may vary.
11+
``export PATH=$HOME/miniconda3/bin:$PATH``, but the exact path may vary.
1212

1313
To activate a conda environment, say, "myenv":
1414

@@ -24,15 +24,14 @@ tested thoroughly.
2424
Latest release, from ODM2 anaconda.org channel
2525
----------------------------------------------
2626

27-
The `latest ``odm2api``
28-
release <https://github.com/ODM2/ODM2PythonAPI/releases>`__ is available
27+
The `latest release <https://github.com/ODM2/ODM2PythonAPI/releases>`__ is available
2928
on the `ODM2 anaconda.org channel <https://anaconda.org/odm2/odm2api>`__
30-
for all major OS paltforms (linux, OS X, win32/win64). To install it on
29+
for all major OS platforms (linux, OS X, win32/win64). To install it on
3130
an existing conda environment:
3231

3332
::
3433

35-
conda install -c odm2 odm2api
34+
conda install odm2api --channel odm2
3635

3736
All dependencies are installed, including Pandas and its dependencies
3837
(numpy, etc).
@@ -44,21 +43,20 @@ To create a new environment "myenv" with the ``odm2api`` package:
4443
conda create -n myenv -c odm2 python=2.7 odm2api
4544

4645

47-
Installing the development version from the ``master`` branch on GitHub
48-
-----------------------------------------------------------------------
46+
Installing the development version
47+
----------------------------------
4948

5049
To create a new environment "myenv" with ``odm2api``, first clone the repository.
5150
Then, on a terminal shell:
5251

5352
.. code:: bash
5453
55-
conda env create -n myenv --file py2_conda_environment.yml
56-
conda create --name myenv python=2.7 --file requirements.txt --file requirements-dev.txt
54+
conda create --name myenv python=2.7 --file requirements.txt --file requirements-dev.txt -c odm2
5755
5856
Activate the new environment, then install ``odm2api`` into the
5957
environment:
6058

6159
.. code:: bash
6260
6361
activate myenv # On Windows
64-
source activate myenv # On MacOSX or Linux
62+
source activate myenv # On OS X or Linux

0 commit comments

Comments
 (0)