diff options
Diffstat (limited to 'editors/nedit/files/patch-ad')
| -rw-r--r-- | editors/nedit/files/patch-ad | 160 |
1 files changed, 12 insertions, 148 deletions
diff --git a/editors/nedit/files/patch-ad b/editors/nedit/files/patch-ad index 2de722a430d0..12cdc67f5583 100644 --- a/editors/nedit/files/patch-ad +++ b/editors/nedit/files/patch-ad @@ -1,148 +1,12 @@ -*** doc/nc.man.orig Tue Oct 23 14:11:38 2001 ---- doc/nc.man Tue Oct 23 14:13:39 2001 -*************** -*** 137,162 **** - .rm #[ #] #H #V #F C - .\" ====================================================================== - .\" -! .IX Title "NC 1" -! .TH NC 1 " " "2001-08-12" " " - .UC - .SH "NAME" -! nc \- Client program for NEdit text editor - .SH "SYNOPSYS" - .IX Header "SYNOPSYS" -! \&\fBnc\fR [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR] - [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR] [\fB\-lm\fR - \&\fIlanguagemode\fR] [\fB\-geometry\fR \fIgeometry\fR] [\fB\-iconic\fR] [\fB\-display\fR - \&\fI[host]:server[.screen]\fR] [file...] - .SH "DESCRIPTION" - .IX Header "DESCRIPTION" -! \&\fBnc\fR is the client interface to the NEdit text editor. A server can be started - explicitly by running NEdit in server mode: - .PP - .Vb 1 - \& nedit -server - .Ve -! If no server is running, \fBnc\fR will start one unless configured otherwize. - Client/server mode is useful for integrating NEdit with software development - environments, mailers, and other programs; or just as a quick way to open files - from the shell command line without starting a new NEdit session. ---- 137,162 ---- - .rm #[ #] #H #V #F C - .\" ====================================================================== - .\" -! .IX Title "NCLIENT 1" -! .TH NCLIENT 1 " " "2001-08-12" " " - .UC - .SH "NAME" -! nclient \- Client program for NEdit text editor - .SH "SYNOPSYS" - .IX Header "SYNOPSYS" -! \&\fBnclient\fR [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR] - [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR] [\fB\-lm\fR - \&\fIlanguagemode\fR] [\fB\-geometry\fR \fIgeometry\fR] [\fB\-iconic\fR] [\fB\-display\fR - \&\fI[host]:server[.screen]\fR] [file...] - .SH "DESCRIPTION" - .IX Header "DESCRIPTION" -! \&\fBnclient\fR is the client interface to the NEdit text editor. A server can be started - explicitly by running NEdit in server mode: - .PP - .Vb 1 - \& nedit -server - .Ve -! If no server is running, \fBnclient\fR will start one unless configured otherwize. - Client/server mode is useful for integrating NEdit with software development - environments, mailers, and other programs; or just as a quick way to open files - from the shell command line without starting a new NEdit session. -*************** -*** 177,194 **** - the command line. - .Ip "\fB\-ask\fR, \fB\-noask\fR" 4 - .IX Item "-ask, -noask" -! Instructs \fBnc\fR whether to automatically start a server if one is not -! available. This is also settable via the X resource, \f(CW\*(C`nc.autoStart\*(C'\fR. - .Ip "\fB\-svrname\fR \fIname\fR" 4 - .IX Item "-svrname name" -! Explicitly instructs \fBnc\fR which server to connect to, an instance of - \&\fBnedit\fR(1) with a corresponding \fB\-svrname\fR argument. By naming servers, you - can run several simultaneously, and direct files and commands specifically to - any one. - .Ip "\fB\-svrcmd\fR \fIcommand\fR" 4 - .IX Item "-svrcmd command" -! The command which \fBnc\fR uses to start an NEdit server. It is also settable via -! the X resource \f(CW\*(C`nc.serverCommand\*(C'\fR, by default, \fI\*(L"nedit \-server\*(R"\fR. - .Ip "\fB\-lm\fR \fIlanguagemode\fR" 4 - .IX Item "-lm languagemode" - Initial language mode used for editing succeeding files. ---- 177,194 ---- - the command line. - .Ip "\fB\-ask\fR, \fB\-noask\fR" 4 - .IX Item "-ask, -noask" -! Instructs \fBnclient\fR whether to automatically start a server if one is not -! available. This is also settable via the X resource, \f(CW\*(C`nclient.autoStart\*(C'\fR. - .Ip "\fB\-svrname\fR \fIname\fR" 4 - .IX Item "-svrname name" -! Explicitly instructs \fBnclient\fR which server to connect to, an instance of - \&\fBnedit\fR(1) with a corresponding \fB\-svrname\fR argument. By naming servers, you - can run several simultaneously, and direct files and commands specifically to - any one. - .Ip "\fB\-svrcmd\fR \fIcommand\fR" 4 - .IX Item "-svrcmd command" -! The command which \fBnclient\fR uses to start an NEdit server. It is also settable via -! the X resource \f(CW\*(C`nclient.serverCommand\*(C'\fR, by default, \fI\*(L"nedit \-server\*(R"\fR. - .Ip "\fB\-lm\fR \fIlanguagemode\fR" 4 - .IX Item "-lm languagemode" - Initial language mode used for editing succeeding files. -*************** -*** 226,236 **** - .Ve - .SH "NOTES" - .IX Header "NOTES" -! Communication between \fBnc\fR and \fBnedit\fR(1) is through the X display. So as -! long as X windows is set up and working properly, \fBnc\fR will work properly -! as well. \fBnc\fR uses the \f(CW\*(C`DISPLAY\*(C'\fR environment variable, the machine name and - your user name to find the appropriate server, meaning, if you have several -! machines sharing a common file system, \fBnc\fR will not be able to find a server - that is running on a machine with a different host name, even though it may be - perfectly appropriate for editing a given file. - .PP ---- 226,236 ---- - .Ve - .SH "NOTES" - .IX Header "NOTES" -! Communication between \fBnclient\fR and \fBnedit\fR(1) is through the X display. So as -! long as X windows is set up and working properly, \fBnclient\fR will work properly -! as well. \fBnclient\fR uses the \f(CW\*(C`DISPLAY\*(C'\fR environment variable, the machine name and - your user name to find the appropriate server, meaning, if you have several -! machines sharing a common file system, \fBnclient\fR will not be able to find a server - that is running on a machine with a different host name, even though it may be - perfectly appropriate for editing a given file. - .PP -*************** -*** 239,250 **** - .Ip "incorrect:" 4 - .IX Item "incorrect:" - .Vb 1 -! \& nc file.c -line 25 - .Ve - .Ip "correct:" 4 - .IX Item "correct:" - .Vb 1 -! \& nc -line 25 file.c - .Ve - .PP - For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit ---- 239,250 ---- - .Ip "incorrect:" 4 - .IX Item "incorrect:" - .Vb 1 -! \& nclient file.c -line 25 - .Ve - .Ip "correct:" 4 - .IX Item "correct:" - .Vb 1 -! \& nclient -line 25 file.c - .Ve - .PP - For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit +--- doc/nc.man.orig Thu Nov 20 18:40:13 2003 ++++ doc/nc.man Sat Feb 7 14:54:18 2004 +@@ -285,6 +285,9 @@ + .PP + For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit + distribution kit. ++.PP ++In FreeBSD, \fInc\fR is installed as \fInclient\fR so it does not ++conflict with the \fInetcat\fR port which also installs an \fInc\fR. + .SH "SEE ALSO" + .IX Header "SEE ALSO" + \&\fInedit\fR\|(1), X(1), \fImwm\fR\|(1), \fIctags\fR\|(1), \fIetags\fR\|(1) |