| @@ -0,0 +1,66 @@
+only in patch2:
+unchanged:
+================================================================================
+--- README.Configuration-File
++++ README.Configuration-File
+@@ -3,12 +3,12 @@
+ flag is designed to speed up highly loaded servers, by avoiding DNS lookups.
+ To enable this, just add it to the server name:
+
+-/usr/local/sbin/pure-ftpd -H
++/usr/sbin/pure-ftpd -H
+
+ Alternative long options are also supported. Here's an equivalent of the
+ previous command:
+
+-/usr/local/sbin/pure-ftpd --dontresolve
++/usr/sbin/pure-ftpd --dontresolve
+
+ But you can use traditional configuration files over command-line
+ options. Adding a parser for configuration files in the server is a bad
+@@ -22,16 +22,17 @@
+ configuration file called 'pure-ftpd.conf' to a suitable location, say /etc:
+
+ cd configuration-files
+-cp pure-ftpd.conf /etc
++mkdir /etc/pure-ftpd/
++cp pure-ftpd.conf /etc/pure-ftpd/
+
+-Edit /etc/pure-ftpd.conf according to your needs.
++Edit /etc/pure-ftpd/pure-ftpd.conf according to your needs.
+
+ Then, to start the server, just run the following command:
+
+ chmod 755 pure-config.pl
+ ./pure-config.pl /etc/pure-ftpd.conf
+
+-This is a simple Perl script that will run /usr/local/sbin/pure-ftpd with
++This is a simple Perl script that will run /usr/sbin/pure-ftpd with
+ the right options, according to the configuration file.
+
+ And because there's a Python vs. Perl friendly war since ages, we also
+--- man/pure-pw.8
++++ man/pure-pw.8
+@@ -49,18 +49,18 @@
+ all are chrooted, and they have their own home directory.
+ .SH "FILES"
+ .LP
+-\fI/etc/pureftpd.passwd\fP
++\fI/etc/pure-ftpd/pureftpd.passwd\fP
+ .br
+-\fI/etc/pureftpd.pdb\fP
++\fI/etc/pure-ftpd/pureftpd.pdb\fP
+ .SH "ENVIRONMENT VARIABLES"
+ .LP
+ \fIPURE_PASSWDFILE\fP
+ If this variable is defined, this is the default value for the text password
+-file. Without this variable, /etc/pureftpd.passwd is assumed.
++file. Without this variable, /etc/pure-ftpd/pureftpd.passwd is assumed.
+ .br
+ \fIPURE_DBFILE\fP
+ If this variable is defined, this is the default value for the PureDB password
+-file. Without this variable, /etc/pureftpd.pdb is assumed.
++file. Without this variable, /etc/pure-ftpd/pureftpd.pdb is assumed.
+ .SH "EXAMPLES"
+ .LP
+ Please read http://www.pureftpd.org/README.Virtual\-Users
|
