[totem/gnome-2-26] Update man pages from master

[Bastien Nocera <hadess src gnome org>]

commit 0ac71dabf3235fb39df3339c191a3aa2a6186881
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Apr 21 15:26:56 2009 +0100

    Update man pages from master
    
    2009-04-21  Bastien Nocera  <hadess hadess net>
    
    	* data/totem-video-thumbnailer.1:
    	* data/totem-video-thumbnailer.pod:
    	* data/totem.1: Update from master
---
 ChangeLog                        |    6 +++
 data/totem-video-thumbnailer.1   |   50 +++++++++++++++--------
 data/totem-video-thumbnailer.pod |   14 ++++++-
 data/totem.1                     |   82 ++-----------------------------------
 4 files changed, 57 insertions(+), 95 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aab2074..b5c6841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-21  Bastien Nocera  <hadess hadess net>
+
+	* data/totem-video-thumbnailer.1:
+	* data/totem-video-thumbnailer.pod:
+	* data/totem.1: Update from master
+
 2009-04-08  Christian Persch  <chpe gnome org>
 
 	* src/eggsmclient-xsmp.c: (save_state): Re-sync from libegg master.
diff --git a/data/totem-video-thumbnailer.1 b/data/totem-video-thumbnailer.1
index 4ffc213..1c6e670 100644
--- a/data/totem-video-thumbnailer.1
+++ b/data/totem-video-thumbnailer.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.07)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -25,11 +25,11 @@
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
@@ -38,8 +38,8 @@
 .    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
 .    ds L" ""
 .    ds R" ""
