diff options
author | Clay Murphy <claym@google.com> | 2015-08-10 18:36:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-10 18:36:56 +0000 |
commit | 82bcaea7b675aa09e65ca2b5c8722d8f21c59bbd (patch) | |
tree | e4c0f004e3db25b15d2ee3ccedb7a6ad192aea9b | |
parent | 00306017df61e5a2cd4c1b7f89a543afb30bd241 (diff) | |
parent | b38549a39976ca518f0ea9a53a4ebea49e84f878 (diff) | |
download | source.android.com-82bcaea7b675aa09e65ca2b5c8722d8f21c59bbd.tar.gz |
Merge "Docs: Add filesystem-config to nav, fix title" into mnc-dev
-rw-r--r-- | src/devices/devices_toc.cs | 43 | ||||
-rw-r--r-- | src/devices/tech/filesystem-config.jd | 2 | ||||
-rw-r--r-- | src/devices/tech/resources.jd | 20 |
3 files changed, 46 insertions, 19 deletions
diff --git a/src/devices/devices_toc.cs b/src/devices/devices_toc.cs index 45ddd700..2f9c4e2b 100644 --- a/src/devices/devices_toc.cs +++ b/src/devices/devices_toc.cs @@ -222,20 +222,6 @@ </div> </li> - <li><a href="<?cs var:toroot ?>devices/tech/kernel.html">Kernel</a></li> - - <li class="nav-section"> - <div class="nav-section-header"> - <a href="<?cs var:toroot ?>devices/tech/ram/index.html"> - <span class="en">RAM</span> - </a> - </div> - <ul> - <li><a href="<?cs var:toroot ?>devices/tech/ram/low-ram.html">Low RAM</a></li> - <li><a href="<?cs var:toroot ?>devices/tech/ram/procstats.html">Viewing RAM Usage Data</a></li> - </ul> - </li> - <li class="nav-section"> <div class="nav-section-header"> <a href="<?cs var:toroot ?>devices/tech/ota/index.html"> @@ -250,15 +236,12 @@ <li><a href="<?cs var:toroot ?>devices/tech/ota/sign_builds.html">Signing Builds for Release</a></li> </ul> </li> - - <li><a href="<?cs var:toroot ?>devices/tech/netstats.html">Viewing Network Data</a></li> - <li class="nav-section"> <div class="nav-section-header"> <a href="<?cs var:toroot ?>devices/tech/power/index.html"><span class="en">Power</span></a> </div> <ul> - <li><a href="<?cs var:toroot ?>devices/tech/power/batterystats.html">Viewing Battery Usage Data</a></li> + <li><a href="<?cs var:toroot ?>devices/tech/power/batterystats.html">Battery Usage Data</a></li> </ul> </li> @@ -331,6 +314,30 @@ </ul> </li> </ul> + + <li class="nav-section"> + <div class="nav-section-header"> + <a href="<?cs var:toroot ?>devices/tech/resources.html"> + <span class="en">System Resources</span> + </a> + </div> + <ul> + <li><a href="<?cs var:toroot ?>devices/tech/filesystem-config.html">File System Configuration</a></li> + <li><a href="<?cs var:toroot ?>devices/tech/kernel.html">Kernel Configuration</a></li> + <li><a href="<?cs var:toroot ?>devices/tech/netstats.html">Network Usage Data</a></li> + <li class="nav-section"> + <div class="nav-section-header"> + <a href="<?cs var:toroot ?>devices/tech/ram/index.html"> + <span class="en">RAM</span> + </a> + </div> + <ul> + <li><a href="<?cs var:toroot ?>devices/tech/ram/low-ram.html">Low RAM Configuration</a></li> + <li><a href="<?cs var:toroot ?>devices/tech/ram/procstats.html">RAM Usage Data</a></li> + </ul> + </li> + </ul> + <li class="nav-section"> <div class="nav-section-header"> <a href="<?cs var:toroot ?>devices/tech/test_infra/tradefed/index.html"> diff --git a/src/devices/tech/filesystem-config.jd b/src/devices/tech/filesystem-config.jd index 78017a1e..41ec4977 100644 --- a/src/devices/tech/filesystem-config.jd +++ b/src/devices/tech/filesystem-config.jd @@ -1,4 +1,4 @@ -page.title=Configuring the Filesystem +page.title=Configuring the File System @jd:body <!-- diff --git a/src/devices/tech/resources.jd b/src/devices/tech/resources.jd new file mode 100644 index 00000000..dade1a7e --- /dev/null +++ b/src/devices/tech/resources.jd @@ -0,0 +1,20 @@ +page.title=System Resources +@jd:body + +<!-- + 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<p> The following sections contain information, documentation, tips and tricks about Android system resources.</p> |