aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClay Murphy <claym@google.com>2014-09-09 16:26:00 -0700
committerClay Murphy <claym@google.com>2014-10-28 16:57:37 -0700
commit291670d0f6dae2c19a0e38b8d3491bd87bac1a41 (patch)
tree0e0da9970cbdc37e55be50804eda15e0e661f60e
parentb842dfce21a404126a26b693fcfaf17d3637f854 (diff)
downloadsource.android.com-291670d0f6dae2c19a0e38b8d3491bd87bac1a41.tar.gz
Docs: Fixing many, small issues in the Source section.
Bug: 10488940 Change-Id: I17198a8858ef8af59deaf5d545b7f80d4597b973 Conflicts: src/source/developing.jd
-rw-r--r--src/source/code-style.jd11
-rw-r--r--src/source/developing.jd8
-rw-r--r--src/source/faqs.jd2
-rw-r--r--src/source/report-bugs.jd13
-rw-r--r--src/source/submit-patches.jd2
-rw-r--r--src/source/using-repo.jd2
6 files changed, 20 insertions, 18 deletions
diff --git a/src/source/code-style.jd b/src/source/code-style.jd
index 9ec3c998..ee65c272 100644
--- a/src/source/code-style.jd
+++ b/src/source/code-style.jd
@@ -277,8 +277,7 @@ structure of the program.</p>
<h3 id="define-fields-in-standard-places">Define Fields in Standard Places</h3>
<p>Fields should be defined either at the top of the file, or immediately before the methods that use them.</p>
<h3 id="limit-variable-scope">Limit Variable Scope</h3>
-<p>The scope of local variables should be kept to a minimum (<em>Effective
-Java</em> Item 29). By doing so, you increase the readability and
+<p>The scope of local variables should be kept to a minimum. By doing so, you increase the readability and
maintainability of your code and reduce the likelihood of error. Each variable
should be declared in the innermost block that encloses all uses of the
variable.</p>
@@ -537,8 +536,7 @@ refactored to isolate the software elements where the annotation applies.</p>
<p>Both the JDK and the Android code bases are very inconsistent with regards
to acronyms, therefore, it is virtually impossible to be consistent with the
code around you. Bite the bullet, and treat acronyms as words.</p>
-<p>For further justifications of this style rule, see <em>Effective Java</em>
-Item 38 and <em>Java Puzzlers</em> Number 68.</p>
+
<h3 id="use-todo-comments">Use TODO Comments</h3>
<p>Use TODO comments for code that is temporary, a short-term solution, or
good-enough but not perfect.</p>
@@ -553,10 +551,9 @@ you either include a very specific date ("Fix by November 2005") or a very
specific event ("Remove this code after all production mixers understand
protocol V7.").</p>
<h3 id="log-sparingly">Log Sparingly</h3>
-<p>While logging is necessary it has a significantly negative impact on
+<p>While logging is necessary, it has a significantly negative impact on
performance and quickly loses its usefulness if it's not kept reasonably
-terse. The logging facilities provides five different levels of logging. Below
-are the different levels and when and how they should be used.</p>
+terse. The logging facilities provides five different levels of logging:</p>
<ul>
<li>
<p><code>ERROR</code>:
diff --git a/src/source/developing.jd b/src/source/developing.jd
index 64c24c2c..e6a97b57 100644
--- a/src/source/developing.jd
+++ b/src/source/developing.jd
@@ -76,13 +76,15 @@ For information about using repo to download source, see <a href="{@docRoot}sour
<p>To start a topic branch using Repo, navigate into the project to be modified and issue: </p>
<pre><code>$ repo start BRANCH_NAME .
</code></pre>
-<p>To verify that your new branch was created:</p>
-<pre><code>$ repo status
+<p>Please note, the period represents the project in the current working directory. To verify your new branch was created:</p>
+<pre><code>$ repo status .
</code></pre>
<h2 id="using-topic-branches">Using topic branches</h2>
<p>To assign the branch to a particular project:</p>
-<pre><code>$ repo start BRANCH_NAME PROJECT
+<pre><code>$ repo start BRANCH_NAME PROJECT_NAME
</code></pre>
+<p>See <a href="https://android.googlesource.com/">android.googlesource.com</a> for a list of all projects. Again, if you've already navigated into a particular project directory, you may simply pass a period to represent the current project.</p>
+
<p>To switch to another branch that you have created in your local work environment:</p>
<pre><code>$ git checkout BRANCH_NAME
</code></pre>
diff --git a/src/source/faqs.jd b/src/source/faqs.jd
index f08a8968..58a9a212 100644
--- a/src/source/faqs.jd
+++ b/src/source/faqs.jd
@@ -321,5 +321,7 @@ ways to help out Android.</p>
implement the 'adb' debugging utility. This means that any compatible device
-- including ones available at retail -- must be able to run the CTS
tests.</p>
+<h3 id="are-codecs-verified">Are codecs verified by CTS?</h3>
+<p>Yes. All mandatory codecs are verified by CTS.</p>
<a href="#top">Back to top</a>
diff --git a/src/source/report-bugs.jd b/src/source/report-bugs.jd
index 027dcd2b..300df543 100644
--- a/src/source/report-bugs.jd
+++ b/src/source/report-bugs.jd
@@ -78,7 +78,7 @@ issue is to be resolved. Below, there are some examples of a good bug report
and a poor bug report.</p>
<h2 id="a-poor-bug-report">A Poor Bug Report</h2>
-<pre>
+<blockquote>
Title: Error message
When running Eclipse I get an "Internal Error" that says "See the .log file for more details".
@@ -91,18 +91,18 @@ I wouldn't get the error message--would work with Object o = null.
Observed results:
See above.
-</pre>
+</blockquote>
<p>This is a poor bug report because it doesn't provide any context for the
issue; is it a problem in the Dalvik virtual machine, the core framework, or
something else? It also doesn't provide any code or hint on how to reproduce
it. In other words, this bug report doesn't provide enough information for
anyone to take action on, so it would be ignored.</p>
<h2 id="a-good-bug-report">A Good Bug Report</h2>
-<pre>
+<blockquote>
Title: Stepping over "Object o = null" causes Eclipse "Internal Error"
Interesting bug, while using Eclipse 3.3.1.1 with m37a of android and the following code:
-
+<pre>
package com.saville.android;
import android.app.Activity;
@@ -125,7 +125,7 @@ public class TestObjectNull extends Activity {
static final String TAG = "TestObjectNull";
}
-
+</pre>
Eclipse indicates an "Internal Error" with "See the .log file for more
details" and then asks if I want to exit the workbench. This occurs when I
place a break point on "setContentView(R.layout.main);" and then single
@@ -134,7 +134,7 @@ step over "Object o = null;"
If I change "Object o = null;" to "Object o" all is well.
The last lines of the .log file are:
-
+<pre>
!ENTRY org.eclipse.core.jobs 4 2 2008-01-01 13:04:15.825
!MESSAGE An internal error occurred during: "has children update".
!STACK 0
@@ -163,3 +163,4 @@ org.eclipse.debug.internal.ui.model.elements.ElementContentProvider.updateHasChi
org.eclipse.debug.internal.ui.model.elements.ElementContentProvider$3.run(ElementContentProvider.java:200)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
</pre>
+</blockquote>
diff --git a/src/source/submit-patches.jd b/src/source/submit-patches.jd
index 1c2dd0d0..c41de253 100644
--- a/src/source/submit-patches.jd
+++ b/src/source/submit-patches.jd
@@ -199,7 +199,7 @@ See <a href="http://site.icu-project.org/bugs">Submitting ICU Bugs and Feature R
<h2 id="mksh">mksh</h2>
<p>All changes to the MirBSD Korn Shell project at <code>external/mksh</code> should be made upstream
-either by sending an email to miros-mksh on the mirbsd.o®g domain (no subscription
+either by sending an email to miros-mksh on the mirbsd.org domain (no subscription
required to submit there) or (optionally) at <a href="https://launchpad.net/mksh">Launchpad</a>.
</p>
<h2 id="openssl">OpenSSL</h2>
diff --git a/src/source/using-repo.jd b/src/source/using-repo.jd
index 67ca7b71..ce86c439 100644
--- a/src/source/using-repo.jd
+++ b/src/source/using-repo.jd
@@ -147,7 +147,7 @@ delays to all servers worldwide.</p>
<p><code>REPO_PATH</code> is the path relative to the root of the client.</p>
</li>
<li>
-<p><code>REPO_REMOTE</code> is the name of the remote sstem from the manifest.</p>
+<p><code>REPO_REMOTE</code> is the name of the remote system from the manifest.</p>
</li>
<li>
<p><code>REPO_LREV</code> is the name of the revision from the manifest, translated to a local tracking branch. Used if you need to pass the manifest revision to a locally executed git command.</p>