use env variables LYX_DIR_12x and LYX_USERDIR_12x; update man page

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3880 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 610b4ead84def22240ec5fd446ea293b117212a7..dd64a5087aa2f825e230a31cf5a1d478bca5a408 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-02  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * lyx.man: update somewhat for 1.2.0
+

 2002-03-31  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * configure.in: call LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG
 2002-03-31  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * configure.in: call LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG

diff --git a/lyx.man b/lyx.man
index f5cc1d3920479a56777000230463ee4391f2b387..8ee7717438d06ab96a0d964ee2a2136e1f6aef9f 100644 (file)
--- a/lyx.man
+++ b/lyx.man
@@ -3,7 +3,7 @@
 .\"
 .\"  tbl lyx.1 | nroff -man | less
 .\"
 .\"
 .\"  tbl lyx.1 | nroff -man | less
 .\"

-.TH LYX 1 "November 1999" "Version 1.1" "LyX 1.1"
+.TH LYX 1 "April 2002" "Version 1.2" "LyX 1.2"

 .SH NAME
 lyx \- A Document Processor
 .\"
 .SH NAME
 lyx \- A Document Processor
 .\"


@@ -20,22 +20,26 @@ lyx \- A Document Processor
 format. If your system is properly configured, you can access the full
 documentation within \fBLyX\fR under the Help menu.
 
 format. If your system is properly configured, you can access the full
 documentation within \fBLyX\fR under the Help menu.
 

-\fBLyX\fR is a modern approach of writing documents with a computer
-which breaks with the tradition of the obsolete typewriter concept. It
-is designed for people who want a professional output with a minimum
-of time effort, without becoming specialists in typesetting. Compared
-to common word processors, \fBLyX\fR will increase the productivity a
-lot, since most of the typesetting will be done by the computer, not
-the author. With \fBLyX\fR the author can concentrate on the contents
-of his writing, since the computer will take care of the look. Read more 
-about this concept in the online documentation under the Help menu.
+\fBLyX\fR is a document preparation system. It excels at letting you create
+complex technical and scientific articles with mathematics,
+cross-references, bibliographies, indices, etc. It is very good at
+documents of any length in which the usual processing abilities are
+required: automatic sectioning and pagination, spellchecking, and so
+forth. It can also be used to write a letter to your mom, though
+granted, there are probably simpler programs available for that. It is
+definitely not the best tool for creating banners, flyers, or
+advertisements (we'll explain why later), though with some effort all
+these can be done, too. Some examples of what it is used for: memos,
+letters, dissertations and theses, lecture notes, seminar notebooks,
+conference proceedings, software documentation, books (on PostgreSQL,
+remote sensing, cryptology, fictional novels, poetry, and even a
+children's book or two), articles in refereed scientific journals,
+scripts for plays and movies, business proposals... you get the idea.

 
 Currently, \fBLyX\fR uses the XForms library as a toolkit. \fBLyX\fR
 should run everywhere, where XForms runs. This is on all major Unix
 
 Currently, \fBLyX\fR uses the XForms library as a toolkit. \fBLyX\fR
 should run everywhere, where XForms runs. This is on all major Unix

-platforms as well as some PC platforms, including Sun, SGI, HP, Compaq
-Tru64, IBM RS6000, Convex, Cray, i386/Linux, Alpha/Linux,
-i386/FreeBSD, i386/NetBSD, DecSystem(mips)/Ultrix, OS/2 with XFree or 
-PMX and others. 
+platforms as well as Windows, Mac OS X (which actually is a unix
+platform) and OS/2.

 .SH OPTIONS
 \fBLyX\fR supports the following command-line switches, which can also
 be specified as X resources (e. g. in .Xdefaults) with class
 .SH OPTIONS
 \fBLyX\fR supports the following command-line switches, which can also
 be specified as X resources (e. g. in .Xdefaults) with class


@@ -120,7 +124,7 @@ specifies the application name under which resources are to be
 obtained, rather than the default executable file name. 
 .SH ENVIRONMENT
 .TP
 obtained, rather than the default executable file name. 
 .SH ENVIRONMENT
 .TP

-.B LYX_DIR_11x
+.B LYX_DIR_12x

 can be used to specify which system directory to use.
 .PP
 The system directory is determined by searching for the file
 can be used to specify which system directory to use.
 .PP
 The system directory is determined by searching for the file


@@ -128,7 +132,7 @@ The system directory is determined by searching for the file
 .br
 1) -sysdir command line parameter
 .br
 .br
 1) -sysdir command line parameter
 .br

