merge commit

Author: Atma Mani

guide/Get Started/Install and set up.ipynb

@@ -6,35 +6,46 @@
    "source": [
     "# Install using Conda\n",
     "\n",
-    "The ArcGIS Python API is distributed via conda.\n",
-    "\n",
-    "To learn more about conda, see the [getting started guide](http://conda.pydata.org/docs/get-started.html) for conda.\n",
+    "The ArcGIS Python API is distributed via conda. Conda is a popular package and environment manager application that helps you install and update packages such as the ArcGIS Python API and their dependencies. To learn more about conda, see the [getting started guide](http://conda.pydata.org/docs/get-started.html) for conda.\n",
     "\n",
     "## Get Conda\n",
-    "Install the latest version of [Anaconda for Python](https://www.continuum.io/downloads)(for Python 3.5), if you don't already have conda. The ArcGIS Python API requires Python 3.\n",
+    "Install the latest version of [Anaconda for Python](https://www.continuum.io/downloads) (for Python 3.5), if you don't already have conda. The ArcGIS Python API requires Python 3.\n",
     "\n",
-    "If you have installed ArcGIS Pro 1.3, you already  have conda.  Run “Python Command Prompt” shortcut within the ArcGIS Pro program group and continue with the subsequent steps.\n",
+    "If you have installed ArcGIS Pro 1.3, you already have conda and you can use that instead of downloading Anaconda.\n",
     "\n",
     "## Install arcgis package\n",
-    "Download and install ArcGIS Python API in your conda environment, using the following commands in cmd.exe or your shell:\n",
+    "Download and install ArcGIS Python API in your conda environment, using the following command in your teminal. If you are running a Windows OS, you can type this into your command prompt or PowerShell or if you have installed ArcGIS Pro, then into your 'Python Command Prompt' shortcut within the ArcGIS Pro program group in Windows start menu. If you are running a Mac or Linux OS, you can type this into your terminal application.\n",
     "\n",
     "    conda install -c esri arcgis\n",
     "    \n",
-    "You can now start using the ArcGIS Python API in your Python IDE of choice, or the Jupyter Notebook environment.\n",
+    "In the screen shot below, I am typing this command into the Windows command prompt.\n",
+    "\n",
+    "![install arcgis package](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_InstallAndSetup_01.PNG)\n",
+    "\n",
+    "You can now start using the ArcGIS Python API in your Python IDE of choice, or from the Jupyter Notebook environment.\n",
+    "\n",
+    "### Upgrade from older arcgis package\n",
+    "If you are upgrading from an older version of arcgis package, run the following command in your terminal:\n",
+    "\n",
+    "    conda upgrade -c esri arcgis\n",
     "\n",
     "## Start jupyter notebook\n",
-    "To use the API in the jupyter notebook environment, use the following command in  cmd.exe or your shell:\n",
+    "To use the API in the Jupyter Notebook environment, use the following command in your terminal:\n",
     "\n",
     "    jupyter notebook\n",
     "\n",
+    "Refer to this doc for more help on [how to use the notebook environment](https://developers.arcgis.com/python/guide/Using-the-Jupyter-Notebook-environment/)\n",
+    "\n",
     "## Test your install\n",
-    "Create a Python 3 notebook with these lines of code:\n",
+    "From the Jupyter Notebook dashboard, create a new Python 3 notebook and type these lines of code:\n",
     "\n",
-    "    from arcgis.gis import *\n",
-    "    gis = GIS()\n",
-    "    gis.map()\n",
+    "    from arcgis import GIS\n",
+    "    my_gis = GIS()\n",
+    "    my_gis.map()\n",
     "    \n",
-    "If the installation went through fine, you should see a map come up."
+    "If the installation went through fine, you should see a map come up as shown below:\n",
+    "\n",
+    "![test your install](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_InstallAndSetup_02.PNG)"
    ]
   }
  ],
@@ -54,7 +65,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.4.5"
+   "version": "3.5.2"
   }
  },
  "nbformat": 4,