- rel.2

[packages/alpine.git] / alpine-doc.patch

--- ./doc/tech-notes.txt.org	2007-12-21 10:47:34.000000000 +0100
+++ ./doc/tech-notes.txt	2007-12-21 10:59:49.000000000 +0100
@@ -275,14 +275,14 @@
    The selection of which MTA to use depends on the settings of
    smtp-server, sendmail-path, and compile-time options. The first MTA
    specified in the following list is used:
-    1. sendmail-path in /usr/local/lib/pine.conf.fixed
-    2. smtp-server in /usr/local/pine.conf.fixed
+    1. sendmail-path in /etc/alpine/alpine.conf.fixed
+    2. smtp-server in /etc/alpine/alpine.conf.fixed
     3. sendmail-path specified on the command line.
     4. smtp-server specified on the command line.
     5. sendmail-path in the user's .pinerc file.
     6. smtp-server in the user's .pinerc file.
-    7. sendmail-path in /usr/local/lib/pine.conf
-    8. smtp-server in /usr/local/pine.conf
+    7. sendmail-path in /etc/alpine/alpine.conf
+    8. smtp-server in /etc/alpine/alpine.conf
     9. DF_SENDMAIL_PATH defined at compile time.
    10. SENDMAIL and SENDMAILFLAGS defined at compile time.
 
@@ -605,26 +605,26 @@
 
    Installing Alpine and Pico is simple. You take the program files which
    you have just transferred or built and you move them to the correct
-   directory on your system. Most often the binaries go in /usr/local/bin
-   though sometimes they are placed in /usr/bin. All the help text is
+   directory on your system. Most often the binaries go in /usr/bin
+   though sometimes they are placed in /usr/local/bin. All the help text is
    compiled into Alpine so there are no required auxiliary files. Instead
    of copying the binaries manually, you may use make install to install
    them.
 
-   There are three optional auxiliary files: /usr/local/lib/pine.info,
-   /usr/local/lib/pine.conf, and /usr/local/lib/pine.conf.fixed. The file
+   There are three optional auxiliary files: /usr/lib/pine.info,
+   /etc/alpine/alpine.conf, and /etc/alpine/alpine.conf.fixed. The file
    pine.info contains text on how to get further help on the local system.
    It is part of the help text for the main menu and should probably refer
    to the local help desk or the system administrator. If this file
    doesn't exist a generic version which suggests ``talking to the
-   computer support staff at your site'' is shown. The file pine.conf is
+   computer support staff at your site'' is shown. The file alpine.conf is
    used to set system-wide default configurations for Alpine. The file
-   pine.conf.fixed is also used to set system-wide default configurations
+   alpine.conf.fixed is also used to set system-wide default configurations
    for Alpine. The difference between these two files is that
-   configuration variables set in the pine.conf.fixed file may not
+   configuration variables set in the alpine.conf.fixed file may not
    normally be over-ridden by a user. See the section on Alpine
-   Configuration later in this document for details about the pine.conf
-   and pine.conf.fixed files.
+   Configuration later in this document for details about the alpine.conf
+   and alpine.conf.fixed files.
      __________________________________________________________________
 
 Installing PC-Alpine
@@ -688,11 +688,11 @@
    This section lists the various files which Alpine uses which are not
    email folders. All of these are the default names of files, they may
    vary based on Alpine's configuration.
-   /usr/local/lib/pine.conf
+   /etc/alpine/alpine.conf
           Pine's global configuration file.
-   /usr/local/lib/pine.conf.fixed
+   /etc/alpine/alpine.conf.fixed
           Non-overridable global configuration file.
-   /usr/local/lib/pine.info
+   /usr/lib/pine.info
           Local pointer to system administrator.
    ~/.pinerc
           Personal configuration file for each user.
@@ -889,11 +889,11 @@
           Configuration: Prints a sample system configuration file to the
           screen or standard output. To generate an initial system
           configuration file, execute
-                alpine -conf > /usr/local/lib/pine.conf
+                alpine -conf > /etc/alpine/alpine.conf
 
           To generate a system configuration file using settings from an
           old system configuration file, execute
-                alpine -P old-pine.conf -conf > /usr/local/lib/pine.conf
+                alpine -P old-pine.conf -conf > /etc/alpine/alpine.conf
 
           A system configuration file is not required.
    -convert_sigs -p pinerc
@@ -998,7 +998,7 @@
           configuration folder.
    -P pinerc
           Uses the named file as the system wide configuration file
-          instead of /usr/local/lib/pine.conf on UNIX, or nothing on
+          instead of /etc/alpine/alpine.conf on UNIX, or nothing on
           PC-Alpine. Pinerc may be either a local file or a remote
           configuration folder.
    -passfile passfile
@@ -1207,10 +1207,10 @@
    configuration. In most cases, the compiled-in preferences will suit
    users and administrators just fine. When running Alpine on a UNIX
    system, the default built-in configuration can be changed by setting
-   variables in the system configuration files, /usr/local/lib/pine.conf
-   or /usr/local/lib/pine.conf.fixed. (Actually, these files can be
+   variables in the system configuration files, /etc/alpine/alpine.conf
+   or /etc/alpine/alpine.conf.fixed. (Actually, these files can be
    changed using the configure arguments --with-system-pinerc=VALUE or
-   --with-system-fixed-pinerc=VALUE.) The location of the pine.conf file
+   --with-system-fixed-pinerc=VALUE.) The location of the alpine.conf file
    can be changed with the -P command line argument. Both Alpine and
    PC-Alpine also use personal (user-based) configuration files. On UNIX
    machines, the personal configuration file is the file ~/.pinerc. For
