X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lyx.1in;h=f6eda766e4d912893bdd9e6b4f3ef51842a99362;hb=41d858b88cc49ef6d5f1dc79e1ae84e15a004644;hp=dd80ae8190f39326178cb149573b0178ca9ae6c8;hpb=f27a18f0fb9afc6df33ea9341061c5618d84bd00;p=lyx.git

diff --git a/lyx.1in b/lyx.1in
index dd80ae8190..f6eda766e4 100644
--- a/lyx.1in
+++ b/lyx.1in
@@ -74,6 +74,24 @@ Note that the order of -e and -x switches matters.
 \fB \-i [\-\-import]\fP \fIfmt file.xxx
 where fmt is the import format of choice and file.xxx is the file to be imported.
 .TP
+\fB \-f [\-\-force\-overwrite]\fP \fIwhat
+where what is is either "\fBall\fR", "\fBmain\fR" or "\fBnone\fR".
+Specify "\fBall\fR" to allow overwriting all files during a batch export,
+"\fBmain\fR" to allow overwriting the main file only, or "\fBnone\fR"
+to disallow overwriting any file. When this switch is followed by anything
+else other than "\fBall\fR", "\fBmain\fR" or "\fBnone\fR", the behavior is as
+if "\fBall\fR" was specified, but what follows is left on the command line for
+further processing.
+.TP
+\fB \-n [\-\-no\-remote]\fP
+open documents passed as arguments in a new instance, even if another
+instance of LyX is already running.
+.TP
+\fB \-r [\-\-remote]\fP
+by using the lyxpipe, ask an already running instance of LyX to open the
+documents passed as arguments and then exit. If the lyxpipe is not set up or
+is not working, a new instance is created and execution continues normally.
+.TP
 .BI -batch
 causes LyX to run the given commands without opening a GUI window.
 Thus, something like:
@@ -117,6 +135,17 @@ The user directory is, in order of precedence:
 .B LYX_LOCALEDIR
 can be used to tell LyX where to look for the translations of its GUI
 strings in other languages.
+
+.TP
+.B LYX_FORCE_OVERWRITE
+can be used to change the default behavior when exporting from command
+line.
+.PP
+By default, LyX overwrites the main file when exporting from command
+line but not the ancillary files. This behavior can be changed by setting
+this environment variable, which relieves the need of using the \-f switch.
+Allowed values are either "\fBall\fR", "\fBmain\fR" or "\fBnone\fR", with
+same meaning as for the \-f switch.
 .SH FILES
 .nf
 .ta \w'\fILIBDIR\fR/lyxrc.in  'u
@@ -155,4 +184,4 @@ are having problems with!
 files. Consult the \fBtex2lyx@version_suffix@\fR documentation.
 
 .SH AUTHORS
-LyX is Copyright (C) 1995 by Matthias Ettrich, 1995-2009 LyX Team
+LyX is Copyright (C) 1995 by Matthias Ettrich, 1995-2010 LyX Team