2002-12-01 15:57:10 -05:00
|
|
|
$OpenBSD: patch-pine_pine_hlp,v 1.1 2002/12/01 20:57:10 jakob Exp $
|
|
|
|
--- pine/pine.hlp.orig Wed Nov 13 23:55:49 2002
|
|
|
|
+++ pine/pine.hlp Sun Dec 1 15:17:47 2002
|
|
|
|
@@ -584,9 +584,9 @@ Unix Pine:
|
1999-03-30 13:26:30 -05:00
|
|
|
executable <Unix search path>/pine
|
|
|
|
persnl cfg ~/.pinerc
|
2000-12-30 23:49:37 -05:00
|
|
|
except cfg ~/.pinercex
|
1999-03-30 13:26:30 -05:00
|
|
|
- global cfg /usr/local/lib/pine.conf
|
|
|
|
- fixed cfg /usr/local/lib/pine.conf.fixed
|
|
|
|
- local help /usr/local/lib/pine.info
|
|
|
|
+ global cfg /etc/pine.conf
|
|
|
|
+ fixed cfg /etc/pine.conf.fixed
|
1999-10-27 08:18:58 -04:00
|
|
|
+ local help /etc/pine.info
|
1999-03-30 13:26:30 -05:00
|
|
|
|
|
|
|
interrupted ~/.pine-interrupted-mail
|
|
|
|
debug ~/.pine-debugN
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -598,8 +598,7 @@ Unix Pine:
|
2001-11-18 21:01:57 -05:00
|
|
|
postponed# ~/mail/postponed-msgs
|
|
|
|
sentmail# ~/mail/sent-mail
|
|
|
|
mailcap# ~/.mailcap + /etc/mailcap
|
|
|
|
- + /usr/etc/mailcap + /usr/local/etc/mailcap
|
|
|
|
- mimetypes# ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
|
|
|
|
+ mimetypes# ~/.mime.types + /etc/mime.types
|
|
|
|
|
|
|
|
news-spool varies across Unix flavors, e.g. /usr/spool/news or /var/news
|
|
|
|
active-news varies across Unix flavors, e.g. /usr/lib/news/active
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -1057,9 +1056,9 @@ contact email address may have been set
|
1999-10-27 08:18:58 -04:00
|
|
|
this link now to send a message to it:<BR>
|
|
|
|
<A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
|
|
|
|
<!--chtml endif-->
|
|
|
|
-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
|
|
|
|
+<!--chtml if [ -r /etc/pine.info ]-->
|
|
|
|
<HR WIDTH="75%">Local Support Contacts:<P>
|
|
|
|
-<!--#include file="/usr/local/lib/pine.info"-->
|
|
|
|
+<!--#include file="/etc/pine.info"-->
|
|
|
|
<HR WIDTH="75%">
|
|
|
|
<!--chtml endif-->
|
|
|
|
<P>
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -1147,7 +1146,7 @@ To Exit this screen and continue your Pi
|
1999-10-27 08:18:58 -04:00
|
|
|
<OL>
|
|
|
|
<LI> <A HREF="#intro">Introduction</A>
|
|
|
|
<LI> <A HREF="#pine_help">Pine Help</A>
|
|
|
|
-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
|
|
|
|
+<!--chtml if [ -r /etc/pine.info ]-->
|
|
|
|
<LI> <A HREF="#local_support">Local Support Contacts</A>
|
|
|
|
<!--chtml endif-->
|
|
|
|
<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -1259,9 +1258,9 @@ copy of Pine you are using has been prop
|
1999-10-27 08:18:58 -04:00
|
|
|
at your site.)
|
|
|
|
|
|
|
|
|
|
|
|
-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
|
|
|
|
+<!--chtml if [ -r /etc/pine.info ]-->
|
|
|
|
<H2><A NAME="local_support">Local Support Contacts</A></H2>
|
|
|
|
-<!--#include file="/usr/local/lib/pine.info"-->
|
|
|
|
+<!--#include file="/etc/pine.info"-->
|
|
|
|
<!--chtml endif-->
|
|
|
|
|
|
|
|
<H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -1945,7 +1944,7 @@ screen or standard output. To generate a
|
2000-12-30 23:49:37 -05:00
|
|
|
file, execute
|
|
|
|
|
|
|
|
<PRE><CODE>
|
|
|
|
- pine -conf > /usr/local/lib/pine.conf
|
|
|
|
+ pine -conf > /etc/pine.conf
|
|
|
|
</CODE></PRE>
|
|
|
|
<P>
|
|
|
|
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -1953,7 +1952,7 @@ To generate a system configuration file
|
2000-12-30 23:49:37 -05:00
|
|
|
system configuration file, execute
|
|
|
|
|
|
|
|
<PRE><CODE>
|
|
|
|
- pine -P old-pine.conf -conf > /usr/local/lib/pine.conf
|
|
|
|
+ pine -P old-pine.conf -conf > /etc/pine.conf
|
|
|
|
</CODE></PRE>
|
|
|
|
<P>
|
|
|
|
A system configuration file is not required.
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -2112,7 +2111,7 @@ Pinerc may be either a local file or a r
|
2000-12-30 23:49:37 -05:00
|
|
|
<DT> -P <EM>pinerc</EM>
|
|
|
|
|
|
|
|
<DD> Uses the named file as the system wide configuration file instead of
|
|
|
|
-<EM>/usr/local/lib/pine.conf</EM> on UNIX, or nothing on <EM>PC-Pine</EM>.
|
|
|
|
+<EM>/etc/pine.conf</EM> on UNIX, or nothing on <EM>PC-Pine</EM>.
|
|
|
|
Pinerc may be either a local file or a remote configuration folder.
|
|
|
|
<P>
|
|
|
|
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -2822,10 +2821,10 @@ In increasing order of precedence they a
|
2000-12-30 23:49:37 -05:00
|
|
|
</OL>
|
|
|
|
<P>
|
|
|
|
The fixed configuration file is normally
|
|
|
|
-<CODE>/usr/local/lib/pine.conf.fixed</CODE>.
|
|
|
|
+<CODE>/etc/pine.conf.fixed</CODE>.
|
|
|
|
<P>
|
|
|
|
The system-wide configuration file is normally
|
|
|
|
-<CODE>/usr/local/lib/pine.conf</CODE> for Unix Pine and is normally not
|
|
|
|
+<CODE>/etc/pine.conf</CODE> for Unix Pine and is normally not
|
|
|
|
set for PC-Pine.
|
|
|
|
For PC-Pine, if the environment variable <EM>$PINECONF</EM> is set, that
|
|
|
|
is used for the system-wide configuration.
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -15072,7 +15071,7 @@ a semi-colon (;) under Windows; for exam
|
2001-11-18 21:01:57 -05:00
|
|
|
</PRE>
|
|
|
|
<!--chtml else-->
|
|
|
|
a colon (:) under UNIX; for example:<PRE>
|
|
|
|
- ~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
|
|
|
|
+ ~/.mailcap:/etc/mailcap
|
|
|
|
</PRE>
|
|
|
|
<!--chtml endif-->
|
|
|
|
<P><UL>
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -17753,7 +17752,7 @@ the fourth is for the connection method
|
2001-11-18 21:01:57 -05:00
|
|
|
<H1>OPTION: ssh-path</H1>
|
|
|
|
|
|
|
|
Sets the name of the command used to open a UNIX secure shell
|
|
|
|
-connection. The default is typically <CODE>/usr/local/bin/ssh</CODE>.
|
|
|
|
+connection. The default is typically <CODE>/usr/bin/ssh</CODE>.
|
|
|
|
<P>
|
|
|
|
<UL>
|
|
|
|
<LI><A HREF="h_finding_help">Finding more information and requesting help</A>
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -18861,7 +18860,7 @@ argument (see the "lynx" examp
|
2001-11-18 21:01:57 -05:00
|
|
|
So, here are some example entries:
|
|
|
|
<PRE>
|
|
|
|
url-viewers = _TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape
|
|
|
|
- "/usr/local/bin/lynx _URL_"
|
|
|
|
+ "/usr/bin/lynx _URL_"
|
|
|
|
C:\BIN\NETSCAPE.BAT
|
|
|
|
</PRE>
|
|
|
|
<P>
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -18869,7 +18868,7 @@ This example shows that for the first vi
|
2001-11-18 21:01:57 -05:00
|
|
|
the environment variable "DISPLAY" must be defined. If it
|
|
|
|
is, then the path and file "/usr/local/bin/netscape" must exist.
|
|
|
|
If neither condition is met,
|
|
|
|
-then the path and file "/usr/local/bin/lynx" must exist.
|
|
|
|
+then the path and file "/usr/bin/lynx" must exist.
|
|
|
|
If it does, then the "_URL_" token is replaced by the selected URL.
|
|
|
|
If the path to "lynx" is invalid,
|
|
|
|
then the final path and file C:\BIN\NETSCAPE.BAT must exist.
|
2002-12-01 15:57:10 -05:00
|
|
|
@@ -18965,7 +18964,7 @@ because of its length, but should all ap
|
2001-11-18 21:01:57 -05:00
|
|
|
url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"<BR>
|
|
|
|
|
|
|
|
_TEST("test -n '${DISPLAY}'")_ "/usr/local/bin/netscape &"<BR>
|
|
|
|
- "/usr/local/bin/lynx '_URL_'"
|
|
|
|
+ "/usr/bin/lynx '_URL_'"
|
|
|
|
<P>
|
|
|
|
<!--chtml endif-->
|
|
|
|
<P>
|