From 7cbe56d12ec3a8dcb0a14758866ae68daa39b6e8 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Mon, 11 Mar 2002 17:00:41 +0000
Subject: [PATCH] sourcedoc-friendly files.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3713 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/xforms/Alert_pimpl.C        | 18 +++++++++-------
 src/frontends/xforms/Color.C              | 22 ++++++++-----------
 src/frontends/xforms/Color.h              | 19 ++++++++++-------
 src/frontends/xforms/Dialogs.C            | 14 ++++++------
 src/frontends/xforms/DropDown.C           |  6 +++++-
 src/frontends/xforms/DropDown.h           |  7 +++++-
 src/frontends/xforms/FeedbackController.C |  7 +++---
 src/frontends/xforms/FeedbackController.h |  5 +++--
 src/frontends/xforms/FileDialog.C         | 24 +++++++++------------
 src/frontends/xforms/FormAboutlyx.C       |  6 +++---
 src/frontends/xforms/FormAboutlyx.h       |  4 ++--
 src/frontends/xforms/FormBase.C           | 14 +++++-------
 src/frontends/xforms/FormBase.h           | 17 +++++++--------
 src/frontends/xforms/FormBaseDeprecated.C | 14 +++++-------
 src/frontends/xforms/FormBaseDeprecated.h | 26 ++++++++++-------------
 src/frontends/xforms/FormBibitem.h        |  2 +-
 src/frontends/xforms/FormBibtex.C         |  6 +++---
 src/frontends/xforms/FormBibtex.h         |  4 ++--
 src/frontends/xforms/FormBrowser.C        | 12 +++++++----
 src/frontends/xforms/FormBrowser.h        |  7 +++---
 src/frontends/xforms/FormCharacter.h      |  2 +-
 src/frontends/xforms/FormCitation.C       | 14 ++++--------
 src/frontends/xforms/FormCitation.h       | 15 +++++--------
 src/frontends/xforms/FormDocument.C       | 15 ++++++-------
 src/frontends/xforms/FormDocument.h       | 16 ++++++--------
 src/frontends/xforms/FormERT.C            | 13 ++++--------
 src/frontends/xforms/FormERT.h            | 15 +++++--------
 src/frontends/xforms/FormError.C          | 12 +++--------
 src/frontends/xforms/FormError.h          | 14 ++++--------
 src/frontends/xforms/FormExternal.C       | 15 +++++--------
 src/frontends/xforms/FormExternal.h       | 17 ++++++---------
 src/frontends/xforms/FormFiledialog.C     |  2 +-
 src/frontends/xforms/FormFiledialog.h     |  2 +-
 src/frontends/xforms/FormFloat.C          | 14 +++++-------
 src/frontends/xforms/FormFloat.h          | 14 +++++-------
 src/frontends/xforms/FormForks.C          |  2 +-
 src/frontends/xforms/FormForks.h          |  4 ++--
 src/frontends/xforms/FormGraphics.C       | 13 ++++--------
 src/frontends/xforms/FormGraphics.h       | 13 ++++--------
 src/frontends/xforms/FormInclude.C        |  2 +-
 src/frontends/xforms/FormInclude.h        |  2 +-
 src/frontends/xforms/FormIndex.C          | 13 ++++--------
 src/frontends/xforms/FormIndex.h          | 13 ++++--------
 src/frontends/xforms/FormInset.C          | 12 +++++------
 src/frontends/xforms/FormInset.h          | 16 ++++++++------
 src/frontends/xforms/FormLog.C            | 12 +++++++----
 src/frontends/xforms/FormLog.h            |  5 +++--
 src/frontends/xforms/FormMinipage.C       | 13 ++++--------
 src/frontends/xforms/FormMinipage.h       | 15 +++++--------
 src/frontends/xforms/FormParagraph.C      | 15 ++++++-------
 src/frontends/xforms/FormParagraph.h      | 16 ++++++--------
 src/frontends/xforms/FormPreferences.C    | 15 +++++--------
 src/frontends/xforms/FormPreferences.h    | 19 ++++++-----------
 src/frontends/xforms/FormPrint.C          |  2 +-
 src/frontends/xforms/FormPrint.h          | 19 ++++++-----------
 src/frontends/xforms/FormRef.C            | 15 +++++--------
 src/frontends/xforms/FormRef.h            | 15 +++++--------
 src/frontends/xforms/FormSearch.C         |  2 +-
 src/frontends/xforms/FormSearch.h         |  2 +-
 src/frontends/xforms/FormSendto.C         |  2 +-
 src/frontends/xforms/FormSendto.h         |  2 +-
 src/frontends/xforms/FormShowFile.C       |  9 +++++---
 src/frontends/xforms/FormShowFile.h       | 10 ++++-----
 src/frontends/xforms/FormSpellchecker.C   |  2 +-
 src/frontends/xforms/FormSpellchecker.h   |  2 +-
 src/frontends/xforms/FormTabular.C        | 15 +++++--------
 src/frontends/xforms/FormTabular.h        | 16 ++++++--------
 src/frontends/xforms/FormTabularCreate.C  | 14 +++++-------
 src/frontends/xforms/FormTabularCreate.h  | 16 ++++++--------
 src/frontends/xforms/FormTexinfo.C        |  2 +-
 src/frontends/xforms/FormTexinfo.h        |  2 +-
 src/frontends/xforms/FormThesaurus.C      |  2 +-
 src/frontends/xforms/FormThesaurus.h      |  2 +-
 src/frontends/xforms/FormToc.C            | 14 ++++--------
 src/frontends/xforms/FormToc.h            | 15 +++++--------
 src/frontends/xforms/FormUrl.C            | 16 ++++++--------
 src/frontends/xforms/FormUrl.h            | 15 +++++--------
 src/frontends/xforms/FormVCLog.C          |  9 +++++---
 src/frontends/xforms/FormVCLog.h          |  9 ++++----
 src/frontends/xforms/GUIRunTime.C         | 13 ++++++------
 src/frontends/xforms/MathsSymbols.C       |  2 +-
 src/frontends/xforms/MathsSymbols.h       |  2 +-
 src/frontends/xforms/Menubar_pimpl.C      | 15 ++++++-------
 src/frontends/xforms/Menubar_pimpl.h      | 18 +++++++---------
 src/frontends/xforms/RadioButtonGroup.C   | 16 +++++++-------
 src/frontends/xforms/RadioButtonGroup.h   | 16 ++++++--------
 src/frontends/xforms/Timeout_pimpl.C      |  4 ++--
 src/frontends/xforms/Timeout_pimpl.h      |  4 ++--
 src/frontends/xforms/Toolbar_pimpl.C      | 19 +++++++----------
 src/frontends/xforms/Toolbar_pimpl.h      | 17 ++++++---------
 src/frontends/xforms/Tooltips.C           |  5 ++++-
 src/frontends/xforms/Tooltips.h           | 24 +++++++++++++--------
 src/frontends/xforms/bmtable.h            | 24 ++++++++++-----------
 src/frontends/xforms/combox.C             | 20 +++++++++--------
 src/frontends/xforms/combox.h             | 24 ++++++++++-----------
 src/frontends/xforms/input_validators.C   |  5 +++++
 src/frontends/xforms/input_validators.h   | 23 ++++++++++----------
 src/frontends/xforms/xformsBC.C           | 13 ++++--------
 src/frontends/xforms/xformsBC.h           | 13 ++++--------
 src/frontends/xforms/xformsGImage.C       |  2 +-
 src/frontends/xforms/xformsGImage.h       |  9 ++++----
 src/frontends/xforms/xforms_helpers.C     |  7 +++++-
 src/frontends/xforms/xforms_helpers.h     |  7 ++++++
 103 files changed, 501 insertions(+), 644 deletions(-)

diff --git a/src/frontends/xforms/Alert_pimpl.C b/src/frontends/xforms/Alert_pimpl.C
index 33436e3233..033b185124 100644
--- a/src/frontends/xforms/Alert_pimpl.C
+++ b/src/frontends/xforms/Alert_pimpl.C
@@ -3,20 +3,22 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #include <config.h>
 
