diff --git a/docs/en_US/cast_dialog.rst b/docs/en_US/cast_dialog.rst
index c20e47c..95b32dc 100644
--- a/docs/en_US/cast_dialog.rst
+++ b/docs/en_US/cast_dialog.rst
@@ -1,21 +1,19 @@
-***********
-Cast Dialog
-***********
+.. _cast:
 
-Use the *Cast* dialog to define a cast. A cast specifies how to convert a value from one data type to another.
-
-The *Cast* dialog allows you to implement options of the *CREATE CAST* command. For more information about the *CREATE CAST* command, see the PostgreSQL core documentation available at:
+***************
+The Cast Dialog
+***************
 
-   http://www.postgresql.org/docs/current/static/sql-createcast.html
+Use the *Cast* dialog to define a cast. A cast specifies how to convert a value from one data type to another.
 
-The *Cast* dialog organizes the development of a cast through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Cast* dialog organizes the development of a cast through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/cast_general.png
 
 Use the fields in the *General* tab to identify the cast:
 
-* The *Name* field is disabled. The name that will be displayed in the tree control is the *Source* type concatenated with the *Target* type, and is generated automatically when you make selections on the *Create - Cast* *Definition* tab. 
-* Store notes about the cast in the *Comments* field.
+* The *Name* field is disabled. The name that will be displayed in the *pgAdmin* tree control is the *Source* type concatenated with the *Target* type, and is generated automatically when you make selections on the *Cast* dialog *Definition* tab. 
+* Store notes about the cast in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
@@ -26,23 +24,21 @@ Use the fields in the *Definition* tab to define parameters:
 * Use the drop-down listbox next to *Source type* to select the name of the source data type of the cast.
 * Use the drop-down listbox next to *Target type* to select the name of the target data type of the cast.
 * Use the drop-down listbox next to *Function* to select the function used to perform the cast. The function's result data type must match the target type of the cast.
-* Slide the *Context* switch to the *Implicit* position if the cast is implicit. By default, a cast can be invoked only by an explicit cast request. If the cast is marked *Implicit* then it can be invoked implicitly in any context, whether assignment or internally in an expression.
+* Move the *Context* switch to the *Implicit* position if the cast is implicit. By default, a cast can be invoked only by an explicit cast request. If the cast is marked *Implicit* then it can be invoked implicitly in any context, whether by assignment or internally in an expression.
 
 Click the *SQL* tab to continue.
 
-.. image:: images/cast_sql.png
+Your entries in the *Cast* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
 
-Your entries in the *Cast* dialog generate a SQL command; you can review the command on the *SQL* pane.
- 
-* Click the *Info* button (i) to access online help. 
-* Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+**Example**
 
-Example
-=======
+The following is an example of the sql command generated by user selections in the *Cast* dialog:
 
-The following is an example of the sql command generated by user selections in the *Cast dialog*:
+.. image:: images/cast_sql.png
 
-.. image:: images/cast_sql_example.png
+The cast uses a function named *int4(bigint)* to convert a biginteger data type to an integer.  
 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
+* Click the *Save* button to save work.
+* Click the *Cancel* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
\ No newline at end of file
diff --git a/docs/en_US/collation_dialog.rst b/docs/en_US/collation_dialog.rst
index 124147a..f863c5f 100644
--- a/docs/en_US/collation_dialog.rst
+++ b/docs/en_US/collation_dialog.rst
@@ -1,30 +1,28 @@
-****************
-Collation Dialog
-****************
+.. _collation:
 
+********************
+The Collation Dialog
+********************
 
-Use the *Collation* dialog to define a collation. To be able to create a collation, you must have a CREATE privilege on the destination schema.
 
-The *Collation* dialog allows you to implement options of the CREATE COLLATION command. For more information about the CREATE COLLATION command, see the documentation available at:
+Use the *Collation* dialog to define a collation. A collation is an SQL schema object that maps a SQL name to operating system locales. To create a collation, you must have a CREATE privilege on the destination schema.
 
-   http://www.postgresql.org/docs/current/static/sql-createcollation.html
-
-The *Collation* dialog organizes the development of a collation through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Collation* dialog organizes the development of a collation through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/collation_general.png
 
 Use the fields in the *General* tab to identify the collation:
 
 * Use the *Name* field to add a name for the collation. The collation name must be unique within a schema. The name will be displayed in the *pgAdmin* tree control.
-* Select the name of the owner from the drop-down listbox in the *Owner* field.
+* Select the name of the owner from the drop-down listbox in the *Owner* field. 
 * Select the name of the schema in which the collation will reside from the drop-down listbox in the *Schema* field.
-* Store notes about the collation in the *Comments* field.
+* Store notes about the collation in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
 .. image:: images/collation_definition.png
 
-Use the fields in the *Definition* tab to specify operating system locale settings: 
+Use the fields in the *Definition* tab to specify the operating system locale settings: 
 
 * Use the drop-down listbox next to *Copy collation* to select the name of an existing collation to copy. The new collation will have the same properties as the existing one, but will be an independent object. If you choose to copy an existing collation, you cannot modify the collation properties displayed on this tab.
 * Use the *Locale* field to specify a locale; a locale specifies language and language formatting characteristics. If you specify this, you cannot specify either of the following parameters. To view a list of locales supported by your Linux system use the command *locale -a*.
@@ -32,26 +30,22 @@ Use the fields in the *Definition* tab to specify operating system locale settin
 * Use the *LC_CTYPE* field to specify a locale with specified character classification. The locale must be applicable to the current database encoding. (See CREATE DATABASE for details.) 
 
 
-For more information about setting a locale, see Chapter 22.1 Locale Support of the PostgreSQL core documentation:
-   
-   http://www.postgresql.org/docs/9.5/static/locale.html
-
 Click the *SQL* tab to continue.
 
+Your entries in the *Collation* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
+
+**Example**
+
+The following is an example of the sql command generated by user selections in the *Collation* dialog: 
+
 .. image:: images/collation_sql.png
 
-Your entries in the *Collation* dialog generate a generate a SQL command. The example shown demonstrates creating a collation named *french* that uses the rules specified for the locale, *fr_FR.utf8.  The collation is owned by *enterprisedb*.
+The example shown demonstrates creating a collation named *french* that uses the rules specified for the locale, *fr_FR.utf8.  The collation is owned by *enterprisedb*.
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation. For more information about setting a locale, see Chapter 22.1 Locale Support of the PostgreSQL core documentation: 
+   http://www.postgresql.org/docs/9.5/static/locale.html  
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Database dialog*:
-
-.. image:: images/collation_sql_example.png
-
 
diff --git a/docs/en_US/database_dialog.rst b/docs/en_US/database_dialog.rst
index 95c46a2..4918d6b 100644
--- a/docs/en_US/database_dialog.rst
+++ b/docs/en_US/database_dialog.rst
@@ -1,22 +1,20 @@
-***************
-Database Dialog
-***************
+.. _database:
 
-Use the *Database* dialog to create a database. To create a database, you must be a database superuser or have the CREATE privilege.
+*******************
+The Database Dialog
+*******************
 
-The *Database* dialog allows you to implement options of the CREATE DATABASE command. For more information about the CREATE DATABASE command, please see:
+Use the *Database* dialog to define a database. To create a database, you must be a database superuser or have the CREATE privilege.  
 
-   http://www.postgresql.org/docs/9.5/static/sql-createdatabase.html
-
- The *Database* dialog organizes the development of a database through the following dialog tabs: *General*, *Definition*, *Security*, and *Parameters*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Database* dialog organizes the development of a database through the following dialog tabs: *General*, *Definition*, *Security*, and *Parameters*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/database_general.png
 
 Use the fields in the *General* tab to identify the database:
 
 * Use the *Database* field to add a descriptive name for the database. The name will be displayed in the *pgAdmin* tree control.
-* Select the owner of the database from the drop-down listbox in the *Owner* field.
-* Store notes about the database in the *Comments* field.  
+* Select the owner of the database from the drop-down listbox in the *Owner* field. 
+* Store notes about the database in the *Comment* field.  
 
 Click the *Definition* tab to continue.
 
@@ -25,7 +23,7 @@ Click the *Definition* tab to continue.
 Use the *Definition* tab to set properties for the database:
 
 * Select a character set from the drop-down listbox in the *Encoding* field. The default is *UTF8*.
-* Select a template from the drop-down listbox in the *Template* field. 
+* Select a template from the drop-down listbox in the *Template* field. If you do not specify a template, the database will use template1. 
 * Select a tablespace from the drop-down listbox in the *Tablespace* field. The selected tablespace will be the default tablespace used to contain database objects. 
 * Select the collation order from the drop-down listbox in the *Collation* field.
 * Select the character classification from the drop-down listbox in the *Character Type* field. This affects the categorization of characters, e.g. lower, upper and digit. The default, or a blank field, uses the character classification of the template database.
@@ -43,7 +41,7 @@ Use the *Privileges* panel to assign privileges to a role. Click *Add* to set pr
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privilege to the specified user.
 * Select the name of the role from the drop-down listbox in the *Grantor* field. The default grantor is the owner of the database.
 
-To discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click add to set additional privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Use the *Security Labels* panel to define security labels applied to the database. Click *Add* to add each security label selection: 
 
@@ -67,20 +65,18 @@ Follow these steps to add additional parameter value definitions; to discard a p
 
 Click the *SQL* tab to continue.
 
+Your entries in the *Database* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in the *Database* dialog: 
+
 .. image:: images/database_sql.png
 
-Your entries in the *Database* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The example creates a database named *hr* that is owned by *enterprisedb*.  It allows unlimited connections, and is available to all authenticated users. 
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Database* dialog:
-
-.. image:: images/database_sql_example.png
-
-The example creates a database named *hr* that is owned by *enterprisedb*.  It allows unlimited connections, and is available to authenticated users in the *public* schema.  
diff --git a/docs/en_US/domain_constraint_dialog.rst b/docs/en_US/domain_constraint_dialog.rst
index a8f27c1..ca57982 100644
--- a/docs/en_US/domain_constraint_dialog.rst
+++ b/docs/en_US/domain_constraint_dialog.rst
@@ -1,24 +1,23 @@
-************************
-Domain Constraint Dialog
-************************
+.. _domain_constraint:
 
