aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClay Murphy <claym@google.com>2015-03-23 22:22:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-23 22:22:57 +0000
commit4502a343e1d9ec88967183404fddb0fd7a24373f (patch)
tree52713525ac67f538d61525bc067184eadef8d1c1
parentd5e8263bec06c79f83be16c07d923056a6077910 (diff)
parente42ff9e2275012b58c36bac09ac9c9526e8c9070 (diff)
downloadsource.android.com-4502a343e1d9ec88967183404fddb0fd7a24373f.tar.gz
Merge "Docs: Renaming "Secure Boot" as "Verified Boot""
-rw-r--r--src/devices/devices_toc.cs8
-rw-r--r--src/devices/tech/security/verifiedboot/dm-verity.jd (renamed from src/devices/tech/security/secureboot/dm-verity.jd)0
-rw-r--r--src/devices/tech/security/verifiedboot/index.jd (renamed from src/devices/tech/security/secureboot/index.jd)2
-rw-r--r--src/devices/tech/security/verifiedboot/verified-boot.jd (renamed from src/devices/tech/security/secureboot/verified-boot.jd)0
4 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/devices_toc.cs b/src/devices/devices_toc.cs
index d487dbe3..b82c4ad2 100644
--- a/src/devices/devices_toc.cs
+++ b/src/devices/devices_toc.cs
@@ -341,13 +341,13 @@
</li>
<li class="nav-section">
<div class="nav-section-header">
- <a href="<?cs var:toroot ?>devices/tech/security/secureboot/index.html">
- <span class="en">Secure Boot</span>
+ <a href="<?cs var:toroot ?>devices/tech/security/verifiedboot/index.html">
+ <span class="en">Verified Boot</span>
</a>
</div>
<ul>
- <li><a href="<?cs var:toroot ?>devices/tech/security/secureboot/verified-boot.html">Verifying boot</a></li>
- <li><a href="<?cs var:toroot ?>devices/tech/security/secureboot/dm-verity.html">Implementing dm-verity</a></li>
+ <li><a href="<?cs var:toroot ?>devices/tech/security/verifiedboot/verified-boot.html">Verifying boot</a></li>
+ <li><a href="<?cs var:toroot ?>devices/tech/security/verifiedboot/dm-verity.html">Implementing dm-verity</a></li>
</ul>
</li>
<li class="nav-section">
diff --git a/src/devices/tech/security/secureboot/dm-verity.jd b/src/devices/tech/security/verifiedboot/dm-verity.jd
index f86c1b2b..f86c1b2b 100644
--- a/src/devices/tech/security/secureboot/dm-verity.jd
+++ b/src/devices/tech/security/verifiedboot/dm-verity.jd
diff --git a/src/devices/tech/security/secureboot/index.jd b/src/devices/tech/security/verifiedboot/index.jd
index 98d8e0be..9146f1af 100644
--- a/src/devices/tech/security/secureboot/index.jd
+++ b/src/devices/tech/security/verifiedboot/index.jd
@@ -1,4 +1,4 @@
-page.title=Secure Boot
+page.title=Verified Boot
@jd:body
<!--
diff --git a/src/devices/tech/security/secureboot/verified-boot.jd b/src/devices/tech/security/verifiedboot/verified-boot.jd
index c96d930c..c96d930c 100644
--- a/src/devices/tech/security/secureboot/verified-boot.jd
+++ b/src/devices/tech/security/verifiedboot/verified-boot.jd