Skip to content

Commit

Permalink
move license section to main page
Browse files Browse the repository at this point in the history
  • Loading branch information
bryevdv committed May 24, 2013
1 parent b57b365 commit f467034
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
9 changes: 3 additions & 6 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ Contents:
commands
api

Indices and tables
==================

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
License Agreement
-----------------

``conda`` is distributed under the `OpenBSD license <http://opensource.org/licenses/bsd-license.php>`_.
13 changes: 4 additions & 9 deletions docs/source/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,18 @@ conda Overview
.. index::
pair: terminology; deactivated

Anaconda packages are downloaded from remote **channels**, which are simply URLs to directories containing Anaconda packages.
Anaconda packages are downloaded from remote **channels**, which are simply URLs to directories containing Anaconda packages.
The ``conda`` command starts with a default set of channels to search, but users may exert control over this list; for example, if they wish to maintain a private or internal channel (see Configuration_ for details).
Continuum provides the following standard channels:
* ``http://repo.continuum.io/pkgs/dev`` - Experimental or developmental versions of packages
* ``http://repo.continuum.io/pkgs/gpl`` - GPL licensed packages
* ``http://repo.continuum.io/pkgs/free`` - non GPL open source packages
To view all available packages, you can use ``conda search --all``. See the :ref:`search command examples <search_example>` for more information.

Once an Anaconda package has been downloaded, it is said to be **locally available**.
A locally available package that has been linked into an Anaconda environment is said to be **activated**.
Once an Anaconda package has been downloaded, it is said to be **locally available**.
A locally available package that has been linked into an Anaconda environment is said to be **activated**.
Conversely, unlinking a package from an environment causes it to be **deactivated**.


.. _location:
.. index::
Expand Down Expand Up @@ -288,8 +288,3 @@ Look here for additional :ref:`update examples <update_example>`.

.. _YAML syntax: http://en.wikipedia.org/wiki/YAML

-------
License
-------

``conda`` is distributed under the `OpenBSD license <http://opensource.org/licenses/bsd-license.php>`_.

0 comments on commit f467034

Please sign in to comment.