summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/index.rst2
-rw-r--r--Documentation/security/index.rst7
-rw-r--r--Documentation/security/tpm/index.rst (renamed from Documentation/tpm/index.rst)0
-rw-r--r--Documentation/security/tpm/tpm_vtpm_proxy.rst (renamed from Documentation/tpm/tpm_vtpm_proxy.rst)0
-rw-r--r--Documentation/security/tpm/xen-tpmfront.txt (renamed from Documentation/tpm/xen-tpmfront.txt)0
5 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/index.rst b/Documentation/index.rst
index 0058b65d361c..b4c3034ebc09 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -19,7 +19,7 @@ Contents:
media/dvb-drivers/index
media/v4l-drivers/index
gpu/index
- tpm/index
+ security/index
Indices and tables
==================
diff --git a/Documentation/security/index.rst b/Documentation/security/index.rst
new file mode 100644
index 000000000000..9bae6bb20e7f
--- /dev/null
+++ b/Documentation/security/index.rst
@@ -0,0 +1,7 @@
+======================
+Security documentation
+======================
+
+.. toctree::
+
+ tpm/index
diff --git a/Documentation/tpm/index.rst b/Documentation/security/tpm/index.rst
index af77a7bbb070..af77a7bbb070 100644
--- a/Documentation/tpm/index.rst
+++ b/Documentation/security/tpm/index.rst
diff --git a/Documentation/tpm/tpm_vtpm_proxy.rst b/Documentation/security/tpm/tpm_vtpm_proxy.rst
index ea08e76b17f5..ea08e76b17f5 100644
--- a/Documentation/tpm/tpm_vtpm_proxy.rst
+++ b/Documentation/security/tpm/tpm_vtpm_proxy.rst
diff --git a/Documentation/tpm/xen-tpmfront.txt b/Documentation/security/tpm/xen-tpmfront.txt
index 69346de87ff3..69346de87ff3 100644
--- a/Documentation/tpm/xen-tpmfront.txt
+++ b/Documentation/security/tpm/xen-tpmfront.txt