Merge from fe-moved

(bzr r6891)

6 files changed, 27 insertions, 28 deletions

diff --git a/src/application/app-prototype.cpp b/src/application/app-prototype.cpp
index 3af818824..3d9aa15e8 100644
--- a/src/application/app-prototype.cpp
+++ b/src/application/app-prototype.cpp
@@ -1,7 +1,7 @@
-/**
- * \brief  Base class for different application modes
- *
- * Author:
+/** @file
+ * @brief  Base class for different application modes
+ */
+/* Author:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *
  * Copyright (C) 2005 Bryce Harrington
@@ -40,4 +40,4 @@ AppPrototype::~AppPrototype()
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
\ No newline at end of file
diff --git a/src/application/app-prototype.h b/src/application/app-prototype.h
index a7c8ad86f..a31bfa7d8 100644
--- a/src/application/app-prototype.h
+++ b/src/application/app-prototype.h
@@ -1,7 +1,7 @@
-/**
- * \brief  Base class for different application modes
- *
- * Author:
+/** @file
+ * @brief  Base class for different application modes
+ */
+/* Author:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *
  * Copyright (C) 2005 Bryce Harrington
@@ -50,4 +50,4 @@ protected:
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
\ No newline at end of file
diff --git a/src/application/application.cpp b/src/application/application.cpp
index c7aa28971..ab516b9d4 100644
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -1,7 +1,7 @@
-/** \file
- * \brief  The top level class for managing the application.
- *
- * Authors:
+/** @file
+ * @brief  The top level class for managing the application
+ */
+/* Authors:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *   Ralf Stephan <ralf@ark.in-berlin.de>
  *
diff --git a/src/application/application.h b/src/application/application.h
index 212add9e8..fce6bd47f 100644
--- a/src/application/application.h
+++ b/src/application/application.h
@@ -1,7 +1,7 @@
-/** \file
- * \brief  The top level class for managing the application.
- *
- * Authors:
+/** @file
+ * @brief  The top level class for managing the application.
+ */
+/* Authors:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *   Ralf Stephan <ralf@ark.in-berlin.de>
  *
diff --git a/src/application/editor.cpp b/src/application/editor.cpp
index 0b8ac263e..24c811778 100644
--- a/src/application/editor.cpp
+++ b/src/application/editor.cpp
@@ -1,9 +1,9 @@
-/** \file
- * \brief Editor Implementation class declaration for Inkscape.  This
+/** @file
+ * @brief Editor class declaration.  This
  *        singleton class implements much of the functionality of the former 
  *        'inkscape' object and its services and signals.
- *
- * Authors:
+ */
+/* Authors:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *   Derek P. Moore <derekm@hackunix.org>
  *   Ralf Stephan <ralf@ark.in-berlin.de>
diff --git a/src/application/editor.h b/src/application/editor.h
index 1eed9a267..4545022b8 100644
--- a/src/application/editor.h
+++ b/src/application/editor.h
@@ -1,9 +1,8 @@
-/** \file
- * \brief  Class to manage an application used for editing SVG documents
- *         using GUI views
- *
- * \note  This class is a Singleton
- *
+/** @file
+ * @brief  Singleton class to manage an application used for editing SVG
+ *         documents using GUI views
+ */
+/*
  * Authors:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *   Ralf Stephan <ralf@ark.in-berlin.de>