Index: branches/v2.9/classes/help/en/cwmm.ipf
===================================================================
--- branches/v2.9/classes/help/en/cwmm.ipf	(revision 16)
+++ branches/v2.9/classes/help/en/cwmm.ipf	(revision 17)
@@ -5,5 +5,4 @@
 .* ----------------------------------------------------------------------------
 :h1 res=010.MP3 audio file
-
 :p.This file is an MP3 audio file. It may be played using MMOS/2 when a suitable
 MP3 MMIOProc has been installed.
@@ -21,5 +20,4 @@
 .* ----------------------------------------------------------------------------
 :h1 res=011.ID3 tag
-
 :p.Use this page to edit selected ID3 tag fields.
 
@@ -70,5 +68,4 @@
 .* ----------------------------------------------------------------------------
 :h1 res=013.ID3 tag
-
 :p.This page displays selected fields of the ID3 tag attached to the MP3 file.
 
@@ -119,5 +116,4 @@
 .* ----------------------------------------------------------------------------
 :h1 res=012.Track meta
-
 :p.Use this page to edit track information. Unlike an ID3 tag, the contents of
 these fields will be saved in the extended attributes of the file upon pressing
@@ -165,5 +161,4 @@
 .* ----------------------------------------------------------------------------
 :h1 res=014.Audio details
-
 :p.This page displays various technical details about the selected audio track.
 
@@ -196,5 +191,4 @@
 .* ----------------------------------------------------------------------------
 :h1 res=020.Ogg audio file
-
 :p.This file is an Ogg audio file. It may be played using MMOS/2 when a suitable
 Ogg MMIOProc has been installed. Ogg is actually a container format, and may
@@ -214,5 +208,4 @@
 .* ----------------------------------------------------------------------------
 :h1 res=030.CD audio track
-
 :p.This file is a CD audio track. The track name and other info is queried from
 a CDDB server if an internet connection is available. The information presented
@@ -228,6 +221,5 @@
 .* ----------------------------------------------------------------------------
 :h1 res=040.M3U playlist
