From 24c1c24062c1f17e274ef090d6065725df902ea8 Mon Sep 17 00:00:00 2001 From: Mandar Gokhale Date: Mon, 28 Jul 2014 17:54:45 -0400 Subject: [PATCH 1/2] Rework setuptools and pip docs Clarify a little more what setuptools allows you to do, what pip is, and what advantages it has. --- docs/starting/install/osx.rst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index 556b1121b..7f1d3955a 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -65,17 +65,17 @@ This will take a minute or two. Setuptools & Pip ---------------- -The most crucial third-party Python software of all is Setuptools, which -extends the packaging and installation facilities provided by the distutils -in the standard library. Once you add Setuptools to your Python system you can -download and install any compliant Python software product with a single -command. It also enables you to add this network installation capability to -your own Python software with very little work. Homebrew already installed -Setuptools for you. - -Happily, when you ran ``brew install python``, Homebrew also installed **pip**. -Pip allows for installation and uninstallation of packages, and is actively -maintained. +Homebrew also installs Setuptools and `pip` for you. + +Setuptools enables you to download and install any compliant Python +software over a network (usually the Internet) with a single command +(``easy_install``). It also enables you to add this network installation +capability to your own Python software with very little work. + +``pip`` is a tool for easily installing and managing Python packages, +that is often recommended over ``easy_install``. It improves over +``easy_install`` in `several ways `_, +and is actively maintained. Virtualenv From 102ab346767a26898a6db39f25ad31e5f33c8f38 Mon Sep 17 00:00:00 2001 From: Mandar Gokhale Date: Thu, 7 Aug 2014 23:14:08 -0400 Subject: [PATCH 2/2] Incorporate changes suggested by @sigmavirus24 --- docs/starting/install/osx.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index 7f1d3955a..a8fd5a97a 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -65,7 +65,7 @@ This will take a minute or two. Setuptools & Pip ---------------- -Homebrew also installs Setuptools and `pip` for you. +Homebrew installs Setuptools and ``pip`` for you. Setuptools enables you to download and install any compliant Python software over a network (usually the Internet) with a single command @@ -73,8 +73,7 @@ software over a network (usually the Internet) with a single command capability to your own Python software with very little work. ``pip`` is a tool for easily installing and managing Python packages, -that is often recommended over ``easy_install``. It improves over -``easy_install`` in `several ways `_, +that is recommended over ``easy_install``. It is superior to ``easy_install`` in `several ways `_, and is actively maintained.