diff --git a/docs/source/guide_administrator.rst b/docs/source/guide_administrator.rst
index bbbc8b15d2adb7ea3ad0b6b69cafe37d33f00a18..e4be125441d3badbce4177a4436df4272d7747be 100644
--- a/docs/source/guide_administrator.rst
+++ b/docs/source/guide_administrator.rst
@@ -1,33 +1,33 @@
 .. _guide_administrator:
 
-PEDASI Administration Guide
-===========================
+PEDASI System Administrator Guide
+=================================
 
 .. toctree::
    :maxdepth: 2
    :caption: Contents:
 
 
-.. note:: Please read the :ref:`User Guide<guide_user>` first to give you an overview of the PEDASI platform and how to use its features before reading this guide.
+.. note:: Please read the :doc:`User Guide<guide_user>` first to give you an overview of the PEDASI platform and how to use its features before reading this guide.
 
 
 Purpose
 -------
 
-This guide is for System Administrators aiming to deploy a PEDASI instance, and Data or Application Providers wanting to add, update, or remove data sources or applications within a PEDASI instance.
+This guide is for System Administrators wishing to deploy a PEDASI instance, either for production or locally for development.
 
 
-System Administrators: Deploying PEDASI in Production
------------------------------------------------------
+Production Deployment
+---------------------
 
 Overview
 ^^^^^^^^
 
 A deployment of PEDASI is done automatically to a remote Ubuntu server via a preconfigured Ansible script, which performs the following tasks:
 
- 1. Install system and webserver prerequisites
+ 1. Install prerequisites
  2. Configure databases
- 3. Deploy PEDASI
+ 3. Install PEDASI
  4. Configure and start webserver
 
 
@@ -90,17 +90,17 @@ You may now deploy PEDASI using the Ansible provisioning script. If you have set
 
 .. code-block:: console
 
-   $ ansible-playbook -v -i inventory.yml playbook.yml -u <your_username_on_the_remote_host>
+   $ ansible-playbook -v -i inventory.yml playbook.yml -u <your username on the remote host>
 
 Otherwise, you will need Ansible to prompt for passwords for the remote user and superuser accounts:
 
 .. code-block:: console
 
-   $ ansible-playbook -v -i inventory.yml playbook.yml -u <your_username_on_the_remote_host> -k -K
+   $ ansible-playbook -v -i inventory.yml playbook.yml -u <your username on the remote host> -k -K
 
 
-Post-Deployment
-^^^^^^^^^^^^^^^
+Create Administrator Account
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 After deploying PEDASI you must create and activate an initial administrator account:
 
@@ -111,8 +111,10 @@ After deploying PEDASI you must create and activate an initial administrator acc
    $ source env/bin/activate
    $ python manage.py createsuperuser --username <username> --email <email address>
 
+Once created, you can access your deployment at https://<server_address>.
 
-Assigning Data or Application Provider Roles to Accounts 
+
+Assigning Data or Application Provider Roles to Accounts
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 To add Data and/or Application Provider roles to an existing PEDASI User account:
@@ -121,152 +123,82 @@ To add Data and/or Application Provider roles to an existing PEDASI User account
  2. Go to the administrator pages at https://<server_address>/admin
  3. Select *Users* from the *PROFILES* subsection to display a list of all system users
  4. Select the user account you wish to change, to edit that user's profile
- 5. Under the *Groups* section under *Permissions*, select *Data Provider* or *Application Provider* and select the right arrow to add this role to the user's profile
+ 5. Under the *Groups* section under *Permissions*, select *Data Provider* or *Application Provider* and select the right arrow to add this role to the use
+r's profile
  6. Select *SAVE* at the bottom of the page
 
 
