Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev

docs/html/training/articles/perf-anr.jd

@@ -1,4 +1,5 @@
 page.title=Keeping Your App Responsive
+page.article=true
 @jd:body
 
 <div id="tb-wrapper">

docs/html/training/articles/perf-jni.jd

@@ -1,4 +1,5 @@
 page.title=JNI Tips
+page.article=true
 @jd:body
 
 <div id="tb-wrapper">

docs/html/training/articles/perf-tips.jd

@@ -1,4 +1,5 @@
 page.title=Performance Tips
+page.article=true
 @jd:body
 
 <div id="tb-wrapper">

docs/html/training/articles/security-tips.jd

@@ -1,10 +1,11 @@
 page.title=Security Tips
+page.article=true
 @jd:body
 
 <div id="tb-wrapper">
 <div id="tb">
 <h2>In this document</h2>
-<ol>
+<ol class="nolist">
   <li><a href="#StoringData">Storing Data</a></li>
   <li><a href="#Permissions">Using Permissions</a></li>
   <li><a href="#Networking">Using Networking</a></li>
@@ -18,11 +19,11 @@ page.title=Security Tips
   <li><a href="#Native">Security in Native Code</a></li>
 </ol>
 <h2>See also</h2>
-<ol>
+<ul>
 <li><a href="http://source.android.com/tech/security/index.html">Android
 Security Overview</a></li>
 <li><a href="{@docRoot}guide/topics/security/permissions.html">Permissions</a></li>
-</ol>
+</ul>
 </div></div>
 
 

docs/html/training/training_toc.cs

@@ -900,6 +900,12 @@
            "How to efficiently use the Java Native Interface with the Android NDK."
           >JNI Tips</a>
       </li>
+      <li>
+        <a href="<?cs var:toroot ?>training/articles/smp.html"
+           description=
+           "Tips for coding Android apps on symmetric multiprocessor systems."
+          >SMP Primer for Android</a>
+      </li>
     </ul>
   </li> <!-- end of Performance -->