@@ -1220,7 +1220,7 @@
    the -p command line argument.
 
    All of these configuration files, other than the fixed system config
-   pine.conf.fixed on UNIX systems, may optionally be remote configuration
+   alpine.conf.fixed on UNIX systems, may optionally be remote configuration
    files instead of local files. This is discussed further in the
    following section and in Remote Configuration.
 
@@ -3679,7 +3679,7 @@
           spell checker. If your Unix system has ispell it is probably
           reasonable to make it the default speller by configuring it as
           the default in the system configuration file,
-          /usr/local/lib/pine.conf.
+          /etc/alpine/alpine.conf.
           If this option is not set, then the system's spell command is
           used. The spell command does not work the same as the alternate
           speller. It produces a list of misspelled words on its standard
@@ -4076,11 +4076,11 @@
           Now for an example:
 
      url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape,
-     /usr/local/bin/lynx, C:\BIN\NETSCAPE.BAT
+     /usr/bin/lynx, C:\BIN\NETSCAPE.BAT
           This example shows that for the first browser in the list to be
           used the environment variable DISPLAY must be defined. If it is,
           then the file /usr/local/bin/netscape must exist. If either
-          condition is not met, then the file /usr/local/bin/lynx must
+          condition is not met, then the file /usr/bin/lynx must
           exist. If it doesn't, then the final path and file must exist.
           Note that the last entry is a DOS/Windows path. This is one way
           to support Alpine running on more than one architecture with the
@@ -10707,9 +10707,9 @@
     5. the system-wide fixed configuration file (Unix Alpine only)
 
    The fixed configuration file is normally
-   /usr/local/lib/pine.conf.fixed.
+   /etc/alpine/alpine.conf.fixed.
 
-   The system-wide configuration file is normally /usr/local/lib/pine.conf
+   The system-wide configuration file is normally /etc/alpine/alpine.conf
    for Unix Alpine and is normally not set for PC-Alpine. For PC-Alpine,
    if the environment variable $PINECONF is set, that is used for the
    system-wide configuration. This location can be set or changed on the
@@ -10969,8 +10969,8 @@
      * A program that implements the SMTP or ESMTP protocol via stdio.
      * An entry in /etc/services for the alternate service.
      * An entry in /etc/inetd.conf for the alternate service.
-     * An entry in /usr/local/lib/pine.conf,
-       /usr/local/lib/pine.conf.fixed or ~/.pinerc.
+     * An entry in /etc/alpine/alpine.conf,
+       /etc/alpine/alpine.conf.fixed or ~/.pinerc.
      __________________________________________________________________
 
 MIME.Types file
@@ -10978,7 +10978,7 @@
    Alpine's MIME-TYPE support is based on code contributed by Hans Drexler
    <drexler@mpi.nl>. Alpine assigns MIME Content-Types according to
    file name extensions found in the system-wide files
-   /usr/local/lib/mime.types and /etc/mime.types, and a user specific
+   /etc/mime.types and /usr/lib/mime.types, and a user specific
    ~/.mime.types file.
 
    In Windows, Alpine looks in the same directory as the PINERC file and
@@ -11834,7 +11834,7 @@
 
    The second selection is the standard UNIX print command. The default is
    lpr, but it can be changed on a system basis to anything so desired in
-   /usr/local/lib/pine.conf.
+   /etc/alpine/alpine.conf.
 
    The third selection is the user's personal choice for a UNIX print
    command. The text to be printed is piped into the command. Enscript or
--- ./doc/alpine.1.org	2007-12-21 10:43:27.000000000 +0100
+++ ./doc/alpine.1	2007-12-21 10:47:01.000000000 +0100
@@ -255,7 +255,7 @@
  o built-in defaults.
 .br
  o system-wide 
-.I pine.conf 
+.I alpine.conf 
 file.
 .br
  o personal 
@@ -265,7 +265,7 @@
  o command-line options.
 .br
  o system-wide 
-.I pine.conf.fixed 
+.I aline.conf.fixed 
 file.
 
 There is one exception to the rule that configuration values are replaced
@@ -285,7 +285,7 @@
 .if n .ta 2.8i
 .if t .ta 2.1i
 
-/usr/spool/mail/xxxx	Default folder for incoming mail.
+/var/mail/xxxx	Default folder for incoming mail.
 .br
 ~/mail	Default directory for mail folders.
 .br
@@ -305,13 +305,13 @@
 .br
 /etc/mime.types	System-wide file ext. to MIME type mapping
 .br
-/usr/local/lib/pine.info	Local pointer to system administrator.
+/usr/lib/pine.info	Local pointer to system administrator.
 .br
-/usr/local/lib/pine.conf	System-wide configuration file.
+/etc/alpine/alpine.conf	System-wide configuration file.
 .br
-/usr/local/lib/pine.conf.fixed	 Non-overridable configuration file.
+/etc/alpine/alpine.conf.fixed	 Non-overridable configuration file.
 .br
-/tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.
+/tmp/.\\var\\mail\\xxxx	Per-folder mailbox lock files.
 .br
 ~/.pine-interrupted-mail	Message which was interrupted.
 .br