-.    ds C` 
-.    ds C' 
+.    ds C` ""
+.    ds C' ""
 'br\}
 .el\{\
 .    ds -- \|\(em\|
@@ -48,22 +48,25 @@
 .    ds R" ''
 'br\}
 .\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
 .\" If the F register is turned on, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.if \nF \{\
+.ie \nF \{\
 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+.    de IX
+..
+.\}
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -128,13 +131,17 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "totem-video-thumbnailer 1"
-.TH totem-video-thumbnailer 1 "2005-03-14" "GNOME" ""
+.IX Title "TOTEM-VIDEO-THUMBNAILER 1"
+.TH TOTEM-VIDEO-THUMBNAILER 1 "2009-04-21" "GNOME" ""
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
 .SH "NAME"
 totem\-video\-thumbnailer \- video thumbnailer for the GNOME desktop
 .SH "SYNOPSYS"
 .IX Header "SYNOPSYS"
-\&\fBtotem-video-thumbnailer\fR [\-s size] input output [backend options]
+\&\fBtotem-video-thumbnailer\fR [\-j|\-\-jpeg] [\-l|\-\-no\-limit] [\-g num|\-\-gallery num] [\-s size] input output [backend options]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 This manual page documents briefly the \fBtotem-video-thumbnailer\fR command. This manual page was written for the Debian Project because  the original program does not have a manual page.
@@ -153,6 +160,15 @@ The output filename, output in \s-1PNG\s0 format.
 Options to be passed to the backend (i.e. \fBxine\fR or \fBgstreamer\fR).
 .SH "OPTIONS"
 .IX Header "OPTIONS"
+.IP "\fB\-j\fR \fB\-\-jpeg\fR" 8
+.IX Item "-j --jpeg"
+Switch the output format to \s-1JPEG\s0. The default is \s-1PNG\s0.
+.IP "\fB\-g num\fR \fB\-\-gallery num\fR" 8
+.IX Item "-g num --gallery num"
+Output a gallery of the given number (0 is the default) of screenshots.
+.IP "\fB\-l\fR \fB\-\-no\-limit\fR" 8
+.IX Item "-l --no-limit"
+Don't limit the thumbnailing time to 30 seconds. For debugging purposes.
 .IP "\fB\-s size\fR" 8
 .IX Item "-s size"
 The size of the thumbnail. Example: \*(L"64x64\*(R". The default is \*(L"128x96\*(R".
diff --git a/data/totem-video-thumbnailer.pod b/data/totem-video-thumbnailer.pod
index 28e91d6..cf85b3d 100644
--- a/data/totem-video-thumbnailer.pod
+++ b/data/totem-video-thumbnailer.pod
@@ -4,7 +4,7 @@ totem-video-thumbnailer - video thumbnailer for the GNOME desktop
 
 =head1 SYNOPSYS
 
-B<totem-video-thumbnailer> [-s size] input output [backend options]
+B<totem-video-thumbnailer> [-j|--jpeg] [-l|--no-limit] [-g num|--gallery num] [-s size] input output [backend options]
 
 =head1 DESCRIPTION
 
@@ -34,6 +34,18 @@ Options to be passed to the backend (i.e. B<xine> or B<gstreamer>).
 
 =over 8
 
+=item B<-j> B<--jpeg>
+
+Switch the output format to JPEG. The default is PNG.
+
+=item B<-g num> B<--gallery num>
+
+Output a gallery of the given number (0 is the default) of screenshots.
+
+=item B<-l> B<--no-limit>
+
+Don't limit the thumbnailing time to 30 seconds. For debugging purposes.
+
 =item B<-s size>
 
 The size of the thumbnail. Example: "64x64". The default is "128x96".
diff --git a/data/totem.1 b/data/totem.1
index 264b8c8..07610d5 100644
--- a/data/totem.1
+++ b/data/totem.1
@@ -52,7 +52,11 @@ Output version information then quit.
 .P
 The following options command an already-running instance of
 .B Totem
-to do something; they are useful for remote-control scripting:
+to do something; they are useful for remote-control scripting. If 
+.B Totem
+is not already running, these commands will launch a new instance of
+.B Totem
+but will not do anything further.
 .TP
 .B --play-pause
 Tell an already-running instance of 
@@ -121,82 +125,6 @@ to the playlist.
 .BI "--replace " filename|URI
 Tell an already-running instance of Totem to play 
 from the playlist.
-.P
-The following options are standard to applications using the
-GDK and GTK+ libraries:
-.TP
-.BI --gdk-debug= flags
-GDK debugging flags to set.
-.TP
-.BI --gdk-no-debug= flags
-GDK debugging flags to unset.
-.TP
-.BI --display= display
-X display to use
-.TP
-.BI --screen= screen
-X screen to use.
-.TP
-.BI --sync
-Make X calls synchronous to facilitate debugging.
-.TP
-.BI --name= name
-Program name as used by the window manager.
-.TP
-.BI --class= class
-Program class a sused by the window manager.
-.TP
-.BI --gxid-host= host
-.TP
-.BI --gxid-port= port
-.TP
-.B --g-fatal-warnings
-Make all warnings fatal.
-.TP
-.BI --gtk-debug= flags
-GTK+ debugging flags to set.
-.TP
-.BI --gtk-no-debug= flags
-GTK+ debugging flags to unset
-.TP
-.BI --gtk-module= module
-Load an additional GTK module.
-.P
-The following options are for Bonobo activation support
-.TP
-.BI --oaf-ior-fd= fd
-File descriptor to print IOR on
-.TP
-.BI --oaf-activate-iid= iid
-IID to activate.
-.TP
-.BI --oaf-private
-Prevent registering of server with OAF
-.P
-The following are standard GNOME options:
-.TP
-.BI --disable-sound
-Disable sound server use.
-.TP
-.BI --enable-sound
-Enable sound server use.
-.TP
-.BI --espeaker= hostname : port
-Specify the host and port on which the sound server is listening.
-.TP
-.BI --disable-crash-dialog
-Disable the crash-reporting dialog.
-.P
-The following options are for session management:
-.TP
-.BI --sm-client-id= ID
-Specify session management ID
-.TP
-.BI --sm-config-prefix= prefix
-Specify prefix of saved configuration
-.TP
-.BI --sm-disable
-Disable connecting to session manager.
 .SH KEYBINDINGS
 Global keybindings for
 .BR Totem :