Merge branch 'docs' of git://git.lwn.net/linux-2.6

* 'docs' of git://git.lwn.net/linux-2.6:
  Document panic_on_unrecovered_nmi sysctl
  Add a reference to paper to SubmittingPatches
  Add kerneldoc documentation for new printk format extensions
  Remove videobook.tmpl
  doc: Test-by?
  Add the development process document
  Documentation/block/data-integrity.txt: Fix section numbers

diff --combined Documentation/00-INDEX
index 4382778,1f3dbdf..7286ad0
--- 1/Documentation/00-INDEX
--- 2/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@@ -21,6 -21,9 +21,9 @@@ Change
        - list of changes that break older software packages.
  CodingStyle
        - how the boss likes the C code in the kernel to look.
+ development-process/
+       - An extended tutorial on how to work with the kernel development
+         process.
  DMA-API.txt
        - DMA API, pci_ API & extensions for non-consistent memory machines.
  DMA-ISA-LPC.txt
@@@ -159,6 -162,8 +162,6 @@@ hayes-esp.tx
        - info on using the Hayes ESP serial driver.
  highuid.txt
        - notes on the change from 16 bit to 32 bit user/group IDs.
 -hpet.txt
 -      - High Precision Event Timer Driver for Linux.
  timers/
        - info on the timer related topics
  hw_random.txt
@@@ -249,6 -254,8 +252,6 @@@ mono.tx
        - how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
  moxa-smartio
        - file with info on installing/using Moxa multiport serial driver.
 -mtrr.txt
 -      - how to use PPro Memory Type Range Registers to increase performance.
  mutex-design.txt
        - info on the generic mutex subsystem.
  namespaces/

diff --combined Documentation/SubmittingPatches
index 7b67f3b,98aa8b1..f309d3c
--- 1/Documentation/SubmittingPatches
--- 2/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@@ -77,7 -77,7 +77,7 @@@ Quilt
  http://savannah.nongnu.org/projects/quilt
  
  Andrew Morton's patch scripts:
 -http://www.zip.com.au/~akpm/linux/patches/
 +http://userweb.kernel.org/~akpm/stuff/patch-scripts.tar.gz
  Instead of these scripts, quilt is the recommended patch management
  tool (see above).
  
@@@ -405,7 -405,7 +405,7 @@@ person it names.  This tag documents th
  have been included in the discussion
  
  
- 14) Using Test-by: and Reviewed-by:
+ 14) Using Tested-by: and Reviewed-by:
  
  A Tested-by: tag indicates that the patch has been successfully tested (in
  some environment) by the person named.  This tag informs maintainers that
@@@ -653,7 -653,7 +653,7 @@@ SECTION 3 - REFERENCE
  ----------------------
  
  Andrew Morton, "The perfect patch" (tpp).
 -  <http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt>
 +  <http://userweb.kernel.org/~akpm/stuff/tpp.txt>
  
  Jeff Garzik, "Linux kernel patch submission format".
    <http://linux.yyz.us/patch-format.html>