Merge branch 'dev'

datatheorem · Aug 2, 2015 · a5eb5fb · a5eb5fb
2 parents 846ed11 + cebf51f
commit a5eb5fb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,13 @@
-Original Authors
-----------------
+Authors
+-------
 Alban Diquet - Data Theorem Inc.
 Angela Chow - Yahoo Inc.
 Eric Castro - Data Theorem Inc.
+
+
+Thanks
+------
+Daryl Low - Yahoo Inc.
+Christopher Harrell - Yahoo Inc.
+Plasma Chen - Yahoo Inc.
+
diff --git a/README.md b/README.md
@@ -45,7 +45,13 @@ Sample Usage
 ------------
 
 Enabling SSL pinning only requires initializing TrustKit with a pinning policy
-(domains, Subject Public Key Info hashes, and additional settings):
+(domains, Subject Public Key Info hashes, and additional settings).
+
+The policy can be configured within the App's Info.plist:
+
+![Info.plist policy](https://datatheorem.github.io/TrustKit/images/linking3_dynamic.png)
+
+Alternatively, the pinning policy can be set programmatically:
 
     NSDictionary *trustKitConfig;
     trustKitConfig = @{