-Use the *Domain Constraint* dialog to create a domain constraint. The *Domain Constraint* dialog implements options of the ALTER DOMAIN command. For more information about the ALTER DOMAIN command, see PostgreSQL core documentation available at:
+****************************
+The Domain Constraint Dialog
+****************************
 
-   http://www.postgresql.org/docs/9.5/static/sql-alterdomain.html
+Use the *Domain Constraint* dialog to create a domain constraint. A domain constraint confirms that the values provided for a domain meet a defined criteria. The *Domain Constraint* dialog implements options of the ALTER DOMAIN command. 
 
-The *Domain Constraint* dialog organizes the development of a domain constraint through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Domain Constraint* dialog organizes the development of a domain constraint through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/domain_constraint_general.png
-   :align: center
    
 Use the fields in the *General* tab to identify the domain constraint:
+
 * Use the *Name* field to add a descriptive name for the constraint. The name will be displayed in the *pgAdmin* tree control.
-* Store notes about the constraint in the *Comments* field.
+* Store notes about the constraint in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
 .. image:: images/domain_constraint_definition.png
-   :align: center
    
 Use the fields in the *Definition* tab to define the domain constraint:
 
@@ -27,22 +26,20 @@ Use the fields in the *Definition* tab to define the domain constraint:
 
 Click the *SQL* tab to continue.
 
+Your entries in the *Domain Constraint* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in the *Domain Constraint* dialog: 
+
 .. image:: images/domain_constraint_sql.png
-   :align: center
-   
-Your entries in the *Domain Constraint* dialog generate a SQL command; you can review the command on the *SQL* pane.
+
+The example shown demonstrates creating a domain constraint on the domain *timesheets* named *weekday*. It constrains a value to equal *Friday*.
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Domain Constraint dialog*:
-
-.. image:: images/domain_constraint_sql_example.png
-
-The example shown demonstrates creating a domain constraint on the domain *timesheets* named *weekday*. It constrains a value to equal *Monday*, *Tuesday*, *Wednesday*, *Thursday*, or *Friday*.  
+  
 
diff --git a/docs/en_US/event_trigger_dialog.rst b/docs/en_US/event_trigger_dialog.rst
index 07fcd30..f012801 100644
--- a/docs/en_US/event_trigger_dialog.rst
+++ b/docs/en_US/event_trigger_dialog.rst
@@ -1,14 +1,12 @@
-********************
-Event Trigger Dialog
-********************
- 
-Use the *Event Trigger* dialog to define an event trigger. Unlike regular triggers, which are attached to a single table and capture only DML events, event triggers are global to a particular database and are capable of capturing DDL events.  Like regular triggers, event triggers can be written in any procedural language that includes event trigger support, or in C, but not in plain SQL.
-
-The *Event Trigger* dialog allows you to implement options of the *CREATE EVENT TRIGGER* command. For more information about the *CREATE EVENT TRIGGER* command, see the PostgreSQL core documentation available at:
+.. _event trigger:
 
-   http://www.postgresql.org/docs/9.5/static/sql-createeventtrigger.html
+************************
+The Event Trigger Dialog
+************************
+ 
+Use the *Domain Trigger* dialog to define an event trigger. Unlike regular triggers, which are attached to a single table and capture only DML events, event triggers are global to a particular database and are capable of capturing DDL events.  Like regular triggers, event triggers can be written in any procedural language that includes event trigger support, or in C, but not in SQL. 
 
-The *Event Trigger* dialog organizes the development of a event trigger through the following dialog tabs: *General*, *Definition*, and *Security Labels*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Domain Trigger* dialog organizes the development of a event trigger through the following dialog tabs: *General*, *Definition*, and *Security Labels*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/event_trigger_general.png
 
@@ -16,7 +14,7 @@ Use the fields in the *General* tab to identify the event trigger:
 
 * Use the *Name* field to add a descriptive name for the event trigger. The name will be displayed in the *pgAdmin* tree control.
 * Use the drop-down listbox next to *Owner* to specify the owner of the event trigger. 
-* Store notes about the event trigger in the *Comments* field.
+* Store notes about the event trigger in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
@@ -36,29 +34,26 @@ Click the *Security Labels* tab to continue.
 Use the *Security* tab to define security labels applied to the trigger. Click *Add* to add each security label. 
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
-* Specify a a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
+* Specify a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
 
-To discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* dialog.
+Click *Add* to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
-For more information about using security Labels, please see the PostgreSQL Core documentation available at:
+Click the *SQL* tab to continue.
 
-   http://www.postgresql.org/docs/current/static/sql-security-label.html
+Your entries in the *Domain Trigger* dialog generate a generate a SQL command. Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
 
-Click the *SQL* tab to continue.
+**Example**
+
+The following is an example of the sql command generated by user selections in the *Domain Trigger* dialog: 
 
 .. image:: images/event_trigger_sql.png
 
-Your entries in the *Event Trigger* dialog generate a generate a SQL command; you can review the command on the *SQL* pane.
+The command creates an event trigger named *accounts* which uses the trigger function *acct_due*.
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Event Trigger dialog*:
 
-.. image:: images/event_trigger_sql_example.png "FIXME"
 
diff --git a/docs/en_US/extension_dialog.rst b/docs/en_US/extension_dialog.rst
index c201942..51f433d 100644
--- a/docs/en_US/extension_dialog.rst
+++ b/docs/en_US/extension_dialog.rst
@@ -1,22 +1,19 @@
-****************
-Extension Dialog
-****************
+.. _extension:
 
-Use the *Extension* dialog to install a new extension into the current database. Each extension must have a unique name.  Before you can use CREATE EXTENSION to load an extension into a database, the extension's supporting files must be installed.
+********************
+The Extension Dialog
+********************
 
-The *Extension* dialog allows you to implement options of the CREATE EXTENSION command through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections.
+Use the *Extension* dialog to install a new extension into the current database. An extension is a collection of SQL objects that add targeted functionality to your Postgres installation.  The *Extension* dialog adds the functionality of an extension to the current database only; you must register the extension in each database that use the extension.  Before you load an extension into a database, you should confirm that any pre-requisite files are installed.
 
-For more information about creating extensions, please see the PostgreSQL core documentation available at:
- 
-   http://www.postgresql.org/docs/9.5/static/sql-createextension.html
-   
-   http://www.postgresql.org/docs/current/static/extend-extensions.html
+The *Extension* dialog allows you to implement options of the CREATE EXTENSION command through the following dialog tabs: *General* and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/extension_general.png
 
 Use the fields in the *General* tab to identify an extension:
 
-* Use the drop-down listbox in the *Name* field to select the extension.   
+* Use the drop-down listbox in the *Name* field to select the extension. Each extension must have a unique name.
+* Store notes about the extension in the *Comment* field.     
 
 Click the *Definition* tab to continue.
 
@@ -29,20 +26,18 @@ Use the *Definition* tab to select the *Schema* and *Version*:
 
 Click the *SQL* tab to continue.
 
+Your entries in the *Extension* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
+
+**Example**
+
+The following is an example of the sql command generated by user selections in the *Extension* dialog: 
+
 .. image:: images/extension_sql.png
 
-Your entries in the *Extension* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The command creates the *chkpass* extension in the *public* schema.  It is version *1.0* of *chkpass*.    
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Extension* dialog:
-
-.. image:: images/extension_sql_example.png
-
-The command creates the *adminpack* extension in the *pg_catalog* schema.  It is version *1.0* of *adminpack*.
\ No newline at end of file
diff --git a/docs/en_US/foreign_data_wrapper_dialog.rst b/docs/en_US/foreign_data_wrapper_dialog.rst
index 858e647..4113f83 100644
--- a/docs/en_US/foreign_data_wrapper_dialog.rst
+++ b/docs/en_US/foreign_data_wrapper_dialog.rst
@@ -1,37 +1,35 @@
-***************************
-Foreign Data Wrapper Dialog
-***************************
+.. _fdw:
 
-Use the *Foreign Data Wrapper* dialog to create a foreign data wrapper. The foreign data wrapper consists of a set of functions; all operations on a foreign table are handled through the foreign data wrapper. The foreign data wrapper is responsible for fetching data from the remote data source and returning it to the PostgreSQL executor.
+*******************************
+The Foreign Data Wrapper Dialog
+*******************************
 
-A foreign-data wrapper name must be unique within the database.  You must be a superuser to create a foreign-data wrapper.
+Use the *Foreign Data Wrapper* dialog to create a foreign data wrapper. A foreign data wrapper is an adapter between a Postgres database and data stored on another data source.  
 
-The *Foreign Data Wrapper* dialog allows you to implement options of the CREATE FOREIGN DATA WRAPPER command. For more information about the CREATE FOREIGN DATA WRAPPER command, see PostgreSQL core documentation available at:
+You must be a superuser to create a foreign data wrapper.
 
-   http://www.postgresql.org/docs/9.5/static/sql-createforeigndatawrapper.html
+The *Foreign Data Wrapper* dialog organizes the development of a foreign data wrapper through the following dialog tabs: *General*, *Definition*, *Options*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
-The *Foreign Data Wrapper* dialog organizes the development of a foreign data wrapper through the following dialog tabs: *General*, *Definition*, *Options*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections.
+.. image:: images/fdw_general.png
 
-.. image:: images/foreign_data_wrapper_general.png
+Use the fields in the *General* tab to identify the foreign data wrapper: 
 
