diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index 40761a1f37..37698d265a 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -55,6 +55,13 @@
+
+
+
+
+
+
+
@@ -70,21 +77,10 @@
definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
-
-
-
-
-
-
+
+
-
-
-
-
+ commandId="com.raytheon.uf.viz.d2d.ui.actions.showPrintDialog"
+ label="Print..."
+ style="push">
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
-
+
@@ -783,7 +753,8 @@
value="2">
-
+
@@ -796,12 +767,41 @@
value="4">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+ value="11">
+ value="12">
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ value="51">
-
+
+ value="52">
-
+
+ value="53">
-
+
+ value="54">
-
+
+ value="55">
-
+
+ value="56">
-
+
+ value="57">
-
+
+ value="58">
-
+
+ value="59">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -916,61 +1224,17 @@
id="com.raytheon.uf.viz.d2d.ui.densityPopulator">
-
-
+
+ commandId="com.raytheon.uf.viz.core.rsc.key.numpadEnter">
+
+
+
+
+
+
@@ -1034,14 +1302,10 @@
class="com.raytheon.uf.viz.d2d.ui.map.actions.ToggleResourceHandler"
commandId="com.raytheon.viz.ui.actions.toggleResource">
-
-
-
-
+ class="com.raytheon.uf.viz.d2d.ui.actions.ShowHistoryList"
+ commandId="com.raytheon.viz.ui.showHistoryList">
+
@@ -1136,194 +1400,50 @@
-
-
+ sequence="M1+H">
+ sequence="M1+P">
+
+
+ sequence="M1+D">
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
-
-
@@ -1513,22 +1633,30 @@
categoryId="com.raytheon.uf.viz.d2d.ui"
description="Open time options dialog"
name="Time Options">
+
+
+
+
+
+
+
+
+ id="com.raytheon.uf.viz.d2d.ui.actions.locateCursorAction"
+ categoryId="com.raytheon.uf.viz.d2d.ui"
+ description="Locates the cursor on the screen"
+ name="Locate Cursor">
-
-
+ id="com.raytheon.viz.ui.showHistoryList"
+ categoryId="com.raytheon.uf.viz.d2d.ui"
+ description="Show the d2d history list"
+ name="Show History List">
+
+
-
-
+ description="Open an existing procedure"
+ name="Open AWIPS Procedure">
+ description="Delete a procedure"
+ name="Delete AWIPS Procedure">
-
@@ -1691,6 +1813,7 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/images/dta_product.png b/docs/images/dta_product.png
new file mode 100644
index 0000000000..cd7b92e237
Binary files /dev/null and b/docs/images/dta_product.png differ
diff --git a/docs/images/radar_menu_daa.png b/docs/images/radar_menu_daa.png
new file mode 100644
index 0000000000..17eb24abe0
Binary files /dev/null and b/docs/images/radar_menu_daa.png differ
diff --git a/docs/index.md b/docs/index.md
index f4fd0f2052..9fc8e231cf 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -21,7 +21,7 @@
AWIPS takes a unified approach to data ingest, and most data types follow a path through the system starting with an [LDM](#ldm) client requesting data from the [Unidata IDD](http://www.unidata.ucar.edu/projects/#idd). These data files are then decoded and stored as HDF5 and Postgres metadata by [EDEX](install/install-edex.html).
-Unidata supports two visualization frameworks for rendering data: [CAVE](install/install-cave.html), and the Python Data Access Framework ([python-awips](http://python-awips.readthedocs.io)).
+Unidata develops and supports the visualization client for rendering data: [CAVE](install/install-cave.html), and the Python Data Access Framework ([python-awips](http://python-awips.readthedocs.io)) for remotely accessing AWIPS data as numpy arrays and Shapely geometries.
---
diff --git a/docs/install/install-edex.md b/docs/install/install-edex.md
index 7e9c6e4640..9777b326f7 100644
--- a/docs/install/install-edex.md
+++ b/docs/install/install-edex.md
@@ -1,4 +1,4 @@
-# EDEX for Linux
+# EDEX for CentOS/Red Hat
[installEDEX.sh ](http://www.unidata.ucar.edu/software/awips2/installEDEX.sh)
@@ -246,7 +246,7 @@ To start *all services except the LDM* (good for troubleshooting):
---
-## Directories to know
+## Directories To Know
* `/awips2` - Contains all of the installed AWIPS software.
* `/awips2/edex/logs` - EDEX logs.
@@ -258,4 +258,4 @@ To start *all services except the LDM* (good for troubleshooting):
* `/awips2/ldm/etc` - Location of **ldmd.conf** and **pqact.conf**
* `/awips2/ldm/logs` - LDM logs.
* `/awips2/data_store` - Raw data store.
-* `/awips2/data_store/ingest` - Manual data ingest endpoint.
+* `/awips2/data_store/ingest` - Manual data ingest endpoint (as of 16.4.1, previously /awips2/edex/data/manual)
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
index 169bb4f24d..b36fae2076 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
@@ -456,9 +456,9 @@
in
-
-
- 4
+
+ 0
+ 12
Radar/8-bit STP
@@ -480,6 +480,36 @@
+
+
+ OHA
+
+
+ in
+
+ 0
+ 12
+
+ Radar/OSF/Storm Total Precip
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
NTP
@@ -487,9 +517,9 @@
in
-
-
- 4
+
+ 0
+ 24
Radar/8-bit STP
diff --git a/mkdocs.yml b/mkdocs.yml
index 0fa61e7edd..231c2faac3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -32,15 +32,15 @@ pages:
- CAVE User Manual:
- D2D Perspective: cave/d2d-perspective.md
- Maps, Views, Projections: cave/maps-views-projections.md
-# - Bundles and Procedures: cave/bundles-and-procedures.md
+ - TODO Bundles and Procedures: cave/bundles-and-procedures.md
- Localization Perspective: cave/localization-perspective.md
- NCP Perspective: cave/ncp-perspective.md
- NSHARP: cave/nsharp.md
- WarnGen: cave/warngen.md
- GIS and Shapefiles: cave/d2d-gis-shapefiles.md
- Volume Browser: cave/d2d-gridded-models.md
-# - Derived Parameters: cave/d2d-gridded-models.md
-# - GEMPAK Grid Display: cave/d2d-gridded-models.md
+ - TODO Derived Parameters: cave/d2d-gridded-models.md
+ - TODO GEMPAK Grid Display: cave/d2d-gridded-models.md
- Display Tools: cave/d2d-tools.md
- Radar Tools: cave/d2d-radar-tools.md
- Editing Menus: cave/d2d-edit-menus.md