-
-:p.This file is an M3U URL (Moving Picture Experts Group Audio Layer 3 Uniform
+:p.This file is an M3U (Moving Picture Experts Group Audio Layer 3 Uniform
 Resource Locator) playlist. M3U is a :hp1.de facto:ehp1. standard, generally
 recognized by most MP3 players.
@@ -246,5 +238,4 @@
 .* ----------------------------------------------------------------------------
 :h1 res=050.Audio stream
-
 :p.This object a stream from provided by a streaming server on the LAN or across
 the internet. The URL for the server is specified in the properties notebook for
Index: branches/v2.9/mediafolder/Help/mediafldr.ipf
===================================================================
--- branches/v2.9/mediafolder/Help/mediafldr.ipf	(revision 16)
+++ branches/v2.9/mediafolder/Help/mediafldr.ipf	(revision 17)
@@ -5,106 +5,106 @@
 :title.Help for Media Folder distribution 
 
-:h1 res=100.Help for Media Player
-:p.
-This object is a Media-Folder. Put any audio file into it
-for playing. Specify the order of the tracks using drag and drop.
-The usual play controls are available like play, stop or volume.
-:p.
-More information and updates:
-:p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.os2world.com/cdwriting'.
-http&colon.//www.os2world.com/cdwriting:elink.
-.br
-:link reftype=launch
-object='netscape.exe'
-data='http://www.geocities.com/SiliconValley/Sector/5785/'.
-http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
-:p.
+.* ----------------------------------------------------------------------------
+:h1 res=100.Media player
+:p.This object is a Media folder. Drag one or more audio files into it for
+playing. To reorder, ensure that :hp1.Always maintain sort order:ehp1. option on
+the :hp2.Sort:ehp2. submenu is deselected, as well as any other sort options
+which might affect manual ordering, and drag and drop the tracks as desired.
+
+:p.Use the buttons to control playback. The Repeat checkbox will cause the
+currently selected track to continuously replay. The Random checkbox will select
+tracks arbitrarily, unless the Repeat checkbox has been set.
+
+:p.More information and updates&colon.
+
+:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
+
 :nt.
-:p.
-For playing of MP3 files you need the MMIOMP3 procedure written
-by Russell O'Connor.
-:p.
-Get it from
-:p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.math.berkeley.edu/~roconnor/'.
-http&colon.//www.math.berkeley.edu/~roconnor/:elink.
+A suitable MP3 MMIOProc is required in order to play MP3 files, as is a suitable
+MMIOProc for Ogg (Vorbis and FLAC) files. These are included in the MMAudio Pak
+2, available from&colon.
+
+:p.http&colon.//r6.ca/MMAudioPak/
+
+:p.(Ogg formats are supported by default in ArcaOS 5.x and above.)
 :ent.
-:p.
-:hp2.Keyboard control:ehp2.
-:p.
-Use the following keys to control the media folder. The buttons in the upper part
-of the folder must have the focus when using the keys. Use :hp2.TAB:ehp2. to switch
-the focus from the container to the buttons.
-:p.
-:ul.
-:li.:hp8.B:ehp8.ack
-:li.:hp8.S:ehp8.top
-:li.:hp8.P:ehp8.ause
-:li.P:hp8.l:ehp8.ay
-:li.:hp8.N:ehp8.ext
-:li.:hp8.R:ehp8.epeat
+
+:p.:hp2.Keyboard control:ehp2.
+
+:p.Use the following keys to control the Media folder. The buttons in the upper
+part of the folder must have focus when using these keys. Use
+:hp2.&lt.Tab&gt.:ehp2. to switch the focus from the container to the buttons.
+
+:ul compact.
+:li.:hp2.B:ehp2.ack
+:li.:hp2.S:ehp2.top
+:li.:hp2.P:ehp2.ause
+:li.P:hp2.l:ehp2.ay
+:li.:hp2.N:ehp2.ext
+:li.:hp2.R:ehp2.epeat
+:li.R:hp2.a:ehp2.ndom
 :eul.
 
-:h1 res=200.Help for CD-Player
-:p.
-This object is a CD player with FreeDB support. Tracktitles and other information
-are queried from a FreeDB server if an internet connection is available. 
-:p.
-More information and updates:
-:p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.os2world.com/cdwriting'.
-http&colon.//www.os2world.com/cdwriting:elink.
-.br
-:link reftype=launch
-object='netscape.exe'
-data='http://www.geocities.com/SiliconValley/Sector/5785/'.
-http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
-:p.
+:p.:hp2.Track position slider:ehp2.
+
+:p.To the right of the player buttons is the Track position slider. Drag the
+slider forward or back to reposition the playback point of the current file.
+
+.* ----------------------------------------------------------------------------
+:h1 res=200.CD player
+:p.This object is a CD player with CDDB support. Track titles and other metadata
+are queried from a configured FreeDB-compatible server if an internet connection
+is available.
+
+:p.More information and updates&colon.
+
+:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
+
 :nt.
-To use FreeDB servers you have to install the appropriate package and you must
-specify an email address. Use the configuration object to do so.
+Most CDDB servers follow the FreeDB practice of requiring a valid email address
+for access. Use the FreeDB Client configuration object in the Multimedia folder
+to set this.
 :ent.
-:p.
-:hp2.Keyboard control:ehp2.
-:p.
-Use the following keys to control the player. The buttons in the upper part
-of the window must have the focus when using the keys. Use :hp2.TAB:ehp2. to switch
-the focus from the container to the buttons.
-:p.
-:ul.
-:li.:hp8.B:ehp8.ack
-:li.:hp8.S:ehp8.top
-:li.:hp8.P:ehp8.ause
-:li.P:hp8.l:ehp8.ay
-:li.:hp8.N:ehp8.ext
-:li.:hp8.R:ehp8.epeat
+
+:p.:hp2.Keyboard control:ehp2.
+
+:p.Use the following keys to control the CD Player. The buttons in the upper
+part of the player must have focus when using these keys. Use
+:hp2.&lt.Tab&gt.:ehp2. to switch the focus from the container to the buttons.
+
+:ul compact.
+:li.:hp2.B:ehp2.ack
+:li.:hp2.S:ehp2.top
+:li.:hp2.P:ehp2.ause
+:li.P:hp2.l:ehp2.ay
+:li.:hp2.N:ehp2.ext
+:li.:hp2.R:ehp2.epeat
 :eul.
 
-:h1 res=300.Help for playlist editor
-:p.
-Use the playlist editor to create or modify M3U playlists. These playlists
-are for example used by portable MP3 players. Such a playlist file is a text file
-containing the filenames of every track to be played.
-:p.
-Weitere Informationen und Updates:
-:p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.os2world.com/cdwriting'.
-http&colon.//www.os2world.com/cdwriting:elink.
-.br
-:link reftype=launch
-object='netscape.exe'
-data='http://www.geocities.com/SiliconValley/Sector/5785/'.
-http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
+:p.:hp2.Track position slider:ehp2.
 
+:p.To the right of the player buttons is the Track position slider. Drag the
+slider forward or back to reposition the playback point of the current track.
+
+.* ----------------------------------------------------------------------------
+:h1 res=300.Playlist editor
+:p.Use the Playlist editor to modify M3U playlists. An M3U playlist is a text
+file which contains paths (URLs) to the tracks it references.
+
+:p.M3U (Moving Picture Experts Group Audio Layer 3 Uniform Resource Locator) is
+a :hp1.de facto:ehp1. standard, generally recognized by most MP3 players.
+
+:p.To add tracks, simply drag and drop them into the editor. To reorder, ensure
+that :hp1.Always maintain sort order:ehp1. option on the :hp2.Sort:ehp2. submenu
+is deselected, as well as any other sort options which might affect manual
+ordering, and drag and drop the tracks as desired. Save the playlist by
+selecting :hp2.File | Save:ehp2. from the menu.
+
+:p.To create a new playlist, drag the M3U playlist template from the Multimedia
+Templates folder to a suitable location on the desktop.
+
+:p.More information and updates&colon.
+
+:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
 
 :euserdoc.
-