-2) LYX_DIR_11x environment variable
+2) LYX_DIR_12x environment variable

 .br
 3) Maybe <path of binary>/TOP_SRCDIR/lib
 .br
 .br
 3) Maybe <path of binary>/TOP_SRCDIR/lib
 .br


@@ -136,14 +140,14 @@ The system directory is determined by searching for the file
 .br
 5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree)
 .TP
 .br
 5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree)
 .TP

-.B LYX_USERDIR_11x
+.B LYX_USERDIR_12x

 can be used to specify which user directory to use.
 .PP
 The user directory is, in order of precedence: 
 .br
 1) -userdir command line parameter
 .br
 can be used to specify which user directory to use.
 .PP
 The user directory is, in order of precedence: 
 .br
 1) -userdir command line parameter
 .br

-2) LYX_USERDIR_11x environment variable
+2) LYX_USERDIR_12x environment variable

 .br
 3) $HOME/.<name of binary> if no explicit setting is made
 
 .br
 3) $HOME/.<name of binary> if no explicit setting is made
 


@@ -177,10 +181,13 @@ reLyX(1), latex(1), xforms(5).
 
 Full documentation in either native \fBLyX\fR or postscript format.
 .SH BUGS/LIMITATIONS
 
 Full documentation in either native \fBLyX\fR or postscript format.
 .SH BUGS/LIMITATIONS

-There are probably still some bugs in \fBLyX\fR. Please report them to
-lyx-devel@lists.lyx.org with detailed info, including which version of
-\fBLyX\fR you use. Consult the bug-reporting instructions in the
-Introduction (accessible from the Help menu in LyX) first if possible.
+There are still some bugs in \fBLyX\fR. To report one, read if
+possible the Introduction found under the Help menu in LyX. You'll
+find detailed info on submitting bug reports there. If you can't do
+that, send details to the LyX Developers mailing list
+lyx-devel@lists.lyx.org, or use the LyX bug tracker at
+http://bugzilla.lyx.org/. Don't forget to mention which version you
+are having problems with!

 
 \fBLaTeX\fR import is still not perfect and may produce buggy *.lyx
 files. Consult the \fBreLyX\fR documentation.
 
 \fBLaTeX\fR import is still not perfect and may produce buggy *.lyx
 files. Consult the \fBreLyX\fR documentation.


@@ -199,12 +206,12 @@ Preview of inline images in rare cases does not show the image. If you
 want to preview the image, just click on it and choose fullscreen
 preview.
 
 want to preview the image, just click on it and choose fullscreen
 preview.
 

-If you have performance problems, please go through the \fBlyxrc\fR
-configuration file. It contains settings that can be used to improve
-performance on slow systems.
+If you have performance problems, please go through the
+Edit>Preferences... dialog. It contains settings that can be used to
+improve performance on slow systems.

 .SH AUTHORS
 Copyright
 .Cr
 .SH AUTHORS
 Copyright
 .Cr

-1995, 1996, 1997, 1998, 1999 by Matthias Ettrich
+1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 by Matthias Ettrich

 (ettrich@informatik.uni-tuebingen.de) and the rest of the \fBLyX
 Team\fR (See Credits under the Help menu item).
 (ettrich@informatik.uni-tuebingen.de) and the rest of the \fBLyX
 Team\fR (See Credits under the Help menu item).

diff --git a/src/ChangeLog b/src/ChangeLog
index f3487eeac4d49f00b901bf5c68b118f0b63e4bb4..420e7da327027add98e8f707130177f6b8c50a6c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-02  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * lyx_main.C (init): use environment variable LYX_DIR_12x instead
+       of LYX_DIR_11x. Same for LYX_USERDIR_12x.
+

 2002-03-29  Juergen Vigna  <jug@sad.it>
 
        * lyxfunc.C (dispatch): add a missing fitCursor call.
 2002-03-29  Juergen Vigna  <jug@sad.it>
 
        * lyxfunc.C (dispatch): add a missing fitCursor call.