-Use the fields in the *General* tab to identify the foreign data wrapper:
-
-* Use the *Name* field to add a descriptive name for the foreign data wrapper. The name will be displayed in the *Object browser* tree control.
-* Use the drop-down listbox next to *Owner* to select the name of the role that will own the foreign data wrapper.
-* Store notes about the foreign data wrapper in the *Comments* field.
+* Use the *Name* field to add a descriptive name for the foreign data wrapper. A foreign data wrapper name must be unique within the database. The name will be displayed in the *pgAdmin* tree control.
+* Use the drop-down listbox next to *Owner* to select the name of the role that will own the foreign data wrapper. 
+* Store notes about the foreign data wrapper in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
-.. image:: images/foreign_data_wrapper_definition.png
+.. image:: images/fdw_definition.png
 
 Use the fields in the *Definition* tab to set parameters:
 
 * Select the name of the handler from the drop-down listbox in the *Handler* field. This is the name of an existing function that will be called to retrieve the execution functions for foreign tables. 
-* Select the name of the validator from the drop-down listbox in the *Validator* field. This is the name of an existing function that will be called to check the generic options given to the foreign-data wrapper, as well as options for foreign servers, user mappings and foreign tables using the foreign-data wrapper.
+* Select the name of the validator from the drop-down listbox in the *Validator* field. This is the name of an existing function that will be called to check the generic options given to the foreign data wrapper, as well as options for foreign servers, user mappings and foreign tables using the foreign data wrapper.
 
 Click the *Options* tab to continue.
 
-.. image:: images/foreign_data_wrapper_options.png
+.. image:: images/fdw_options.png
 
 Use the fields in the *Options* tab to specify options:
 
@@ -42,7 +40,7 @@ Click *Add* to specify each additional pair; to discard an option, click the tra
 
 Click the *Security* tab to continue.
 
-.. image:: images/foreign_data_wrapper_security.png
+.. image:: images/fdw_security.png
 
 Use the *Security* tab to assign security privileges. Click *Add* to assign a set of privileges.
 
@@ -50,24 +48,23 @@ Use the *Security* tab to assign security privileges. Click *Add* to assign a se
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privileges to the specified user.
 * Select the name of the role granting the privileges from the drop-down listbox in the *Grantor* field. The default grantor is the owner of the foreign data wrapper.
 
-To discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click add to assign additional privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 
-.. image:: images/foreign_data_wrapper_sql.png
+Your entries in the *Foreign Data Wrapper* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in the *Foreign Data Wrapper* dialog: 
+
+.. image:: images/fdw_sql.png
 
-Your entries in the *Foreign Data Wrapper* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The example creates a foreign data wrapper named *libpq_debug* that uses pre-existing validator and handler functions, *dblink_fdw_validator* and *libpg_fdw_handler*.  Selections on the *Options* tab set *debug* equal to *true*.  The foreign data wrapper is owned by *enterprisedb*.
  
-* Click the *Help* button (?) to access online help. 
+* Click the *Help* button (?) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Foreign Data Wrapper dialog*:
 
-.. image:: images/foreign_data_wrapper_sql_example.png
-
-The example creates a foreign data wrapper named *libpq_debug* that uses pre-existing validator and handler functions, *dblink_fdw_validator* and *libpg_fdw_handler*.  Selections on the *Options* tab set *debug* equal to *true*.  The foreign data wrapper is owned by *enterprisedb*.
diff --git a/docs/en_US/fts_parser_dialog.rst b/docs/en_US/fts_parser_dialog.rst
index 24ff441..40e0777 100644
--- a/docs/en_US/fts_parser_dialog.rst
+++ b/docs/en_US/fts_parser_dialog.rst
@@ -1,14 +1,12 @@
-*****************
-FTS Parser Dialog
-*****************
+.. _fts_parser:
 
-Use the *FTS Parser* dialog to create a new text search parser. A text search parser defines a method for splitting a text string into tokens and assigning types (categories) to the tokens. The *FTS Parser* dialog allows you to implement options of the CREATE TEXT SEARCH PARSER command. For more information about the CREATE TEXT SEARCH PARSER command, see PostgreSQL core documentation available at:
+*********************
+The FTS Parser Dialog    
+*********************
 
-   http://www.postgresql.org/docs/9.5/static/sql-createtsparser.html
+Use the *FTS Parser* dialog to create a new text search parser. A text search parser defines a method for splitting a text string into tokens and assigning types (categories) to the tokens. 
 
-The *FTS Parser* dialog organizes the development of a text search parser through the following dialog tabs: *General*, and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections.
- 
-Click the *General* tab to begin.
+The *FTS Parser* dialog organizes the development of a text search parser through the following dialog tabs: *General*, and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/fts_parser_general.png
 
@@ -16,7 +14,7 @@ Use the fields in the *General* tab to identify a text search parser:
 
 * Use the *Name* field to add a descriptive name for the parser. The name will be displayed in the *pgAdmin* tree control.
 * Select the name of the schema in which the parser will reside from the drop-down listbox in the *Schema* field.
-* Store notes about the domain in the *Comments* field.
+* Store notes about the domain in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
@@ -24,19 +22,21 @@ Click the *Definition* tab to continue.
 
 Use the fields in the *Definition* tab to define parameters:
 
-* Use the drop-down listbox next to *Start function* to select the name of the start function for the parser.
-* Use the drop-down listbox next to *Get next token function* to select the name of the get-next-token function for the parser.
-* Use the drop-down listbox next to *End function* to select the name of the end function for the parser.
-* Use the drop-down listbox next to *Lextypes function* to select the name of the lextypes function for the parser (a function that returns information about the set of token types it produces).
-* Use the drop-down listbox next to *Headline function* to select the name of the headline function for the parser (a function that summarizes a set of tokens).
+* Use the drop-down listbox next to *Start function* to select the name of the function that will initialize the parser.
+* Use the drop-down listbox next to *Get next token function* to select the name of the function that will return the next token.
+* Use the drop-down listbox next to *End function* to select the name of the function that is called when the parser is finished.
+* Use the drop-down listbox next to *Lextypes function* to select the name of the lextypes function for the parser. The lextypes function returns an array that contains the id, alias, and a description of the tokens used by the parser.
+* Use the drop-down listbox next to *Headline function* to select the name of the headline function for the parser. The headline function returns an excerpt from the document in which the terms of the query are highlighted.
 
 Click the *SQL* tab to continue.
 
 .. image:: images/fts_parser_sql.png
 
-Your entries in the *Extension* dialog generate a generate a SQL command; you can review the command on the *SQL* pane.
+Your entries in the *FTS Parser* dialog generate a generate a SQL command. Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
+
+
diff --git a/docs/en_US/fts_template_dialog.rst b/docs/en_US/fts_template_dialog.rst
index 102643a..1bc035b 100644
--- a/docs/en_US/fts_template_dialog.rst
+++ b/docs/en_US/fts_template_dialog.rst
@@ -1,12 +1,12 @@
-*******************
-FTS Template Dialog
-*******************
+.. _fts_template:
 
-Use the *FTS Template* dialog to create a new text search template. A text search template defines the functions that implement text search dictionaries. The *FTS Template* dialog allows you to implement options of the CREATE TEXT SEARCH TEMPLATE command. For more information about the CREATE TEXT SEARCH TEMPLATE command, see PostgreSQL core documentation available at:
+***********************
+The FTS Template Dialog   
+***********************
 
-   http://www.postgresql.org/docs/9.5/static/sql-createtstemplate.html
+Use the *FTS Template* dialog to create a new text search template. A text search template defines the functions that implement text search dictionaries. 
 
-The *FTS Template* dialog organizes the development of a text search Template through the following dialog tabs: *General*, and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *FTS Template* dialog organizes the development of a text search Template through the following dialog tabs: *General*, and *Definition*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/fts_template_general.png
 
@@ -14,7 +14,7 @@ Use the fields in the *General* tab to identify a template:
 
 * Use the *Name* field to add a descriptive name for the template. The name will be displayed in the *pgAdmin* tree control.
 * Select the name of the schema in which the template will reside from the drop-down listbox in the *Schema* field.
-* Store notes about the domain in the *Comments* field.
+* Store notes about the template in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
@@ -27,24 +27,21 @@ Use the fields in the *Definition* tab to define function parameters:
 
 Click the *SQL* tab to continue.
 
+Your entries in the *FTS Template* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in the *FTS Template* dialog: 
+
 .. image:: images/fts_template_sql.png
 
-Your entries in the *FTS Template* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The example shown demonstrates creating a fts template named *ru_template* that uses the ispell dictionary. 
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *FTS Template dialog*:
-
-.. image:: images/fts_template_sql_example.png
-
-The example shown demonstrates creating a fts template named *ru_template* that uses the ispell dictionary.
-
 
 
 
diff --git a/docs/en_US/function_dialog.rst b/docs/en_US/function_dialog.rst
index a80f9bd..a95908f 100644
--- a/docs/en_US/function_dialog.rst
+++ b/docs/en_US/function_dialog.rst
@@ -1,14 +1,12 @@
-***************
-Function Dialog
-***************
+.. _function:
 
-Use the *Function* dialog to define a function.  If you drop and then recreate a function, the new function is not the same entity as the old; you must drop existing rules, views, triggers, etc. that refer to the old function.
+*******************
+The Function Dialog
+*******************
 
-The *Function* dialog allows you to implement options of the CREATE FUNCTION and ALTER FUNCTION commands. For more information about the CREATE FUNCTION command, see the PostgreSQL core documentation available at:
+Use the *Function* dialog to define a function.  If you drop and then recreate a function, the new function is not the same entity as the old; you must drop existing rules, views, triggers, etc. that refer to the old function. 
 
-   http://www.postgresql.org/docs/9.5/static/sql-createfunction.html
-
-The *Function* dialog organizes the development of a function through the following dialog tabs: *General*, *Definition*, *Options*, *Arguments*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Function* dialog organizes the development of a function through the following dialog tabs: *General*, *Definition*, *Options*, *Arguments*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/function_general.png
 
@@ -17,7 +15,7 @@ Use the fields in the *General* tab to identify a function:
 * Use the *Name* field to add a descriptive name for the function. The name will be displayed in the *pgAdmin* tree control.
 * Use the drop-down listbox next to *Owner* to select the name of the role that will own the function.
 * Use the drop-down listbox next to *Schema* to select the schema in which the function will be created.
