From b25b6894fafd7f388424c390768f0490b5e551e4 Mon Sep 17 00:00:00 2001
From: david <>
Date: Sat, 30 Mar 2002 21:29:39 +0000
Subject: [PATCH] update README to match new directory structure for Lampadas

---
 LDP/README          | 23 +++++++++++++----------
 LDP/texi2db/texi2db |  8 ++++++--
 LDP/wt2db/CREDITS   |  2 +-
 LDP/wt2db/README    | 24 +++++++++++++++---------
 LDP/wt2db/wt2db     |  1 -
 5 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/LDP/README b/LDP/README
index 39c34cf8..6b24b9fb 100644
--- a/LDP/README
+++ b/LDP/README
@@ -5,12 +5,6 @@ builder/	scripts and stylesheets to publish documents to the website
   dsssl/	the ldp sgml stylesheet
   ldp_print/	perl script to generate pdf output from ldp html sources
   xsl/		ldp extensions to norm walsh's docbook xsl stylesheets
-database/	the ldp database built on postgresql
-  db2db/	python script to parse docbook dom and update database
-  ldpwn/	perl script to generate the ldp weekly news lists
-  tables/	sql scripts to create tables
-  omf.pl	perl script to generate omf xml from database
-  xml.pl	perl script to generate ldp xml from database
 faq/		frequently asked questions
   docbook/	faqs in docbook format
   linuxdoc/	faqs in linuxdoc format
@@ -22,6 +16,18 @@ howto/		linux howtos
     archived/	archived docbook documents
   linuxdoc/	howtos in linuxdoc format
     archived/	archived linuxdoc documents
+lampadas/	Lampadas Project
+  conf/		configuration files
+  cron/		crontab and maintenance scripts
+  database/	scripts to build, backup, restore the database
+  doc/		documentation
+  tools/	miscellaneous tools
+    db2db/	script to parse docbook dom and update database
+    ldpwn/	perl script to generate the ldp weekly news lists
+  lib/		the Lampadas Perl module - www and tools are built on this
+  pub/		packages (tar.gz, deb and rpm)
+  www/		website
+    css/	cascading stylesheets
 ref/		quick references
 scrollserver/	python web application server front end to scrollkeeper
   pub/		packaging script and packaged releases
@@ -32,9 +38,6 @@ texi2db/	utility to convert Texinfo files into docbook
 users/		individual users' areas
 wt2db/		utility to convert WikiText files into docbook
 www/		websites
-  developer./	ldp database website
-    cgi-bin/	perl scripts for the ldp database (mod_auth)
-    cgi-pub/	perl scripts for the ldp database (public)
-    help/	help for the ldp database
   linuxdoc.org/	www.linuxdoc.org website
   list./	ldp mailing list archives website
+
diff --git a/LDP/texi2db/texi2db b/LDP/texi2db/texi2db
index 89036855..59d05677 100755
--- a/LDP/texi2db/texi2db
+++ b/LDP/texi2db/texi2db
@@ -667,13 +667,17 @@ sub processfile {
 	my $fh = new FileHandle;
 
 	$filename = @_[0];
-	$filename = 'STDIN' unless ($filename);
+	$filename = '' unless ($filename);
 
 	($basename, $path, $ext) = fileparse($filename);
 	&message("processing $filename") if ($verbose);
 	$linenumber = 0;
 
-	open $fh, "<$filename" or raiseerror("cannot open $filename\n");
+	if ($filename) {
+		open $fh, "<$filename" or raiseerror("cannot open $filename\n");
+	} else {
+		$fh = STDIN;
+	}
 LINE:	while ($line = <$fh>) {
 		chomp($line);
 
diff --git a/LDP/wt2db/CREDITS b/LDP/wt2db/CREDITS
index 08302250..5459371a 100644
--- a/LDP/wt2db/CREDITS
+++ b/LDP/wt2db/CREDITS
@@ -1 +1 @@
-Copyright 2002 David Merrill <david@lupercalia.net>
+Copyright 2002 David C. Merrill <david@lupercalia.net>
diff --git a/LDP/wt2db/README b/LDP/wt2db/README
index 120edf37..4498c2f5 100644
--- a/LDP/wt2db/README
+++ b/LDP/wt2db/README
@@ -1,14 +1,20 @@
-This is a utility to convert text files in a specific format into valid
-DocBook. Just pass it the input filename on the commmand line and you'll
-get a .sgml file out. It won't be a complete valid document, as it will
-have no header information or dtd specification. It's just a DocBook
-fragment, not a complete document.
+This is wt2db version 0.1.
 
-The following constructs are currently supported. If you need support for
-an addition construct, write discuss@linuxdoc.org if you're subscribed,
-or feedback@linuxdoc.org if you're not.
+wt2db is a utility to convert text files in WikiText format into
+DocBook.  It generates a DocBook fragment, not valid DocBook.
 
-Or just add it in the cvs. :-)
+
+Reporting Bugs
+--------------
+
+Bugs should be reported at sourceforge.net/projects/linuxdoc. Select
+'wt2db' in the 'Category' field.
+
+
+WikiText Tags
+-------------
+
+The following constructs are currently supported.
 
 Foo			<para>Foo</para>
 
diff --git a/LDP/wt2db/wt2db b/LDP/wt2db/wt2db
index 064ee394..16ba819c 100755
--- a/LDP/wt2db/wt2db
+++ b/LDP/wt2db/wt2db
@@ -59,7 +59,6 @@ while (1) {
 # abort if no input file given
 # 
 if($txtfile eq '') {
-	print "txt2db: ERROR text file not specified.\n\n";
 	$error = 1;
 	&usage();
 } elsif( !(-r $txtfile) ) {