Skip to content

Commit

Permalink
Install direction updates
Browse files Browse the repository at this point in the history
  • Loading branch information
rrigdon committed Jan 30, 2020
1 parent 2507b3a commit 23db73a
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 37 deletions.
12 changes: 6 additions & 6 deletions docs/source/user-guide/install/download.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ Choose Anaconda if you:

* Are new to conda or Python.

* Like the convenience of having Python and over 150 scientific
* Like the convenience of having Python and over 1,500 scientific
packages automatically installed at once.

* Have the time and disk space---a few minutes and 300 MB.
* Have the time and disk space---a few minutes and 3 GB.

* Do not want to individually install each of the packages you
want to use.
Expand All @@ -48,7 +48,7 @@ Choose Miniconda if you:
* Do not mind installing each of the packages you want to use
individually.

* Do not have time or disk space to install over 150 packages at
* Do not have time or disk space to install over 1,500 packages at
once.

* Want fast access to Python and the conda commands and you wish
Expand Down Expand Up @@ -124,9 +124,9 @@ Download the installer file and before installing verify it as follows:

#. Navigate to the file.

#. Run the following command:
Start-PsFCIV -Path C:\path\to\file.ext -HashAlgorithm SHA256 -Online
#. Run the following command::
Start-PsFCIV -Path C:\path\to\file.ext -HashAlgorithm SHA256 -Online

* macOS: In iTerm or a terminal window enter ``shasum -a 256 filename``.

Expand Down
11 changes: 5 additions & 6 deletions docs/source/user-guide/install/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Installation
The fastest way to :doc:`obtain <download>` conda is to install
:ref:`Miniconda <miniconda-glossary>`, a mini version of
:ref:`Anaconda <anaconda-glossary>` that includes only conda and
its dependencies. If you prefer to have conda plus over 720 open-source
its dependencies. If you prefer to have conda plus over 7,500 open-source
packages, install Anaconda.

We recommend you install Anaconda for the local user, which does
Expand Down Expand Up @@ -84,16 +84,16 @@ variable.
To see if the conda installation of Python is in your PATH
variable:

* On macOS and Linux, open the terminal and run---``echo $PATH``.

* On Windows, open an Anaconda Prompt and run---``echo %PATH%``.

To see which Python installation is currently set as the default:
* On macOS and Linux, open the terminal and run---``echo $PATH``.

* On macOS and Linux, open the terminal and run---``which python``.
To see which Python installation is currently set as the default:

* On Windows, open an Anaconda Prompt and run---``where python``.

* On macOS and Linux, open the terminal and run---``which python``.

To see which packages are installed in your current conda
environment and their version numbers, in your terminal window
or an Anaconda Prompt, run ``conda list``.
Expand All @@ -106,5 +106,4 @@ or an Anaconda Prompt, run ``conda list``.
windows
macos
linux
test-installation
rpm-debian
8 changes: 5 additions & 3 deletions docs/source/user-guide/install/linux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Installing on Linux

#. Download the installer:

* `Miniconda installer for Linux <https://conda.io/miniconda.html>`_.
* `Miniconda installer for Linux <https://docs.conda.io/en/latest/miniconda.html#linux-installers>`_.

* `Anaconda installer for Linux <https://www.anaconda.com/download/>`_.

Expand Down Expand Up @@ -32,7 +32,9 @@ Installing on Linux
#. To make the changes take effect, close and then re-open your
terminal window.

#. :doc:`Test your installation <test-installation>`.
#. Test your installation. In your terminal window or
Anaconda Prompt, run the command ``conda list``. A list of installed packages appears
if it has been installed correctly.


.. _install-linux-silent:
Expand Down Expand Up @@ -64,7 +66,7 @@ Uninstalling Anaconda or Miniconda

#. Open a terminal window.

#. Remove the entire miniconda install directory with::
#. Remove the entire Miniconda install directory with::

rm -rf ~/miniconda

Expand Down
8 changes: 4 additions & 4 deletions docs/source/user-guide/install/macos.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ Installing on macOS
#. To make the changes take effect, close and then re-open your
terminal window.

#. :doc:`Test your installation <test-installation>`.
#. Test your installation. In your terminal window or
Anaconda Prompt, run the command ``conda list``. A list of installed packages appears
if it has been installed correctly.


.. _install-macos-silent:
Expand Down Expand Up @@ -64,7 +66,7 @@ The installer prompts “Do you wish the installer to initialize Miniconda3 by r

**MacOS Catalina**

