Merge "Fix encryption documentation for LMP"
diff --git a/src/source/code-style.jd b/src/source/code-style.jd
index 3eadc68..9ec3c99 100644
--- a/src/source/code-style.jd
+++ b/src/source/code-style.jd
@@ -196,9 +196,11 @@
<p>There are conventions for using Android's Java libraries and tools. In some
cases, the convention has changed in important ways and older code might use a
deprecated pattern or library. When working with such code, it's okay to
-continue the existing style (see <a href="#consistency">Consistency</a>). When
-creating new components never use deprecated libraries.</p>
+continue the existing style. When creating new components never use deprecated
+libraries.</p>
+
<h2 id="java-style-rules">Java Style Rules</h2>
+
<h3 id="use-javadoc-standard-comments">Use Javadoc Standard Comments</h3>
<p>Every file should have a copyright statement at the top. Then a package
statement and import statements should follow, each block separated by a blank
@@ -262,9 +264,10 @@
<p>Every method you write, whether public or otherwise, would benefit from
Javadoc. Public methods are part of an API and therefore require Javadoc.</p>
<p>Android does not currently enforce a specific style for writing Javadoc
-comments, but you should follow the <a
-href="http://www.oracle.com/technetwork/java/codeconv-138413.html">Code
-Conventions for the Java Programming Language</a>.</p>
+comments, but you should follow the instructions <a
+href="http://www.oracle.com/technetwork/java/javase/documentation/index-137868.html">How
+to Write Doc Comments for the Javadoc Tool</a>.</p>
+
<h3 id="write-short-methods">Write Short Methods</h3>
<p>To the extent that it is feasible, methods should be kept small and
focused. It is, however, recognized that long methods are sometimes