diff --git a/docs/source/about.rst b/docs/source/about.rst
index 20c75e8..a8bbaca 100644
--- a/docs/source/about.rst
+++ b/docs/source/about.rst
@@ -1,16 +1,14 @@
-=====
-About AWIPS II
-=====
+===================
+About Unidata AWIPS
+===================
-.. raw:: html
-
-AWIPS II is a weather forecasting display and analysis package being
-developed by the National Weather Service and Raytheon. AWIPS II is a
+AWIPS is a weather forecasting display and analysis package being
+developed by the National Weather Service and Raytheon. AWIPS is a
Java application consisting of a data-rendering client (CAVE, which runs
on Red Hat/CentOS Linux and Mac OS X) and a backend data server (EDEX,
which runs only on Linux)
-AWIPS II takes a unified approach to data ingest, and most data types
+AWIPS takes a unified approach to data ingest, and most data types
follow a standard path through the system. At a high level, data flow
describes the path taken by a piece of data from its source to its
display by a client system. This path starts with data requested and
@@ -18,7 +16,7 @@ stored by an `LDM <#ldm>`_ client and includes the decoding of the data
and storing of decoded data in a form readable and displayable by the
end user.
-The AWIPS II ingest and request processes are a highly distributed
+The AWIPS ingest and request processes are a highly distributed
system, and the messaging broken `Qpid <#qpid>`_ is used for
inter-process communication.
@@ -43,32 +41,31 @@ FOSS_COTS_License.pdf at `https://github.com/Unidata/awips2 `_
The **LDM** (Local Data Manager), developed and supported by Unidata, is
a suite of client and server programs designed for data distribution,
and is the fundamental component comprising the Unidata Internet Data
-Distribution (IDD) system. In AWIPS II, the LDM provides data feeds for
+Distribution (IDD) system. In AWIPS, the LDM provides data feeds for
grids, surface observations, upper-air profiles, satellite and radar
imagery and various other meteorological datasets. The LDM writes data
directly to file and alerts EDEX via Qpid when a file is available for
@@ -157,7 +151,7 @@ processing. The LDM is started and stopped with the commands
``service edex_ldm start`` and ``service edex_ldm stop``
edexBridge
--------------------
+----------
edexBridge, invoked in the LDM configuration file
``/awips2/ldm/etc/ldmd.conf``, is used by the LDM to post "data
@@ -165,12 +159,12 @@ available" messaged to Qpid, which alerts the EDEX Ingest server that a
file is ready for processing.
Qpid
--------------------
+----
`http://qpid.apache.org `_
**Apache Qpid**, the Queue Processor Interface Daemon, is the messaging
-system used by AWIPS II to facilitate communication between services.
+system used by AWIPS to facilitate communication between services.
When the LDM receives a data file to be processed, it employs
**edexBridge** to send EDEX ingest servers a message via Qpid. When EDEX
has finished decoding the file, it sends CAVE a message via Qpid that
@@ -179,7 +173,7 @@ and stopped by ``edex start`` and ``edex stop``, and is controlled by
the system script ``/etc/rc.d/init.d/qpidd``
PostgreSQL
--------------------
+----------
`http://www.postgresql.org `_
@@ -193,12 +187,12 @@ called **psql**. Postgres is started and stopped by ``edex start`` and
``/etc/rc.d/init.d/edex_postgres``
HDF5
--------------------
+----
`http://www.hdfgroup.org/HDF5/ `_
**Hierarchical Data Format (v.5)** is
-the primary data storage format used by AWIPS II for processed grids,
+the primary data storage format used by AWIPS for processed grids,
satellite and radar imagery and other products. Similar to netCDF,
developed and supported by Unidata, HDF5 supports multiple types of data
within a single file. For example, a single HDF5 file of radar data may
@@ -208,10 +202,10 @@ also contain data from multiple radars. HDF5 is stored in
``/awips2/edex/data/hdf5/``
PyPIES (httpd-pypies)
--------------------
+---------------------
**PyPIES**, Python Process Isolated Enhanced Storage, was created for
-AWIPS II to isolate the management of HDF5 Processed Data Storage from
+AWIPS to isolate the management of HDF5 Processed Data Storage from
the EDEX processes. PyPIES manages access, i.e., reads and writes, of
data in the HDF5 files. In a sense, PyPIES provides functionality
similar to a DBMS (i.e PostgreSQL for metadata); all data being written
diff --git a/docs/source/dev.rst b/docs/source/dev.rst
index e737c8a..e01cd5a 100644
--- a/docs/source/dev.rst
+++ b/docs/source/dev.rst
@@ -1,6 +1,6 @@
-Dev Guide
-=========
+Development Guide
+=================
The Data Access Framework allows developers to retrieve different types
of data without having dependencies on those types of data. It provides
@@ -266,7 +266,7 @@ contributing the necessary code for the framework to support its data.
For example, the satellite plugin provides a factory class for
interacting with the framework and registers itself as being compatible
with the Data Access Framework. This concept is similar to how EDEX in
-AWIPS II expects a plugin developer to provide a decoder class and
+AWIPS expects a plugin developer to provide a decoder class and
record class and register them, but then automatically manages the rest
of the ingest process including routing, storing, and alerting on new
data. This style of plugin architecture effectively enables the
diff --git a/docs/source/examples/index.rst b/docs/source/examples/index.rst
index 80a4f80..6c9ba8f 100644
--- a/docs/source/examples/index.rst
+++ b/docs/source/examples/index.rst
@@ -1,8 +1,8 @@
.. _examples-index:
-################
- Data Plotting Examples
-################
+######################
+Data Plotting Examples
+######################
.. toctree::
:maxdepth: 1
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 9fb703b..a02255e 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -2,9 +2,45 @@
Python AWIPS Data Access Framework
==================================
-The `python-awips `_ package provides a Data Access Framework (DAF) for requesting data from a remote AWIPS II EDEX server.
+`AWIPS `_ is a weather display and analysis package developed by the National Weather Service for operational forecasting. UCAR's `Unidata Program Center `_ supports a non-operational open-source release of the AWIPS software (`EDEX `_, `CAVE `_, and `python-awips `_).
-The `AWIPS II Python Stack `_ installed via RPM contains the DAF, matplotlib, numpy, scipy, basemap, pint, shapely, and other packages.
+The python-awips package provides a data access framework for requesting grid and geometry datasets from an `EDEX `_ server.
+
+.. _Jupyter Notebook: http://nbviewer.jupyter.org/github/Unidata/python-awips/tree/master/examples/notebooks
+
+Install
+-------
+
+- pip install python-awips
+
+Requirements
+~~~~~~~~~~~~
+
+- Python 2.7+
+- Shapely 1.4+
+- MetPy and enum34 to run the `Jupyter Notebook`_ examples
+
+How to Use
+~~~~~~~~~~
+
+::
+
+ from awips.dataaccess import DataAccessLayer
+ DataAccessLayer.changeEDEXHost("edex-cloud.unidata.ucar.edu")
+ request = DataAccessLayer.newDataRequest()
+ dataTypes = DataAccessLayer.getSupportedDatatypes()
+ request.setDatatype("grid")
+ request.addLocationNames("RAP40")
+ request.setParameters("T")
+ request.setLevels("0.0SFC")
+ cycles = DataAccessLayer.getAvailableTimes(request, True)
+ times = DataAccessLayer.getAvailableTimes(request)
+ response = DataAccessLayer.getGridData(request, times[-1])
+ for grid in response:
+ data = grid.getRawData()
+ lons, lats = grid.getLatLonCoords()
+
+See the `API Documentation `_ for more information.
-------------
Documentation
@@ -14,7 +50,8 @@ Documentation
:maxdepth: 2
install
+ api/index
examples/index
- about
dev
gridparms
+ about
diff --git a/docs/source/install.rst b/docs/source/install.rst
index 5ea8457..d25b5ca 100644
--- a/docs/source/install.rst
+++ b/docs/source/install.rst
@@ -1,6 +1,6 @@
.. _Jupyter Notebook: http://nbviewer.jupyter.org/github/Unidata/python-awips/tree/master/examples/notebooks
-Install python-awips
+Installation
------------------
- pip install python-awips
@@ -15,19 +15,23 @@ Requirements
Install from Github
~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- git clone https://github.com/Unidata/python-awips.git
-- cd python-awips
+- git clone https://github.com/Unidata/python-awips.git && cd python-awips
- python setup.py install
-Install for AWIPS (/awips2/python)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Install for AWIPS
+~~~~~~~~~~~~~~~~~
-AWIPS II >=15.1.3 (March 2016) has `python-awips` bundled with the awips2-server and awips2-cave groups, as well as a full meteorological data stack (metpy, matplotlib, numpy, etc).
+On standalone AWIPS systems, the full `AWIPS Python Stack `_ is installed to ``/awips2/python`` as RPM packages.
Easy install on an AWIPS system
-- wget https://bootstrap.pypa.io/ez_setup.py -O - | /awips2/python/bin/python
-- /awips2/python/bin/easy_install pip
-- /awips2/python/bin/pip install python-awips
+* For Unidata AWIPS release **16.2.2+**:
+
+ /awips2/python/bin/easy_install pip
+ /awips2/python/bin/pip install python-awips
+
+* For releases before and up to **16.1.5** you may need to run
+
+ yum install awips2-python-setuptools