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

2026-09-14 18:22:56 +00:00 · 2005-05-20 15:27:44 -05:00 · 2005-05-20 15:27:44 -05:00 · ad34ea2cc3
commit ad34ea2cc3
parent 90356ac319 88d7bd8cb9
1285 changed files with 32403 additions and 15847 deletions
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/BK-usage/00-INDEX
+++ b/Documentation/BK-usage/00-INDEX
--- a/Documentation/BK-usage/bk-kernel-howto.txt
+++ b/Documentation/BK-usage/bk-kernel-howto.txt
--- a/Documentation/BK-usage/bk-make-sum
+++ b/Documentation/BK-usage/bk-make-sum
--- a/Documentation/BK-usage/bksend
+++ b/Documentation/BK-usage/bksend
--- a/Documentation/BK-usage/bz64wrap
+++ b/Documentation/BK-usage/bz64wrap
--- a/Documentation/BK-usage/cpcset
+++ b/Documentation/BK-usage/cpcset
--- a/Documentation/BK-usage/cset-to-linus
+++ b/Documentation/BK-usage/cset-to-linus
--- a/Documentation/BK-usage/csets-to-patches
+++ b/Documentation/BK-usage/csets-to-patches
--- a/Documentation/BK-usage/gcapatch
+++ b/Documentation/BK-usage/gcapatch
--- a/Documentation/BK-usage/unbz64wrap
+++ b/Documentation/BK-usage/unbz64wrap
--- a/Documentation/Changes
+++ b/Documentation/Changes
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/stylesheet.xsl
+++ b/Documentation/DocBook/stylesheet.xsl
--- a/Documentation/DocBook/tulip-user.tmpl
+++ b/Documentation/DocBook/tulip-user.tmpl
--- a/Documentation/DocBook/via-audio.tmpl
+++ b/Documentation/DocBook/via-audio.tmpl
--- a/Documentation/RCU/RTFP.txt
+++ b/Documentation/RCU/RTFP.txt
--- a/Documentation/RCU/UP.txt
+++ b/Documentation/RCU/UP.txt
--- a/Documentation/RCU/checklist.txt
+++ b/Documentation/RCU/checklist.txt
--- a/Documentation/RCU/listRCU.txt
+++ b/Documentation/RCU/listRCU.txt
--- a/Documentation/RCU/rcu.txt
+++ b/Documentation/RCU/rcu.txt
--- a/Documentation/aoe/aoe.txt
+++ b/Documentation/aoe/aoe.txt
--- a/Documentation/aoe/status.sh
+++ b/Documentation/aoe/status.sh
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/i386/zero-page.txt
+++ b/Documentation/i386/zero-page.txt
--- a/Documentation/networking/DLINK.txt
+++ b/Documentation/networking/DLINK.txt
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
--- a/Documentation/pci.txt
+++ b/Documentation/pci.txt
--- a/Documentation/power/pci.txt
+++ b/Documentation/power/pci.txt
--- a/Documentation/s390/cds.txt
+++ b/Documentation/s390/cds.txt