Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[sfrench/cifs-2.6.git] / Documentation / 00-INDEX

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index cd077ca0e1b86dfba53b3bd2d0fa62724eb24eb4..cb9a6c6fa83b2288792d10e046cfd56c0ba668b5 100644 (file)
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -255,10 +255,10 @@ kbuild/
        - directory with info about the kernel build process.
 kdump/
        - directory with mini HowTo on getting the crash dump code to work.
-kernel-doc-nano-HOWTO.txt
-       - mini HowTo on generation and location of kernel documentation files.
 kernel-docs.txt
        - listing of various WWW + books that document kernel internals.
+kernel-documentation.rst
+       - how to write and format reStructuredText kernel documentation
 kernel-parameters.txt
        - summary listing of command line / boot prompt args for the kernel.
 kernel-per-CPU-kthreads.txt