diff --git a/src/compatibility/downloads.jd b/src/compatibility/downloads.jd
index 0d729f2..d5ce7ec 100644
--- a/src/compatibility/downloads.jd
+++ b/src/compatibility/downloads.jd
@@ -30,7 +30,7 @@
 <h2 id="android-50">Android 5.0</h2>
 <p>Android 5.0 is the release of the development milestone code-named Lollipop.
 The source code for the following tests can be synced with the
-'android-cts-5.0_r2' tag in the open-source tree.</p>
+'android-cts-5.0_r2' tag in the open source tree.</p>
 <ul>
 <li><a href="5.0/android-5.0-cdd.pdf">Android 5.0 Compatibility Definition
 Document (CDD)</a></li>
@@ -51,7 +51,7 @@
 <h2 id="android-44">Android 4.4</h2>
 <p>Android 4.4 is the release of the development milestone code-named
 KitKat. Source code for Android 4.4 is found in the
-'android-4.4.4_r1' branch in the open-source tree.</p>
+'android-4.4.4_r1' branch in the open source tree.</p>
 <ul>
 <li><a href="4.4/android-4.4-cdd.pdf">Android 4.4 Compatibility Definition
 Document (CDD)</a></li>
@@ -71,7 +71,7 @@
 
 <h2 id="android-43">Android 4.3</h2>
 <p>Android 4.3 is the release of the development milestone code-named
-Jelly Bean-MR2. Source code for Android 4.3 is found in the 'android-4.3_r2.2-cts' branch in the open-source tree.</p>
+Jelly Bean-MR2. Source code for Android 4.3 is found in the 'android-4.3_r2.2-cts' branch in the open source tree.</p>
 <ul>
 <li><a href="4.3/android-4.3-cdd.pdf">Android 4.3 Compatibility Definition Document (CDD)</a></li>
 <li><a
@@ -84,7 +84,7 @@
 
 <h2 id="android-42">Android 4.2</h2>
 <p>Android 4.2 is the release of the development milestone code-named
-Jelly Bean-MR1. Source code for Android 4.2 is found in the 'android-4.2.2_r1' branch in the open-source tree.</p>
+Jelly Bean-MR1. Source code for Android 4.2 is found in the 'android-4.2.2_r1' branch in the open source tree.</p>
 <ul>
 <li><a href="4.2/android-4.2-cdd.pdf">Android 4.2 Compatibility Definition Document (CDD)</a></li>
 <li><a href="https://dl.google.com/dl/android/cts/android-cts-4.2_r4-linux_x86-arm.zip">Android 4.2 R4 Compatibility Test Suite (CTS)</a></li>
@@ -93,7 +93,7 @@
 <h2 id="android-41">Android 4.1</h2>
 <p>Android 4.1 is the release of the development milestone code-named Jelly
 Bean. The source code of the Compatibility Test Suite revisions below is
-available at the 'android-cts-4.1_r4' tag in the open-source tree.</p>
+available at the 'android-cts-4.1_r4' tag in the open source tree.</p>
 <ul>
 <li><a href="4.1/android-4.1-cdd.pdf">Android 4.1 Compatibility Definition Document (CDD)</a></li>
 <li><a href="https://dl.google.com/dl/android/cts/android-cts-4.1_r4-linux_x86-arm.zip">Android 4.1 R4 Compatibility Test Suite (CTS)</a></li>
@@ -102,7 +102,7 @@
 <h2 id="android-403">Android 4.0.3</h2>
 <p>Android 4.0.3 is the release of the development milestone code-named
 Ice Cream Sandwich. Android 4.0.3 is the current version of Android. Source code for
-Android 4.0.3 is found in the 'android-4.0.3_r1' branch in the open-source tree.</p>
+Android 4.0.3 is found in the 'android-4.0.3_r1' branch in the open source tree.</p>
 <ul>
 <li><a href="4.0/android-4.0-cdd.pdf">Android 4.0 Compatibility Definition Document (CDD)</a></li>
 <li><a href="https://dl.google.com/dl/android/cts/android-cts-4.0.3_r3-linux_x86-arm.zip">Android 4.0.3 R3 Compatibility Test Suite (CTS)</a></li>
