summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2013-09-27 10:04:48 -0700
committerDavid Friedman <dmail@google.com>2013-09-27 10:04:48 -0700
commit36b692d8ef595eee1e28d20b740be548365a5671 (patch)
tree5e633f5b6144374b0cfe9b85a4ec7acb23a81a12 /docs/html/training
parenta8f519ff9cb38e97db34f5a7bac95a9e09ed5ade (diff)
downloadframeworks_base-36b692d8ef595eee1e28d20b740be548365a5671.zip
frameworks_base-36b692d8ef595eee1e28d20b740be548365a5671.tar.gz
frameworks_base-36b692d8ef595eee1e28d20b740be548365a5671.tar.bz2
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file.
Bug: 10807931 10796994 Change-Id: I8c8e07c3e8606d5983c2545fa6638af45650d27c
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/articles/security-ssl.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/articles/security-ssl.jd b/docs/html/training/articles/security-ssl.jd
index d3f68e2..f52865a 100644
--- a/docs/html/training/articles/security-ssl.jd
+++ b/docs/html/training/articles/security-ssl.jd
@@ -250,7 +250,7 @@ due to a self-signed certificate, which means the server is behaving as its own
This is similar to an unknown certificate authority, so you can use the
same approach from the previous section.</p>
-<p>You can create yout own {@link javax.net.ssl.TrustManager},
+<p>You can create your own {@link javax.net.ssl.TrustManager},
this time trusting the server certificate directly. This has all of the
downsides discussed earlier of tying your app directly to a certificate, but can be done
securely. However, you should be careful to make sure your self-signed certificate has a