commit 7250c15f6d4c0210af13ce8ec1f922f30d2537c9
author Kevin Hufnagle <khufnagle@google.com> Wed Apr 27 03:24:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 27 03:24:31 2016 +0000
tree 1d35409fca15da91b809834e59cbcfb682359c1f
parent 44ac1c7ca784d474c7922b9b8413ff222411fe7c
parent d893d0c5c4dacc702c2bcbc84b2d6f93ed36fef7

Merge "docs: Clarified structure of security config file." into mnc-mr-docs am: c3cada0 am: 0e6f90e
am: d893d0c

* commit 'd893d0c5c4dacc702c2bcbc84b2d6f93ed36fef7':
  docs: Clarified structure of security config file.

Change-Id: I4b0b6116cce7f5504d916e87875607c30db9acdd

docs/html/preview/features/security-config.jd

diff --git a/docs/html/preview/features/security-config.jd b/docs/html/preview/features/security-config.jd
index 607e8f3..42c4ff5 100644
--- a/docs/html/preview/features/security-config.jd
+++ b/docs/html/preview/features/security-config.jd
@@ -70,12 +70,13 @@
 
 <pre>
 &lt;?xml version="1.0" encoding="utf-8"?&gt;
-...
-&lt;application ...&gt;
+&lt;manifest ... &gt;
+  &lt;application ... &gt;
     &lt;meta-data android:name="android.security.net.config"
                android:resource="@xml/network_security_config" /&gt;
     ...
-&lt;/application&gt;
+  &lt;/application&gt;
+&lt;/manifest&gt;
 </pre>
 
 <h2 id="CustomTrust">Customizing Trusted CAs</h2>