-Data Providers: Managing Data Sources
--------------------------------------
-
-In order for users to begin using PEDASI, you should provide access to a range of data sources. The following sections will walk you through adding and managing your first data source. We will use the IoTUK Nation Database API (see https://iotuk.org.uk/iotuk-nation-database-api/) as a basic example.
-
-If you are not a Central Administrator or don't have Data Provider privileges associated with your account, you'll need to obtain these first. Contact the Central Administrator to grant these privileges for your account.
-
-Adding a Data Source
-^^^^^^^^^^^^^^^^^^^^
+Development Deployment
+----------------------
 
-Before adding a new data source, first check if the license type for that data source already exists. Select *Licences* from the navigation bar to display all current licenses, and if the licence you need to use isn't already in the list, you'll need to add it as a new licence type. See *Adding a New Data Source Licence* below.
+Overview
+^^^^^^^^
 
-To add a new data source:
+A development instance of PEDASI can be automatically and rapidly deployed using Vagrant. It uses VirtualBox as a virtual machine (VM) management tool to provision a Vagrant-style VM and provisions a PEDASI instance within that VM.
 
- 1. Select *Data Sources* from the PEDASI navigation bar to see a list of all data sources to which you have access
- 2. Select *New Data Source* from the Data Sources page, and add in details for each of the following fields:
 
-    - *Name*: add in a unique name for this data source, such as 'UKIoT Nations'
-    - *Description*: optionally add in some specific details concerning this data source, such as its owner any links or references to any specifications or other documentation regarding the data source and format of the data that is delivered on request, e.g. some of the overview text at https://iotuk.org.uk/projects/iotuk-nation-database%E2%80%8B/ and a link to the page, and perhaps a link to the API details at https://github.com/TheDataCity/IoT-UK-Nation-Database-APIs. If the data source provides partially or fully encrypted data, also specify links to contact information and/or any reference material for obtaining a means to encrypt the data (not required for IoTUK Nations)
-    - *Url*: specify the base API URL for this data source, e.g. https://api.iotuk.org.uk/iotOrganisation.
-    - *Api key*: optionally specify an API key if one is required for PEDASI to access this resource
-    - *Plugin name*: select an appropriate data connector to interface with this API, e.g. DataSetConnector
-    - *Licence*: select an appropriate licence from those available in the dropdown list, e.g. Open Database Licence.
-    - *Is encrypted*: select this if the data supplied from the data source is partially or fully encrypted, e.g. leave unselected
-    - *Public permission level*: see the *Requesting Access to a Data Source* section in the :ref:`User Guide<guide_user>` for a breakdown of the different levels of access you can specify for a data source. e.g. DATA
-    - *Prov exempt*: select this if user activity tracking should be enabled for this data source, e.g. leave unselected
+Prerequisites
+^^^^^^^^^^^^^
 
- 3. Then select 'Create' to create this data source, and you'll be presented with an overview page for that data source.
+Ensure you have the following prerequisites before you begin:
 
-The next stage is to add in metadata for each of the parameters that can be used within the API. This step isn't mandatory, since arbitrary parameters can be specified via the Applications API or from within the Data Explorer, but is recommended. From the data source overview page, for each API query parameter (e.g. town, year, postcode for the IoTUK Nation Database data source):
+ - A Linux or Mac OS X local machine with the following installed:
 
- 1. In the *Metadata* section, select *data_query_param* from the first dropdown
- 2. Add the name of the API query field to the *Value* textbox, e.g. 'town'
- 3. Select *Add* to add this query parameter
+   - Vagrant v2.2.0 or above
+   - VirtualBox v5.2.0 or above
+   - Git command line client v2.0 or above
 
-Once complete, your data source is ready to use.
 
+Cloning the PEDASI Repository
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Updating a Data Source
-^^^^^^^^^^^^^^^^^^^^^^
+On your local machine, from a shell first clone the PEDASI repository:
 
-To edit details for an existing data source:
+.. code-block:: console
 
- 1. Select *Data Sources* from the navigation bar to see a list of all data sources to which you have access
- 2. Select *Detail* for the data source you wish to edit
- 3. Select *Edit* to edit the data source's details
- 4. Edit the fields as instructed in the *Adding a Data Source* section
- 5. Select *Update* to update the data source's details
+   $ git clone https://github.com/PEDASI/PEDASI.git
 
 
-Removing a Data Source
+Configuring Deployment
 ^^^^^^^^^^^^^^^^^^^^^^
 
-To remove an existing data source:
-
- 1. Select *Data Sources* from the navigation bar to see a list of all data sources to which you have access
- 2. Select *Detail* for the data source you wish to remove
- 3. Select *Delete* to indicate you wish to remove the data source
- 4. Select *Delete* to confirm you wish to remove this data source
+First, check the settings in the *Vagrantfile* in the repository's root directory to ensure any provisioned VM will not conflict with any other resources running on the default ports.
 
+Then create a new *.env* file in the repository's *deploy/* directory with the following contents (replacing *some_test_key* with a string of your choice):
 
-Adding a New Data Source Licence
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+::
 
-If you need to add a new type of licence for a data source:
+   SECRET_KEY=some_test_key
+   DEBUG=true
 
- 1. Select *Licences* from the navigation bar to display all current licenses
- 2. Select *New License* to create a new licence
- 3. Add detail for the following fields:
 
-    - *Name*: add a full name for a new licence, e.g. Open Database Licence
-    - *Short name*: add a short name for the licence, typically an acronym, e.g. ODbL
-    - *Version*: add the version number for the licence to use
-    - *URL*: add a link to an online resource describing the full terms of the licence
+Managing Deployment
+^^^^^^^^^^^^^^^^^^^
 
- 4. Select 'Create' to create the licence, and you'll be presented with an overview page for that licence.
+To deploy the Vagrant instance, provision the instance, and deploy PEDASI within it, within the PEDASI repository root directory:
 
+.. code-block:: console
 
-Approving Data Access Requests
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-To approve user requests for amended access rights to data sources:
-
- 1. Select *Data Sources* from the navigation bar to see a list of all data sources to which you have access
- 2. Select *Detail* for the data source you wish to manage access on
- 3. Select *Manage Access* to list access requests and manage those requests. You'll see the level of access requested for each user, their current access level, and the reason for the request
- 4. Select either:
-
-    - *Approve*: to approve the request
-    - *Edit*: to amend the request's access privileges and data push rights (if data push is supported for this data source)
-    - *Reject*: to reject the request
-
-
-Application Providers: Managing Applications
---------------------------------------------
-
-In order for a developer to access PEDASI's capabilities within their application, their application needs to be first registered within PEDASI in order to obtain an API key they can use to authenticate with PEDASI. The following sections will walk you through adding and managing your first application. We will use the IoTUK Nation Map Demo application (see https://github.com/Southampton-RSG/app-iotorgs-map) as a basic example.
-
-If you are not a Central Administrator or don't have Application Provider privileges associated with your account, you'll need to obtain these first. Contact the Central Administrator to grant these privileges for your account.
-
-
-Adding an Application
-^^^^^^^^^^^^^^^^^^^^^
-
-To add a new application:
-
- 1. Select *Applications* from the PEDASI navigation bar to see a list of all applications to which you have access
- 2. Select *New Application* from the Applications page, and add in details for each of the following fields:
-
-    - *Name*: add a full name for the application, e.g. IoTUK Nation Map Demo
-    - *Description*: add a brief description of the application, including what it aims to achieve using PEDASI
-    - *Url*: specify a public URL for the deployed application itself if it's web-based, or alternatively a source code repository URL if one exists, e.g. https://github.com/Southampton-RSG/app-iotorgs-map
-    - *Access control*: TODO: add in text here, e.g. leave unselected
-
- 3. Select *Create* to register the new application within PEDASI, and you'll be presented with an overview page for that application, with a new API key
+   $ vagrant up
 
-The API key is what will be used by the developer to authenticate with PEDASI from their application.
+The Vagrant instance will now be visible within VirtualBox, and the PEDASI service visible from a browser at http://localhost:8888/.
 
+To access the Vagrant instance from the command line:
 
-Updating an Application
-^^^^^^^^^^^^^^^^^^^^^^^
+.. code-block:: console
 
- 1. Select *Applications* from the PEDASI navigation bar to see a list of all applications to which you have access
- 2. Select *Detail* for the application you wish to edit. From here, you can also:
+   $ vagrant ssh
 
-    - Select *Revoke API Token*: to revoke the current API token which will prohibit its further use within PEDASI
-    - *If an API token has been revoked*, select *Generate API Token* to generate a new API token for this application
+Please see the `Vagrant documentation`_ for more details on how to use Vagrant, including shutting down and destroying Vagrant instances.
 
- 3. Select *Edit* to edit the application's details
- 4. Edit the fields as instructed in the *Adding an Application* section
- 5. Select *Update* to update the data source's details
+.. _`Vagrant documentation`: https://www.vagrantup.com/docs/
 
 
-Removing an Application
-^^^^^^^^^^^^^^^^^^^^^^^
+Creating Administrator and Provider Accounts
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To remove an application:
+Follow the instructions in the *Create Administrator Account* subsection of the *Production Deployment* section above to set up an administrator user, as well as the *Assigning Data or Application Provider Roles to Accounts* subsection as required.
 
- 1. Select *Applications* from the PEDASI navigation bar to see a list of all applications to which you have access
- 2. Select *Detail* for the application you wish to remove
- 3. Select *Delete* to indicate you wish to remove this application
- 4. Select *Delete* to confirm you wish to remove this application
 
 
 References
diff --git a/docs/source/guide_developer.rst b/docs/source/guide_developer.rst
index 90cba14c56eff21faa25b4b2f0ca02657c2ad877..574aa41a2c8153c58ac45234d2a3851e0fd44a63 100644
--- a/docs/source/guide_developer.rst
+++ b/docs/source/guide_developer.rst
@@ -8,7 +8,7 @@ PEDASI Developer Guide
    :caption: Contents:
 
 
-.. note:: Please read the :ref:`User Guide<guide_user>` first to give you an overview of the PEDASI platform before reading this guide.
+.. note:: Please read the :doc:`User Guide<guide_user>` first to give you an overview of the PEDASI platform before reading this guide.
 
 
 Purpose
@@ -85,18 +85,30 @@ Please see the `Vagrant documentation`_ for more details on how to use Vagrant,
 Developing an Application
 -------------------------
 
-The following sections will walk you through using the PEDASI Applications API in your own applications. We will use the JavaScript IoTUK Nation Map Demo application (see https://github.com/Southampton-RSG/app-iotorgs-map) as a basic example.
+The following sections will walk you through using the PEDASI Applications API in your own applications. We will use the JavaScript IoTUK Nation Map Demo application (see https://github.com/Southampton-RSG/app-iotorgs-map) as a basic example. These instructions assume you are aiming to develop against a production deployment of PEDASI managed buy a Central Administrator, but you can also use a local development deployment if you wish.
+
+Adding Required Data Sources
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Firstly, you'll need to ensure that the data sources your application aims to use are added to PEDASI, which require Data Provider account privileges. If you do not already have these privileges on your PEDASI account, either:
+
+ - Contact your local PEDASI Data Provider to register the data sources
+ - Contact the PEDASI Central Administrator to register the data sources
+ - Contact the PEDASI Central Administrator to request Data Provider privileges for your account
+
+If you now have these privileges and wish to add the data sources yourself, follow the *Adding a Data Source* section in the :doc:`Data and Application Provider Guide<guide_provider>` (which also contains details for adding the IoTUK Nation Data as a data source).
 
 
 Obtaining an Application API Key
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-You will first need to register some basic application details to obtain an API key for your application to authenticate with PEDASI. Either:
+You will first need to register some basic application details to obtain an API key for your application to authenticate with PEDASI, which requires Application Provider account privileges. If you do not have these privileges on your PEDASI account, either:
 
- - If you wish to develop an application that will use your locally provisioned Vagrant PEDASI instance, you can proceed.
- - If you aim to develop an application for an instance owned by someone else, and you already have Application Provider privileges associated with your PEDASI account, you can proceed. Otherwise you will need to contact the PEDASI Central Administrator to either register a new application and obtain an API key or request Application Provider privileges for your account.
+ - Contact your local PEDASI Application Provider to register the application and obtain an API key
+ - Contact the PEDASI Central Administrator to register the new application and obtain an API key
+ - Contact the PEDASI Central Administrator to request Application Provider privileges for your account
 
-If you have Application Provider privileges in either case you can create a new application and gain an Application API key yourself following the *Adding an Application* section in the :ref:`Administrator Guide<guide_admin>`, which also contains details for adding the IoTUK Nation Map Demo application.
+If you now have these privileges and wish to add the application yourself, follow the *Adding an Application* section in the :doc:`Data and Application Provider Guide<guide_provider>` (which also contains details for adding the IoTUK Nation Map Demo application).
 
 
 Code Examples
@@ -116,7 +128,7 @@ An `example`_ hosted on GitHub is a lightweight exemplar PEDASI web application
 Application API Documentation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The :ref:`Applications API Reference<ref_applications_api>` documentation covers the API and its endpoints, and how to use it.
+The :doc:`Applications API Reference<ref_applications_api>` documentation covers the API and its endpoints, and how to use it.
 
 
 Using the Test Suite
diff --git a/docs/source/guide_provider.rst b/docs/source/guide_provider.rst
new file mode 100644
index 0000000000000000000000000000000000000000..a57f210fba00d0ea2b7238b31d7ccd785160f9fa
--- /dev/null
+++ b/docs/source/guide_provider.rst
@@ -0,0 +1,170 @@
+.. _guide_provider:
+
+PEDASI Data And Application Provider Guide
+==========================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+
+.. note:: Please read the :doc:`User Guide<guide_user>` first to give you an overview of the PEDASI platform and how to use its features before reading this guide.
+
+
+Purpose
+-------
+
+This guide is for Data or Application Providers wanting to add, update, or remove data sources or applications within a PEDASI instance.
+
+
+Data Providers: Managing Data Sources
+-------------------------------------
+
+In order for users to begin using PEDASI, you should provide access to a range of data sources. The following sections will walk you through adding and managing your first data source. We will use the IoTUK Nation Database API (see https://iotuk.org.uk/iotuk-nation-database-api/) as a basic example.
+
+If you are not a Central Administrator or don't have Data Provider privileges associated with your account, you'll need to obtain these first. Contact the Central Administrator to grant these privileges for your account.
+
+
+Adding a Data Source
+^^^^^^^^^^^^^^^^^^^^
+
+Before adding a new data source, first check if the license type for that data source already exists. Select *Licences* from the navigation bar to display all current licenses, and if the licence you need to use isn't already in the list, you'll need to add it as a new licence type. See *Adding a New Data Source Licence* below.
+
+To add a new data source:
+
+ 1. Select *Data Sources* from the PEDASI navigation bar to see a list of all data sources to which you have access
+ 2. Select *New Data Source* from the Data Sources page, and add in details for each of the following fields:
+
+    - *Name*: add in a unique name for this data source, such as 'UKIoT Nations'
+    - *Description*: optionally add in some specific details concerning this data source, such as its owner any links or references to any specifications or other documentation regarding the data source and format of the data that is delivered on request, e.g. some of the overview text at https://iotuk.org.uk/projects/iotuk-nation-database%E2%80%8B/ and a link to the page, and perhaps a link to the API details at https://github.com/TheDataCity/IoT-UK-Nation-Database-APIs. If the data source provides partially or fully encrypted data, also specify links to contact information and/or any reference material for obtaining a means to encrypt the data (not required for IoTUK Nations)
+    - *Url*: specify the base API URL for this data source, e.g. https://api.iotuk.org.uk/iotOrganisation.
+    - *Api key*: optionally specify an API key if one is required for PEDASI to access this resource
+    - *Plugin name*: select an appropriate data connector to interface with this API, e.g. DataSetConnector
+    - *Licence*: select an appropriate licence from those available in the dropdown list, e.g. Open Database Licence.
+    - *Is encrypted*: select this if the data supplied from the data source is partially or fully encrypted, e.g. leave unselected
+    - *Public permission level*: see the *Requesting Access to a Data Source* section in the :doc:`User Guide<guide_user>` for a breakdown of the different levels of access you can specify for a data source. e.g. DATA
+    - *Prov exempt*: select this if user activity tracking should be enabled for this data source, e.g. leave unselected
+
+ 3. Then select 'Create' to create this data source, and you'll be presented with an overview page for that data source.
+
+The next stage is to add in metadata for each of the parameters that can be used within the API. This step isn't mandatory, since arbitrary parameters can be specified via the Applications API or from within the Data Explorer, but is recommended. From the data source overview page, for each API query parameter (e.g. town, year, postcode for the IoTUK Nation Database data source):
+
+ 1. In the *Metadata* section, select *data_query_param* from the first dropdown
+ 2. Add the name of the API query field to the *Value* textbox, e.g. 'town'
+ 3. Select *Add* to add this query parameter
+
+Once complete, your data source is ready to use.
+
+
+Updating a Data Source
+^^^^^^^^^^^^^^^^^^^^^^
+
+To edit details for an existing data source:
+
+ 1. Select *Data Sources* from the navigation bar to see a list of all data sources to which you have access
+ 2. Select *Detail* for the data source you wish to edit
+ 3. Select *Edit* to edit the data source's details
+ 4. Edit the fields as instructed in the *Adding a Data Source* section
+ 5. Select *Update* to update the data source's details
+
+
+Removing a Data Source
+^^^^^^^^^^^^^^^^^^^^^^
+
+To remove an existing data source:
+
+ 1. Select *Data Sources* from the navigation bar to see a list of all data sources to which you have access
+ 2. Select *Detail* for the data source you wish to remove
+ 3. Select *Delete* to indicate you wish to remove the data source
+ 4. Select *Delete* to confirm you wish to remove this data source
+
+
+Adding a New Data Source Licence
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you need to add a new type of licence for a data source:
+
+ 1. Select *Licences* from the navigation bar to display all current licenses
+ 2. Select *New License* to create a new licence
+ 3. Add detail for the following fields:
+
+    - *Name*: add a full name for a new licence, e.g. Open Database Licence
+    - *Short name*: add a short name for the licence, typically an acronym, e.g. ODbL
+    - *Version*: add the version number for the licence to use
+    - *URL*: add a link to an online resource describing the full terms of the licence
+
+ 4. Select 'Create' to create the licence, and you'll be presented with an overview page for that licence.
+
+
+Approving Data Access Requests
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To approve user requests for amended access rights to data sources:
+
+ 1. Select *Data Sources* from the navigation bar to see a list of all data sources to which you have access
+ 2. Select *Detail* for the data source you wish to manage access on
+ 3. Select *Manage Access* to list access requests and manage those requests. You'll see the level of access requested for each user, their current access level, and the reason for the request
+ 4. Select either:
+
+    - *Approve*: to approve the request
+    - *Edit*: to amend the request's access privileges and data push rights (if data push is supported for this data source)
+    - *Reject*: to reject the request
+
+
+Application Providers: Managing Applications
+--------------------------------------------
+
+In order for a developer to access PEDASI's capabilities within their application, their application needs to be first registered within PEDASI in order to obtain an API key they can use to authenticate with PEDASI. The following sections will walk you through adding and managing your first application. We will use the IoTUK Nation Map Demo application (see https://github.com/Southampton-RSG/app-iotorgs-map) as a basic example.
+
+If you are not a Central Administrator or don't have Application Provider privileges associated with your account, you'll need to obtain these first. Contact the Central Administrator to grant these privileges for your account.
+
+
+Adding an Application
+^^^^^^^^^^^^^^^^^^^^^
+
+To add a new application:
+
+ 1. Select *Applications* from the PEDASI navigation bar to see a list of all applications to which you have access
+ 2. Select *New Application* from the Applications page, and add in details for each of the following fields:
+
+    - *Name*: add a full name for the application, e.g. IoTUK Nation Map Demo
+    - *Description*: add a brief description of the application, including what it aims to achieve using PEDASI
+    - *Url*: specify a public URL for the deployed application itself if it's web-based, or alternatively a source code repository URL if one exists, e.g. https://github.com/Southampton-RSG/app-iotorgs-map
+    - *Access control*: TODO: add in text here, e.g. leave unselected
+
+ 3. Select *Create* to register the new application within PEDASI, and you'll be presented with an overview page for that application, with a new API key
+
+The API key is what will be used by the developer to authenticate with PEDASI from their application.
+
+
+Updating an Application
+^^^^^^^^^^^^^^^^^^^^^^^
+
+ 1. Select *Applications* from the PEDASI navigation bar to see a list of all applications to which you have access
+ 2. Select *Detail* for the application you wish to edit. From here, you can also:
+
+    - Select *Revoke API Token*: to revoke the current API token which will prohibit its further use within PEDASI
+    - *If an API token has been revoked*, select *Generate API Token* to generate a new API token for this application
+
+ 3. Select *Edit* to edit the application's details
+ 4. Edit the fields as instructed in the *Adding an Application* section
+ 5. Select *Update* to update the data source's details
+
+
+Removing an Application
+^^^^^^^^^^^^^^^^^^^^^^^
+
+To remove an application:
+
+ 1. Select *Applications* from the PEDASI navigation bar to see a list of all applications to which you have access
+ 2. Select *Detail* for the application you wish to remove
+ 3. Select *Delete* to indicate you wish to remove this application
+ 4. Select *Delete* to confirm you wish to remove this application
+
+
+References
+----------
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 34a5e68c139c1fe26d2a8fa7bf4413732d12ab08..7a04a4aeb1de2fe4b8cb08685209a2c727363d3d 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -38,7 +38,8 @@ Resources
 Documentation is available for the following stakeholders:
 
  - :doc:`Researchers and other end-users<guide_user>`: for users wishing to discover, explore, and make use of datasets using the web interface
- - :doc:`Administrators<guide_administrator>`: for those aiming to deploy PEDASI, or provide data or use applications through PEDASI
+ - :doc:`Data or Application Providers<guide_provider>`: for those aiming to provide data or use applications through PEDASI
+ - :doc:`System Administrators<guide_administrator>`: for those aiming to deploy and manage PEDASI either for development or production
  - :doc:`Application developers<guide_developer>`: for developers wanting to create applications that access data available through PEDASI
 
 This documentation is also available on `Read the Docs`_.
diff --git a/docs/source/ref_applications_api.rst b/docs/source/ref_applications_api.rst
index 497e73c9aa8d65d39c5dec904293d978a2749ee8..9b08a772b4a519b25b8c0d083fef0078d89ead95 100644
--- a/docs/source/ref_applications_api.rst
+++ b/docs/source/ref_applications_api.rst
@@ -8,7 +8,7 @@ Applications API Reference
    :caption: Contents:
 
 
-.. note:: Please read the :ref:`Developer Guide<guide_developer>` first before reading this reference.
+.. note:: Please read the :doc:`Developer Guide<guide_developer>` first before reading this reference.
 
 
 Overview