[13/50] incubator-trafficcontrol git commit: test push 2

[mi...@apache.org]

test push 2


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2ea04e7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2ea04e7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2ea04e7b

Branch: refs/heads/master
Commit: 2ea04e7b9e76ed1655871abcc114e6faf683c9fc
Parents: 13d8538
Author: Mark Torluemke <mt...@apache.org>
Authored: Sat Oct 22 21:06:20 2016 +0000
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri Oct 28 15:04:12 2016 -0600

----------------------------------------------------------------------
 docs/source/admin/traffic_ops_using.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2ea04e7b/docs/source/admin/traffic_ops_using.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_using.rst b/docs/source/admin/traffic_ops_using.rst
index 4a50742..4700f04 100644
--- a/docs/source/admin/traffic_ops_using.rst
+++ b/docs/source/admin/traffic_ops_using.rst
@@ -1026,7 +1026,7 @@ Fairly straight forward, this button set the **dnssec.enabled** param to either
 
 **Generate Keys**
 
-Generate Keys will generate dnssec keys for the CDN TLD as well as for each Delivery Service in the CDN.  It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record.  Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly.  When a user clicks the **Generate Keys** button, they will be presented with a screen with the following fields:
+Generate Keys will generate DNSSEC keys for the CDN TLD as well as for each Delivery Service in the CDN.  It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record.  Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly.  When a user clicks the **Generate Keys** button, they will be presented with a screen with the following fields:
 
   - **CDN:** This is not editable and displays the CDN for which keys will be generated
   - **ZSK Expiration (Days):**  Sets how long (in days) the Zone Signing Key will be valid for the CDN and associated Delivery Services. The default is 30 days.