From 42b3daa09cda8a4b80661177d3bf74b9258b0b88 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 5 Jun 2000 09:51:24 +0000
Subject: [PATCH] Description of protocol module moved to where it belongs. If
 documentation of standard modules is stored in their source, such auxilliary
 files should be as well.

---
 Doc                                    | 2 +-
 TODO                                   | 1 +
 doc/Doc                                | 1 +
 nest/Doc                               | 2 +-
 doc/prog-proto.sgml => nest/proto.sgml | 0
 tools/progdoc                          | 8 ++++----
 6 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 doc/Doc
 rename doc/prog-proto.sgml => nest/proto.sgml (100%)

diff --git a/Doc b/Doc
index 57eeb78f..f5f15087 100644
--- a/Doc
+++ b/Doc
@@ -1,4 +1,4 @@
-D prog-intro.sgml
+C doc
 C nest
 C conf
 C filter
diff --git a/TODO b/TODO
index 08ec2156..2226d0b8 100644
--- a/TODO
+++ b/TODO
@@ -91,6 +91,7 @@ Martin:	DOC: korektury
 	OSPF: zkontrolovat defaultni hodnoty metrik
 	Zinscenovat jeste jeden poradny test OSPF
 	Zjistit, kde se bude tisknout a vazat dokumentace
+	DOC: Linux 2.2 je ten, kdo podporuje vice routing tables
 
 Pavel:	RIP: programatorska dokumentace (finish)
 	filtry: programatorska dokumentace
diff --git a/doc/Doc b/doc/Doc
new file mode 100644
index 00000000..0c3e04e5
--- /dev/null
+++ b/doc/Doc
@@ -0,0 +1 @@
+D prog-intro.sgml
diff --git a/nest/Doc b/nest/Doc
index 7395e75c..8cb73102 100644
--- a/nest/Doc
+++ b/nest/Doc
@@ -2,7 +2,7 @@ H Core
 S rt-fib.c
 S rt-table.c
 S rt-attr.c
-D prog-proto.sgml
+D proto.sgml
 S proto.c
 S proto-hooks.c
 S iface.c
diff --git a/doc/prog-proto.sgml b/nest/proto.sgml
similarity index 100%
rename from doc/prog-proto.sgml
rename to nest/proto.sgml
diff --git a/tools/progdoc b/tools/progdoc
index a5028bda..ef44d3aa 100755
--- a/tools/progdoc
+++ b/tools/progdoc
@@ -3,15 +3,15 @@
 $srcdir = $ARGV[0];
 
 open(OUT, ">prog.sgml") || die "Cannot create output file";
-include("prog-head.sgml");
+include("doc/prog-head.sgml");
 process("");
-include("prog-foot.sgml");
+include("doc/prog-foot.sgml");
 close OUT;
 exit 0;
 
 sub include {
   my $f = shift @_;
-  open(IN, "$srcdir/doc/$f") || die "Unable to find $f";
+  open(IN, "$srcdir/$f") || die "Unable to find $f";
   while (<IN>) {
     print OUT;
   }
@@ -41,7 +41,7 @@ sub process {
       close DOC;
     } elsif ($cmd eq "D") {
       print "    $arg\n";
-      include($arg);
+      include("$dir/$arg");
     } else { die "Unknown command: $cmd"; }
   }
 }