@@ -111,7 +111,7 @@
 <h2 id="android-23">Android 2.3</h2>
 <p>Android 2.3 is the release of the development milestone code-named
 Gingerbread. Source code for Android 2.3 is found in the 'gingerbread' branch in 
-the open-source tree.</p>
+the open source tree.</p>
 <ul>
 <li><a href="2.3/android-2.3.3-cdd.pdf">Android 2.3 Compatibility Definition Document (CDD)</a></li>
 <li><a href="https://dl.google.com/dl/android/cts/android-cts-2.3_r13-linux_x86-arm.zip">Android 2.3 R13 Compatibility Test Suite (CTS)</a></li>
@@ -120,7 +120,7 @@
 <h2 id="android-22">Android 2.2</h2>
 <p>Android 2.2 is the release of the development milestone code-named
 FroYo. Source code for Android 2.2 is found in the 'froyo' branch in the
-open-source tree.</p>
+open source tree.</p>
 <ul>
 <li><a href="2.2/android-2.2-cdd.pdf">Android 2.2 Compatibility Definition Document (CDD)</a></li>
 <li><a href="https://dl.google.com/dl/android/cts/android-cts-2.2_r8-linux_x86-arm.zip">Android 2.2 R8 Compatibility Test Suite (CTS)</a></li>
@@ -128,7 +128,7 @@
 <h2 id="android-21">Android 2.1</h2>
 <p>Android 2.1 is the release of the development milestone code-named
 Eclair. Source code for Android 2.1 is found in the 'eclair' branch in the
-open-source tree. Note that for technical reasons, there is no compatibility
+open source tree. Note that for technical reasons, there is no compatibility
 program for Android 2.0 or 2.0.1, and new devices must use Android 2.1.</p>
 <ul>
 <li><a href="2.1/android-2.1-cdd.pdf">Android 2.1 Compatibility Definition Document (CDD)</a></li>
@@ -137,7 +137,7 @@
 <h2 id="android-16">Android 1.6</h2>
 <p>Android 1.6 was the release of the development milestone code-named Donut.
 Android 1.6 was obsoleted by Android 2.1. Source code for Android 1.6 is found
-in the 'donut' branch in the open-source tree.</p>
+in the 'donut' branch in the open source tree.</p>
 <ul>
 <li><a href="1.6/android-1.6-cdd.pdf">Android 1.6 Compatibility Definition Document (CDD)</a></li>
 <li><a href="https://dl.google.com/dl/android/cts/android-cts-1.6_r1-x86.zip">Android 1.6 R1 Compatibility Test Suite (CTS)</a></li>
diff --git a/src/devices/graphics/architecture.jd b/src/devices/graphics/architecture.jd
index 75623cc..5b03ae5 100644
--- a/src/devices/graphics/architecture.jd
+++ b/src/devices/graphics/architecture.jd
@@ -55,7 +55,7 @@
 out in a few places.</p>
 
 <p>At various points I will refer to source code from the AOSP sources or from
-Grafika.  Grafika is a Google open-source project for testing; it can be found at
+Grafika.  Grafika is a Google open source project for testing; it can be found at
 <a
 href="https://github.com/google/grafika">https://github.com/google/grafika</a>.
 It's more "quick hack" than solid example code, but it will suffice.</p>
diff --git a/src/devices/tech/security/overview/index.jd b/src/devices/tech/security/overview/index.jd
index e23d734..6b00c55 100644
--- a/src/devices/tech/security/overview/index.jd
+++ b/src/devices/tech/security/overview/index.jd
@@ -39,11 +39,11 @@
     and security resources, with appropriate security controls integrated into the
     architecture of the system.</li>
   <li><strong>Penetration Testing and Code Review</strong>: During the development of the
-    platform, Android-created and open-source components are subject to vigorous
+    platform, Android-created and open source components are subject to vigorous
     security reviews. These reviews are performed by the Android Security Team,
     Google’s Information Security Engineering team, and independent security
     consultants. The goal of these reviews is to identify weaknesses and possible
