Index: src/orca/speechserver.py
===================================================================
--- src/orca/speechserver.py	(revision 2533)
+++ src/orca/speechserver.py	(working copy)
@@ -205,7 +205,7 @@
             event_string += " " + _("off")
 
         debug.println(debug.LEVEL_INFO, "SPEECH OUTPUT: '" + event_string +"'")
-        log.info("'%s'" % event_string)
+        log.info("speakKeyEvent utterance='%s'" % event_string)
 
         self.speak(event_string, acss=voice)
 
@@ -260,7 +260,7 @@
         for [context, acss] in utteranceIterator:
             debug.println(debug.LEVEL_INFO,
                           "SPEECH OUTPUT: '" + context.utterance + "'")
-            log.info("'%s'" % context.utterance)
+            log.info("sayAll utterance='%s'" % context.utterance)
             self.speak(context.utterance, acss)
 
     def increaseSpeechRate(self, step=5):
Index: src/orca/speech.py
===================================================================
--- src/orca/speech.py	(revision 2533)
+++ src/orca/speech.py	(working copy)
@@ -33,7 +33,6 @@
 
 import debug
 import orca_state
-import platform
 import settings
 
 from acss import ACSS
@@ -122,6 +121,11 @@
         return
     if _speechserver:
         _speechserver.sayAll(utteranceIterator, progressCallback)
+    else:
+        for [context, acss] in utteranceIterator:
+            debug.println(debug.LEVEL_INFO,
+                          "SPEECH OUTPUT: '" + context.utterance + "'")
+            log.info("sayAll utterance='%s'" % context.utterance)
 
 def speak(text, acss=None, interrupt=True):
     """Speaks all queued text immediately.  If text is not None,
@@ -148,7 +152,7 @@
         return
 
     debug.println(debug.LEVEL_INFO, "SPEECH OUTPUT: '" + text + "'")
-    log.info("'%s'" % text)
+    log.info("speak utterance='%s'" % text)
 
     if _speechserver:
         _speechserver.speak(text, __resolveACSS(acss), interrupt)
@@ -200,7 +204,7 @@
     for utterance in utterances:
         debug.println(debug.LEVEL_INFO,
                       "SPEECH OUTPUT: '" + utterance + "'")
-        log.info("'%s'" % utterance)
+        log.info("speakUtterances utterance='%s'" % utterance)
 
     if _speechserver:
         _speechserver.speakUtterances(utterances,
Index: src/orca/braille.py
===================================================================
--- src/orca/braille.py	(revision 2533)
+++ src/orca/braille.py	(working copy)
@@ -28,7 +28,7 @@
 __id__        = "$Id$"
 __version__   = "$Revision$"
 __date__      = "$Date$"
-__copyright__ = "Copyright (c) 2005-2006 Sun Microsystems Inc."
+__copyright__ = "Copyright (c) 2005-2007 Sun Microsystems Inc."
 __license__   = "LGPL"
 
 import logging
@@ -831,13 +831,12 @@
         cursorCell += 1 # Normalize to 1-based offset
 
     debug.println(debug.LEVEL_INFO, "BRAILLE LINE:  '%s'" % string)
-    log.info("line:'%s'" % string)
-
     debug.println(debug.LEVEL_INFO, "     VISIBLE:  '%s', cursor=%d" \
                   % (string[startPos:endPos], cursorCell))
-    log.info("visible:'%s'" % string[startPos:endPos])
-    log.info("cursor:%d" % cursorCell)
 
+    log.info("refresh line='%s', visible='%s', cursor=%d" \
+             % (string, string[startPos:endPos], cursorCell))
+
     string = string.decode("UTF-8")
     substring = string[startPos:endPos].encode("UTF-8")
     if useBrlAPIBindings:
Index: src/orca/gnomespeechfactory.py
===================================================================
--- src/orca/gnomespeechfactory.py	(revision 2533)
+++ src/orca/gnomespeechfactory.py	(working copy)
@@ -504,7 +504,7 @@
                                           "SPEECH OUTPUT: '" \
                                           + utterance \
                                           + "'")
-                            log.info("'%s'" % utterance)
+                            log.info("sayAll utterance='%s'" % utterance)
                             if utterance and len(utterance)\
                                and not utterance.isspace():
                                 self.__sayAll.idForCurrentContext = \
@@ -867,7 +867,7 @@
             [context, acss] = utteranceIterator.next()
             debug.println(debug.LEVEL_INFO,
                           "SPEECH OUTPUT: '" + context.utterance + "'")
-            log.info("'%s'" % context.utterance)
+            log.info("sayAll utterance='%s'" % context.utterance)
             self.__sayAll = _SayAll(utteranceIterator,
                                     context,
                                     self.__speak(context.utterance, acss),
Index: src/orca/debug.py
===================================================================
--- src/orca/debug.py	(revision 2533)
+++ src/orca/debug.py	(working copy)
@@ -1,6 +1,6 @@
 # Orca
 #
-# Copyright 2005-2006 Sun Microsystems Inc.
+# Copyright 2005-2007 Sun Microsystems Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -25,20 +25,10 @@
 __id__        = "$Id$"
 __version__   = "$Revision$"
 __date__      = "$Date$"
-__copyright__ = "Copyright (c) 2005-2006 Sun Microsystems Inc."
+__copyright__ = "Copyright (c) 2005-2007 Sun Microsystems Inc."
 __license__   = "LGPL"
 
-import logging
 import sys
-logging.basicConfig()
-
-log = logging.getLogger()
-
-# Set the level to INFO if you want the logging of speech and braille
-# output.
-#
-#log.setLevel(logging.INFO)
-
 import traceback
 
 # Used to turn off all debugging.