-* Store notes about the function in the *Comments* field.
+* Store notes about the function in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
@@ -26,7 +24,7 @@ Click the *Definition* tab to continue.
 Use the fields in the *Definition* tab to define the function:
 
 * Use the drop-down listbox next to *Return type* to select the data type returned by the function, if any. 
-* Use the drop-down listbox next to *Language* to select the implementation language. 
+* Use the drop-down listbox next to *Language* to select the implementation language. The default is *sql*.
 * Use the *Code* field to write the code that will execute when the function is called.
 
 Click the *Options* tab to continue.
@@ -39,14 +37,14 @@ Use the fields in the *Options* tab to describe or modify the action of the func
    *VOLATILE* indicates that the function value can change even within a single table scan, so no optimizations can be made. 
    *STABLE* indicates that the function cannot modify the database, and that within a single table scan it will consistently return the same result for the same argument values.
    *IMMUTABLE* indicates that the function cannot modify the database and always returns the same result when given the same argument values.
-* Use the *Returns a Set?* switch to indicate if the function returns a set that includes multiple rows. The default is *No*.
-* Use the *Strict?* switch to indicate if the function always returns NULL whenever any of its arguments are NULL. If *Yes*, the function is not executed when there are NULL arguments; instead a NULL result is assumed automatically. The default is *No*.
-* Use the *Security of definer?* switch to specify that the function is to be executed with the privileges of the user that created it. The default is *No*.
-* Use the *Window?* switch to indicate that the function is a window function rather than a plain function. The default is *No*. This is currently only useful for functions written in C. The WINDOW attribute cannot be changed when replacing an existing function definition. For more information about the CREATE FUNCTION command, see the PostgreSQL core documentation available at:
+* Move the *Returns a Set?* switch to indicate if the function returns a set that includes multiple rows. The default is *No*. 
+* Move the *Strict?* switch to indicate if the function always returns NULL whenever any of its arguments are NULL. If *Yes*, the function is not executed when there are NULL arguments; instead a NULL result is assumed automatically. The default is *No*.
+* Move the *Security of definer?* switch to specify that the function is to be executed with the privileges of the user that created it. The default is *No*.
+* Move the *Window?* switch to indicate that the function is a window function rather than a plain function. The default is *No*. This is currently only useful for functions written in C. The WINDOW attribute cannot be changed when replacing an existing function definition. For more information about the CREATE FUNCTION command, see the PostgreSQL core documentation available at:
    http://www.postgresql.org/docs/9.5/static/functions-window.html
 * Use the *Estimated cost* field to specify a positive number representing the estimated execution cost for the function, in units of cpu_operator_cost. If the function returns a set, this is the cost per returned row. 
-* Use the *Estimated rows* field to specify a positive number giving the estimated number of rows that the planner should expect the function to return. This is only allowed when the function is declared to return a set. The default assumption is 1000 rows.
-* Use the *Leak proof?* switch to indicate whether the function has side effects. The default is *No*. This option can only be set by the superuser.
+* Use the *Estimated rows* field to specify a positive number giving the estimated number of rows that the query planner should expect the function to return. This is only allowed when the function is declared to return a set. The default assumption is 1000 rows. 
+* Move the *Leak proof?* switch to indicate whether the function has side effects. The default is *No*. This option can only be set by the superuser.
 
 Click the *Arguments* tab to continue.
 
@@ -68,7 +66,7 @@ Click the *Parameters* tab to continue.
 Use the fields in the *Parameters* tab to specify settings that will be applied when the function is invoked:
 
 * Use the drop-down listbox next to *Parameter Name* in the *Parameters* panel to select a parameter. 
-* Click the *Add* button to add the variable to *Name* field.
+* Click the *Add* button to add the variable to *Name* field in the table.
 * Use the *Value* field to specify the value that will be associated with the selected variable. This field is context-sensitive.
 
 Click the *Security* tab to continue.
@@ -94,21 +92,20 @@ Click *Add* to assign additional security labels; to discard a security label, c
 
 Click the *SQL* tab to continue.
 
+Your entries in the *Function* dialog generate a generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
+
+**Example**
+
+The following is an example of the sql command generated by selections made in the *Function* dialog: 
+
 .. image:: images/function_sql.png
 
-Your entries in the *Function* dialog generate a generate a SQL command; you can review the command on the *SQL* pane.
+The example demonstrates creating an *edbspl* function named *emp_comp*.  The function adds two columns (p_sal and p_comm), and then uses the result to compute a yearly salary, returning a NUMERIC value.
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help.View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by selections made in the *Function dialog*:
 
-.. image:: images/function_sql_example.png
-
-The example demonstrates creating an *edbspl* function named *emp_comp*.  The function adds two columns (p_sal and p_comm), and then uses the result to compute a yearly salary, returning a NUMERIC value.
 