-    vulnerabilities well before the platform is open-sourced, and to simulate the
+    vulnerabilities well before the platform is open sourced, and to simulate the
     types of analysis that will be performed by external security experts upon
     release.</li>
   <li><strong>Open Source and Community Review</strong>: The Android Open Source Project enables
diff --git a/src/index.jd b/src/index.jd
index 6055e13..2a4c9a3 100644
--- a/src/index.jd
+++ b/src/index.jd
@@ -25,12 +25,13 @@
   <div class="landing-banner">
       <h1 itemprop="name" style="margin-bottom:0;">Welcome to the Android Open Source Project!</h1>
 
-      <p>
-      Android is an open-source software stack for a wide range of mobile devices and a corresponding open-source project led by 
-      Google. Here you can find the information and source code you need to learn more about the Android platform. From there you can
-      create custom variants of the Android software stack, port devices and accessories to the Android platform,
-      and ensure your devices are compatible with the Android compatibility definition.
-      </p>
+<p>
+Android is an open source software stack for a wide range of mobile devices and
+a corresponding open source project led by Google. This site offers the
+information and source code you need to create custom variants of the Android
+stack, port devices and accessories to the Android platform, and ensure your
+devices meet compatibility requirements.
+</p>
 
   </div>
 
diff --git a/src/source/building-devices.jd b/src/source/building-devices.jd
index 06b4352..fee5254 100644
--- a/src/source/building-devices.jd
+++ b/src/source/building-devices.jd
@@ -181,7 +181,7 @@
 branches can be downloaded from <a
 href="https://developers.google.com/android/nexus/drivers">Google's Nexus
 driver page</a>. These add access to additional hardware capabilities with
-non-open-source code. To instead build the AOSP master branch, use the <a
+non-open source code. To instead build the AOSP master branch, use the <a
 href="https://developers.google.com/android/nexus/blobs-preview">Binaries
 Preview for Nexus Devices</a>.</p>
 <p>When building the master branch for a device, the binaries for the most
diff --git a/src/source/code-lines.jd b/src/source/code-lines.jd
index 2e82e7b..3ec8798 100644
--- a/src/source/code-lines.jd
+++ b/src/source/code-lines.jd
@@ -89,7 +89,7 @@
   </li>
   <li>
 	<p>
-	  An <em>upstream</em> project is an open-source project from which the Android stack is
+	  An <em>upstream</em> project is an open source project from which the Android stack is
 	  pulling code. These include obvious projects such as the Linux kernel and WebKit.
 	  Over time we are migrating some of the semi-autonomous Android projects (such as ART,
 	  the Android SDK tools, Bionic, and so on) to work as "upstream" projects. Generally,
@@ -173,7 +173,7 @@
   As a result, Google frequently has possession of confidential information from third parties.
   And we must refrain from revealing sensitive features until we've secured the appropriate
   protections. In addition, there are real risks to the platform arising from having too many
-  platform versions extant at once. For these reasons, we have structured the open-source
+  platform versions extant at once. For these reasons, we have structured the open source
   project -- including third-party contributions -- to focus on the currently-public stable
   version of Android. "Deep development" on the next version of the platform will happen in
   private until it's ready to become an official release.
diff --git a/src/source/community/index.jd b/src/source/community/index.jd
index 8845469..ea92fb7 100644
--- a/src/source/community/index.jd
+++ b/src/source/community/index.jd
@@ -27,7 +27,7 @@
 <ul>
 <li>
 <p><em>android-platform</em>:
-This list is for general discussion about the Android open-source project or
+This list is for general discussion about the Android Open Source Project or
 the platform technologies.</p>
 <ul>
 <li>Subscribe using Google Groups:
@@ -258,4 +258,4 @@
 <p><a href="irc://irc.freenode.net/android-root">#android-root</a> - for
 discussion related to off-label uses of hardware</p>
 </li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/src/source/developing.jd b/src/source/developing.jd
