[PATCH 1/2] Comments in speechd.conf.in updated and polished

[Hynek Hanke]

---
 config/speechd.conf.in |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/config/speechd.conf.in b/config/speechd.conf.in
index f17e28f..c136a99 100644
--- a/config/speechd.conf.in
+++ b/config/speechd.conf.in
@@ -150,24 +150,18 @@ DefaultVolume 100
 # -- AUDIO OUTPUT --
 
 # Chooses between three possible sound output systems:
-#       "oss"   - Open Sound System
+#       "pulse" - PulseAudio
 #       "alsa"  - Advanced Linux Sound System
+#       "oss"   - Open Sound System
 #       "nas"   - Network Audio System
-#       "pulse" - PulseAudio
-# ALSA is default and recommended. The recent implementations
-# support mixing of multiple streams. OSS is only provided
-# for compatibility with architectures that do not include ALSA.
-# NAS is an audio server with higher level of control over
-# your audio stream, with the possibility to stream your audio
-# over the network to a different computer and other advanced
-# features. (The NAS backend is not very well tested however.)
-# PulseAudio is a sound server for POSIX and WIN32 systems. 
-#
+# Pulse audio is default and recommended sound server. OSS and ALSA
+# are only provided for compatibility with architectures that do not
+# include Pulse Audio.  NAS provides network transparency, but is not
+# very well tested.
 
-# AudioOutputMethod "pulse,alsa"
+# AudioOutputMethod "pulse"
 
-# What ALSA device to use when Advanced Linux Sound Architecture is
-# chosen for the audio output.
+# What ALSA device to use when ALSA is chosen for the audio output.
 
 #AudioALSADevice "default"
 
@@ -175,24 +169,24 @@ DefaultVolume 100
 
 #AudioPulseServer "default"
 
-# Maximum length of the buffer
+# Maximum length of the buffer for Pulse Audio
 
 #AudioPulseMaxLength -1
 
-# Target length of the buffer
-# The server tries to assure that at least FestivalPulseTargetLength
+# Target length of the buffer for Pulse Audio
+# The server tries to assure that at least AudioPulseTargetLength
 # bytes are always available in the buffer
 
 #AudioPulseTargetLength 4410
 
-# Pre-buffering
+# Pre-buffering in Pulse Audio
 # The server does not start with playback before at least 
-# FestivalPulsePrebuffering bytes are available in the buffer
+# AudiolPulsePrebuffering bytes are available in the buffer
 
 #AudioPulsePreBuffering -1
 
-# Minimum request
-# The server does not request less than FestivalPulseMinRequest bytes
+# Minimum request in Pulse Audio
+# The server does not request less than AudioPulseMinRequest bytes
 # from the client, instead waits until the buffer is free enough to
 # request more bytes at once
 
-- 
1.7.0.4