Imported Upstream version 3.2

2 files changed, 17 insertions, 22 deletions

diff --git a/man/audacious.1.in b/man/audacious.1.in
index 167d8f0..b32b9c0 100644
--- a/man/audacious.1.in
+++ b/man/audacious.1.in
@@ -1,4 +1,4 @@
-.TH AUDACIOUS "1" "April 2009" "Version @PACKAGE_VERSION@" "Audacious"
+.TH AUDACIOUS "1" "April 2009" "Version @VERSION@" "Audacious"
 
 .SH NAME
 audacious \- an advanced audio player.
@@ -182,8 +182,6 @@ Control + Alt + w	Toggle rolling up equalizer
 .br
 Shift + Control + w	Toggle rolling up playlist
 .br
-Control + d	Toggle double size
-.br
 i	Display Song Information dialog
 .br
 Control + j	Display Jump to Time dialog
@@ -215,14 +213,14 @@ User's set of Audacious-specific GTK+ config settings. Options such as widget
 color and fonts sizes can be set here.
 .TP
 ~/.local/share/audacious/Skins, @datarootdir@/audacious/Skins
-Default location(s) where Audacious should look for skinfiles.
+Default location(s) where Audacious should look for skin files.
 .TP
 ~/.local/share/audacious/Plugins
 Location of user-installed plugins.
 .SH ENVIRONMENT
 .TP 12
 .B SKINSDIR
-Colon separated list of paths where Audacious should look for skinfiles.
+Colon separated list of paths where Audacious should look for skin files.
 .TP
 .B TARCMD
 Tar command supporting GNU tar style decompression.  Used for
diff --git a/man/audtool.1.in b/man/audtool.1.in
index 71cff5e..d2438f7 100644
--- a/man/audtool.1.in
+++ b/man/audtool.1.in
@@ -69,10 +69,10 @@ Go to the next song in the playlist.
 Go to the previous song in the playlist.
 .TP
 .I --playlist-addurl <uri>
-Adds a uri to the playlist.
+Adds a URI to the playlist.
 .TP
 .I --playlist-insurl <uri> <position>
-Inserts a url at specified position in the playlist.
+Inserts a URL at specified position in the playlist.
 .TP
 .I --playlist-delete <position>
 Deletes the song at <position> from the playlist.
@@ -119,6 +119,12 @@ Returns the status of playlist shuffle.
 .I --playlist-shuffle-toggle
 Toggles playlist shuffle.
 .TP
+.I --playlist-stop-after-status
+Queries whether the "stop after current song" option is set.
+.TP
+.I --playlist-stop-after-toggle
+Toggles the "stop after current song" option.
+.TP
 .I --playlist-tuple-data <fieldname> <position>
 Returns the value of a tuple field for a song in the playlist.
 .PP
@@ -131,7 +137,7 @@ Adds the song at <position> in the playlist to the playqueue.
 Removes the song at <position> in the playlist from the playqueue.
 .TP
 .I --playqueue-is-queued <position>
-Returns OK if the song at <postion> in the playtlist is queued.
+Returns OK if the song at <position> in the playlist is queued.
 .TP
 .I --playqueue-get-position <position>
 Returns the playqueue position of the song at <position> in the playlist.
@@ -178,10 +184,10 @@ Returns OK if audacious is stopped.
 Returns the playback status.
 .TP
 .I --playback-seek
-Performs an absolute seek in milliseconds.
+Performs an absolute seek in seconds.
 .TP
 .I --playback-seek-relative
-Performs a seek relative to the current position in milliseconds.
+Performs a seek relative to the current position in seconds.
 .PP
 .B "Volume control:"
 .TP
@@ -219,12 +225,6 @@ Sets the equalizer value in specified band.
 .I --mainwin-show <on/off>
 Shows/hides the main window.
 .TP
-.I --playlist-show <on/off>
-Shows/hides the playlist window.
-.TP
-.I --equalizer-show <on/off>
-Shows/hides the equalizer window.
-.TP
 .I --filebrowser-show <on/off>
 Shows/hides the filebrowser.
 .TP
@@ -237,14 +237,11 @@ Shows/hides the preferences window.
 .I --about-show <on/off>
 Shows/hides the about window.
 .TP
-.I --activate
-Activates and raises audacious.
-.TP
 .I --always-on-top <on/off>
 Enables/disables always on top setting.
 .TP
 .I --version
-Displays version information for the Audacious2 core.
+Displays Audacious version.
 .TP
 .I --shutdown
 Shuts down audacious.
@@ -260,7 +257,7 @@ Shows handlers list.
 Handlers may be prefixed with `\-\-' (GNU\-style long\-options) or not, your choice.
 .SH BUGS
 There are no known bugs in audtool at this time; if you find any please
-report them on www.atheme.org in the Audacious issue tracker.
+report them on www.redmine.audacious-media-player.org in the Audacious issue tracker.
 .SH AUTHORS
 .B audtool
 was written by George Averill <nhjm@nhjm.net> and William
@@ -275,7 +272,7 @@ under the terms of the GNU General Public License, Version 2 or any
 later version published by the Free Software Foundation.
 .PP
 The complete text of the GNU General Public License is available in the
-sourcecode of Audacious, and is typically included with binary packages
+source code of Audacious, and is typically included with binary packages
 as well.
 .PP
 If installed with an operating system, see your Operating System's