index 0bbafe2..c47f425 100644
--- a/src/source/developing.jd
+++ b/src/source/developing.jd
@@ -25,7 +25,7 @@
 </div>
 
 <p>To work with the Android code, you will need to use both Git and Repo.  In most situations, you can use Git instead of Repo, or mix Repo and Git commands to form complex commands. Using Repo for basic across-network operations will make your work much simpler, however.</p>
-<p><strong>Git</strong> is an open-source version-control system designed to handle very large projects that are distributed over multiple repositories. In the context of Android, we use Git for local operations such as local branching, commits, diffs, and edits.  One of the challenges in setting up the Android project was figuring out how to best support the outside community--from the hobbiest community to large OEMs building mass-market consumer devices. We wanted components to be replaceable, and we wanted interesting components to be able to grow a life of their own outside of Android. We first chose a distributed revision control system, then further narrowed it down to Git.</p>
+<p><strong>Git</strong> is an open source version-control system designed to handle very large projects that are distributed over multiple repositories. In the context of Android, we use Git for local operations such as local branching, commits, diffs, and edits.  One of the challenges in setting up the Android project was figuring out how to best support the outside community--from the hobbiest community to large OEMs building mass-market consumer devices. We wanted components to be replaceable, and we wanted interesting components to be able to grow a life of their own outside of Android. We first chose a distributed revision control system, then further narrowed it down to Git.</p>
 <p><strong>Repo</strong> is a repository management tool that we built on top of Git. Repo
 unifies the many Git repositories when necessary, does the uploads to our
 <a href="https://android-review.googlesource.com/">revision control system</a>, and
diff --git a/src/source/faqs.jd b/src/source/faqs.jd
index 346ad98..42e52bf 100644
--- a/src/source/faqs.jd
+++ b/src/source/faqs.jd
@@ -2,7 +2,7 @@
 @jd:body
 
 <!--
-    Copyright 2013 The Android Open Source Project
+    Copyright 2015 The Android Open Source Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -44,11 +44,11 @@
 their innovative ideas a reality. We also wanted to make sure there was no
 central point of failure, so no single industry player could restrict or control
 the innovations of any other.  The single most important goal of the Android
-Open Source Project (AOSP) is to make sure that the open-source Android
+Open Source Project (AOSP) is to make sure that the open source Android
 software is implemented as widely and compatibly as possible, to everyone's
 benefit.</p>
-<h3 id="what-kind-of-open-source-project-is-android">What kind of open-source project is Android?</h3>
-<p>Google oversees the development of the core Android open-source platform
+<h3 id="what-kind-of-open-source-project-is-android">What kind of open source project is Android?</h3>
+<p>Google oversees the development of the core Android open source platform
 and works to create robust developer and user communities. For the most part,
 the Android source code is licensed under the permissive Apache Software
 License 2.0, rather than a "copyleft" license. The main reason for this is
@@ -66,7 +66,7 @@
 operation and strikes the business deals necessary to make sure great
 devices running Android actually make it to market.</p>
 <p>By making sure Android is a success with users, we help ensure the
-vitality of Android as a platform and as an open-source project. After all,
+vitality of Android as a platform and as an open source project. After all,
 who wants the source code to an unsuccessful product?</p>
 <p>Google's goal is to ensure a successful ecosystem around Android. Of course, no
 one is required to participate. We opened the Android source code
@@ -84,7 +84,7 @@
 according to the actual needs of real-world devices.</p>
 <h3 id="how-is-the-android-software-developed">How is the Android software developed?</h3>
 <p>Each platform version of Android (such as 1.5, 1.6, and so on) has a
-corresponding branch in the open-source tree. At any given moment, the most
+corresponding branch in the open source tree. At any given moment, the most
 recent such branch will be considered the "current stable" branch version.
 This current stable branch is the one that manufacturers port to their
 devices. This branch is kept suitable for release at all times.</p>
@@ -148,7 +148,7 @@
 around the same time the devices reach users.</p>
 <h3 id="how-does-the-aosp-relate-to-the-android-compatibility-program">How does the AOSP relate to the Android Compatibility Program?</h3>
 <p>The Android Open Source Project maintains the Android software, and