-#include FORMS_H_LOCATION
- 
-#include <algorithm>
- 
-#include <gettext.h>
-#include "xforms_helpers.h"
- 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "Alert.h"
 #include "Alert_pimpl.h" 
+#include "xforms_helpers.h"
+#include "gettext.h"
+
+#include <algorithm>
+#include FORMS_H_LOCATION
  
 using std::pair;
 using std::make_pair;
diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index 82706e055e..aa1795b45d 100644
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -1,25 +1,21 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file Color.C
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
  *
- *======================================================*/
+ * \author Angus Leeming, a.leeming@ic.ac.uk
+ */
 
 #include <config.h>
 
-#include <algorithm> // max
-#include <cmath> // floor
-
-#include FORMS_H_LOCATION
-
 #ifdef __GNUG_
 #pragma implementation
 #endif
 
 #include "Color.h"
+#include <algorithm> // max
+#include <cmath> // floor
+#include FORMS_H_LOCATION
 
 using std::max;
 using std::min;
diff --git a/src/frontends/xforms/Color.h b/src/frontends/xforms/Color.h
index a257867afd..d90174a1eb 100644
--- a/src/frontends/xforms/Color.h
+++ b/src/frontends/xforms/Color.h
@@ -1,13 +1,16 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file Color.h
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2002 The LyX Team.
+ * Read the file COPYING
  *
- *======================================================*/
+ * \author Angus Leeming, a.leeming@ic.ac.uk
+ */
+
+/* structs RGBColor and HSVColor to enable simple conversion between
+ * color spaces.
+ */
 
 #ifndef COLOR_H
 #define COLOR_H
diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index de38fe37cc..7d8e7bfd35 100644
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -1,12 +1,10 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file Dialogs.C
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 The LyX Team.
+ * See the file COPYING.
  *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ======================================================
+ * \author Allan Rae, rae@lyx.org
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/DropDown.C b/src/frontends/xforms/DropDown.C
index 17cce0981f..096e3436a9 100644
--- a/src/frontends/xforms/DropDown.C
+++ b/src/frontends/xforms/DropDown.C
@@ -3,11 +3,15 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "DropDown.h"
 #include "xforms_helpers.h"
 
diff --git a/src/frontends/xforms/DropDown.h b/src/frontends/xforms/DropDown.h
index 8baccbe479..1fb4ccd074 100644
--- a/src/frontends/xforms/DropDown.h
+++ b/src/frontends/xforms/DropDown.h
@@ -1,14 +1,19 @@
+// -*- C++ -*-
 /**
  * \file DropDown.h
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #ifndef DROPDOWN_H
 #define DROPDOWN_H
  
+#ifdef __GNUG_
+#pragma interface
+#endif
+
 #include "LyXView.h"
 #include <sigc++/signal_system.h> 
 #include "LString.h"
diff --git a/src/frontends/xforms/FeedbackController.C b/src/frontends/xforms/FeedbackController.C
index 2450ec2ef6..6d3e4e78d3 100644
--- a/src/frontends/xforms/FeedbackController.C
+++ b/src/frontends/xforms/FeedbackController.C
@@ -1,11 +1,12 @@
-/*
+/**
  * \file FeedbackController.C
  * Copyright 2002 the LyX Team
  * Read the file COPYING
  *
  * \author Angus Leeming, a.leeming@ic.ac.uk
- *
- * A common interface for posting feedback messages to a message widget in
+ */
+
+/* A common interface for posting feedback messages to a message widget in
  * xforms.
  * Derive FormBase and FormBaseDeprecated from it, so daughter classes of
  * either can interface tooltips in the same way.
diff --git a/src/frontends/xforms/FeedbackController.h b/src/frontends/xforms/FeedbackController.h
index 69aa4a237c..93b94188b6 100644
--- a/src/frontends/xforms/FeedbackController.h
+++ b/src/frontends/xforms/FeedbackController.h
@@ -5,8 +5,9 @@
  * Read the file COPYING
  *
  * \author Angus Leeming, a.leeming@ic.ac.uk
- *
- * A common interface for posting feedback messages to a message widget in
+ **/
+
+/* A common interface for posting feedback messages to a message widget in
  * xforms.
  * Derive FormBase and FormBaseDeprecated from it, so daughter classes of
  * either can interface tooltips in the same way.
diff --git a/src/frontends/xforms/FileDialog.C b/src/frontends/xforms/FileDialog.C
index c876ffc0a3..0e42bb4f31 100644
--- a/src/frontends/xforms/FileDialog.C
+++ b/src/frontends/xforms/FileDialog.C
@@ -3,32 +3,28 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author John Levon
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-#include <gettext.h>
-#include <utility>
-
-#include "commandtags.h"
-
-#include "support/lstrings.h" 
-
+#include "FormFiledialog.h"
+#include "frontends/FileDialog.h"
 // temp. hack until Allow/prohibitInput is not
 // needed any more in src/ - for now it's simplest
 // to leave it there 
 #include "LyXView.h" 
 #include "bufferview_funcs.h"
- 
-#include "frontends/FileDialog.h"
-
-#include "FormFiledialog.h"
-
+#include "gettext.h"
+#include "commandtags.h"
 #include "debug.h"
+#include "support/lstrings.h" 
+#include <utility>
+
 
 using std::make_pair;
 using std::pair;
diff --git a/src/frontends/xforms/FormAboutlyx.C b/src/frontends/xforms/FormAboutlyx.C
index 306912f742..f6c1fbaba2 100644
--- a/src/frontends/xforms/FormAboutlyx.C
+++ b/src/frontends/xforms/FormAboutlyx.C
@@ -4,15 +4,15 @@
  * See the file COPYING.
  *
  * \author Edwin Leuven, leuven@fee.uva.nl
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-
 #include "xformsBC.h"
 #include "ControlAboutlyx.h"
 #include "FormAboutlyx.h"
diff --git a/src/frontends/xforms/FormAboutlyx.h b/src/frontends/xforms/FormAboutlyx.h
index 0a6de74eaf..0f27e7e84b 100644
--- a/src/frontends/xforms/FormAboutlyx.h
+++ b/src/frontends/xforms/FormAboutlyx.h
@@ -4,8 +4,8 @@
  * Copyright 2001 The LyX Team.
  * See the file COPYING.
  *
- * \author Edwin Leuven <leuven@fee.uva.nl>
- * \author Angus Leeming <a.leeming@.ac.uk>
+ * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMABOUTLYX_H
diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C
index f311472d43..420c85d456 100644
--- a/src/frontends/xforms/FormBase.C
+++ b/src/frontends/xforms/FormBase.C
@@ -1,13 +1,9 @@
-/* This file is part of
- * ====================================================== 
+/**
+ * \file FormBase.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h
index a11ff21b79..29c27abd73 100644
--- a/src/frontends/xforms/FormBase.h
+++ b/src/frontends/xforms/FormBase.h
@@ -1,14 +1,13 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
+/**
+ * \file FormBase.h
+ * Copyright 2000-2002 the LyX Team
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming, a.leeming@ic.ac.uk
+ */
+
+/* A base class for the MCV-ed xforms dialogs.
  */
 
 #ifndef FORMBASE_H
diff --git a/src/frontends/xforms/FormBaseDeprecated.C b/src/frontends/xforms/FormBaseDeprecated.C
index 23b1f395ac..0ab52cee51 100644
--- a/src/frontends/xforms/FormBaseDeprecated.C
+++ b/src/frontends/xforms/FormBaseDeprecated.C
@@ -1,17 +1,13 @@
-/* This file is part of
- * ====================================================== 
+/**
+ * \file FormBaseDeprecated.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
 
-#include FORMS_H_LOCATION
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
diff --git a/src/frontends/xforms/FormBaseDeprecated.h b/src/frontends/xforms/FormBaseDeprecated.h
index 67ca32fa35..33958833db 100644
--- a/src/frontends/xforms/FormBaseDeprecated.h
+++ b/src/frontends/xforms/FormBaseDeprecated.h
@@ -1,12 +1,16 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
+/**
+ * \file FormBase.h
+ * Copyright 2000-2002 the LyX Team
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
+ * \author Angus Leeming, a.leeming@ic.ac.uk
+ */
+
+/* A base class for those remaining xforms dialogs that haven't yet undergone
+ * the controller-view split.
+ * It is meant to be used solely as the parent class to FormBaseBI
+ * and FormBaseBD.
  */
 
 #ifndef FORMBASEDEPRECATED_H
