Merge "Docs: Changes to source.android.com" am: 4ede9c5263 am: e9c0de4899

am: 48ad0f1258

Change-Id: Ie2468275f0942e1400e50e848680ea37fce192e2

5 files changed, 13 insertions, 14 deletions

diff --git a/en/devices/architecture/kernel/modular-kernels.html b/en/devices/architecture/kernel/modular-kernels.html
index 004b8f7b..dc36e8c8 100644
--- a/en/devices/architecture/kernel/modular-kernels.html
+++ b/en/devices/architecture/kernel/modular-kernels.html
@@ -58,7 +58,7 @@ framework.</li>
 <p>All SoC kernels should support loadable kernel modules. As a starting point,
 the following kernel-config options (or their kernel-version equivalent) have
 been added to
-<a href="https://android.googlesource.com/kernel/common/+/android-4.4/android/configs/android-base.cfg" class="external">android-base.cfg</a>
+<a href="https://android.googlesource.com/kernel/common/+/android-4.4-o/android/configs/android-base.cfg" class="external">android-base.cfg</a>
 in all common kernels and must be enabled in all device kernels:</p>
 
 <pre class="prettyprint">
diff --git a/en/devices/audio/latency.html b/en/devices/audio/latency.html
index 151c4c6a..58b3024b 100644
--- a/en/devices/audio/latency.html
+++ b/en/devices/audio/latency.html
@@ -34,7 +34,7 @@
 </tr>
 <tr>
   <td>Description of audio latency for purposes of Android compatibility</td>
-  <td><a href="/compatibility/android-cdd.pdf">Android CDD</a><br /><em>section 5.5 Audio Latency</em></td>
+  <td><a href="/compatibility/android-cdd#5_6_audio_latency">Android CDD</a><br /><em>section 5.6 Audio Latency</em></td>
 </tr>
 <tr>
   <td>Common causes of audio latency</td>
diff --git a/en/devices/automotive/index.html b/en/devices/automotive/index.html
index c6b6896f..521ff64c 100644
--- a/en/devices/automotive/index.html
+++ b/en/devices/automotive/index.html
@@ -33,7 +33,7 @@ models of the same brand); examples include Controller Area Network (CAN) bus,
 Local Interconnect Network (LIN) bus, Media Oriented Systems Transport (MOST),
 as well as automotive-grade Ethernet and TCP/IP networks such as BroadR-Reach.
 </p>
-<p>the Android Automotive hardware abstraction layer (HAL) provides a
+<p>The Android Automotive hardware abstraction layer (HAL) provides a
 consistent interface to the Android framework regardless of physical transport
 layer. This vehicle HAL is the interface for developing Android Automotive
 implementations.</p>
diff --git a/en/devices/drm.html b/en/devices/drm.html
index 42ab3280..2640c008 100644
--- a/en/devices/drm.html
+++ b/en/devices/drm.html
@@ -25,7 +25,7 @@
 
 <img style="float: right; margin: 0px 15px 15px 15px;" src="images/ape_fwk_hal_drm.png" alt="Android DRM HAL icon"/>
 
-<p>This document provides an overview of the Android DRM framework, and
+<p>This document provides an overview of the Android digital rights management (DRM) framework and
 introduces the interfaces a DRM plug-in must implement. This document does not
 describe robustness rules or compliance rules that may be defined by a DRM
 scheme.</p>
@@ -55,11 +55,10 @@ Layer</p>
 Availability of rich digital content is important to users on mobile devices. To
 make their content widely available, Android developers and digital content
 publishers need a consistent DRM implementation supported across the Android
-ecosystem. To make that digital content available on Android devices and to ensure at least one consistent DRM available across all
-devices, Google provides DRM without license fees on compatible Android devices.
-On Android 3.0 and higher platforms, the DRM plug-in is integrated with the
-Android DRM framework and can use hardware-backed protection to secure premium
-content and user credentials.
+ecosystem. To make that digital content available on Android devices and to ensure at least one
+consistent DRM available across all devices, Google provides DRM without license fees on compatible
+Android devices. On Android 3.0 and higher platforms, the DRM plug-in is integrated with the Android
+DRM framework and can use hardware-backed protection to secure premium content and user credentials.
 </p>
 
 <p>
@@ -125,7 +124,7 @@ them under:</p>
 <pre class="devsite-click-to-copy">
 /system/lib/drm/plugins/native/
 </pre>
- 
+
 <img src="images/ape_fwk_drm_plugins_life.png" alt="Android DRM Plug-in Lifecycle" />
 
 <p class="img-caption"><strong>Figure 4.</strong> DRM plug-in lifecycle</p>
@@ -157,8 +156,9 @@ defines an API to retrieve an instance of DrmInfo called acquireDrmInfo().</p>
 DrmInfo* acquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest);
 </pre>
 <p>Retrieves necessary information for registration, deregistration or rights
-acquisition information. See <a
-href="http://developer.android.com/reference/android/drm/DrmInfoRequest.html">DrmInfoRequest</a> for more information.</p>
+acquisition information. See
+<a href="http://developer.android.com/reference/android/drm/DrmInfoRequest.html">DrmInfoRequest</a>
+for more information.</p>
 
 <pre class="devsite-click-to-copy prettyprint">
 DrmInfoStatus* processDrmInfo(int uniqueId, const DrmInfo* drmInfo);
diff --git a/en/devices/tech/display/hdr.html b/en/devices/tech/display/hdr.html
index 53e4ae8f..fbec8475 100644
--- a/en/devices/tech/display/hdr.html
+++ b/en/devices/tech/display/hdr.html
@@ -471,8 +471,7 @@ general HDR decoder support, it must:</p>
 <ul>
 <li>Provide a Dolby-Vision aware extractor, even if it does not support
 HDR playback.</li>
-<li>Provide a decoder that supports at least Dolby Vision profile X/level
-Y.</li>
+<li>Provide a decoder that supports the vision profile as defined by Dolby.</li>
 </ul>
 
 <h4>HDR10 decoder support</h4>