-develops new versions. Since it's open-source, this software can be used for
+develops new versions. Since it's open source, this software can be used for
 any purpose, including to develop devices that are not compatible with other
 devices based on the same source.</p>
 <p>The function of the Android Compatibility Program is to define a baseline
@@ -250,7 +250,7 @@
 they must first demonstrate their devices are compatible.</p>
 <h3 id="how-much-does-compatibility-certification-cost">How much does compatibility certification cost?</h3>
 <p>There is no cost to obtain Android compatibility for a device. The
-Compatibility Test Suite is open-source and available to anyone for device testing.</p>
+Compatibility Test Suite is open source and available to anyone for device testing.</p>
 <h3 id="how-long-does-compatibility-take">How long does compatibility take?</h3>
 <p>The process is automated. The Compatibility Test Suite generates a report
 that can be provided to Google to verify compatibility. Eventually we intend
@@ -261,7 +261,7 @@
 for each release. We draft the CDD for a new Android version in consultation
 with various OEMs who provide input on its contents.</p>
 <h3 id="how-long-will-each-android-version-be-supported-for-new-devices">How long will each Android version be supported for new devices?</h3>
-<p>Since Android's code is open-source, we can't prevent someone from using an
+<p>Since Android's code is open source, we can't prevent someone from using an
 old version to launch a device. Instead, Google chooses not to license the
 Google Play client software for use on versions that are considered
 obsolete. This allows anyone to continue to ship old versions of Android,
diff --git a/src/source/index.jd b/src/source/index.jd
index 34531f0..1941ed6 100644
--- a/src/source/index.jd
+++ b/src/source/index.jd
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 <p>
-Android is an open-source software stack created for a wide array of devices
+Android is an open source software stack created for a wide array of devices
 with different form factors. The primary purposes of Android are to create an
 open software platform available for carriers, OEMs, and developers to make
 their innovative ideas a reality and to introduce a successful,
@@ -47,7 +47,7 @@
 </p>
 <p>The companies that have invested in Android have done so on its merits
 because we believe an open platform is necessary. Android is
-intentionally and explicitly an open-source -- as opposed to a free software --
+intentionally and explicitly an open source -- as opposed to a free software --
 effort; a group of organizations with shared needs has pooled
 resources to collaborate on a single implementation of a shared product.
 The Android philosophy is pragmatic, first and foremost. The objective is
diff --git a/src/source/submit-patches.jd b/src/source/submit-patches.jd
index d78aabc..0298ea9 100644
--- a/src/source/submit-patches.jd
+++ b/src/source/submit-patches.jd
@@ -179,7 +179,7 @@
 <p>To publish your comments so that others using Gerrit will be able to see them, click the Publish Comments button. Your comments will be emailed to all relevant parties for this change, including the change owner, the patch set uploader (if different from the owner), and all current reviewers.</p>
 <p><a name="upstream-projects"></a></p>
 <h1 id="upstream-projects">Upstream Projects</h1>
-<p>Android makes use of a number of other open-source projects, such as the Linux kernel and WebKit, as described in
+<p>Android makes use of a number of other open source projects, such as the Linux kernel and WebKit, as described in
 <a href="{@docRoot}source/code-lines.html">Codelines, Branches, and Releases</a>. For most projects under <code>external/</code>, changes should be made upstream and then the Android maintainers informed of the new upstream release containing these changes. It may also be useful to upload patches that move us to track a new upstream release, though these can be difficult changes to make if the project is widely used within Android like most of the larger ones mentioned below, where we tend to upgrade with every release.</p>
 <p>One interesting special case is bionic. Much of the code there is from BSD, so unless the change is to code that's new to bionic, we'd much rather see an upstream fix and then pull a whole new file from the appropriate BSD. (Sadly we have quite a mix of different BSDs at the moment, but we hope to address that in future, and get into a position where we track upstream much more closely.)</p>
 <h2 id="icu4c">ICU4C</h2>