Release 4 (by relup.sh)

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

--- ./doc/tech-notes.txt.org	2008-03-25 21:28:28.958953593 +0100
+++ ./doc/tech-notes.txt	2008-03-25 21:36:04.727408589 +0100
@@ -271,14 +271,14 @@ SMTP and Sendmail
    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.
 
@@ -595,24 +595,24 @@ Installing Alpine and Pico on UNIX Platf
 
    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 compiled
+   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 used to set system-wide default
-   configurations for _Alpine_. The file pine.conf.fixed is also used to set
+   your site'' is shown. The file alpine.conf is used to set system-wide default
+   configurations for _Alpine_. The file 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
+   these two files is that 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
@@ -674,11 +674,11 @@ Support Files and Environment Variables:
    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.
@@ -872,10 +872,10 @@ Alpine
           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_
           Convert  signatures  contained  in signature files into literal
@@ -973,7 +973,7 @@ Alpine
           Pinerc may be either a local file or a remote 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 _PC-Alpine_. Pinerc
+          _/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_
           This tells _Alpine_ what file should be used as the password file.
@@ -1180,10 +1180,10 @@ Alpine Configuration
    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 changed using
+   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 can be
+   --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 _PC-Alpine_ systems,
@@ -1192,7 +1192,7 @@ Alpine Configuration
    configuration file can be specified with 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.
 
@@ -3538,7 +3538,7 @@ index-format=STATUS MSGNO SMARTDATETIME2
           For  Unix  _Alpine_ the program _ispell_ works well as an alternate
           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.
+          default in the system configuration file, /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 output, instead,
@@ -3932,15 +3932,15 @@ index-format=STATUS MSGNO SMARTDATETIME2
           must exist as a full path or a path relative to your home directory).
           Now for an example:
 
-     url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape,
-     /usr/local/bin/lynx, C:\BIN\NETSCAPE.BAT
+     url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/bin/netscape,
+     /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 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 same configuration file.
+          file /usr/bin/netscape must exist. If either 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 same configuration file.
    _use-only-domain-name_
           Can  be  set to _yes_ or _no._ Anything but _yes_ means _no._ If set to
           _yes_ the first label in the host name will be lopped off to get the
@@ -10273,9 +10273,9 @@ Configuration Inheritance
     4. a command line argument
     5. the system-wide _fixed_ configuration file (Unix _Alpine_ only)
 
-   The fixed configuration file is normally /usr/local/lib/pine.conf.fixed.
+   The fixed configuration file is normally /etc/alpine/alpine.conf.fixed.
 
-   The system-wide configuration file is normally /usr/local/lib/pine.conf for
+   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
@@ -10524,7 +10524,7 @@ SMTP Servers
      * 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
+     * An entry in /etc/alpine/alpine.conf, /etc/alpine/alpine.conf.fixed or
        ~/.pinerc.
      _________________________________________________________________
 
@@ -10533,7 +10533,7 @@ MIME.Types file
    _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
+   /usr/lib/mime.types  and  /etc/mime.types,  and  a user specific
    ~/.mime.types file.
 
    In Windows, _Alpine_ looks in the same directory as the PINERC file and the
@@ -11366,7 +11366,7 @@ Printers and Printing
 
    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 _lpr_ with
--- ./doc/alpine.1.org	2008-03-15 00:53:39.000000000 +0100
+++ ./doc/alpine.1	2008-03-25 21:39:17.983313992 +0100
@@ -113,7 +113,7 @@ argument is applied to the first defined
 .IP \fB-conf\fR 20
 Produce a sample/fresh copy of the 
 system-wide configuration file,
-.I pine.conf,
+.I alpine.conf,
 on the standard output. This is distinct from the per-user
 .I .pinerc
 file.
@@ -176,7 +176,7 @@ Use 
 .I config-file
 as the configuration file instead of default
 system-wide configuration file 
-.IR pine.conf .
+.IR alpine.conf .
 .IP \fB-pinerc\ \fIfile\fR 20
 Output fresh pinerc configuration to 
 .I file, preserving the settings of variables that the user has made.
@@ -255,7 +255,7 @@ increasing precedence:
  o built-in defaults.
 .br
  o system-wide 
-.I pine.conf 
+.I alpine.conf 
 file.
 .br
  o personal 
@@ -265,7 +265,7 @@ file (may be set via built-in Setup/Conf
  o command-line options.
 .br
  o system-wide 
-.I pine.conf.fixed 
+.I alpine.conf.fixed 
 file.
 
 There is one exception to the rule that configuration values are replaced
@@ -285,7 +285,7 @@ uses the following environment variables
 .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 @@ uses the following environment variables
 .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.
+/usr/lib/alpine.conf	System-wide configuration file.
 .br
-/usr/local/lib/pine.conf.fixed	 Non-overridable configuration file.
+/usr/lib/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