diff --git a/docs/en_US/images/cast_definition.png b/docs/en_US/images/cast_definition.png
index bfafd6b66f9c5729850aa25730dc3c2956fa8ca5..9846a9d8d51b8a9bd518c8bc545e9f5812b68b1d 100644
GIT binary patch
diff --git a/docs/en_US/images/cast_general.png b/docs/en_US/images/cast_general.png
index a068bffb62f545bc8d81167321e9992dc8aeec68..26b4c0a1401e535da7bb1912363a33c89b7c05ec 100644
GIT binary patch
diff --git a/docs/en_US/images/cast_sql.png b/docs/en_US/images/cast_sql.png
index 1ff53f57d943236813bea20048be9434591b7578..af811900951879c6046df934780c4dc110fab168 100644
GIT binary patch
diff --git a/docs/en_US/images/collation_definition.png b/docs/en_US/images/collation_definition.png
index f883199b3d7b803a614b3a9c8a0e4713fb97fdcb..ce06bd68ce033232daef14082532d5a840ff36d2 100644
GIT binary patch
diff --git a/docs/en_US/images/collation_general.png b/docs/en_US/images/collation_general.png
index e8d927ea3a05e44bfc50eabc6fe10753425e39d3..4ce75cd3e6dd22831c793696fb55cb75e9e66e60 100644
GIT binary patch
diff --git a/docs/en_US/images/collation_sql.png b/docs/en_US/images/collation_sql.png
index dc299a74e5c95aa881e974243db3c6f535b01d67..4802479ca487991435fd4632bd45c6cbaacbf51e 100644
GIT binary patch
diff --git a/docs/en_US/images/database_definition.png b/docs/en_US/images/database_definition.png
index 256cea1e3173b23a96f8a00f8d5770fd7f888b3c..7282b4af7b07db5958aadfac71294a6da38742f0 100644
GIT binary patch
diff --git a/docs/en_US/images/database_general.png b/docs/en_US/images/database_general.png
index a95776a9aa82ceb4b344fd436d1ffaec007bcc6c..17b1c8187968d23ff3f0f1bdbed180d08eeaed38 100644
GIT binary patch
diff --git a/docs/en_US/images/database_parameters.png b/docs/en_US/images/database_parameters.png
index 9ad64368ab84c55109e7d441c8835c7a08b6e8ae..0871c61845f3b5b5245c248695417c535db51aec 100644
GIT binary patch
diff --git a/docs/en_US/images/database_security.png b/docs/en_US/images/database_security.png
index c9d3863e2f39e8f9fa07c1f909af603cd677e166..e2955519fbd3ce24a82c80cda22b5d1d04604da9 100644
GIT binary patch
diff --git a/docs/en_US/images/database_sql.png b/docs/en_US/images/database_sql.png
index 4e9df1ddf738a4b8f4b6a638252610274c43c313..a98839a5622fd72c498f8f551fa6356e6c3fa86c 100644
GIT binary patch
diff --git a/docs/en_US/images/domain_constraint_definition.png b/docs/en_US/images/domain_constraint_definition.png
index 3685e666a797873591fb9a914f9abc14c84681f2..f7e674219cc637446fa9055aa86327b13266092e 100644
GIT binary patch
diff --git a/docs/en_US/images/domain_constraint_general.png b/docs/en_US/images/domain_constraint_general.png
index 6242b84e00e73b7c264396ec49fdcde5bdc32bbd..5aa0b192e8b30961dd51fb15a32edf07d2c1019f 100644
GIT binary patch
diff --git a/docs/en_US/images/domain_constraint_sql.png b/docs/en_US/images/domain_constraint_sql.png
index 3ebe9a50518d62979dbe0a77650e3fcb8f85626b..3c950c7c7617abbd5ddd413bd16e8dd4fb51576c 100644
GIT binary patch
diff --git a/docs/en_US/images/domain_constraints.png b/docs/en_US/images/domain_constraints.png
index 55d1b690526c48136c48d158095f9e056b12adcb..c1704490fc7c42f998accade39a4280614a3e8d2 100644
GIT binary patch
diff --git a/docs/en_US/images/domain_definition.png b/docs/en_US/images/domain_definition.png
index 1cc8ef8674a59f08c1aa340a1f8b03932b1673af..fd14d9d5255adae72654555aafd9f514a0d2207f 100644
GIT binary patch
diff --git a/docs/en_US/images/domain_general.png b/docs/en_US/images/domain_general.png
index 47915f373e7382c0ba9d805a66cefe1280dd76c2..ca8c5c5c8926b73382a7046e3851a2a26dc00a22 100644
GIT binary patch
diff --git a/docs/en_US/images/domain_security.png b/docs/en_US/images/domain_security.png
index 6fc7db3e35f94e53e023f159eb6088f8d29617e8..26f286738ed6de8c4117fbed4daded2f8513b15d 100644
GIT binary patch
diff --git a/docs/en_US/images/domain_sql.png b/docs/en_US/images/domain_sql.png
index f3d9194fc5e243574846c7784e2c683f278839ed..440fa0f0a3c75a69f13421d2fcbb7b9deb02295b 100644
GIT binary patch
diff --git a/docs/en_US/images/event_trigger_definition.png b/docs/en_US/images/event_trigger_definition.png
index 73758aca847aa8797fc9ece858c6d52001193d8a..71391f2458c77b4f48b5fa3b96752b67c1f2c8e5 100644
GIT binary patch
diff --git a/docs/en_US/images/event_trigger_general.png b/docs/en_US/images/event_trigger_general.png
index d48637dc4be63d38a4fbf9e65cd11316d89dce52..2b9e6b6398dad006464ef81e5cf088c762e9c155 100644
GIT binary patch
diff --git a/docs/en_US/images/event_trigger_security.png b/docs/en_US/images/event_trigger_security.png
index b4bc043a17a919924b61e89cef8a6bac6ea89d9d..f24d4213481ffe62a5645d07c80476edf6729dd5 100644
GIT binary patch
diff --git a/docs/en_US/images/event_trigger_sql.png b/docs/en_US/images/event_trigger_sql.png
index 62b76d2b6ddfb078d9bce1dce1506c371ec088e0..39e1d4a885f93a1afd5e0501be52391cc1e1e120 100644
GIT binary patch
diff --git a/docs/en_US/images/extension_definition.png b/docs/en_US/images/extension_definition.png
index f31dafc6fb1e944041a03d3035276a63e671245c..6d1c800b2fd024a73d380f7885c06576e449a5ef 100644
GIT binary patch
diff --git a/docs/en_US/images/extension_general.png b/docs/en_US/images/extension_general.png
index f48c509f3ec5bc68c95d7a7671eb46ee634d27d0..3a8085d2afbb4e74d59241cd2f57c5659c2888cf 100644
GIT binary patch
diff --git a/docs/en_US/images/extension_sql.png b/docs/en_US/images/extension_sql.png
index 049871d1af67916939654929a6c4de4ca61c5af5..81255e934f82d726289c8df5b66a949b2077ce00 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_dictionary_definition.png b/docs/en_US/images/fts_dictionary_definition.png
index 3a8b40101567d8e3badc3cb81caa97814da44c05..ae1e72c5cea6ffe0c150ec297bdbd5ebf6ea76ea 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_dictionary_general.png b/docs/en_US/images/fts_dictionary_general.png
index c16d8dc8d72c2c2be77ce0c6008a31b39283852a..61cc7936a3db4ee2496b4ddfca61cb0fd8ed11df 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_dictionary_options.png b/docs/en_US/images/fts_dictionary_options.png
index e66bff3de9c10ba2df7385222d77ff51d7f9e77d..3e127d386db97fec251f831118744764b029e373 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_dictionary_sql.png b/docs/en_US/images/fts_dictionary_sql.png
index f506df78380473fe2ead88199432a5159a4fbca6..92a794d1f5dae29d9dcb4dc307e055277c9e506f 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_parser_definition.png b/docs/en_US/images/fts_parser_definition.png
index f2e5b2e0d03d6110f5bb8259837fda7ee6db778e..fbedbc06629858078e909afb3b90835063f49c58 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_parser_general.png b/docs/en_US/images/fts_parser_general.png
index d23cc877f3d7abedd8645cc6ad38bff0b0df10a7..2d244c94928fdfe86da2273d88d5f71903ce2a4a 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_parser_sql.png b/docs/en_US/images/fts_parser_sql.png
index 60878a88e538f7c1a81fbd524f120d6cf8cec2fe..6ee3cf6266a82fb8b9326f65bf799779fd0a27d1 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_template_definition.png b/docs/en_US/images/fts_template_definition.png
index 0cfc3858e80fdcaf3382b32805140e62c0154435..363d1d42fadcafe98bad5ea1919d97b935067940 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_template_general.png b/docs/en_US/images/fts_template_general.png
index f46479d79ca5d2d0ab95eadff6c6056f8b943f99..4cc953843eafe228334874bc09dfdb4567db43e0 100644
GIT binary patch
diff --git a/docs/en_US/images/fts_template_sql.png b/docs/en_US/images/fts_template_sql.png
index 400809e713056250758788efaf38371adf7205f1..9664bb7d72370e774f81bf918bf22a8f833f12ec 100644
GIT binary patch
diff --git a/docs/en_US/images/function_arguments.png b/docs/en_US/images/function_arguments.png
index c44231c12b4a145fc143ac5422ddbb68cf14a80c..b3eb31e7da789521c3ee448286fbbe076c8a796c 100644
GIT binary patch
diff --git a/docs/en_US/images/function_definition.png b/docs/en_US/images/function_definition.png
index 8c5f76d527db6b67f9249544a141033630fd046c..ad266acd1b62d8069fae612be68edc380044b69e 100644
GIT binary patch
diff --git a/docs/en_US/images/function_general.png b/docs/en_US/images/function_general.png
index 8e0c78d59fb94eec25685a564b3972d8567fe626..3b4c5e5afa6f936f7d3189b9828a8757c436c59d 100644
GIT binary patch
diff --git a/docs/en_US/images/function_options.png b/docs/en_US/images/function_options.png
index bf146b8cede49716ee1f5944781980f8ad8e22d5..4c4f129be1da09ae46cd718391e8b431961741e2 100644
GIT binary patch
diff --git a/docs/en_US/images/function_parameters.png b/docs/en_US/images/function_parameters.png
index 6b0add40d0b01ea2630ca0c7b058412d248d7d20..a1185159a2e6a126219dad1836382d41de4de0d3 100644
GIT binary patch
diff --git a/docs/en_US/images/function_security.png b/docs/en_US/images/function_security.png
index 13c786ec92cb9bd30348d748f7c22eb5b3528c7e..ca4930d110e0ed4f6e1bc2f94aabcf20eb044ecb 100644
GIT binary patch
diff --git a/docs/en_US/images/function_sql.png b/docs/en_US/images/function_sql.png
index 4e3abf25707e92fc597374b41767adb022cf1a80..f0093ece0a6f9921a51905b3f8e6830882f6c6e2 100644
GIT binary patch
diff --git a/docs/en_US/images/procedure_arguments.png b/docs/en_US/images/procedure_arguments.png
index ffc087442b72c398c6056e9a06b2fd70beff0da8..bdc63dae3d981a9c658867be015a15598ef6e5d7 100644
GIT binary patch
diff --git a/docs/en_US/images/procedure_definition.png b/docs/en_US/images/procedure_definition.png
index 4fe4adff381def645eb7bd9246fde69f6df695eb..7b97644a6ec31a2521cc7713397c12db245035f6 100644
GIT binary patch
diff --git a/docs/en_US/images/procedure_general.png b/docs/en_US/images/procedure_general.png
index 98bb23f458521d081a34d4889378b6ab920a0917..a63151b856e8de25278d1f13f15dcc12ed05cf50 100644
GIT binary patch
diff --git a/docs/en_US/images/procedure_options.png b/docs/en_US/images/procedure_options.png
index d031b5fd62be6dd9af23dcc6ef19ee5e25988021..e62d231eab2337015b68703730fef167015d17b5 100644
GIT binary patch
diff --git a/docs/en_US/images/procedure_parameters.png b/docs/en_US/images/procedure_parameters.png
index b2e158f4e7066fa0f4e6bc2f63ca070b8184cc99..20e4aa8bd528b627219bcf85876acb91cbcc70e7 100644
GIT binary patch
diff --git a/docs/en_US/images/procedure_security.png b/docs/en_US/images/procedure_security.png
index 150945f34de3c98aed024805aca1f294b7b1ff89..2f64b6106930516ae04225d81a869f86bf9b19d1 100644
GIT binary patch
diff --git a/docs/en_US/images/procedure_sql.png b/docs/en_US/images/procedure_sql.png
index cb7d6c6934acd0a8f123ba48d581eecf62ff846a..c9e07a44df45a4bb4d9b63a08c798105e51599dd 100644
GIT binary patch
diff --git a/docs/en_US/images/resource_group_general.png b/docs/en_US/images/resource_group_general.png
index 2b1523d7f47416665eab473ce378fbea0c4a44f5..475cf405d4acbb6035270bfbff83eb3999f0fe07 100644
GIT binary patch
diff --git a/docs/en_US/images/resource_group_sql.png b/docs/en_US/images/resource_group_sql.png
index 675e12ccacf785b7efb5097c4c8dd2d9d0da50c6..0caf9ae7e1c8dedfbc4e169c27853e096b48ab1a 100644
GIT binary patch
diff --git a/docs/en_US/images/role_definition.png b/docs/en_US/images/role_definition.png
index 33f1bf52dd287c8e58568a3e92c28deb4cbf815c..7d79621e93a3f4676d1691439f226e016a4753d1 100644
GIT binary patch
diff --git a/docs/en_US/images/role_general.png b/docs/en_US/images/role_general.png
index e88e1be627312933d755a27b13fc48f1b7f19fbf..73c83cde2e89c122d12926fc6aaeb70e51b18584 100644
GIT binary patch
diff --git a/docs/en_US/images/role_parameters.png b/docs/en_US/images/role_parameters.png
index b825be1cdd6533bd6362ca230ab4aadb488bb515..be22f6cbcbfdc9d1194f848a746901287e52ee71 100644
GIT binary patch
diff --git a/docs/en_US/images/role_privileges.png b/docs/en_US/images/role_privileges.png
index 3ff569ce5d0a1d0d52bfb4f9fa38766d3ccfaba9..53673dcd4707d5e51c56bb4624c39df93cb55d11 100644
GIT binary patch
diff --git a/docs/en_US/images/role_security.png b/docs/en_US/images/role_security.png
index b3fb470689262ef08d93f7e1f65d7c15392af078..d6b4f02f5926979a5596a5dff36b120e9a4869d9 100644
GIT binary patch
diff --git a/docs/en_US/images/role_sql.png b/docs/en_US/images/role_sql.png
index b80ad46af58e47c6330f3877b315377606111468..c9d67f7ebccb3045b7c5b340ceffc10e5b007380 100644
GIT binary patch
diff --git a/docs/en_US/images/schema_general.png b/docs/en_US/images/schema_general.png
index b46f209a5673f8a59d67c9528261c5f8fc36fa1a..20ec6f21bcce27ae1575556ef866fc2e136fbb48 100644
GIT binary patch
diff --git a/docs/en_US/images/schema_security.png b/docs/en_US/images/schema_security.png
index 2ecb695c27c6aef6cacecdf8d570ae0136c5b8f4..3b97d81a63df666364a0aa44bd71907686367918 100644
GIT binary patch
diff --git a/docs/en_US/images/schema_sql.png b/docs/en_US/images/schema_sql.png
index b6b9e671a7155aff9648ad794de40044216287a5..f673e11f0f3bf74bc2b386570e694e1f91010e6c 100644
GIT binary patch
diff --git a/docs/en_US/images/sequence_definition.png b/docs/en_US/images/sequence_definition.png
index 7aa31c11d2cd8687fbcf650b47c3054c2de2b929..26649e370bc10e17eac990be1bc56cb283920d19 100644
GIT binary patch
diff --git a/docs/en_US/images/sequence_general.png b/docs/en_US/images/sequence_general.png
index fb8ad32173066309a55e01e59cff98c7b446339f..d6591b241fd71e97eac41dcedd81c8fea35983e9 100644
GIT binary patch
diff --git a/docs/en_US/images/sequence_security.png b/docs/en_US/images/sequence_security.png
index 1f2891a9e5ec865cbf60ff7edb0cc694972a54d6..65c30126cb79fb0e360072b9377173b8c56b3f12 100644
GIT binary patch
diff --git a/docs/en_US/images/sequence_sql.png b/docs/en_US/images/sequence_sql.png
index be028a12cdf7f5c35098e0b32e6076496216ceac..d2ca8b53db1e607d1147aed24310b34e5615e2b6 100644
GIT binary patch
diff --git a/docs/en_US/images/server_connection.png b/docs/en_US/images/server_connection.png
index 8291e0f4917ca367dea0dfaf5662709ab148e9b5..ee0cb72c3d88b7ecd4aae2de7076f89ad0faca35 100644
GIT binary patch
diff --git a/docs/en_US/images/server_general.png b/docs/en_US/images/server_general.png
index 85e4e3aa5c1b585d3d0bf5b4bbd01cc93998640a..d7691ca2fdac081853f34fafc1efee4fb686b225 100644
GIT binary patch
diff --git a/docs/en_US/images/server_group.png b/docs/en_US/images/server_group.png
index 6fd635998ad9886bfe1717dcf0b313b2dcdc1a63..dad62b203d54828f7e814cd4fd4b85fc9450918c 100644
GIT binary patch
diff --git a/docs/en_US/images/tablespace_definition.png b/docs/en_US/images/tablespace_definition.png
index d521cf6d5811aaf67548163d2b196ce53e852153..00c58167264d2dddebdb07850856d6a421a1acb0 100644
GIT binary patch
diff --git a/docs/en_US/images/tablespace_general.png b/docs/en_US/images/tablespace_general.png
index 4e16554624935ba66c11b15791eed2ac42c0bfc8..c8d209806a5ec88d6e81534a7e7363f87597feb9 100644
GIT binary patch
diff --git a/docs/en_US/images/tablespace_parameters.png b/docs/en_US/images/tablespace_parameters.png
index 2df1cabc45695f3a1b41a3646b4f911b8b4376b9..3b6da8b6bf9f0d99dd6405c972f786e589730897 100644
GIT binary patch
diff --git a/docs/en_US/images/tablespace_security.png b/docs/en_US/images/tablespace_security.png
index 201d76f337aec28eea8a15271356d4120dc91048..51ceb2d0bd5703005fd1d7a1aa173cac5a20aaaf 100644
GIT binary patch
diff --git a/docs/en_US/images/tablespace_sql.png b/docs/en_US/images/tablespace_sql.png
index 158c5d8cf5e72eb9c126bbee1a9d6ee10954ee87..ee5030fdc63c409392ebfc87f1f8f263b7d20562 100644
GIT binary patch
diff --git a/docs/en_US/procedure_dialog.rst b/docs/en_US/procedure_dialog.rst
index e755e72..3e40e96 100644
--- a/docs/en_US/procedure_dialog.rst
+++ b/docs/en_US/procedure_dialog.rst
@@ -1,12 +1,14 @@
-****************
-Procedure Dialog
-****************
+.. _procedure:
+
+********************
+The Procedure Dialog
+********************
  
 Use the *Procedure* dialog to create a procedure; procedures are supported by EDB Postgres Advanced Server. The *Procedure* dialog allows you to implement options of the CREATE PROCEDURE command; for more information about the CREATE PROCEDURE SQL command, please see the Database Compatibility for Oracle Developer's, available at:
 