If you are on MacOS Catalina, the new default shell is zsh. You will instead need to run ``source <path to conda>/bin/activate`` followed by ``conda init zsh``.
If you are on macOS Catalina, the new default shell is zsh. You will instead need to run ``source <path to conda>/bin/activate`` followed by ``conda init zsh``.

Updating Anaconda or Miniconda
==============================
Expand All @@ -85,8 +87,6 @@ Uninstalling Anaconda or Miniconda

rm -rf ~/miniconda

#. You may also:

#. OPTIONAL: Edit ``~/.bash_profile`` to remove the Miniconda
directory from your PATH environment variable.

Expand Down
19 changes: 12 additions & 7 deletions docs/source/user-guide/install/rpm-debian.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
-----------------------------------------
RPM and Debian Repositories for Miniconda
-----------------------------------------
Conda, the package manager from Anaconda, is now available as either a RedHat RPM or as a Debian package. The packages are the equivalent to the Miniconda installer which only contains conda and its dependencies. You can use yum or apt-get to install, uninstall and manage conda on your system. To install conda, follow the instructions for your Linux distribution.
Conda, the package manager from Anaconda, is available as either a RedHat RPM or as a Debian package. The packages are the equivalent to the Miniconda installer which only contains conda and its dependencies. You can use yum or apt-get to install, uninstall and manage conda on your system. To install conda, follow the instructions for your Linux distribution.

To install the RPM on RedHat, CentOS, Fedora distributions, and other RPM-based distributions such as openSUSE, download the gpg key and add a repository configuration file for conda.
To install the RPM on RedHat, CentOS, Fedora distributions, and other RPM-based distributions such as openSUSE, download the GPG key and add a repository configuration file for conda.

.. code-block:: none
# Import our gpg public key
# Import our GPG public key
rpm --import https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc
# Add the Anaconda repository
Expand Down Expand Up @@ -56,11 +56,11 @@ Conda is ready to install on your RPM-based distribution.
Installed size: 210 M
Is this ok [y/N]:
To install on Debian-based Linux distributions such as Ubuntu, download the public gpg key and add the conda repository to the sources list.
To install on Debian-based Linux distributions such as Ubuntu, download the public GPG key and add the conda repository to the sources list.

.. code-block:: none
# Install our public gpg key to trusted store
# Install our public GPG key to trusted store
curl https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > conda.gpg
install -o root -g root -m 644 conda.gpg /usr/share/keyrings/conda-archive-keyring.gpg
Expand Down Expand Up @@ -104,9 +104,14 @@ Check to see if the installation is successful by typing:
conda 4.5.11
Installing conda packages with the system package manager makes it very easy to distribute conda across a cluster of machines running Linux without having to worry about any non privileged user modifying the installation. Any non privileged user simply needs to run `source/opt/conda/etc/profile.d/conda.sh` to use conda.
Installing conda packages with the system package manager makes it very easy
to distribute conda across a cluster of machines running Linux without having
to worry about any non-privileged user modifying the installation.
Any non-privileged user simply needs to run ``source/opt/conda/etc/profile.d/conda.sh`` to use conda.

Administrators can also distribute a .condarc file at /opt/conda/.condarc so that a predefined configuration for channels, package cache directory and environment locations is pre-seeded to all users in a large organization. A sample configuration could look like:
Administrators can also distribute a .condarc file at /opt/conda/.condarc so that a
predefined configuration for channels, package cache directory, and environment locations
is pre-seeded to all users in a large organization. A sample configuration could look like:

.. code-block:: none
Expand Down
8 changes: 0 additions & 8 deletions docs/source/user-guide/install/test-installation.rst

This file was deleted.

8 changes: 5 additions & 3 deletions docs/source/user-guide/install/windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ Installing on Windows
When installation is finished, from the **Start** menu, open the
Anaconda Prompt.

#. :doc:`Test your installation <test-installation>`.
#. Test your installation. In your terminal window or
Anaconda Prompt, run the command ``conda list``. A list of installed packages appears
if it has been installed correctly.


.. _install-win-silent:
Expand All @@ -38,8 +40,8 @@ To run the the Windows installer for Miniconda in
:ref:`silent mode <silent-mode-glossary>`, use the ``/S``
argument. The following optional arguments are supported:

* ``/InstallationType=[JustMe|AllUsers]``---Default is``JustMe``.
* ``/AddToPath=[0|1]``---Default is ``1``'
* ``/InstallationType=[JustMe|AllUsers]``---Default is ``JustMe``.
* ``/AddToPath=[0|1]``---Default is ``1``
* ``/RegisterPython=[0|1]``---Make this the system's default
Python.
``0`` indicates ``JustMe``, which is the default. ``1``
Expand Down

0 comments on commit 23db73a

Please sign in to comment.