aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2009-06-20 04:10:38 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-20 04:10:38 -0400
commit952e57ba3769d6fc6139b8a99c32ea2bb63f23e9 (patch)
tree5bdfe58c714d6af58d248b6401df6429aafb66ea /Documentation
parent6877f54e6a3326c99aaf84b7bff6a3019da0b847 (diff)
isdn: clean up documentation index
Remove duplicates, a stray merge conflict marker, and an entry for a file which doesn't exist, and move one entry to its correct alphabetical place. Signed-off-by: Tilman Schmidt <tilman@imap.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/isdn/00-INDEX19
1 files changed, 2 insertions, 17 deletions
diff --git a/Documentation/isdn/00-INDEX b/Documentation/isdn/00-INDEX
index f6010a536590..e87e336f590e 100644
--- a/Documentation/isdn/00-INDEX
+++ b/Documentation/isdn/00-INDEX
@@ -14,25 +14,14 @@ README
14 - general info on what you need and what to do for Linux ISDN. 14 - general info on what you need and what to do for Linux ISDN.
15README.FAQ 15README.FAQ
16 - general info for FAQ. 16 - general info for FAQ.
17README.audio
18 - info for running audio over ISDN.
19README.fax
20 - info for using Fax over ISDN.
21README.gigaset
22 - info on the drivers for Siemens Gigaset ISDN adapters.
23README.icn
24 - info on the ICN-ISDN-card and its driver.
25>>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
26README.HiSax 17README.HiSax
27 - info on the HiSax driver which replaces the old teles. 18 - info on the HiSax driver which replaces the old teles.
19README.act2000
20 - info on driver for IBM ACT-2000 card.
28README.audio 21README.audio
29 - info for running audio over ISDN. 22 - info for running audio over ISDN.
30README.avmb1 23README.avmb1
31 - info on driver for AVM-B1 ISDN card. 24 - info on driver for AVM-B1 ISDN card.
32README.act2000
33 - info on driver for IBM ACT-2000 card.
34README.eicon
35 - info on driver for Eicon active cards.
36README.concap 25README.concap
37 - info on "CONCAP" encapsulation protocol interface used for X.25. 26 - info on "CONCAP" encapsulation protocol interface used for X.25.
38README.diversion 27README.diversion
@@ -59,7 +48,3 @@ README.x25
59 - info for running X.25 over ISDN. 48 - info for running X.25 over ISDN.
60syncPPP.FAQ 49syncPPP.FAQ
61 - frequently asked questions about running PPP over ISDN. 50 - frequently asked questions about running PPP over ISDN.
62README.hysdn
63 - info on driver for Hypercope active HYSDN cards
64README.mISDN
65 - info on the Modular ISDN subsystem (mISDN).