-     http://www.enterprisedb.com
+     http://www.enterprisedb.com  
 
-The *Procedure* dialog organizes the development of a procedure through the following dialog tabs: *General*, *Definition*, *Options*, *Arguments*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Procedure* dialog organizes the development of a procedure through the following dialog tabs: *General*, *Definition*, *Options*, *Arguments*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections. 
  
 .. image:: images/procedure_general.png
 
@@ -15,7 +17,7 @@ Use the fields in the *General* tab to identify a procedure:
 * Use the *Name* field to add a descriptive name for the procedure. The name will be displayed in the *pgAdmin* tree control.
 * Use the drop-down listbox next to *Owner* to select a role.
 * Select the name of the schema in which the procedure will reside from the drop-down listbox in the *Schema* field.
-* Store notes about the procedure in the *Comments* field.
+* Store notes about the procedure in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
@@ -36,10 +38,10 @@ Use the fields in the *Options* tab to describe or modify the behavior of the pr
    *VOLATILE* indicates that the value can change even within a single table scan, so no optimizations can be made. 
    *STABLE* indicates that the procedure cannot modify the database, and that within a single table scan it will consistently return the same result for the same argument values, but that its result could change across SQL statements. 
    *IMMUTABLE* indicates that the procedure cannot modify the database and always returns the same result when given the same argument values.
-* Use the *Strict?* switch to indicate if the procedure always returns NULL whenever any of its arguments are NULL. If *Yes*, the procedure is not executed when there are NULL arguments; instead a NULL result is assumed automatically. The default is *No*.
-* Use the *Security of definer?* switch to specify that the procedure is to be executed with the privileges of the user that created it. The default is *No*.
+* Move the *Strict?* switch to indicate if the procedure always returns NULL whenever any of its arguments are NULL. If *Yes*, the procedure is not executed when there are NULL arguments; instead a NULL result is assumed automatically. The default is *No*.
+* Move the *Security of definer?* switch to specify that the procedure is to be executed with the privileges of the user that created it. The default is *No*.
 * Use the *Estimated cost* field to specify a positive number representing the estimated execution cost for the procedure, in units of cpu_operator_cost. If the procedure returns a set, this is the cost per returned row. 
-* Use the *Leak proof?* switch to indicate whether the procedure has side effects — it reveals no information about its arguments other than by its return value. The default is *No*. 
+* Move the *Leak proof?* switch to indicate whether the procedure has side effects — it reveals no information about its arguments other than by its return value. The default is *No*.   
 
 Click the *Arguments* tab to continue.
 
@@ -61,7 +63,7 @@ Click the *Parameters* tab to continue.
 Use the fields in the *Parameters* tab to specify settings that will be applied when the procedure is invoked:
 
 * Use the drop-down listbox next to *Parameter Name* in the *Parameters* panel to select a parameter. 
-* Click the *Add* button to add the variable to *Name* field.
+* Click the *Add* button to add the variable to *Name* field in the table.
 * Use the *Value* field to specify the value that will be associated with the selected variable. This field is context-sensitive.
 
 Click the *Security* tab to continue.
@@ -87,21 +89,19 @@ Click *Add* to assign additional security labels; to discard a security label, c
 
 Click the *SQL* tab to continue.
 
+Your entries in the *Procedure* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by selections made in the *Procedure* dialog: 
+
 .. image:: images/procedure_sql.png
 
-Your entries in the *Procedure* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The example demonstrates creating a procedure that returns a list of employees from a table named *emp*.  The procedure is a SECURITY DEFINER, and will execute with the privileges of the role that defined the procedure.  
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help.  View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by selections made in the *Procedure* dialog:
-
-.. image:: images/procedure_sql_example.png
-
-The example demonstrates creating a procedure that returns a list of employees from a table named *emp*.  The procedure is a SECURITY DEFINER, and will execute with the privileges of the role that defined the procedure.  
 
diff --git a/docs/en_US/resource_group_dialog.rst b/docs/en_US/resource_group_dialog.rst
index 70b23db..a5fba38 100644
--- a/docs/en_US/resource_group_dialog.rst
+++ b/docs/en_US/resource_group_dialog.rst
@@ -1,12 +1,14 @@
-*********************
-Resource Group Dialog
-*********************
+.. _resource_group:
 
-Use the *Resource Group* dialog to create a resource group and set values for the groups resources. A resource group is a named, global group on which various resource usage limits can be defined. The resource group is accessible from all databases in the cluster. To use the *Resource Group dialog*, you must have superuser privileges.  Please note that resource groups are supported when connected to EDB Postgres Advanced Server; for more information about using resource groups, please see the EDB Postgres Advanced Server Guide, available at:
+*************************
+The Resource Group Dialog
+*************************
+
+Use the *Resource Group* dialog to create a resource group and set values for its resources. A resource group is a named, global group on which various resource usage limits can be defined. The resource group is accessible from all databases in the cluster. To use the *Resource Group* dialog, you must have superuser privileges.  Please note that resource groups are supported when connected to EDB Postgres Advanced Server; for more information about using resource groups, please see the EDB Postgres Advanced Server Guide, available at:
 
    http://www.enterprisedb.com/
 
