[vidalia-svn] r2155: Who knew Merriam-Webster hung out in #vidalia? Also make Dox (in trunk: . src/util)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-01 12:48:14 -0500 (Sat, 01 Dec 2007)
New Revision: 2155

Modified:
   trunk/
   trunk/src/util/stringutil.cpp
   trunk/src/util/stringutil.h
   trunk/src/util/torsocket.h
   trunk/src/util/torsslsocket.h
Log:
 r2191@lysithea:  edmanm | 2007-12-01 12:48:05 -0500
 Who knew Merriam-Webster hung out in #vidalia? Also make Doxygen stop yelling
 at me too.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2191] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/src/util/stringutil.cpp
===================================================================
--- trunk/src/util/stringutil.cpp	2007-12-01 08:55:02 UTC (rev 2154)
+++ trunk/src/util/stringutil.cpp	2007-12-01 17:48:14 UTC (rev 2155)
@@ -20,7 +20,7 @@
  ****************************************************************/
 
 /** 
- * \file string.cpp
+ * \file stringutil.cpp
  * \version $Id$
  * \brief Common string manipulation functions
  */

Modified: trunk/src/util/stringutil.h
===================================================================
--- trunk/src/util/stringutil.h	2007-12-01 08:55:02 UTC (rev 2154)
+++ trunk/src/util/stringutil.h	2007-12-01 17:48:14 UTC (rev 2155)
@@ -20,7 +20,7 @@
  ****************************************************************/
 
 /** 
- * \file string.h
+ * \file stringutil.h
  * \version $Id$
  * \brief Common string manipulation functions
  */

Modified: trunk/src/util/torsocket.h
===================================================================
--- trunk/src/util/torsocket.h	2007-12-01 08:55:02 UTC (rev 2154)
+++ trunk/src/util/torsocket.h	2007-12-01 17:48:14 UTC (rev 2155)
@@ -48,7 +48,7 @@
   /** Emitted when a connection has been established through Tor to the remote
    * host specified in a prior call to connectToHost(). */
   void connectedToRemoteHost();
-  /** Emmitted when a connection error has occurred. */
+  /** Emitted when a connection error has occurred. */
   void socketError(QString errmsg);
   
 private slots:

Modified: trunk/src/util/torsslsocket.h
===================================================================
--- trunk/src/util/torsslsocket.h	2007-12-01 08:55:02 UTC (rev 2154)
+++ trunk/src/util/torsslsocket.h	2007-12-01 17:48:14 UTC (rev 2155)
@@ -52,7 +52,7 @@
   /** Emitted when a connection has been established through Tor to the remote
    * host specified in a prior call to connectToHost(). */
   void connectedToRemoteHost();
-  /** Emmitted when a connection error has occurred. */
+  /** Emitted when a connection error has occurred. */
   void socketError(QString errmsg);
     
 private slots: