Skip to content

Commit

Permalink
Merge pull request #20 from ndcolter-mcafee/master
Browse files Browse the repository at this point in the history
Merge pull request #2 from opendxl/master
  • Loading branch information
chrissmith-mcafee committed Oct 24, 2017
2 parents 79956f5 + 30f7a16 commit f3ce60b
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 5 deletions.
Binary file modified docs/sdk/editdxlcerts-save.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/sdk/editdxlcerts-selectca.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/sdk/editdxlcerts.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions docs/sdk/epobrokercertsexport.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@ to the fabric. This certificate information allows clients to ensure the Brokers

The following steps walk through the process to export the DXL Broker certificate information:

1. Navigate to **Server Settings** and select the **DXL Certificates** setting on the left navigation bar.

1. Navigate to **Server Settings** and select the **DXL Certificates (Third Party)** setting on the left navigation bar.

.. note::

If using an older version of the DXL ePO Extensions, the **Server Settings** in the ePO console may have only a
single option for all DXL certificates (titled "**DXL Certificates**"). Click that setting, and proceed with the
rest of the steps in this guide as normal.

.. _here: _images/serversettings_old.png

.. image:: serversettings-certs.png

2. Click the **Edit** button in the lower right corner (as shown in the image above)
Expand Down
12 changes: 10 additions & 2 deletions docs/sdk/epobrokerlistexport.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,16 @@ DXL clients need to have a list of Brokers on the fabric to connect to.

The following steps walk through the process to export the list of all DXL brokers on the fabric for use by DXL clients:

1. Navigate to **Server Settings** and select the **DXL Certificates** setting on the left navigation bar.

1. Navigate to **Server Settings** and select the **DXL Certificates (Third Party)** setting on the left navigation bar.

.. note::

If using an older version of the DXL ePO Extensions, the **Server Settings** in the ePO console may have only a
single option for all DXL certificates (titled "**DXL Certificates**"). Click that setting, and proceed with the
rest of the steps in this guide as normal.

.. _here: _images/serversettings_old.png

.. image:: serversettings-certs.png

2. Click the **Edit** button in the lower right corner (as shown in the image above)
Expand Down
10 changes: 9 additions & 1 deletion docs/sdk/epocaimport.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ the :doc:`certcreation` section.

The steps to import the CA certificate into ePO are listed below:

1. Navigate to **Server Settings** and select the **DXL Certificates** setting on the left navigation bar.
1. Navigate to **Server Settings** and select the **DXL Certificates (Third Party)** setting on the left navigation bar.

.. note::

If using an older version of the DXL ePO Extensions, the **Server Settings** in the ePO console may have only a
single option for all DXL certificates (titled "**DXL Certificates**"). Click that setting, and proceed with the
rest of the steps in this guide as normal.

.. _here: _images/serversettings_old.png

.. image:: serversettings.png

Expand Down
Binary file modified docs/sdk/serversettings-certs.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/sdk/serversettings.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f3ce60b

Please sign in to comment.