merge by hand - fix up rejections in Documentation/DocBook/Makefile

git-mirror · May 20, 2005 · ad34ea2 · ad34ea2
2 parents 90356ac + 88d7bd8
commit ad34ea2
Show file tree

Hide file tree

Showing 1,282 changed files with 32,287 additions and 15,731 deletions.
diff --git a/CREDITS b/CREDITS
@@ -339,7 +339,7 @@ W: http://tomas.nocrew.org/
 D: dsp56k device driver
 
 N: Ross Biro
-E: bir7@leland.Stanford.Edu
+E: ross.biro@gmail.com
 D: Original author of the Linux networking code
 
 N: Anton Blanchard

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
@@ -12,8 +12,6 @@ Following translations are available on the WWW:
 
 00-INDEX
 	- this file.
-BK-usage/
-	- directory with info on BitKeeper.
 BUG-HUNTING
 	- brute force method of doing binary search of patches to find bug.
 Changes

diff --git a/Documentation/BK-usage/00-INDEX b/Documentation/BK-usage/00-INDEX
diff --git a/Documentation/BK-usage/bk-kernel-howto.txt b/Documentation/BK-usage/bk-kernel-howto.txt
diff --git a/Documentation/BK-usage/bk-make-sum b/Documentation/BK-usage/bk-make-sum