-The *Resource Group* dialog organizes the development of a resource group through the *General* dialog tab. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Resource Group* dialog organizes the development of a resource group through the *General* dialog tab. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/resource_group_general.png
 
@@ -18,20 +20,18 @@ Use the fields in the *General* tab to specify resource group parameters:
 
 Click the *SQL* tab to continue.
 
+Your entries in the *Resource Group* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit the *General* tab to make any changes to the SQL command. 
+
+**Example**
+
+The following is an example of the sql command generated by selections made in the *Resource Group* dialog: 
+
 .. image:: images/resource_group_sql.png
 
-Your entries in the *Resource Group* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The example creates a resource group named *acctg* that sets *cpu_rate_limit* to *2*, and *dirty_rate_limit* to *6144*.
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by selections made in the *Resource Group dialog*:
-
-.. image:: images/resource_group_sql_example.png
-
-The example creates a resource group named *acctg* that sets *cpu_rate_limit* to *2*, and *dirty_rate_limit* to *6144*.
\ No newline at end of file
diff --git a/docs/en_US/role_dialog.rst b/docs/en_US/role_dialog.rst
index 0616333..5ecfe40 100644
--- a/docs/en_US/role_dialog.rst
+++ b/docs/en_US/role_dialog.rst
@@ -1,12 +1,12 @@
-***********
-Role Dialog
-***********
+.. _role:
 
-A role may be an individual user (with or without login privileges) or a group of users. Note that roles defined at the cluster level are shared by all databases in the cluster. For more information about creating roles, please see the PostgreSQL core documentation available at:
- 
-   http://www.postgresql.org/docs/9.5/static/sql-createrole.html
+***************************
+The Login/Group Role Dialog
+***************************
+
+Use the *Login/Group Role* dialog to define a role. A role may be an individual user (with or without login privileges) or a group of users. Note that roles defined at the cluster level are shared by all databases in the cluster. 
 
-The *Role* dialog organizes the creation of roles through the following dialog tabs: *General*, *Definition*, *Role Privileges*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections.
+The dialog *Login/Group Role* organizes the creation of roles through the following dialog tabs: *General*, *Definition*, *Role Privileges*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/role_general.png
 
@@ -35,10 +35,10 @@ Use the *Role Privileges* tab to grant privileges to the role.
 * Move the *Superuser* switch to the *Yes* position if the role is a superuser within the database. The default value is *No*.
 * Move the *Create roles?* switch to the *Yes* position to specify whether a role is permitted to create roles. A role with this privilege can alter and drop roles. The default value is *No*.
 * Move the *Create databases* switch to the *Yes* position to control whether a role can create databases. The default value is *No*.
-* The *Update catalogs?* switch is disabled until the role is given superuser privileges. Move the *Update catalogs?* switch to the *No* position to control whether a role can update catalogs. The default value is *Yes*.
+* The *Update catalog?* switch is disabled until the role is given superuser privileges. Move the *Update catalogs?* switch to the *No* position to control whether a role can update catalogs. The default value is *Yes* when the *Superuser* switch is in the *Yes* position.
 * Move the *Inherit rights from the parent roles?* switch to the *No* position if a role does not inherit privileges. The default value is *Yes*.
 * Move the *Can initiate streaming replication and backups?* switch to the *Yes* position to control whether a role can initiate streaming replication or put the system in and out of backup mode. The default value is *No*.
-* Specify members of the role in the *Role Membership* field by checking the checkbox to the right of the role name. Membership conveys the privileges granted to a role to each of its members. 
+* Specify members of the role in the *Role Membership* field. Click inside the *Role Membership* field to select role names from a drop down list. Confirm each selection by checking the checkbox to the right of the role name; delete a selection by clicking the *x* to the left of the role name. Membership conveys the privileges granted to a role to each of its members. 
 
 Click the *Parameters* tab to continue.
 
@@ -64,30 +64,23 @@ Use the *Security* tab to define security labels applied to the role. Click *Add
 
 To discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
-For more information about using security labels, please see the PostgreSQL Core documentation available at:
+Click the *SQL* tab to continue.
+
+Your entries in the *Login/Group Role* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
 
-   http://www.postgresql.org/docs/current/static/sql-security-label.html
+**Example**
 
-Click the *SQL* tab to continue.
+The following is an example of the sql command generated by user selections in the *Login/Group Role* dialog: 
 
 .. image:: images/role_sql.png
 
-Your entries in the *Role* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The example creates a login role named *alice*; the role is limited to 3 connections to the server at any given time.  When EDB auditing is enabled, any transactions written to the audit log by alice will include a tag that states *acctg - payroll*.
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Role dialog*:
-
-.. image:: images/role_sql_example.png
-
-The example creates a login role named *alice*; the role is limited to 3 connections to the server at any given time.  When EDB auditing is enabled, any transactions written to the audit log by alice will include a tag that states *acctg - payroll*.
-
 
 
 
diff --git a/docs/en_US/schema_dialog.rst b/docs/en_US/schema_dialog.rst
index 6b9fc24..19938cb 100644
--- a/docs/en_US/schema_dialog.rst
+++ b/docs/en_US/schema_dialog.rst
@@ -1,22 +1,20 @@
-*************
-Schema Dialog
-*************
+.. _schema:
 
-Use the *Schema* dialog to define a schema. A schema is the organizational workhorse of a database, similar to directories or namespaces. To create a schema, you must be a database superuser or have the CREATE privilege.
+*****************
+The Schema Dialog 
+*****************
 
-The *Schema* dialog allows you to implement options of the CREATE SCHEMA command. For more information about the CREATE SCHEMA command, please see:
+Use the *Schema* dialog to define a schema. A schema is the organizational workhorse of a database, similar to directories or namespaces. To create a schema, you must be a database superuser or have the CREATE privilege.  
 
-   http://www.postgresql.org/docs/current/static/sql-createschema.html
-
- The *Schema* dialog organizes the development of schema through the following dialog tabs: *General* and *Security*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Schema* dialog organizes the development of schema through the following dialog tabs: *General* and *Security*. The *SQL* tab displays the SQL code generated by dialog selections. 
  
 .. image:: images/schema_general.png
 
 Use the fields on the *General* tab to identify the schema.
 
-* Use the *Name* field to add a descriptive name for the schema. 
+* Use the *Name* field to add a descriptive name for the schema. The name will be displayed in the *pgAdmin* tree control.
 * Select the owner of the schema from the drop-down listbox in the *Owner* field.
-* Store notes about the schema in the *Comments* field.  
+* Store notes about the schema in the *Comment* field.  
 
 Click the *Security* tab to continue.
 
@@ -30,32 +28,31 @@ Click *Add* to assign a set of privileges in the *Privileges* panel:
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privileges to the specified user.
 * Select the name of the role that is granting the privilege from the drop-down listbox in the *Grantor* field. The default grantor is the owner of the schema.
 
-To discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click add to assign additional sets of privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click *Add* to assign a security label in the *Security Labels* panel:
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
 * Specify a a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
 
-To discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click *Add* to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 
+Your entries in the *Schema* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by selections made in the *Schema* dialog: 
+
 .. image:: images/schema_sql.png
 
-Your entries in the *Schema* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The example creates a schema named hr; the command grants *USAGE* privileges to *public*.
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by selections made in the *Schema dialog*:
 
-.. image:: images/schema_sql_example.png
-
-The example creates a schema named hr; the command grants *USAGE* privileges to *public*.
  
diff --git a/docs/en_US/sequence_dialog.rst b/docs/en_US/sequence_dialog.rst
index 9b69b45..583d2f9 100644
--- a/docs/en_US/sequence_dialog.rst
+++ b/docs/en_US/sequence_dialog.rst
@@ -1,29 +1,25 @@
-***************
-Sequence Dialog
-***************
+.. _sequence:
 
-Use the *Sequence* dialog to create a sequence.  A sequence generates unique values in a sequential order (not necessarily contiguous).
+*******************
+The Sequence Dialog
+*******************
 
-The *Sequence* dialog allows you to implement options of the CREATE SEQUENCE command. For more information about the CREATE SEQUENCE command, see the PostgreSQL core documentation available at:
+Use the *Sequence* dialog to create a sequence.  A sequence generates unique values in a sequential order (not necessarily contiguous).  
 
-   http://www.postgresql.org/docs/9.5/static/sql-createsequence.html
-
-The *Sequence* dialog organizes the development of a sequence through the following dialog tabs: *General*, *Definition*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Sequence* dialog organizes the development of a sequence through the following dialog tabs: *General*, *Definition*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/sequence_general.png
-   :align: center
    
 Use the fields in the *General* tab to identify a sequence:
 
 * Use the *Name* field to add a descriptive name for the sequence. The name will be displayed in the *pgAdmin* tree control.  The sequence name must be distinct from the name of any other sequence, table, index, view, or foreign table in the same schema. 
-* Use the drop-down listbox next to *Owner* to select the name of the role that will own the extension.
+* Use the drop-down listbox next to *Owner* to select the name of the role that will own the sequence.
 * Use the drop-down listbox next to *Schema* to select an existing schema.
-* Store notes about the sequence in the *Comments* field.
+* Store notes about the sequence in the *Comment* field.
 
 Click the *Definition* tab to continue.
 
 .. image:: images/sequence_definition.png
-   :align: center
    
 Use the fields in the *Definition* tab to define the sequence:
 
@@ -32,25 +28,23 @@ Use the fields in the *Definition* tab to define the sequence:
 * Provide a value in the *Minimum* field to specify the minimum value a sequence can generate. If this clause is not supplied or NO MINVALUE is specified, then defaults will be used. The defaults are 1 and -263-1 for ascending and descending sequences, respectively.
 * Provide a value in the *Maximum* field to specify the maximum value for the sequence. If this clause is not supplied or NO MAXVALUE is specified, then default values will be used. The defaults are 263-1 and -1 for ascending and descending sequences, respectively.
 * Provide a value in the *Cache* field to specify how many sequence numbers are to be preallocated and stored in memory for faster access. The minimum value is 1 (only one value can be generated at a time, i.e., no cache), and this is also the default.
