Remove the last remaining wine options when running programs.
Keep support for --help, and --version when they are the only options
on the command line.
diff --git a/documentation/README.de b/documentation/README.de
index 05a7162..9694df6 100644
--- a/documentation/README.de
+++ b/documentation/README.de
@@ -156,17 +156,6 @@
libntdll.so") fügen Sie bitte den Library-Pfad zur Datei /etc/ld.so.conf hinzu
und führen Sie ldconfig als root aus.
-Um zu prüfen, ob Ihre Umgebung passend eingerichtet ist, um Wine erfolgreich
-laufen zu lassen, können Sie das Kommando "./tools/winecheck | less" ausführen.
-Es wird Ihnen eine Punktzahl in Prozent mitgeteilt, welche die "Korrektheit der
-Wine-Konfiguration" darstellt.
-Da dieses Programm immer noch im Alpha-Stadium ist, führt es aber keinen wirklich
-umfassenden Test durch, die Ergebnisse der Überprüfungsollten sollten also nur
-als erster Prüfschritt betrachtet werden.
-
-In der Man-Page zu wine.conf können Sie nachlesen, wie Sie zum reinen Text-Modus
-wechseln können, wenn gewünscht.
-
6. AUSFÜHREN VON PROGRAMMEN
Wenn Sie Wine aufrufen, können Sie den vollständigen Pfad zur ausführbaren
@@ -181,7 +170,7 @@
wine /usr/windows/sol.exe (die Dateinamen-Syntax von Unix benutzend)
- wine -- sol.exe /parameter1 -parameter2 parameter3
+ wine sol.exe /parameter1 -parameter2 parameter3
(Programmaufruf mit Parametern)
Hinweis: Der Pfad zur Datei wird auch zum Pfad hinzugefügt, wenn ein vollständiger
diff --git a/documentation/README.fr b/documentation/README.fr
index 71bf728..ef82f39 100644
--- a/documentation/README.fr
+++ b/documentation/README.fr
@@ -157,16 +157,6 @@
"Error while loading shared libraries: libntdll.so"), assurez vous d'ajouter
le chemin des librairies à /etc/ld.so.conf et exécuter ldconfig en tant que root.
-Pour pouvoir vérifier l'exactitude de l'environnement dont vous avez besoin pour
-que Wine s'exécute correctement, vous pouvez exécuter "./tools/winecheck | less".
-Vous aurez un score en pourcentage indiquant "l'exactitude de la configuration
-de Wine". Ce programme est encore en développement alpha, il n'effectue pas
-encore un véritable test en profondeur, il devrait cependant être utile dans
-une première vérification.
-
-Lisez les page man de wine.conf pour savoir comment basculer en un mode texte
-uniquement.
-
6. EXÉCUTER DES PROGRAMMES
Lorsque l'on invoque Wine, vous pouvez spécifier le chemin entier vers
@@ -182,7 +172,7 @@
wine /usr/windows/sol.exe (en utilisant la syntaxe de fichiers Unix)
- wine -- sol.exe /parametre1 -parametre2 parametre3
+ wine sol.exe /parametre1 -parametre2 parametre3
(en appelant le programme avec des paramètres)
Note: le chemin du fichier sera également additionné au chemin par défaut
diff --git a/documentation/README.it b/documentation/README.it
index da61ed1..e0c2d5a 100644
--- a/documentation/README.it
+++ b/documentation/README.it
@@ -154,16 +154,6 @@
aggiungere il percorso della directory a /etc/ld.so.conf ed esegui ldconfig come
root.
-Per verificare la correttezza dell'ambiente di cui hai bisogno per eseguire Wine
-con successo, puoi eseguire "./tools/winecheck | less".
-Otterrai un punteggio percentuale che indica la "Correttezza della
-configurazione di Wine".
-poiché questo programma è una alpha, anche se non esegue un vero test completo
-ancora, può essere utilizzato come un primo step di verifica.
-
-Controlla la pagina wine.conf man su come passare alla modalità solo testuale
-se lo desideri.
-
6. ESEGUIRE I PROGRAMMI
Quando si esegue Wine, si può specificare l'intero percorso dell'eseguibile o
@@ -176,7 +166,7 @@
wine c:\\windows\\sol.exe (utilizzando la sintassi DOS)
wine /usr/windows/sol.exe (utilizzando la sintassi Unix)
- wine - sol.exe /parameter1 -parameter2 parameter3
+ wine sol.exe /parameter1 -parameter2 parameter3
(chiama il programma con dei parametri)
Nota: il percorso del file può essere aggiunto al percorso quando è fornito un
diff --git a/documentation/README.pt_br b/documentation/README.pt_br
index eb92eaa..6ba86d5 100644
--- a/documentation/README.pt_br
+++ b/documentation/README.pt_br
@@ -150,15 +150,6 @@
de adicionar o caminho da biblioteca a /etc/ld.so.conf e executar
ldconfig como root.
-A fim verificar a exatidão do ambiente que você necessita para que o
-Wine funcione com sucesso, você pode executar "./tools/winecheck | less".
-Você irá obter um percentual do resultado indicando "Wine configuration
-correctness".
-Como este programa é alfa, não rodou um teste verdadeiramente completo ainda,
-embora, assim deve ser feito como uma primeira etapa da verificação somente.
-
-Veja em "man wine.conf" como se muda para o suporte em modo texto se desejar.
-
6.EXECUTAR PROGRAMAS
Ao invocar o Wine, você pode especificar o caminho completo do executável,
@@ -172,7 +163,7 @@
wine /usr/windows/sol.exe (usando um nome de arquivo Unix)
- wine -- sol.exe /parameter1 -parameter2 parameter3
+ wine sol.exe /parameter1 -parameter2 parameter3
(chamando o programa com parãmetros)
Nota: o caminho do arquivo será também adicionado ao caminho
diff --git a/documentation/running.sgml b/documentation/running.sgml
index 4416ca9..7035b37 100644
--- a/documentation/running.sgml
+++ b/documentation/running.sgml
@@ -73,30 +73,20 @@
<title>How to run Wine</title>
<para>
- You can invoke the <command>wine --help</command> command to
- get a listing of all Wine's command-line parameters:
+ You can simply invoke the <command>wine</command> command to
+ get a small help message:
</para>
<para>
<screen>
-Usage: ./wine [options] program_name [arguments]
-
-Options:
- --debugmsg name Turn debugging-messages on or off
- --help,-h Show this help message
- --version,-v Display the Wine version
+Wine 20040405
+Usage: wine PROGRAM [ARGUMENTS...] Run the specified program
+ wine --help Display this help and exit
+ wine --version Output version information and exit
</screen>
</para>
<para>
- You can specify as many options as you want, if any.
- Typically, you will want to have your configuration file set
- up with a sensible set of defaults; in this case, you can run
- <command>wine</command> without explicitly listing any
- options. In rare cases, you might want to override certain
- parameters on the command line.
- </para>
- <para>
- After the options, you should put the name of the file you
+ The first argument should be the name of the file you
want <command>wine</command> to execute. If the executable is
in the <parameter>Path</parameter> parameter in the
configuration file, you can simply give the executable file
@@ -148,8 +138,25 @@
<sect1 id="command-line-options">
<title>Wine Command Line Options</title>
- <sect2 id="config-parameter">
- <title>--debugmsg [channels]</title>
+ <sect2>
+ <title>--help</title>
+ <para>
+ Shows a small command line help page.
+ </para>
+ </sect2>
+
+ <sect2>
+ <title>--version</title>
+ <para>
+ Shows the Wine version string. Useful to verify your installation.
+ </para>
+ </sect2>
+ </sect1>
+
+ <sect1>
+ <title>Environment variables</title>
+ <sect2>
+ <title>WINEDEBUG=[channels]</title>
<para>
Wine isn't perfect, and many Windows applications still
don't run without bugs under Wine (but then, a lot of programs
@@ -178,7 +185,7 @@
section of configuring wine you can
modify what the <parameter>relay</parameter> trace reports).
Logging does slow down Wine
- quite a bit, so don't use <parameter>--debugmsg</parameter>
+ quite a bit, so don't use <parameter>WINEDEBUG</parameter>
unless you really do want log files.
</para>
<para>
@@ -197,28 +204,28 @@
To turn on a debug channel, use the form
<parameter>class+channel</parameter>. To turn it off, use
<parameter>class-channel</parameter>. To list more than one
- channel in the same <parameter>--debugmsg</parameter>
+ channel in the same <parameter>WINEDEBUG</parameter>
option, separate them with commas. For example, to request
<parameter>warn</parameter> class messages in the
<parameter>heap</parameter> debug channel, you could invoke
<command>wine</command> like this:
</para>
<screen>
-<prompt>$</prompt> <userinput>wine --debugmsg warn+heap <replaceable>program_name</replaceable></userinput>
+<prompt>$</prompt> <userinput>WINEDEBUG=warn+heap wine <replaceable>program_name</replaceable></userinput>
</screen>
<para>
If you leave off the message class, <command>wine</command>
will display messages from all four classes for that channel:
</para>
<screen>
-<prompt>$</prompt> <userinput>wine --debugmsg +heap <replaceable>program_name</replaceable></userinput>
+<prompt>$</prompt> <userinput>WINEDEBUG=heap wine <replaceable>program_name</replaceable></userinput>
</screen>
<para>
If you wanted to see log messages for everything except the
relay channel, you might do something like this:
</para>
<screen>
-<prompt>$</prompt> <userinput>wine --debugmsg +all,-relay <replaceable>program_name</replaceable></userinput>
+<prompt>$</prompt> <userinput>WINEDEBUG=+all,-relay wine <replaceable>program_name</replaceable></userinput>
</screen>
<para>
Here is a list of the debug channels and classes in Wine.
@@ -286,20 +293,6 @@
The Wine Developer's Guide</ulink>.
</para>
</sect2>
-
- <sect2>
- <title>--help</title>
- <para>
- Shows a small command line help page.
- </para>
- </sect2>
-
- <sect2>
- <title>--version</title>
- <para>
- Shows the Wine version string. Useful to verify your installation.
- </para>
- </sect2>
</sect1>
<sect1 id="wineserver-command-line-options">
@@ -319,7 +312,7 @@
Sets the debug level for debug output in the terminal that
wineserver got started in at level <n>.
In other words: everything greater than 0 will enable
- wineserver specific debugging output (not to confuse with Wine's wineserver logging channel, --debugmsg +server, though!).
+ wineserver specific debugging output.
</para>
</sect2>
diff --git a/documentation/wine.conf.man b/documentation/wine.conf.man
index 3b8c180..3d83efc 100644
--- a/documentation/wine.conf.man
+++ b/documentation/wine.conf.man
@@ -174,7 +174,7 @@
Always make sure that you have some kind of strategy in mind when you start
fiddling with the current defaults and needless to say that you must know
what you are doing.
---debugmsg +loaddll might come in handy for experimenting with that stuff.
+WINEDEBUG=loaddll might come in handy for experimenting with that stuff.
.PP
.B [Debug]
.br
diff --git a/documentation/wine.man.in b/documentation/wine.man.in
index f19b298..ef6d082 100644
--- a/documentation/wine.man.in
+++ b/documentation/wine.man.in
@@ -1,9 +1,13 @@
.\" -*- nroff -*-
-.TH WINE 1 "May 2002" "@PACKAGE_STRING@" "Windows On Unix"
+.TH WINE 1 "May 2004" "@PACKAGE_STRING@" "Windows On Unix"
.SH NAME
wine \- run Windows programs on Unix
.SH SYNOPSIS
-.BI "wine " "[wine_options] " "[--] " "program " "[arguments ... ]"
+.BI "wine " "program " "[arguments ... ]"
+.br
+.B wine --help
+.br
+.B wine --version
.PP
For instructions on passing arguments to Windows programs, please see the
.B
@@ -28,27 +32,18 @@
for CUI programs will only provide very limited console support, and your
program might not function properly.
.PP
-.B wine
-currently runs a growing list of applications written for all kinds of
-Windows versions >= Win2.0, e.g. Win3.1, Win95/98, NT.
-Older, simpler applications work better than newer, more complex ones.
-Using Windows ME or Win2000 components with Wine is more problematic than
-using none at all or the ones from older Windows versions.
-A large percentage of the API has been implemented,
-although there are still several major pieces of work left to do.
+When invoked with
+.B --help
+or
+.B --version
+as the only argument,
+.B wine
+will simply print a small help message or its version respectively and exit.
.SH REQUIREMENTS AND INSTALLATION
Read the README file in the Wine source distribution and the
.BR wine.conf (5)
man page to know what Wine requires and how it is installed from
source.
-.SH OPTIONS
-.TP
-.I --debugmsg [xxx]#name[,[xxx1]#name1]
-Turn debugging messages on or off. This option is deprecated, you
-should use the
-.I WINEDEBUG
-environment variable instead (see below).
-.PD 1
.SH PROGRAM/ARGUMENTS
The program name may be specified in DOS format (
.I
@@ -64,45 +59,6 @@
.PP
wine C:\(rs\(rsProgram\(rs Files\(rs\(rsMyPrg\(rs\(rstest.exe
.PP
-Command line processing goes as
-follows: first
-.B wine
-checks whether one or more of the above mentioned
-.B wine
-options have been specified. These
-are removed from the command line, which is passed to the windows program. You can use
-the parameter
-.I --
-to indicate that
-.B wine
-should stop command line processing. This is needed in case a windows program understands
-an option that is usually interpreted (and thus removed from the command line)
-by
-.B wine.
-For example, if you want to execute
-.B wine
-with the options
-.I --debugmsg +module
-and if
-.B wine
-should run the program
-.I myapp.exe
-with the arguments
-.I --display 3d somefile
-, then you could use the following command line to invoke
-.B wine:
-.PP
-.I wine --debugmsg +module -- myapp.exe --display 3d somefile
-.PP
-Note that in contrast to previous versions of
-.B wine,
-you must not pass
-program name and program option in one argument to
-.B wine.
-To run more
-than one windows program, just execute
-.B wine
-once with the name of each program as argument.
.SH ENVIRONMENT VARIABLES
.B wine
makes the environment variables of the shell from which
@@ -323,7 +279,7 @@
.SH BUGS
.PP
A status report on many applications is available from
-.I http://www.winehq.org/Apps.
+.I http://appdb.winehq.org.
Please add entries to this list for applications you currently run.
.PP
Bug reports may be posted to Wine Bugzilla
@@ -350,18 +306,10 @@
WineHQ, the
.B wine
development headquarters, is at
-.I http://www.winehq.org/.
+.I http://www.winehq.org.
This website contains a great deal of information about
.B wine.
.PP
-The
-.B wine
-newsgroup is
-.I comp.emulators.ms-windows.wine.
-It is used for discussion of various
-.B wine
-end user aspects/help.
-.PP
For further information about
.B wine
development, you might want to subscribe to the
