From b59eb9255f21607d203e5d798a3af30433851b1f Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 23 Jan 2007 07:36:02 +0000 Subject: [PATCH] docs/gimp.1.in document the new behaviour and command-line parameter. 2007-01-23 Sven Neumann * docs/gimp.1.in * docs/gimp-remote.1.in: document the new behaviour and command-line parameter. svn path=/trunk/; revision=21762 --- ChangeLog | 6 ++++++ docs/gimp-remote.1.in | 8 +++++++- docs/gimp.1.in | 42 ++++++++++++++++++++++++++---------------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index e914b52847..d3540fa80c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-23 Sven Neumann + + * docs/gimp.1.in + * docs/gimp-remote.1.in: document the new behaviour and + command-line parameter. + 2007-01-23 Sven Neumann * app/widgets/dbus-service.xml: added Activate method. diff --git a/docs/gimp-remote.1.in b/docs/gimp-remote.1.in index 654ae16a6b..31baa7a222 100644 --- a/docs/gimp-remote.1.in +++ b/docs/gimp-remote.1.in @@ -1,4 +1,4 @@ -.TH GIMP-REMOTE 1 "March 23 2004" "Version @GIMP_VERSION@" "GIMP Manual Pages" +.TH GIMP-REMOTE 1 "Januar 23 2007" "Version @GIMP_VERSION@" "GIMP Manual Pages" .SH NAME gimp\-remote - tells a running GIMP to open a (local or remote) image file. @@ -25,6 +25,12 @@ instance and ask it to load the specified images. If no filename or URL is given, \fIgimp-remote\fP will start a new GIMP. This behaviour can be altered using the command-line options described below. +.PP +If you are using GIMP on Linux or another platform with the D-Bus +message bus system, chances are good that this functionality is +already built into the main GIMP executable and that you will not need +to use \fIgimp-remote\fP. + .SH OPTIONS .l diff --git a/docs/gimp.1.in b/docs/gimp.1.in index 3020eef4ff..a77e870a5c 100644 --- a/docs/gimp.1.in +++ b/docs/gimp.1.in @@ -1,4 +1,4 @@ -.TH GIMP 1 "Version @GIMP_VERSION@" "GIMP Manual Pages" +.TH GIMP 1 "Januar 23 2007" "Version @GIMP_VERSION@" "GIMP Manual Pages" .SH NAME gimp - an image manipulation and paint program. @@ -7,9 +7,10 @@ gimp - an image manipulation and paint program. .SH SYNOPSIS .B gimp [\-h] [\-\-help] [\-\-help-all] [\-\-help-gtk] [-v] [\-\-version] -[\-\-license] [\-\-verbose] [\-\-no\-shm] [\-\-no\-cpu\-accel] -[\-\-display \fIdisplay\fP] [\-d] [\-\-no\-data] [\-f] [\-\-no\-fonts] -[\-i] [\-\-no\-interface] [\-s] [\-\-no\-splash] [\-\-session \fI\fP] +[\-\-license] [\-\-verbose] [\-n] [\-\-new\-instance] +[\-i] [\-\-no\-interface] [\-d] [\-\-no\-data] [\-f] [\-\-no\-fonts] +[\-s] [\-\-no\-splash] [\-\-no\-shm] [\-\-no\-cpu\-accel] +[\-\-display \fIdisplay\fP] [\-\-session \fI\fP] [\-g] [\-\-gimprc \fI\fP] [\-\-system\-gimprc \fI\fP] [\-\-dump\-gimprc\fP] [\-\-console\-messages] [\-\-debug\-handlers] [\-\-stack\-trace\-mode \fI\fP] [\-\-pdb\-compat\-mode \fI\fP] @@ -39,11 +40,16 @@ images. GIMP ships with a second binary called \fIgimp-console\fP. This binary is a console-only version and behaves as if \fIgimp\fP was called with the \-\-no\-interface command\-line option. +.PP +On platforms with the D-Bus message bus system, GIMP will by default check +if an instance is already running in this user session. If it detects that, +it will pass all filenames given on the command-line to the already running +GIMP instance and quit. .SH OPTIONS .l -The \fIgimp\fP accepts the following options: +GIMP accepts the following options: .TP 8 .B \-h, \-\-help Show GIMP command\-line options. @@ -63,14 +69,12 @@ Output license information and exit. .B \-\-verbose Be verbose and create information on standard output. .TP 8 -.B \-\-no\-shm -Do not use shared memory between GIMP and its plug-ins. -Instead of using shared memory, GIMP will send the data via pipe. This -will result in slower performance than using shared memory. +.B \-i, \-\-no\-interface +Run without a user interface. .TP 8 -.B \-\-no\-cpu\-accel -Do not use CPU accelerations such as MMX or SSE even if GIMP detects -that your CPU provides this functionality. +.B \-n, \-\-new\-instance +Do not attempt to reuse an already running GIMP instance. Always start a +new one. .TP 8 .B \-d, \-\-no\-data Do not load patterns, gradients, palettes, or brushes. Often useful @@ -80,15 +84,21 @@ in non-interactive situations where startup time is to be minimized. Do not load any fonts. No text functionality will be available if this option is used. .TP 8 -.B \-i, \-\-no\-interface -Run without a user interface. -.TP 8 .B \-\-display \fIdisplay\fP Use the designated X display. .TP 8 .B \-s, \-\-no\-splash Do not show the splash screen. .TP 8 +.B \-\-no\-shm +Do not use shared memory between GIMP and its plug-ins. +Instead of using shared memory, GIMP will send the data via pipe. This +will result in slower performance than using shared memory. +.TP 8 +.B \-\-no\-cpu\-accel +Do not use CPU accelerations such as MMX or SSE even if GIMP detects +that your CPU provides this functionality. +.TP 8 .B \-\-session \fI\fP Use a different sessionrc for this GIMP session. The given session name is appended to the default sessionrc filename. @@ -323,7 +333,7 @@ ftp://ftp.gimp.org/. .SH AUTHORS -Spencer Kimball and Peter Mattis. +Spencer Kimball, Peter Mattis and the GIMP Development Team. With patches, fixes, plug-ins, extensions, scripts, translations, documentation and more from lots and lots of people all over the