-* Check the *Cycled* checkbox to allow the sequence to wrap around when the MAXVALUE or the MINVALUE has been reached by an ascending or descending sequence respectively. If the limit is reached, the next number generated will be the MINVALUE or MAXVALUE, respectively.
+* Move the *Cycled* switch to the *Yes* position to allow the sequence to wrap around when the MAXVALUE or the MINVALUE has been reached by an ascending or descending sequence respectively. If the limit is reached, the next number generated will be the MINVALUE or MAXVALUE, respectively. The default is *No*.
 
 Click the *Security* tab to continue.
 
 .. image:: images/sequence_security.png
-   :align: center
 
-Use the *Security* tab to assign privileges and define security labels.  
+Use the *Security* tab to assign privileges and define security labels for the sequence.  
 
-Use the *Privileges* panel to assign privileges to a role. Click *Add* to set privileges for database objects:
+Use the *Privileges* panel to assign privileges. Click *Add* to set privileges:
 
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privilege to the specified user.
 * Select the name of the role from the drop-down listbox in the *Grantor* field. The default grantor is the owner of the database.
 
-
 Click *Add* to assign additional privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
-Use the *Security Labels* panel to define security labels applied to the function. Click *Add* to add each security label selection: 
+Use the *Security Labels* panel to define security labels applied to the sequence. Click *Add* to add each security label selection: 
 
 * Specify a security label provider in the *Provider* field. The named provider must be loaded and must consent to the proposed labeling operation.
 * Specify a a security label in the *Security Label* field. The meaning of a given label is at the discretion of the label provider. PostgreSQL places no restrictions on whether or how a label provider must interpret security labels; it merely provides a mechanism for storing them. 
@@ -58,25 +52,23 @@ Use the *Security Labels* panel to define security labels applied to the functio
 Click *Add* to assign additional security labels; to discard a security label, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
+   
+Your entries in the *Sequence* dialog generate a generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
+
+**Example**
+
+The following is an example of the sql command generated by user selections in the *Sequence* dialog: 
 
 .. image:: images/sequence_sql.png
-   :align: center
-   
-Your entries in the *Sequence* dialog generate a generate a SQL command; you can review the command on the *SQL* pane.
+
+The example shown demonstrates a sequence named *seconds*. The sequence will increase in *5* second increments, and stop when it reaches a maximum value equal of *60*.
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Database dialog*:
-
-.. image:: images/sequence_sql_example.png
-
-The example shown demonstrates a sequence named *seconds*. It will increment by *5*  with a start value equal to *0* (cached) and a maximum value equal to *60*.  
+  
 
 
 
diff --git a/docs/en_US/server_dialog.rst b/docs/en_US/server_dialog.rst
index 2c0ee13..a1862aa 100644
--- a/docs/en_US/server_dialog.rst
+++ b/docs/en_US/server_dialog.rst
@@ -1,16 +1,19 @@
-*************
-Server Dialog
-*************
+.. _server:
 
-Use the *Server* dialog to describe a connection to a server. Note: you must ensure the pg_hba.conf file of the server from which you are connecting allows connections from the host of the client.
+*****************
+The Server Dialog 
+*****************
 
-The *Server* dialog organizes the connection of a server through the following dialog tabs: *General*, and *Connection*.
+Use the *Server* dialog to describe a connection to a server. Note: you must ensure the pg_hba.conf file of the server from which you are connecting allows connections from the host of the client. 
+
+The *Server* dialog organizes the connection of a server through the following dialog tabs: *General*, and *Connection*. 
 
 .. image:: images/server_general.png
 
 Use the fields in the *General* tab to identify the server:
 
-* Use the *Name* field to add a descriptive name for the server; the name specified will be displayed in the tree control of the client.
+* Use the drop-down list box in the *Server Group* field to specify the *pgAdmin* tree control parent node for the server.
+* Use the *Name* field to add a descriptive name for the server; the name specified will be displayed in the *pgAdmin* tree control of the client. 
 * Provide a comment about the server in the *Comments* field.
 
 Click the *Connection* tab to continue.
@@ -26,7 +29,9 @@ Use the fields in the *Connection* tab to configure a connection:
 * Use the *Role* field to specify the name of a role that has privileges that will be conveyed to the client after authentication with the server. This selection allows you to connect as one role, and then assume the permissions of this specified role after the connection is established. Note that the connecting role must be a member of the role specified.
 * Use the drop-down list box in the SSL field to select the type of SSL connection the server should use. For more information about using SSL encryption, see Section 31.18 of the Postgres documentation:
    
-   http://www.postgresql.org/docs/9.5/static/libpq-ssl.html
-
+   http://www.postgresql.org/docs/9.5/static/libpq-ssl.html  
 
+* Click the *Save* button to save work.
+* Click the *Cancel* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
   
diff --git a/docs/en_US/server_group_dialog.rst b/docs/en_US/server_group_dialog.rst
index d8757c4..9fe7510 100644
--- a/docs/en_US/server_group_dialog.rst
+++ b/docs/en_US/server_group_dialog.rst
@@ -1,17 +1,18 @@
-*******************
-Server Group Dialog
-*******************
+.. _server_group:
 
-Use the *Server Group* dialog to add a new server group. Assign servers to server groups to simplify management of multiple servers. Server groups are displayed as part of the client tree control.
+***********************
+The Server Group Dialog
+***********************
+
+Use the *Server Group* dialog to add a new server group. Assign servers to server groups to simplify management of multiple servers. Server groups are displayed as part of the *pgAdmin* tree control.  
 
 .. image:: images/server_group.png
 
-Use the *Name* field on the *Server Group* dialog to specify a name that will identify the server group in the pgAdmin tree control.
+Use the *Name* field on the *Server Group* dialog to specify a name that will identify the server group in the *pgAdmin* tree control.
 
-* Click the *Info* button (i) to access online help. 
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-To create server connections in a server group, right click on the named server group and select the *Create* option to open the *Server dialog*.
+To create server connections in a server group, right click on the named server group and select the *Create* option to open the *Create - Server* dialog.  
 
diff --git a/docs/en_US/tablespace_dialog.rst b/docs/en_US/tablespace_dialog.rst
index e02281c..8eb1718 100644
--- a/docs/en_US/tablespace_dialog.rst
+++ b/docs/en_US/tablespace_dialog.rst
@@ -1,20 +1,18 @@
-*****************
-Tablespace Dialog
-*****************
+.. _tablespace:
 
-A tablespace allows superusers to define an alternative location on the file system where the data files containing database objects (such as tables and indexes) reside. Tablespaces are only supported on systems that support symbolic links. Note that a tablespace cannot be used independently of the cluster in which it is defined.
+*********************
+The Tablespace Dialog
+*********************
 
-The *Tablespace* dialog allows you to implement options of the CREATE TABLESPACE command.  For more information about the CREATE TABLESPACE command, please see:
+Use The *Tablespace* dialog to define a tablespace. A tablespace allows superusers to define an alternative location on the file system where the data files containing database objects (such as tables and indexes) reside. Tablespaces are only supported on systems that support symbolic links. Note that a tablespace cannot be used independently of the cluster in which it is defined.
 
-   http://www.postgresql.org/docs/9.5/static/sql-createtablespace.html
-
-The *Tablespace* dialog organizes the definition of a tablespace through the following tabs: *General*, *Definition*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *Tablespace* dialog organizes the definition of a tablespace through the following tabs: *General*, *Definition*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections. 
 
 .. image:: images/tablespace_general.png
 
 * Use the *Name* field to identify the tablespace with a descriptive name. The name cannot begin with pg\_; these names are reserved for system tablespaces. 
-* Select the owner of the tablespace from the drop-down listbox in the *Owner* field.
-* Store notes about the tablespace in the *Comments* field.  
+* Select the owner of the tablespace from the drop-down listbox in the *Owner* field.  
+* Store notes about the tablespace in the *Comment* field.  
 
 Click the *Definition* tab to continue.
 
@@ -38,15 +36,15 @@ Click the *Security* tab to continue.
 
 .. image:: images/tablespace_security.png
 
-Use the *Security* tab to assign privileges and define security labels. 
+Use the *Security* tab to assign privileges and define security labels for the tablespace. 
 
-Use the *Privileges* panel to assign security privileges to a role. Click *Add* to assign a set of privileges:
+Use the *Privileges* panel to assign security privileges. Click *Add* to assign a set of privileges:
 
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
-* Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privileges to the specified user.
 * Select the name of the role from the drop-down listbox in the *Grantor* field. The default grantor is the owner of the owner of the tablespace.
+* Click inside the *Privileges* field. Check the boxes to the left of one or more privileges to grant the selected privileges to the specified user.
 
-To discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
+Click add to assign additional sets of privileges; to discard a privilege, click the trash icon to the left of the row and confirm deletion in the *Delete Row* popup.
 
 Use the *Security Labels* panel to define security labels applied to the tablespace. Click *Add* to add each security label selection: 
 
@@ -57,19 +55,20 @@ To discard a security label, click the trash icon to the left of the row and con
 
 Click the *SQL* tab to continue.
 
+Your entries in the *Tablespace* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command. 
+
+**Example**
+
+The following is an example of the sql command generated by user selections in the *Tablespace* dialog: 
+
 .. image:: images/tablespace_sql.png
 
-Your entries in the *Tablespace* dialog generate a SQL command; you can review the command on the *SQL* pane.
+The example shown demonstrates creating a tablespace named *space_01*. It has a *random_page_cost* value equal to *4*.  
  
-* Click the *Info* button (i) to access online help. 
+* Click the *Info* button (i) to access online help. View context-sensitive help in the *Tabbed browser*, where a new tab displays the PostgreSQL core documentation.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
-Example
-=======
-
-The following is an example of the sql command generated by user selections in the *Tablespace dialog*:
 
-.. image:: images/tablespace_sql_example.png
 
