Merge branch 'master' of /home/vorner/pciids

diff --git a/PciIds/Startup.pm b/PciIds/Startup.pm
index ee7d9dba96d1645325dbf202f83bea57e1462646..2bacade7178c57faf0077df25889bc3e2d79fd74 100644 (file)
--- a/PciIds/Startup.pm
+++ b/PciIds/Startup.pm
@@ -22,10 +22,10 @@ use warnings;
 use base 'Exporter';
 
 #Where are data?
-our $directory = '/home/vorner/prog/pciids/';
+our $directory = '/home/pciids/ids/perl/';
 our @EXPORT=qw($directory);
 
 #Where are the modules?
-use lib ( '/home/vorner/prog/pciids/' );
+use lib ( '/home/pciids/ids/perl/' );
 
 1;

diff --git a/cf/answers b/cf/answers
index e1f3acc56dbd0050acff63430264631e9595701a..f744b0d3b42eecabfec5c4c1e1c8999dcb1d7ffb 100644 (file)
--- a/cf/answers
+++ b/cf/answers
@@ -1,5 +1,18 @@
+Details
+Could you please provide a more detailed description?
+
 USB
-This is USB ID.
+This looks like a USB ID, not a PCI ID.
 
 Device
-This is a device, not vendor.
+This is a device, not a vendor.
+
+Subsystem
+This is a subsystem, not a device.
+
+Doubt
+I am not sure that this ID is correct. Could you please send us
+a `lspci -vvx' dump for this device to pciids-devel@lists.sf.net?
+
+No vendor
+Device/subsystem names should not contain the name of the vendor.

diff --git a/cf/config b/cf/config
index 8ed29e2c62505c5ca23405d4b999037ba29fd463..31434f2fb8ea1a1563df2e1130196cac952632e4 100644 (file)
--- a/cf/config
+++ b/cf/config
@@ -1,14 +1,14 @@
-db = pciids
-dbuser = pciids
-dbpasswd = 1234
-passwdsalt = 1234
-regmailsalt = 1234
-authsalt = 1234
-from_addr = vorner+pciids@ucw.cz
-sendmail = /home/vorner/bin/sendmail-apache
-logfile = /home/vorner/prog/pciids/pciids.log
-hostname = localhost
-jelnet = /home/vorner/bin/jelnet
-xmpp_passwd = 1234
-xmpp_name = none
+dbname = pciids2
+dbuser = pciids2
+dbpasswd = ZaseChciplyKun?
+passwdsalt = OSNTOomONTHplrchluhcSONUNSt
+regmailsalt = SNTOHmjsaontmsthoseuhtlrc,'E<<<ua'.LRCHlrchhhewl',rca'a"Hhhhhlr',h
+authsalt = ANSTHh'othal'cllal"<H>Lsnahtuoesnth'n,.hWLhl'rgp348gSTHl',crnTHOSNTJHSntahOSTHWLRc'h,l.
+from_addr = PCI ID database <pci-ids+www@ucw.cz>
+sendmail = /usr/sbin/sendmail
+logfile = /home/pciids/ids/log/ids.log
+hostname = pci-ids.ucw.cz
+jelnet = /home/pciids/ids/perl/scripts/jelnet
+xmpp_passwd = IorekByrnison
+xmpp_name = pci-ids@ucw.cz
 default_uri = PC/