@@ -29,14 +33,6 @@ class Dialogs;
 class LyXView;
 class Tooltips;
 
-/** This class is an XForms GUI base class.
-    It is meant to be used solely as the parent class to FormBaseBI
-    and FormBaseBD.
-    It has now been superceeded by the Controller/View split.
-    See FormBase.[Ch] for the way to go!
-    @author Angus Leeming
- */
-
 class FormBaseDeprecated : public DialogBase, public FeedbackController
 {
 public:
diff --git a/src/frontends/xforms/FormBibitem.h b/src/frontends/xforms/FormBibitem.h
index 9599fbc85a..7f8b1c700e 100644
--- a/src/frontends/xforms/FormBibitem.h
+++ b/src/frontends/xforms/FormBibitem.h
@@ -5,7 +5,7 @@
  * Read the file COPYING
  *
  * \author John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMBIBITEM_H
diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C
index 5b61ad4bd5..02678dee4c 100644
--- a/src/frontends/xforms/FormBibtex.C
+++ b/src/frontends/xforms/FormBibtex.C
@@ -3,9 +3,9 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author Angus Leeming
- * \author John Levon
- * \author Herbert Voss <voss@lyx.org>
+ * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author John Levon, moz@compsoc.man.ac.uk
+ * \author Herbert Voss, voss@lyx.org
  */
 
 #ifdef __GNUG__
diff --git a/src/frontends/xforms/FormBibtex.h b/src/frontends/xforms/FormBibtex.h
index 66a3241e77..c92edfd275 100644
--- a/src/frontends/xforms/FormBibtex.h
+++ b/src/frontends/xforms/FormBibtex.h
@@ -4,8 +4,8 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author Angus Leeming
- * \author John Levon
+ * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #ifndef FORMBIBTEX_H
diff --git a/src/frontends/xforms/FormBrowser.C b/src/frontends/xforms/FormBrowser.C
index f75ff009a3..54e9c910e5 100644
--- a/src/frontends/xforms/FormBrowser.C
+++ b/src/frontends/xforms/FormBrowser.C
@@ -1,13 +1,17 @@
-/* FormBrowser.C
- * (C) 2001 LyX Team
- * John Levon, moz@compsoc.man.ac.uk
+/**
+ * \file FormBrowser.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
 #include "FormBrowser.h"
 #include "form_browser.h"
 #include "xformsBC.h"
diff --git a/src/frontends/xforms/FormBrowser.h b/src/frontends/xforms/FormBrowser.h
index 58be37f7ae..884b8ed1cb 100644
--- a/src/frontends/xforms/FormBrowser.h
+++ b/src/frontends/xforms/FormBrowser.h
@@ -1,10 +1,11 @@
 // -*- C++ -*-
 /*
  * \file FormBrowser.h
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
  *
- * (C) 2001 LyX Team
- * John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author John Levon, moz@compsoc.man.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMBROWSER_H
diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h
index 8e6fd23233..86018efbd1 100644
--- a/src/frontends/xforms/FormCharacter.h
+++ b/src/frontends/xforms/FormCharacter.h
@@ -5,7 +5,7 @@
  * See the file COPYING.
  * 
  * \author Edwin Leuven, leuven@fee.uva.nl
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORM_CHARACTER_H
diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index 449d934f22..39844f9ca3 100644
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -1,14 +1,8 @@
-// -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormCitation.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
diff --git a/src/frontends/xforms/FormCitation.h b/src/frontends/xforms/FormCitation.h
index cef3dc4edb..2d40374d2f 100644
--- a/src/frontends/xforms/FormCitation.h
+++ b/src/frontends/xforms/FormCitation.h
@@ -1,15 +1,10 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormCitation.h
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * Copyright 2000-2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMCITATION_H
diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 41226d8602..90393b569b 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -1,13 +1,10 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 2000-2001 The LyX Team.
+/**
+ * \file FormDocument.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *           @author J�rgen Vigna
- *
- *======================================================*/
+ * \author J�rgen Vigna, jug@sad.it
+ */
 
 #include <config.h>
 
diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h
index f87f169c3c..6bc93cba56 100644
--- a/src/frontends/xforms/FormDocument.h
+++ b/src/frontends/xforms/FormDocument.h
@@ -1,14 +1,11 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 2000-2001 The LyX Team.
+/**
+ * \file FormDocument.h
+ * Copyright 2000-2002 the LyX Team
+ * Read the file COPYING
  *
- *           @author J�rgen Vigna
- *
- *======================================================*/
+ * \author J�rgen Vigna, jug@sad.it
+ */
 
 #ifndef FORM_DOCUMENT_H
 #define FORM_DOCUMENT_H
@@ -34,7 +31,6 @@ struct FD_form_doc_bullet;
 
 /** This class provides an XForms implementation of the FormDocument dialog.
     The table-layout-form here changes values for latex-tabulars
-    @author J�rgen Vigna
  */
 class FormDocument : public FormBaseBD {
 public:
diff --git a/src/frontends/xforms/FormERT.C b/src/frontends/xforms/FormERT.C
index e81bd150c7..73e46a214a 100644
--- a/src/frontends/xforms/FormERT.C
+++ b/src/frontends/xforms/FormERT.C
@@ -1,13 +1,8 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormERT.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author J�rgen Vigna, jug@sad.it
  */
 
diff --git a/src/frontends/xforms/FormERT.h b/src/frontends/xforms/FormERT.h
index 130e88c903..9d943da098 100644
--- a/src/frontends/xforms/FormERT.h
+++ b/src/frontends/xforms/FormERT.h
@@ -1,15 +1,10 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *          Copyright 2001 The LyX Team.
- *
- *======================================================
- *
+/**
  * \file FormERT.h
- * \author Juergen Vigna, jug@sad.it
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author J�rgen Vigna, jug@sad.it
  */
 
 #ifndef FORMERT_H
diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index 9c6cedd189..d8bf9b49cb 100644
--- a/src/frontends/xforms/FormError.C
+++ b/src/frontends/xforms/FormError.C
@@ -1,15 +1,9 @@
 /*
  * \file FormError.C
- * This file is part of
- * ====================================================== 
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifdef __GNUG__
diff --git a/src/frontends/xforms/FormError.h b/src/frontends/xforms/FormError.h
index d927e02d45..cedc1f917c 100644
--- a/src/frontends/xforms/FormError.h
+++ b/src/frontends/xforms/FormError.h
@@ -1,16 +1,10 @@
 // -*- C++ -*-
-/*
+/**
  * \file FormError.h
- * This file is part of
- * ====================================================== 
+ * Copyright 2000-2002 the LyX Team
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMERROR_H
diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index 5324c1cebd..d4f45513e2 100644
--- a/src/frontends/xforms/FormExternal.C
+++ b/src/frontends/xforms/FormExternal.C
@@ -1,15 +1,10 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormExternal.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author Asger Alstrup
- * \author John Levon
+ * \author John Levon, moz@compsoc.man.ac.uk
  * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
diff --git a/src/frontends/xforms/FormExternal.h b/src/frontends/xforms/FormExternal.h
index 35c3995896..a6c4b91202 100644
--- a/src/frontends/xforms/FormExternal.h
+++ b/src/frontends/xforms/FormExternal.h
@@ -1,16 +1,11 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormExternal.h
- * \author Asger Alstrup
- * \author John Levon
+ * Copyright 2000-2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Asger Alstrup Nielsen
+ * \author John Levon, moz@compsoc.man.ac.uk
  * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C
index e5ed32b8e4..e4c713c99a 100644
--- a/src/frontends/xforms/FormFiledialog.C
+++ b/src/frontends/xforms/FormFiledialog.C
@@ -4,7 +4,7 @@
  * Read the file COPYING
  *
  * \author unknown
- * \author John Levon
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormFiledialog.h b/src/frontends/xforms/FormFiledialog.h
index 6b2c4aec32..2bf14020c8 100644
--- a/src/frontends/xforms/FormFiledialog.h
+++ b/src/frontends/xforms/FormFiledialog.h
@@ -5,7 +5,7 @@
  * Read the file COPYING
  *
  * \author unknown
- * \author John Levon
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #ifndef FORMFILEDIALOG_H
diff --git a/src/frontends/xforms/FormFloat.C b/src/frontends/xforms/FormFloat.C
index 154559f4a7..6fbf37a7b0 100644
--- a/src/frontends/xforms/FormFloat.C
+++ b/src/frontends/xforms/FormFloat.C
@@ -1,13 +1,9 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormFloat.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Lars Gullik Bj�nnes, larsbj@lyx.org
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormFloat.h b/src/frontends/xforms/FormFloat.h
index e07b4e2eae..416400edbb 100644
--- a/src/frontends/xforms/FormFloat.h
+++ b/src/frontends/xforms/FormFloat.h
@@ -1,14 +1,10 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *          Copyright 2001 The LyX Team.
- *
- *======================================================
- *
+/**
  * \file FormFloat.h
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Lars Gullik Bj�nnes, larsbj@lyx.org
  */
 
 #ifndef FORMFLOAT_H
diff --git a/src/frontends/xforms/FormForks.C b/src/frontends/xforms/FormForks.C
index 9ee34540ea..a4fcb77083 100644
--- a/src/frontends/xforms/FormForks.C
+++ b/src/frontends/xforms/FormForks.C
@@ -3,7 +3,7 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author Angus Leeming
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  * \date 2001-10-22
  */
 
diff --git a/src/frontends/xforms/FormForks.h b/src/frontends/xforms/FormForks.h
index 74f5b71423..a167fcd312 100644
--- a/src/frontends/xforms/FormForks.h
+++ b/src/frontends/xforms/FormForks.h
@@ -1,10 +1,10 @@
 // -*- C++ -*-
 /**
  * \file FormForks.h
- * Copyright 2001 the LyX Team
+ * Copyright 2002 the LyX Team
  * Read the file COPYING
  *
- * \author Angus Leeming
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMFORKS_H
diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index b5ce351bcc..795e229731 100644
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -1,13 +1,8 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormGraphics.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author Baruch Even, baruch.even@writeme.com
  * \author Herbert Voss, voss@perce.de
  */
diff --git a/src/frontends/xforms/FormGraphics.h b/src/frontends/xforms/FormGraphics.h
index 588c603664..f486f68117 100644
--- a/src/frontends/xforms/FormGraphics.h
+++ b/src/frontends/xforms/FormGraphics.h
@@ -1,14 +1,9 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormGraphics.h
+ * Copyright 2000-2001 the LyX Team
+ * Read the file COPYING
+ *
  * \author Baruch Even, baruch.even@writeme.com
  * \author Herbert Voss, voss@lyx.org
  */
diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C
index 636574b121..dbf38964d4 100644
--- a/src/frontends/xforms/FormInclude.C
+++ b/src/frontends/xforms/FormInclude.C
@@ -5,7 +5,7 @@
  *
  * \author Alejandro Aguilar Sierra
  * \author John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormInclude.h b/src/frontends/xforms/FormInclude.h
index 65e4077a1f..6b9ecde561 100644
--- a/src/frontends/xforms/FormInclude.h
+++ b/src/frontends/xforms/FormInclude.h
@@ -6,7 +6,7 @@
  *
  * \author Alejandro Aguilar Sierra
  * \author John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 #ifndef FORMINCLUDE_H
 #define FORMINCLUDE_H
diff --git a/src/frontends/xforms/FormIndex.C b/src/frontends/xforms/FormIndex.C
index c2057a5a99..045d36d3f0 100644
--- a/src/frontends/xforms/FormIndex.C
+++ b/src/frontends/xforms/FormIndex.C
@@ -1,13 +1,8 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormIndex.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
diff --git a/src/frontends/xforms/FormIndex.h b/src/frontends/xforms/FormIndex.h
index 1a3fc3f534..5901908284 100644
--- a/src/frontends/xforms/FormIndex.h
+++ b/src/frontends/xforms/FormIndex.h
@@ -1,14 +1,9 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormIndex.h
+ * Copyright 2000-2001 the LyX Team
+ * Read the file COPYING
+ *
  * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
diff --git a/src/frontends/xforms/FormInset.C b/src/frontends/xforms/FormInset.C
index 5597c7f81a..917f163631 100644
--- a/src/frontends/xforms/FormInset.C
+++ b/src/frontends/xforms/FormInset.C
@@ -1,11 +1,9 @@
-/* This file is part of
- * ====================================================== 
+/**
+ * \file FormInset.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormInset.h b/src/frontends/xforms/FormInset.h
index cd429b3da1..fabff8ff9a 100644
--- a/src/frontends/xforms/FormInset.h
+++ b/src/frontends/xforms/FormInset.h
@@ -1,12 +1,14 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
+/**
+ * \file FormInset.h
+ * Copyright 2000-2001 the LyX Team
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
+ * \author Angus Leeming, a.leeming@ic.ac.uk
+ */
+
+/* A base class for dialogs connected to insets. This class is temporary in that
+ * it has been superceeded by the controller-view split.
  */
 
 #ifndef FORMCOMMAND_H
diff --git a/src/frontends/xforms/FormLog.C b/src/frontends/xforms/FormLog.C
index 194fc2a96e..7c174c5ab5 100644
--- a/src/frontends/xforms/FormLog.C
+++ b/src/frontends/xforms/FormLog.C
@@ -1,13 +1,17 @@
-/* FormLog.C
- * (C) 2001 LyX Team
- * John Levon, moz@compsoc.man.ac.uk
+/**
+ * \file FormLog.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
 #include "xformsBC.h"
 #include "ControlLog.h"
 #include "FormLog.h"
diff --git a/src/frontends/xforms/FormLog.h b/src/frontends/xforms/FormLog.h
index 220dd3d03a..c8f40d7df5 100644
--- a/src/frontends/xforms/FormLog.h
+++ b/src/frontends/xforms/FormLog.h
@@ -1,9 +1,10 @@
 // -*- C++ -*-
 /*
  * FormLog.h
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
  *
- * (C) 2001 LyX Team
- * John Levon, moz@compsoc.man.ac.uk
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #ifndef FORMLOG_H
diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C
index 6725bdd322..bb007c0999 100644
--- a/src/frontends/xforms/FormMinipage.C
+++ b/src/frontends/xforms/FormMinipage.C
@@ -1,13 +1,8 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormMinipage.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author J�rgen Vigna, jug@sad.it
  */
 
diff --git a/src/frontends/xforms/FormMinipage.h b/src/frontends/xforms/FormMinipage.h
index deaaa0eb2c..f905c1a2c9 100644
--- a/src/frontends/xforms/FormMinipage.h
+++ b/src/frontends/xforms/FormMinipage.h
@@ -1,15 +1,10 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *          Copyright 2001 The LyX Team.
- *
- *======================================================
- *
+/**
  * \file FormMinipage.h
- * \author Juergen Vigna, jug@sad.it
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author J�rgen Vigna, jug@sad.it
  */
 
 #ifndef FORMMINIPAGE_H
diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index 648114776a..6b35359289 100644
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -1,13 +1,10 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 2000-2001 The LyX Team.
+/**
+ * \file FormParagraph.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *           @author J�rgen Vigna
- *
- *======================================================*/
+ * \author J�rgen Vigna, jug@sad.it
+ */
 
 #include <config.h>
 
diff --git a/src/frontends/xforms/FormParagraph.h b/src/frontends/xforms/FormParagraph.h
index 224b4b4a9e..9078dabb54 100644
--- a/src/frontends/xforms/FormParagraph.h
+++ b/src/frontends/xforms/FormParagraph.h
@@ -1,14 +1,11 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 2000-2001 The LyX Team.
+/**
+ * \file Tooltips.h
+ * Copyright 2000-2001 the LyX Team
+ * Read the file COPYING
  *
- *           @author J�rgen Vigna
- *
- *======================================================*/
+ * \author J�rgen Vigna, jug@sad.it
+ */
 
 #ifndef FORM_PARAGRAPH_H
 #define FORM_PARAGRAPH_H
@@ -25,7 +22,6 @@ class Paragraph;
 struct FD_form_paragraph;
 
 /** This class provides an XForms implementation of the FormParagraph dialog.
- *           @author J�rgen Vigna
  */
 class FormParagraph : public FormBaseBD {
 public:
diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index df44136a86..156a69b11c 100644
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -1,14 +1,9 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file FormPreferences.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *======================================================*/
-/* FormPreferences.C
- * FormPreferences Interface Class Implementation
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index a26c1e896a..e7f03bfcc7 100644
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -1,17 +1,12 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file FormPreferences.h
+ * Copyright 1995-2002 the LyX Team
+ * Copyright 1999-2001 Allan Rae
+ * Read the file COPYING
  *
- *	    This file copyright 1999-2001
- *	    Allan Rae
- *======================================================*/
-/* FormPreferences.h
- * FormPreferences Interface Class
+ * \author Allan Rae, rae@lyx.org
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMPREFERENCES_H
diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C
index 9f33f36219..08d7a27bd6 100644
--- a/src/frontends/xforms/FormPrint.C
+++ b/src/frontends/xforms/FormPrint.C
@@ -4,7 +4,7 @@
  * See the file COPYING.
  *
  * \author Allan Rae, rae@lyx.org
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormPrint.h b/src/frontends/xforms/FormPrint.h
index 8f68ba2727..c250772e95 100644
--- a/src/frontends/xforms/FormPrint.h
+++ b/src/frontends/xforms/FormPrint.h
@@ -1,19 +1,12 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- *	    This file copyright 1999-2001
- *	    Allan Rae
- *======================================================
- *
+/**
  * \file FormPrint.h
+ * Copyright 2002 the LyX Team
+ * Copyright 1999-2001 Allan Rae
+ * Read the file COPYING
+ *
  * \author Allan Rae, rae@lyx.org
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMPRINT_H
diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index 388db8cd98..0e3617db9d 100644
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -1,14 +1,9 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- * 
+/**
  * \file FormRef.C
- * \author Angus Leeming, a.leeming@ic.ac.uk 
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormRef.h b/src/frontends/xforms/FormRef.h
index 9a6901324d..0170f6fd24 100644
--- a/src/frontends/xforms/FormRef.h
+++ b/src/frontends/xforms/FormRef.h
@@ -1,15 +1,10 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormRef.h
- * \author Angus Leeming, a.leeming@.ac.uk
+ * Copyright 2000-2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMREF_H
diff --git a/src/frontends/xforms/FormSearch.C b/src/frontends/xforms/FormSearch.C
index 34077d94f4..f01efb6686 100644
--- a/src/frontends/xforms/FormSearch.C
+++ b/src/frontends/xforms/FormSearch.C
@@ -3,7 +3,7 @@
  * Copyright 2001 The LyX Team.
  * See the file COPYING.
  *
- * \author Edwin Leuven
+ * \author Edwin Leuven, leuven@fee.uva.nl
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormSearch.h b/src/frontends/xforms/FormSearch.h
index 24a473ad8c..93b0d922e7 100644
--- a/src/frontends/xforms/FormSearch.h
+++ b/src/frontends/xforms/FormSearch.h
@@ -4,7 +4,7 @@
  * Copyright 2001 The LyX Team.
  * See the file COPYING.
  *
- * \author Edwin Leuven
+ * \author Edwin Leuven, leuven@fee.uva.nl
  */
 
 #ifndef FORMSEARCH_H
diff --git a/src/frontends/xforms/FormSendto.C b/src/frontends/xforms/FormSendto.C
index 7d305d2c8e..9c6e7aaf79 100644
--- a/src/frontends/xforms/FormSendto.C
+++ b/src/frontends/xforms/FormSendto.C
@@ -3,7 +3,7 @@
  * Copyright 2002 the LyX Team
  * Read the file COPYING
  *
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormSendto.h b/src/frontends/xforms/FormSendto.h
index a4f59bbd7d..7d3aff18fc 100644
--- a/src/frontends/xforms/FormSendto.h
+++ b/src/frontends/xforms/FormSendto.h
@@ -4,7 +4,7 @@
  * Copyright 2002 the LyX Team
  * Read the file COPYING
  *
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMSENDTO_H
diff --git a/src/frontends/xforms/FormShowFile.C b/src/frontends/xforms/FormShowFile.C
index 5e2d1b5a57..9e1f22f196 100644
--- a/src/frontends/xforms/FormShowFile.C
+++ b/src/frontends/xforms/FormShowFile.C
@@ -1,6 +1,9 @@
-/* FormHelp.C
- * (C) 2001 LyX Team
- * \author Herbert Voss <voss@perce.de>
+/**
+ * \file FormShowFile.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Herbert Voss, voss@perce.de
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormShowFile.h b/src/frontends/xforms/FormShowFile.h
index 58ce7950ea..fd71682b26 100644
--- a/src/frontends/xforms/FormShowFile.h
+++ b/src/frontends/xforms/FormShowFile.h
@@ -1,10 +1,10 @@
 // -*- C++ -*-
-
-/*
- * FormShowFile.h
+/**
+ * \file FormShowFile.h
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
  *
- * (C) 2001 LyX Team
- * \author Herbert Voss <voss@perce.de>
+ * \author Herbert Voss, voss@perce.de
  */
 
 #ifndef FORMSHOWFILE_H
diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C
index 9779085267..4bc83db3a6 100644
--- a/src/frontends/xforms/FormSpellchecker.C
+++ b/src/frontends/xforms/FormSpellchecker.C
@@ -3,7 +3,7 @@
  * Copyright 2001 The LyX Team.
  * See the file COPYING.
  *
- * \author Edwin Leuven
+ * \author Edwin Leuven, leuven@fee.uva.nl
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormSpellchecker.h b/src/frontends/xforms/FormSpellchecker.h
index e387356cde..1bb7deb6ad 100644
--- a/src/frontends/xforms/FormSpellchecker.h
+++ b/src/frontends/xforms/FormSpellchecker.h
@@ -4,7 +4,7 @@
  * Copyright 2001 The LyX Team.
  * See the file COPYING.
  *
- * \author Edwin Leuven
+ * \author Edwin Leuven, leuven@fee.uva.nl
  */
 
 #ifndef FORMSPELLCHECKER_H
diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index 8d95f31c51..a6eb29fbf0 100644
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -1,14 +1,9 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file FormTabular.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *======================================================*/
-/* FormTabular.C
- * FormTabular Interface Class Implementation
+ * \author J�rgen Vigna, jug@sad.it
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormTabular.h b/src/frontends/xforms/FormTabular.h
index 08002a16b1..c6c49efae0 100644
--- a/src/frontends/xforms/FormTabular.h
+++ b/src/frontends/xforms/FormTabular.h
@@ -1,15 +1,11 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file FormTabular.h
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 the LyX Team
+ * Read the file COPYING
  *
- *======================================================*/
-/* FormTabular.h
- * FormTabular Interface Class
+ * \author J�rgen Vigna, jug@sad.it
  */
 
 #ifndef FORMTABULAR_H
diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C
index e7a297e7cd..738e8aaebf 100644
--- a/src/frontends/xforms/FormTabularCreate.C
+++ b/src/frontends/xforms/FormTabularCreate.C
@@ -1,13 +1,9 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormTabularCreate.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author \author J�rgen Vigna, jug@sad.it
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormTabularCreate.h b/src/frontends/xforms/FormTabularCreate.h
index ab2811709f..9e339147e3 100644
--- a/src/frontends/xforms/FormTabularCreate.h
+++ b/src/frontends/xforms/FormTabularCreate.h
@@ -1,15 +1,11 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- *======================================================
- *
+/**
  * \file FormTabularCreate.h
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author unknown.
  */
 
 #ifndef FORMTABULARCREATE_H
diff --git a/src/frontends/xforms/FormTexinfo.C b/src/frontends/xforms/FormTexinfo.C
index fc06713813..0e6b9757df 100644
--- a/src/frontends/xforms/FormTexinfo.C
+++ b/src/frontends/xforms/FormTexinfo.C
@@ -3,7 +3,7 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author Herbert Voss <voss@lyx.org>
+ * \author Herbert Voss, voss@lyx.org
  * \date 2001-10-01
  */
 
diff --git a/src/frontends/xforms/FormTexinfo.h b/src/frontends/xforms/FormTexinfo.h
index 012da2b0a0..a42fe75c52 100644
--- a/src/frontends/xforms/FormTexinfo.h
+++ b/src/frontends/xforms/FormTexinfo.h
@@ -4,7 +4,7 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author Herbert Voss <voss@perce.de>
+ * \author Herbert Voss, voss@perce.de
  */
 
 #ifndef FORMTEXINFO_H
diff --git a/src/frontends/xforms/FormThesaurus.C b/src/frontends/xforms/FormThesaurus.C
index 734a14ece9..a0bde91fac 100644
--- a/src/frontends/xforms/FormThesaurus.C
+++ b/src/frontends/xforms/FormThesaurus.C
@@ -3,7 +3,7 @@
  * Copyright 2001 The LyX Team.
  * See the file COPYING.
  *
- * \author Edwin Leuven
+ * \author Edwin Leuven, leuven@fee.uva.nl
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormThesaurus.h b/src/frontends/xforms/FormThesaurus.h
index 99923dcad5..cba55d52e0 100644
--- a/src/frontends/xforms/FormThesaurus.h
+++ b/src/frontends/xforms/FormThesaurus.h
@@ -4,7 +4,7 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author John Levon
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #ifndef FORMTHESAURUS_H
diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C
index 9a6f50797b..a0ad95bf15 100644
--- a/src/frontends/xforms/FormToc.C
+++ b/src/frontends/xforms/FormToc.C
@@ -1,13 +1,8 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormToc.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
@@ -84,7 +79,6 @@ void FormToc::updateType()
 	// Update the choice list from scratch
 	fl_clear_choice(dialog_->choice_toc_type);
 	string const choice = getStringFromVector(controller().getTypes(), "|");
-	lyxerr << "choice " << choice << endl; 
 	fl_addto_choice(dialog_->choice_toc_type, choice.c_str());
 
 	// And select the correct one
diff --git a/src/frontends/xforms/FormToc.h b/src/frontends/xforms/FormToc.h
index 1e5bfeb1fc..f44b039455 100644
--- a/src/frontends/xforms/FormToc.h
+++ b/src/frontends/xforms/FormToc.h
@@ -1,15 +1,10 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormToc.h
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * Copyright 2000-2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMTOC_H
diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index f8a1f88553..eb41c7dc85 100644
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -1,16 +1,12 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- * 
+/**
  * \file FormUrl.C
- * \author Angus Leeming, a.leeming@ic.ac.uk 
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
+
 #include <config.h>
 
 #ifdef __GNUG__
diff --git a/src/frontends/xforms/FormUrl.h b/src/frontends/xforms/FormUrl.h
index 5ad62ce30f..37319eede7 100644
--- a/src/frontends/xforms/FormUrl.h
+++ b/src/frontends/xforms/FormUrl.h
@@ -1,15 +1,10 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormUrl.h
- * \author Angus Leeming, a.leeming@.ac.uk
+ * Copyright 2000-2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #ifndef FORMURL_H
diff --git a/src/frontends/xforms/FormVCLog.C b/src/frontends/xforms/FormVCLog.C
index b9ccbe3d1c..4b69470635 100644
--- a/src/frontends/xforms/FormVCLog.C
+++ b/src/frontends/xforms/FormVCLog.C
@@ -1,6 +1,9 @@
-/* FormVCLog.C
- * (C) 2001 LyX Team
- * John Levon, moz@compsoc.man.ac.uk
+/**
+ * \file FormVCLog.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/FormVCLog.h b/src/frontends/xforms/FormVCLog.h
index cca629d009..c1b6d67b4c 100644
--- a/src/frontends/xforms/FormVCLog.h
+++ b/src/frontends/xforms/FormVCLog.h
@@ -1,9 +1,10 @@
 // -*- C++ -*-
-/*
- * FormVCLog.h
+/**
+ * \file FormVCLog.h
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
  *
- * (C) 2001 LyX Team
- * John Levon, moz@compsoc.man.ac.uk
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #ifndef FORMVCLOG_H
diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C
index a2d0ced6a9..c047bac63a 100644
--- a/src/frontends/xforms/GUIRunTime.C
+++ b/src/frontends/xforms/GUIRunTime.C
@@ -1,11 +1,10 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 2000-2001 The LyX Team.
+/**
+ * \file GUIRunTime.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *======================================================*/
+ * \author unknown
+ */
 
 #include <config.h>
 
diff --git a/src/frontends/xforms/MathsSymbols.C b/src/frontends/xforms/MathsSymbols.C
index 9a212bf451..623d1c3cfc 100644
--- a/src/frontends/xforms/MathsSymbols.C
+++ b/src/frontends/xforms/MathsSymbols.C
@@ -4,7 +4,7 @@
  * Read the file COPYING
  *
  * \author Alejandro Aguilar Sierra
- * \author John Levon
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/MathsSymbols.h b/src/frontends/xforms/MathsSymbols.h
index 09fe6b3fcf..eeb1c2212f 100644
--- a/src/frontends/xforms/MathsSymbols.h
+++ b/src/frontends/xforms/MathsSymbols.h
@@ -5,7 +5,7 @@
  * Read the file COPYING
  *
  * \author Alejandro Aguilar Sierra
- * \author John Levon
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #ifndef MATHS_SYMBOLS_H
diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index 06ada66362..ca4d75ab94 100644
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -1,11 +1,10 @@
-/* This file is part of
-* ======================================================
-* 
-*           LyX, The Document Processor
-* 	 
-*           Copyright 1999-2001 The LyX Team.
-*
-* ======================================================*/
+/**
+ * \file Menubar_pimpl.C
+ * Copyright 1999-2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author  Lars Gullik Bj�nnes, larsbj@lyx.org
+ */
 
 #include <config.h>
 
diff --git a/src/frontends/xforms/Menubar_pimpl.h b/src/frontends/xforms/Menubar_pimpl.h
index 97a6720a83..cac54fda23 100644
--- a/src/frontends/xforms/Menubar_pimpl.h
+++ b/src/frontends/xforms/Menubar_pimpl.h
@@ -1,15 +1,13 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file Menubar_pimpl.h
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2002 the LyX Team
+ * Copyright 1996-2001 Lars Gullik Bj�nnes
+ * Read the file COPYING
  *
- *           This file is Copyright 1996-2001
- *           Lars Gullik Bj�nnes
- *
- * ====================================================== */
+ * \author Lars Gullik Bj�nnes, larsbj@lyx.org
+ */
 
 #ifndef MENUBAR_PIMPL_H
 #define MENUBAR_PIMPL_H
diff --git a/src/frontends/xforms/RadioButtonGroup.C b/src/frontends/xforms/RadioButtonGroup.C
index 007e772570..e2a0df2cff 100644
--- a/src/frontends/xforms/RadioButtonGroup.C
+++ b/src/frontends/xforms/RadioButtonGroup.C
@@ -1,12 +1,12 @@
-/* This file is part of
- * =================================================
- * 
- *          LyX, The Document Processor
- *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file RadioButtonGroup.C
+ * Copyright 1995 Matthias Ettrich.
+ * Copyright 1995-2001 The LyX Team.
+ * Copyright 2000 Baruch Even
+ * See the file COPYING.
  *
- *          This file Copyright 2000 Baruch Even
- * ================================================= */
+ * \author Baruch Even, baruch.even@writeme.com
+ */
 
 #include <config.h> 
 
diff --git a/src/frontends/xforms/RadioButtonGroup.h b/src/frontends/xforms/RadioButtonGroup.h
index 2b5623deb6..a24f008ea5 100644
--- a/src/frontends/xforms/RadioButtonGroup.h
+++ b/src/frontends/xforms/RadioButtonGroup.h
@@ -1,13 +1,12 @@
 // -*- C++ -*-
-/* This file is part of
- * =================================================
- * 
- *          LyX, The Document Processor
- *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file RadioButtonGroup.h
+ * Copyright 2002 the LyX Team
+ * Copyright 2000 Baruch Even
+ * Read the file COPYING
  *
- *          This file Copyright 2000 Baruch Even
- * ================================================= */
+ * \author Baruch Even, baruch.even@writeme.com
+ */
 
 
 #ifndef RADIOBUTTONGROUP_H
@@ -27,7 +26,6 @@
  * the idea is that you register a bunch of radio buttons with the accompanying
  * value for each radio button and then you get to query or set the active
  * button in a single function call.
- * @author Baruch Even
  */
 class RadioButtonGroup {
 public:
diff --git a/src/frontends/xforms/Timeout_pimpl.C b/src/frontends/xforms/Timeout_pimpl.C
index 9a7f26a634..1cd764b241 100644
--- a/src/frontends/xforms/Timeout_pimpl.C
+++ b/src/frontends/xforms/Timeout_pimpl.C
@@ -3,8 +3,8 @@
  * Copyright 2001 LyX Team
  * Read COPYING
  *
- * \author Lars Gullik Bj�nnes
- * \author John Levon
+ * \author Lars Gullik Bj�nnes, larsbj@lyx.org
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/Timeout_pimpl.h b/src/frontends/xforms/Timeout_pimpl.h
index 83156e2616..cf4306a46c 100644
--- a/src/frontends/xforms/Timeout_pimpl.h
+++ b/src/frontends/xforms/Timeout_pimpl.h
@@ -4,8 +4,8 @@
  * Copyright 2001 LyX Team
  * Read COPYING
  *
- * \author Lars Gullik Bj�nnes
- * \author John Levon
+ * \author Lars Gullik Bj�nnes, larsbj@lyx.org
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 #ifndef TIMEOUTPIMPL_H
 #define TIMEOUTPIMPL_H
diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C
index 0337e93e6d..cae74b7fef 100644
--- a/src/frontends/xforms/Toolbar_pimpl.C
+++ b/src/frontends/xforms/Toolbar_pimpl.C
@@ -1,15 +1,12 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
+/**
+ * \file FormBase.C
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 The LyX Team.
+ * Copyright 1996-1998 Lars Gullik Bj�nnes
+ * See the file COPYING.
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- *           This file is Copyright 1996-1998
- *           Lars Gullik Bj�nnes
- *
- * ====================================================== */
+ * \author Lars Gullik Bj�nnes, larsbj@lyx.org
+ */
 
 //  Added pseudo-action handling, asierra 180296
 
diff --git a/src/frontends/xforms/Toolbar_pimpl.h b/src/frontends/xforms/Toolbar_pimpl.h
index 4ec1e070ef..b579723fee 100644
--- a/src/frontends/xforms/Toolbar_pimpl.h
+++ b/src/frontends/xforms/Toolbar_pimpl.h
@@ -1,15 +1,12 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file Toolbar_pimpl.h
+ * Copyright 2002 the LyX Team
+ * Copyright 1996-2001 Lars Gullik Bj�nnes
+ * Read the file COPYING
  *
- *           This file is Copyright 1996-2001
- *           Lars Gullik Bj�nnes
- *
- * ====================================================== */
+ * \author Lars Gullik Bj�nnes, larsbj@lyx.org
+ */
 
 #ifndef TOOLBAR_PIMPL_H
 #define TOOLBAR_PIMPL_H
diff --git a/src/frontends/xforms/Tooltips.C b/src/frontends/xforms/Tooltips.C
index ee80e05586..4328bab6ee 100644
--- a/src/frontends/xforms/Tooltips.C
+++ b/src/frontends/xforms/Tooltips.C
@@ -4,6 +4,9 @@
  * Read the file COPYING
  *
  * \author Angus Leeming, a.leeming@ic.ac.uk
+ */
+
+/*
  *
  * Tooltips for xforms. xforms 0.89 supports them directly, but 0.88 needs
  * a bit of jiggery pokery. This class wraps it all up in a neat interface.
@@ -210,7 +213,7 @@ void TooltipTimerCB(FL_OBJECT * timer, long data)
 	lyx::Assert(ob && ob->form && timer && timer->u_vdata);
 	FL_FORM * form = ob->form;
 	Tooltips * tooltip = static_cast<Tooltips *>(timer->u_vdata);
-	
+
 	string const help = tooltip->getTooltip(ob);
 	if (help.empty())
 		return;
diff --git a/src/frontends/xforms/Tooltips.h b/src/frontends/xforms/Tooltips.h
index 6e461db570..bd4342cc0a 100644
--- a/src/frontends/xforms/Tooltips.h
+++ b/src/frontends/xforms/Tooltips.h
@@ -1,12 +1,13 @@
 // -*- C++ -*-
-/*
+/**
  * \file Tooltips.h
  * Copyright 2002 the LyX Team
  * Read the file COPYING
  *
  * \author Angus Leeming, a.leeming@ic.ac.uk
- *
- * Tooltips for xforms. xforms 0.89 supports them directly, but 0.88 needs
+ */
+
+/* Tooltips for xforms. xforms 0.89 supports them directly, but 0.88 needs
  * a bit of jiggery pokery. This class wraps it all up in a neat interface.
  * Based on code originally in Toolbar_pimpl.C that appears to have been
  * written by Matthias Ettrich and Jean-Marc Lasgouttes.
@@ -18,8 +19,8 @@
 #include "LString.h"
 #include <boost/utility.hpp>
 #include <sigc++/signal_system.h>
-#include FORMS_H_LOCATION // Can't forward-declare FL_OBJECT
 #include <map>
+#include FORMS_H_LOCATION // Can't forward-declare FL_OBJECT
 
 #ifdef __GNUG__
 #pragma interface
@@ -29,7 +30,7 @@ class Tooltips : boost::noncopyable, public SigC::Object {
 public:
 	Tooltips();
 
-	/// Initialise a tooltip for this ob
+	/// Initialise a tooltip for this ob.
 	void initTooltip(FL_OBJECT * ob, string const & tip);
 
 	/// Are the tooltips on or off?
@@ -37,7 +38,9 @@ public:
 
 #if FL_REVISION < 89
 
-	/// Return the tooltip associated with this object
+	/** Return the tooltip associated with this object.
+	 *  Required by an xforms callback routine.
+	 */
 	string const getTooltip(FL_OBJECT *) const;
 
 #endif
@@ -48,7 +51,7 @@ private:
 	static bool enabled_;
 
 	/** This method is connected to Dialogs::toggleTooltips and toggles
-	 *  the state of enabled_
+	 *  the state of enabled_.
 	 */
 	static void toggleEnabled();
 
@@ -60,16 +63,19 @@ private:
 	/// This method is connected to the tooltipsToggled signal.
 	void toggleTooltips();
 
-	/// The tooltips are stored so that they can be turned on and off
+	/// The tooltips are stored so that they can be turned on and off.
 	typedef std::map<FL_OBJECT *, string> TooltipsMap;
 
 	TooltipsMap tooltipsMap;
 
 #if FL_REVISION < 89
 
+	/** A timer is started once the mouse enters an object, so that the
+	 *  tip appears a short delay afterwards.
+	 */
 	FL_OBJECT * tooltip_timer_;
 
-#endif // FL_REVISION >= 89
+#endif
 };
 
 #endif // TOOLTIPS_H
diff --git a/src/frontends/xforms/bmtable.h b/src/frontends/xforms/bmtable.h
index a55c423f09..5efd29bc24 100644
--- a/src/frontends/xforms/bmtable.h
+++ b/src/frontends/xforms/bmtable.h
@@ -1,17 +1,15 @@
-/*
- *  File:        bmtable.h
- *  Purpose:     Declaration of the XForms object bmtable. 
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
- *  Created:     November 1995
- *  Description: A bitmap table uses a single bitmap to simulate a 2d array 
- *               of bitmap buttons. It can be used to build bitmap menus.
- *               
- *  Copyright 1995, 1996 Alejandro Aguilar Sierra 
+/**
+ * \file bmtable.h
+ * Copyright 2002 the LyX Team
+ * Copyright 1995-1996 Alejandro Aguilar Sierra
+ * Read the file COPYING
  *
- *  You are free to use and modify this code under the terms of
- *  the GNU General Public Licence version 2 or later. 
- * 
- */ 
+ * \author Alejandro Aguilar Sierra
+ */
+
+/* A bitmap table uses a single bitmap to simulate a 2d array 
+ * of bitmap buttons. It can be used to build bitmap menus.
+ */
 
 #ifndef BMTABLE_H
 #define BMTABLE_H 
diff --git a/src/frontends/xforms/combox.C b/src/frontends/xforms/combox.C
index c4b30bbcfe..2fa57fd7ac 100644
--- a/src/frontends/xforms/combox.C
+++ b/src/frontends/xforms/combox.C
@@ -1,12 +1,14 @@
-/*
- *  Combox: A combination of two objects (a button and a browser) is
- *          encapsulated to get a combobox-like object. All XForms 
- *          functions are hidden.         
- * 
- *  GNU Copyleft 1996 Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *                        and the LyX Team.
- * 
- *  Dependencies:  Only XForms, but created to be used with LyX.
+/**
+ * \file combox.C
+ * Copyright 1996-2002 The LyX Team.
+ * Copyright 1996Alejandro Aguilar Sierra
+ * See the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ */
+
+/* A combination of two objects (a button and a browser) is encapsulated to
+ * get a combobox-like object. All XForms functions are hidden.         
  * 
  */ 
 
diff --git a/src/frontends/xforms/combox.h b/src/frontends/xforms/combox.h
index a98592530a..8e322cda50 100644
--- a/src/frontends/xforms/combox.h
+++ b/src/frontends/xforms/combox.h
@@ -1,17 +1,17 @@
 // -*- C++ -*-
-/*
- *  Combox: A combination of two objects (a button and a browser) is
- *          encapsulated to get a combobox-like object. All XForms 
- *          functions are hidden.         
- * 
- *  GNU Copyleft 1996 Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *                        and the LyX Team.
- * 
- *  Dependencies:  Only XForms, but created to be used with LyX.
- * 
- */ 
+/**
+ * \file combox.h
+ * Copyright 2002 the LyX Team
+ * Copyright 1996 Alejandro Aguilar Sierra
+ * Read the file COPYING
+ *
+ * \author Alejandro Aguilar Sierra, asierra@servidor.unam.mx
+ */
 
-/* Change log:
+/* A combination of two objects (a button and a browser) is encapsulated to
+ * get a combobox-like object. All XForms functions are hidden.
+ *
+ * Change log:
  *  
  *  2/06/1996,   Alejandro Aguilar Sierra 
  *    Created and tested.
diff --git a/src/frontends/xforms/input_validators.C b/src/frontends/xforms/input_validators.C
index cc237bf3de..9a56b6f627 100644
--- a/src/frontends/xforms/input_validators.C
+++ b/src/frontends/xforms/input_validators.C
@@ -5,6 +5,11 @@
  */
 
 #include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include FORMS_H_LOCATION
 #include "support/lstrings.h"
 #include "input_validators.h"
diff --git a/src/frontends/xforms/input_validators.h b/src/frontends/xforms/input_validators.h
index 26cb7571b9..f15eaea734 100644
--- a/src/frontends/xforms/input_validators.h
+++ b/src/frontends/xforms/input_validators.h
@@ -1,17 +1,14 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
+/**
+ * \file input_validators.h
+ * Copyright 2002 the LyX Team
+ * Copyright 1999-2001 Allan Rae
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- *           This file Copyright 1999-2001
- *           Allan Rae
- * ====================================================== */
+ * \author Allan Rae, rae@lyx.org
+ */
 
-/** Input validators and filters for xforms.
+/* Input validators and filters for xforms.
  * A collection of input filtering and validating functions for use in
  * XForms dialogs.  Mainly meant for filtering input boxes although may
  * be extended to include other generally useful xforms-specific tools.
@@ -20,6 +17,10 @@
 #ifndef INPUT_VALIDATORS_H
 #define INPUT_VALIDATORS_H
 
+#ifdef __GNUG_
+#pragma interface
+#endif
+
 #if defined(__cplusplus)
 extern "C"
 {
diff --git a/src/frontends/xforms/xformsBC.C b/src/frontends/xforms/xformsBC.C
index b10badc9e9..6bd90c56c4 100644
--- a/src/frontends/xforms/xformsBC.C
+++ b/src/frontends/xforms/xformsBC.C
@@ -1,13 +1,8 @@
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file xformsBC.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author Allan Rae, rae@lyx.org
  * \author Angus Leeming, a.leeming@ic.ac.uk
  * \author Baruch Even, baruch.even@writeme.com
diff --git a/src/frontends/xforms/xformsBC.h b/src/frontends/xforms/xformsBC.h
index d435b23552..c8ec742a47 100644
--- a/src/frontends/xforms/xformsBC.h
+++ b/src/frontends/xforms/xformsBC.h
@@ -1,14 +1,9 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file xformsBC.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
+ *
  * \author Allan Rae, rae@lyx.org
  * \author Angus Leeming, a.leeming@ic.ac.uk
  * \author Baruch Even, baruch.even@writeme.com
diff --git a/src/frontends/xforms/xformsGImage.C b/src/frontends/xforms/xformsGImage.C
index bcaa69f488..257c1fd61d 100644
--- a/src/frontends/xforms/xformsGImage.C
+++ b/src/frontends/xforms/xformsGImage.C
@@ -3,7 +3,7 @@
  * Copyright 2002 the LyX Team
  * Read the file COPYING
  *
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/xformsGImage.h b/src/frontends/xforms/xformsGImage.h
index c393db1d5f..d1f67faf40 100644
--- a/src/frontends/xforms/xformsGImage.h
+++ b/src/frontends/xforms/xformsGImage.h
@@ -4,10 +4,11 @@
  *  Copyright 2002 the LyX Team
  *  Read the file COPYING
  *
- *  \author Angus Leeming <a.leeming@ic.ac.uk>
- *
- *  An instantiation of GImage that makes use of the xforms lirary routines
- *  to load and store the image in memory.
+ *  \author Angus Leeming, a.leeming@ic.ac.uk
+ */
+
+/* An instantiation of GImage that makes use of the xforms lirary routines
+ * to load and store the image in memory.
  */
 
 #ifndef XFORMS_GRAPHICSIMAGE_H
diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index 422440ed3a..70a3bcb99d 100644
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -1,4 +1,9 @@
-/** Collection of some useful xform helper functions
+/**
+ * \file xforms_helpers.C
+ * Copyright 2000-2002 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
diff --git a/src/frontends/xforms/xforms_helpers.h b/src/frontends/xforms/xforms_helpers.h
index 3630765465..aba58c48ea 100644
--- a/src/frontends/xforms/xforms_helpers.h
+++ b/src/frontends/xforms/xforms_helpers.h
@@ -1,4 +1,11 @@
 // -*- C++ -*-
+/**
+ * \file xforms_helpers.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Angus Leeming, a.leeming@ic.ac.uk
+ */
 
 #ifndef XFORMSHELPERS_H
 #define XFORMSHELPERS_H