Skip to content

DOC: fixed additional small typo in installation docs #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slivingston merged 3 commits into from
Jan 1, 2017
Merged

DOC: fixed additional small typo in installation docs #125

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bfd2be
DOC: fixed small typo in installation docs + add prereqs
murrayrm Dec 29, 2016
c387c69
TRV: removed trailing spaces
murrayrm Dec 31, 2016
46d5dc5
TRV: fixed grammatical error in conda instructions
murrayrm Jan 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions doc/intro.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ and verifying that no error message appears. It may be necessary to install
from the `slycot project page <https://github.com/python-control/Slycot>`_.

For users with a working the Anaconda distribution of Python, the following

@slivingston slivingston Jan 1, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be "...with the Anaconda distribution..."?

(copied from #123 (comment); still relevant here)

command can be used::
commands can be used::

conda install -c python-control -c cyclus slycot python-control
conda install numpy scipy matplotlib # if not yet installed
conda install -c python-control -c cyclus slycot control

This installs `slycot` and `python-control` from the `python-control`
channel and uses the `cyclus` channel to obtain the required `lapack`
Expand Down