diff --git a/src/lyx_main.C b/src/lyx_main.C
index ecb5e296634089d5907f8b0e8e22e7bd8b6a2acf..7f8e5bb0ba62f70d59a8ff8082e8285b125e27ca 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -262,7 +262,7 @@ void LyX::init(bool gui)
 
        // Directories are searched in this order:
        // 1) -sysdir command line parameter
 
        // Directories are searched in this order:
        // 1) -sysdir command line parameter

-       // 2) LYX_DIR_11x environment variable
+       // 2) LYX_DIR_12x environment variable

        // 3) Maybe <path of binary>/TOP_SRCDIR/lib
        // 4) <path of binary>/../share/<name of binary>/
        // 4a) repeat 4 after following the Symlink if <path of
        // 3) Maybe <path of binary>/TOP_SRCDIR/lib
        // 4) <path of binary>/../share/<name of binary>/
        // 4a) repeat 4 after following the Symlink if <path of


@@ -279,11 +279,11 @@ void LyX::init(bool gui)
        if (!system_lyxdir.empty())
                searchpath= MakeAbsPath(system_lyxdir) + ';';
 
        if (!system_lyxdir.empty())
                searchpath= MakeAbsPath(system_lyxdir) + ';';
 

-       // LYX_DIR_11x environment variable
-       string const lyxdir = GetEnvPath("LYX_DIR_11x");
+       // LYX_DIR_12x environment variable
+       string const lyxdir = GetEnvPath("LYX_DIR_12x");

 
        if (!lyxdir.empty()) {
 
        if (!lyxdir.empty()) {

-               lyxerr[Debug::INIT] << "LYX_DIR_11x: " << lyxdir << endl;
+               lyxerr[Debug::INIT] << "LYX_DIR_12x: " << lyxdir << endl;

                searchpath += lyxdir + ';';
        }
 
                searchpath += lyxdir + ';';
        }
 


@@ -359,7 +359,7 @@ void LyX::init(bool gui)
        // Warn if environment variable is set, but unusable
        if (!lyxdir.empty()) {
                if (system_lyxdir != NormalizePath(lyxdir)) {
        // Warn if environment variable is set, but unusable
        if (!lyxdir.empty()) {
                if (system_lyxdir != NormalizePath(lyxdir)) {

-                       lyxerr <<_("LYX_DIR_11x environment variable no good.")
+                       lyxerr <<_("LYX_DIR_12x environment variable no good.")

                               << '\n'
                               << _("System directory set to: ")
                               << system_lyxdir << endl;
                               << '\n'
                               << _("System directory set to: ")
                               << system_lyxdir << endl;


@@ -371,7 +371,7 @@ void LyX::init(bool gui)
        if (system_lyxdir == "./") {
                lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
                       <<_("Try the '-sysdir' command line parameter or ")
        if (system_lyxdir == "./") {
                lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
                       <<_("Try the '-sysdir' command line parameter or ")

-                      <<_("set the environment variable LYX_DIR_11x to the "
+                      <<_("set the environment variable LYX_DIR_12x to the "

                           "LyX system directory ")
                       << _("containing the file `chkconfig.ltx'.") << endl;
                if (!path_shown) {
                           "LyX system directory ")
                       << _("containing the file `chkconfig.ltx'.") << endl;
                if (!path_shown) {


@@ -401,15 +401,15 @@ void LyX::init(bool gui)
 
        // Directories are searched in this order:
        // 1) -userdir command line parameter
 
        // Directories are searched in this order:
        // 1) -userdir command line parameter

-       // 2) LYX_USERDIR_11x environment variable
+       // 2) LYX_USERDIR_12x environment variable

        // 3) $HOME/.<name of binary>
 
        // If we had a command line switch, user_lyxdir is already set
        bool explicit_userdir = true;
        if (user_lyxdir.empty()) {
 
        // 3) $HOME/.<name of binary>
 
        // If we had a command line switch, user_lyxdir is already set
        bool explicit_userdir = true;
        if (user_lyxdir.empty()) {
 

-               // LYX_USERDIR_11x environment variable
-               user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
+               // LYX_USERDIR_12x environment variable
+               user_lyxdir = GetEnvPath("LYX_USERDIR_12x");

 
                // default behaviour
                if (user_lyxdir.empty())
 
                // default behaviour
                if (user_lyxdir.empty())