From e068f34784f285909c0c93d123a604d76bb244a9 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 14 Oct 2008 02:27:40 +0000
Subject: [PATCH] Cleaned up some of the comments ... removed vestiges of last
 year's doxygen experiment

---
 webcit/event.c       | 50 ++++++++++++++++-----------------
 webcit/rss.c         | 23 ++++++---------
 webcit/serv_func.c   | 18 ++++++------
 webcit/siteconfig.c  |  5 ++--
 webcit/snprintf.c    | 37 ++++++++++--------------
 webcit/sysmsgs.c     | 26 +++++++----------
 webcit/tcp_sockets.c | 67 ++++++++++++++++++++------------------------
 webcit/useredit.c    | 39 +++++++++++---------------
 webcit/userlist.c    | 18 ++++--------
 webcit/vcard_edit.c  | 18 ++++--------
 10 files changed, 127 insertions(+), 174 deletions(-)

diff --git a/webcit/event.c b/webcit/event.c
index 64ea22707..2bbf91f62 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -253,7 +253,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	}
 	wprintf("</TEXTAREA></TD></TR>");
 
-	/**
+	/*
 	 * For a new event, the user creating the event should be the
 	 * organizer.  Set this field accordingly.
 	 */
@@ -265,7 +265,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		);
 	}
 
-	/**
+	/*
 	 * Determine who is the organizer of this event.
 	 * We need to determine "me" or "not me."
 	 */
@@ -293,7 +293,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		wprintf("</I></FONT>\n");
 	}
 
-	/**
+	/*
 	 * Transmit the organizer as a hidden field.   We don't want the user
 	 * to be able to change it, but we do want it fed back to the server,
 	 * especially if this is a new event and there is no organizer already
@@ -305,14 +305,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
 	wprintf("</TD></TR>\n");
 
-	/** Transparency */
+	/* Transparency */
 	wprintf("<TR><TD><B>");
 	wprintf(_("Show time as:"));
 	wprintf("</B></TD><TD>");
 
 	p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
 	if (p == NULL) {
-		/** No transparency found.  Default to opaque (busy). */
+		/* No transparency found.  Default to opaque (busy). */
 		p = icalproperty_new_transp(ICAL_TRANSP_OPAQUE);
 		if (p != NULL) {
 			icalcomponent_add_property(vevent, p);
@@ -341,7 +341,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	wprintf("</TD></TR>\n");
 
 
-	/** Done with properties. */
+	/* Done with properties. */
 	wprintf("</TABLE>\n");
 
 	end_tab(0, 3);
@@ -356,7 +356,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	wprintf(_("(One per line)"));
 	wprintf("</font>\n");
 
-	/** Pop open an address book -- begin **/
+	/* Pop open an address book -- begin */
 	wprintf(
 		"&nbsp;<a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
 		"title=\"%s\">"
@@ -365,7 +365,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		_("Attendees"),
 		_("Contacts")
 	);
-	/* Pop open an address book -- end **/
+	/* Pop open an address book -- end */
 
 	wprintf("</TD><TD>"
 		"<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
@@ -379,14 +379,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		strcpy(attendee_string, icalproperty_get_attendee(attendee));
 		if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
 
-			/** screen name or email address */
+			/* screen name or email address */
 			strcpy(attendee_string, &attendee_string[7]);
 			striplt(attendee_string);
 			if (i++) wprintf("\n");
 			escputs(attendee_string);
 			wprintf(" ");
 
-			/** participant status */
+			/* participant status */
 			partstat_as_string(buf, attendee);
 			escputs(buf);
 		}
@@ -660,7 +660,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 
 	if (supplied_vevent != NULL) {
 		vevent = supplied_vevent;
-		/**
+		/*
 		 * If we're looking at a fully encapsulated VCALENDAR
 		 * rather than a VEVENT component, attempt to use the first
 		 * relevant VEVENT subcomponent.  If there is none, the
@@ -685,7 +685,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 	if ( (havebstr("save_button"))
 	   || (havebstr("check_button")) ) {
 
-		/** Replace values in the component with ones from the form */
+		/* Replace values in the component with ones from the form */
 
 		while (prop = icalcomponent_get_first_property(vevent,
 		      ICAL_SUMMARY_PROPERTY), prop != NULL) {
@@ -741,7 +741,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 			icaltime_from_webform(&event_start, "dtstart");
 		}
 
-		/**
+		/*
 		 * The following odd-looking snippet of code looks like it
 		 * takes some unnecessary steps.  It is done this way because
 		 * libical incorrectly turns an "all day event" into a normal
@@ -776,7 +776,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 			);
 		}
 
-		/** See if transparency is indicated */
+		/* See if transparency is indicated */
 		if (havebstr("transp")) {
 			if (!strcasecmp(bstr("transp"), "opaque")) {
 				formtransp = ICAL_TRANSP_OPAQUE;
@@ -794,14 +794,14 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 			icalcomponent_add_property(vevent, icalproperty_new_transp(formtransp));
 		}
 
-		/** Give this event a UID if it doesn't have one. */
+		/* Give this event a UID if it doesn't have one. */
 		if (icalcomponent_get_first_property(vevent,
 		   ICAL_UID_PROPERTY) == NULL) {
 			generate_uuid(buf);
 			icalcomponent_add_property(vevent, icalproperty_new_uid(buf));
 		}
 
-		/** Increment the sequence ID */
+		/* Increment the sequence ID */
 		while (prop = icalcomponent_get_first_property(vevent,
 		      ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
 			i = icalproperty_get_sequence(prop);
@@ -814,7 +814,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 			icalproperty_new_sequence(sequence)
 		);
 		
-		/**
+		/*
 		 * Set the organizer, only if one does not already exist *and*
 		 * the form is supplying one
 		 */
@@ -823,7 +823,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 		   ICAL_ORGANIZER_PROPERTY) == NULL) 
 		   && (!IsEmptyStr(buf)) ) {
 
-			/** set new organizer */
+			/* set new organizer */
 			sprintf(organizer_string, "MAILTO:%s", buf);
 			icalcomponent_add_property(vevent,
 				icalproperty_new_organizer(organizer_string)
@@ -831,7 +831,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 
 		}
 
-		/**
+		/*
 		 * Add any new attendees listed in the web form
 		 */
 
@@ -850,7 +850,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 			}
 		}
 
-		/** Now iterate! */
+		/* Now iterate! */
 		for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
 			extract_token(buf, form_attendees, i, '\n', sizeof buf);
 			striplt(buf);
@@ -873,7 +873,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 			}
 		}
 
-		/**
+		/*
 		 * Remove any attendees *not* listed in the web form
 		 */
 STARTOVER:	for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
@@ -895,7 +895,7 @@ STARTOVER:	for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
 			}
 		}
 
-		/**
+		/*
 		 * Encapsulate event into full VCALENDAR component.  Clone it first,
 		 * for two reasons: one, it's easier to just free the whole thing
 		 * when we're done instead of unbundling, but more importantly, we
@@ -907,7 +907,7 @@ STARTOVER:	for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
 		/* Set the method to PUBLISH */
 		icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
 
-		/** If the user clicked 'Save' then save it to the server. */
+		/* If the user clicked 'Save' then save it to the server. */
 		if ( (encaps != NULL) && (havebstr("save_button")) ) {
 			serv_puts("ENT0 1|||4|||1|");
 			serv_getln(buf, sizeof buf);
@@ -929,13 +929,13 @@ STARTOVER:	for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
 			encaps = NULL;
 		}
 
-		/** Or, check attendee availability if the user asked for that. */
+		/* Or, check attendee availability if the user asked for that. */
 		if ( (encaps != NULL) && (havebstr("check_button")) ) {
 
 			/* Call this function, which does the real work */
 			check_attendee_availability(encaps);
 
-			/** This displays the form again, with our annotations */
+			/* This displays the form again, with our annotations */
 			display_edit_individual_event(encaps, msgnum, from, unread, NULL);
 
 			icalcomponent_free(encaps);
diff --git a/webcit/rss.c b/webcit/rss.c
index 8a8638f8d..912e049dd 100644
--- a/webcit/rss.c
+++ b/webcit/rss.c
@@ -1,11 +1,7 @@
 /*
  * $Id$
  */
-/**
- * \defgroup RssRooms Generate some RSS for our rooms.
- * \ingroup WebcitHttpServerRSS
- */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
 
@@ -18,10 +14,10 @@
 #define ANON_RSS_PASS ""
 time_t if_modified_since;    /**< the last modified stamp */
 
-/**
- * \brief view rss Config menu
- * \param reply_to the original author
- * \param subject the subject of the feed
+/*
+ * view rss Config menu
+ * reply_to the original author
+ * subject the subject of the feed
  */
 void display_rss_control(char *reply_to, char *subject)
 {
@@ -42,10 +38,10 @@ void display_rss_control(char *reply_to, char *subject)
 }
 
 
-/**
- * \brief print the feed to the subscriber
- * \param roomname the room we sould print out as rss 
- * \param request_method the way the rss is requested????
+/*
+ * print the feed to the subscriber
+ * roomname the room we sould print out as rss 
+ * request_method the way the rss is requested????
  */
 void display_rss(char *roomname, StrBuf *request_method)
 {
@@ -358,4 +354,3 @@ ENDITEM:
 }
 
 
-/*@}*/
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index bce6cd5ca..29b048176 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -106,8 +106,8 @@ void get_serv_info(char *browser_host, char *user_agent)
 
 
 /**
- * \brief Read Citadel variformat text and spit it out as HTML.
- * \param align html align string
+ *  Read Citadel variformat text and spit it out as HTML.
+ *  align html align string
  */
 inline void fmout(char *align)
 {
@@ -159,7 +159,7 @@ void _fmout(StrBuf *Target, char *align)
 
 
 /**
- * \brief Read Citadel variformat text and spit it out as HTML in a form
+ *  Read Citadel variformat text and spit it out as HTML in a form
  * suitable for embedding in another message (forward/quote).
  * (NO LINEBREAKS ALLOWED HERE!)
  */
@@ -202,9 +202,9 @@ void pullquote_fmout(void) {
 
 
 /**
- * \brief Transmit message text (in memory) to the server.
+ *  Transmit message text (in memory) to the server.
  *
- * \param ptr Pointer to the message being transmitted
+ *  ptr Pointer to the message being transmitted
  */
 void text_to_server(char *ptr)
 {
@@ -245,10 +245,10 @@ void text_to_server(char *ptr)
 
 
 /**
- * \brief Transmit message text (in memory) to the server,
+ *  Transmit message text (in memory) to the server,
  *        converting to Quoted-Printable encoding as we go.
  *
- * \param ptr Pointer to the message being transmitted
+ *  ptr Pointer to the message being transmitted
  */
 void text_to_server_qp(char *ptr)
 {
@@ -321,7 +321,7 @@ void text_to_server_qp(char *ptr)
 
 
 /**
- * \brief translate server message output to text
+ *  translate server message output to text
  * (used for editing room info files and such)
  */
 void server_to_text()
@@ -395,7 +395,7 @@ int read_server_binary(StrBuf *Ret, size_t total_len)
 
 
 /**
- * \brief Read text from server, appending to a string buffer until the
+ *  Read text from server, appending to a string buffer until the
  * usual 000 terminator is found.  Caller is responsible for freeing
  * the returned pointer.
  */
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 27271e334..4a67d748b 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -38,7 +38,7 @@ void LoadZoneFiles(void)
 
 
 /*
- * \brief display all configuration items
+ *  display all configuration items
  */
 void display_siteconfig(void)
 {
@@ -871,7 +871,7 @@ CfgMapping ServerConfig[] = {
 
 
 /*
- * \brief display all configuration items
+ *  display all configuration items
  */
 void load_siteconfig(void)
 {
@@ -1070,4 +1070,3 @@ InitModule_SITECONFIG
 	RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg, CTX_NONE);
 	RegisterConditional(HKEY("COND:SERVCFG:SUBST"), 4, ConditionalServCfgSubst, CTX_NONE);
 }
-/*@}*/
diff --git a/webcit/snprintf.c b/webcit/snprintf.c
index 66e9701e2..37cc5293b 100644
--- a/webcit/snprintf.c
+++ b/webcit/snprintf.c
@@ -1,14 +1,9 @@
 /*
  * $Id$
  */
-/** 
- * \defgroup SnprintfReplacement modified from Sten Gunterberg's BUGTRAQ post of 22 Jul 1997
- * --nathan bryant <bryant@cs.usm.maine.edu>
- * \ingroup tools
- */
-/*@{*/
+
 /**
- * \brief Replacements for snprintf() and vsnprintf()
+ *  Replacements for snprintf() and vsnprintf()
  *
  * Use it only if you have the "spare" cycles needed to effectively
  * do every snprintf operation twice! Why is that? Because everything
@@ -28,9 +23,9 @@
 #include "webserver.h"
 
 /**
- * \brief is it needed????
- * \param fmt the formatstring?
- * \param argp how many params?
+ *  is it needed????
+ *  fmt the formatstring?
+ *  argp how many params?
  */
 static int needed(const char *fmt, va_list argp)
 {
@@ -51,11 +46,11 @@ static int needed(const char *fmt, va_list argp)
 }
 
 /**
- * \brief vsnprintf wrapper
- * \param buf the output charbuffer
- * \param max maximal size of the buffer
- * \param fmt the formatstring (see man printf)
- * \param argp the variable argument list 
+ *  vsnprintf wrapper
+ *  buf the output charbuffer
+ *  max maximal size of the buffer
+ *  fmt the formatstring (see man printf)
+ *  argp the variable argument list 
  */
 int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp)
 {
@@ -76,11 +71,11 @@ int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp)
 }
 
 /**
- * \brief snprintf wrapper
- * \param buf the output charbuffer
- * \param max maximal size of the buffer
- * \param fmt the formatstring (see man printf)
- * \param ... the variable argument list 
+ *  snprintf wrapper
+ *  buf the output charbuffer
+ *  max maximal size of the buffer
+ *  fmt the formatstring (see man printf)
+ *  ... the variable argument list 
  */
 int snprintf(char *buf, size_t max, const char *fmt,...)
 {
@@ -95,5 +90,3 @@ int snprintf(char *buf, size_t max, const char *fmt,...)
 }
 
 
-
-/*@}*/
diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index d626fbc6b..7db7f4f7f 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,21 +1,16 @@
 /*
  * $Id$
  */
-/**
- * \defgroup ShowSysMsgs Editing of various text files on the Citadel server.
- * \ingroup WebcitDisplayItems
- */
-/*@{*/
 #include "webcit.h"
 
 
 /**
- * \brief display the form for editing something (room info, bio, etc)
- * \param description the descriptive text for the box
- * \param check_cmd command to check????
- * \param read_cmd read answer from citadel server???
- * \param save_cmd save comand to the citadel server??
- * \param with_room_banner should we bisplay a room banner?
+ *  display the form for editing something (room info, bio, etc)
+ *  description the descriptive text for the box
+ *  check_cmd command to check????
+ *  read_cmd read answer from citadel server???
+ *  save_cmd save comand to the citadel server??
+ *  with_room_banner should we bisplay a room banner?
  */
 void display_edit(char *description, char *check_cmd,
 		  char *read_cmd, char *save_cmd, int with_room_banner)
@@ -63,10 +58,10 @@ void display_edit(char *description, char *check_cmd,
 
 
 /**
- * \brief save a screen which was displayed with display_edit()
- * \param description the window title???
- * \param enter_cmd which command to enter at the citadel server???
- * \param regoto should we go to that room again after executing that command?
+ *  save a screen which was displayed with display_edit()
+ *  description the window title???
+ *  enter_cmd which command to enter at the citadel server???
+ *  regoto should we go to that room again after executing that command?
  */
 void save_edit(char *description, char *enter_cmd, int regoto)
 {
@@ -120,4 +115,3 @@ InitModule_SYSMSG
 	WebcitAddUrlHandler(HKEY("display_editbio"), display_editbio, 0);
 	WebcitAddUrlHandler(HKEY("editbio"), editbio, 0);
 }
-/*@}*/
diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 6c9b34f35..d7a43f414 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -1,11 +1,6 @@
 /*
  * $Id$
  */
-/** 
- * \defgroup TcpSockets TCP client socket module for WebCit
- * \ingroup CitadelCommunitacion
- */
-/*@{*/
 
 /*
  * Uncomment this to log all communications with the Citadel server
@@ -16,9 +11,9 @@
 #include "webcit.h"
 #include "webserver.h"
 
-/**
- * \brief register the timeout
- * \param signum signalhandler number
+/*
+ *  register the timeout
+ *  signum signalhandler number
  * \return signals
  */
 RETSIGTYPE timeout(int signum)
@@ -28,9 +23,9 @@ RETSIGTYPE timeout(int signum)
 }
 
 
-/**
- * \brief Connect a unix domain socket
- * \param sockpath where to open a unix domain socket
+/*
+ *  Connect a unix domain socket
+ *  sockpath where to open a unix domain socket
  */
 int uds_connectsock(char *sockpath)
 {
@@ -59,10 +54,10 @@ int uds_connectsock(char *sockpath)
 }
 
 
-/**
- * \brief Connect a TCP/IP socket
- * \param host the host to connect to
- * \param service the service on the host to call
+/*
+ *  Connect a TCP/IP socket
+ *  host the host to connect to
+ *  service the service on the host to call
  */
 int tcp_connectsock(char *host, char *service)
 {
@@ -119,10 +114,10 @@ int tcp_connectsock(char *host, char *service)
 
 
 
-/**
- * \brief Input binary data from socket
- * \param buf the buffer to get the input to
- * \param bytes the maximal number of bytes to read
+/*
+ *  Input binary data from socket
+ *  buf the buffer to get the input to
+ *  bytes the maximal number of bytes to read
  */
 inline void _serv_read(char *buf, int bytes, struct wcsession *WCC)
 {
@@ -152,8 +147,8 @@ void serv_read(char *buf, int bytes)
 	_serv_read(buf, bytes, WCC);
 }
 
-/**
- * \brief input string from pipe
+/*
+ *  input string from pipe
  */
 int serv_getln(char *strbuf, int bufsize)
 {
@@ -213,10 +208,10 @@ int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize)
 	return rc;
 }
 
-/**
- * \brief send binary to server
- * \param buf the buffer to write to citadel server
- * \param nbytes how many bytes to send to citadel server
+/*
+ *  send binary to server
+ *  buf the buffer to write to citadel server
+ *  nbytes how many bytes to send to citadel server
  */
 void serv_write(const char *buf, int nbytes)
 {
@@ -239,9 +234,9 @@ void serv_write(const char *buf, int nbytes)
 }
 
 
-/**
- * \brief send line to server
- * \param string the line to send to the citadel server
+/*
+ *  send line to server
+ *  string the line to send to the citadel server
  */
 void serv_puts(const char *string)
 {
@@ -252,9 +247,9 @@ void serv_puts(const char *string)
 	serv_write("\n", 1);
 }
 
-/**
- * \brief send line to server
- * \param string the line to send to the citadel server
+/*
+ *  send line to server
+ *  string the line to send to the citadel server
  */
 void serv_putbuf(const StrBuf *string)
 {
@@ -266,10 +261,10 @@ void serv_putbuf(const StrBuf *string)
 }
 
 
-/**
- * \brief convenience function to send stuff to the server
- * \param format the formatstring
- * \param ... the entities to insert into format 
+/*
+ *  convenience function to send stuff to the server
+ *  format the formatstring
+ *  ... the entities to insert into format 
  */
 void serv_printf(const char *format,...)
 {
@@ -290,5 +285,3 @@ void serv_printf(const char *format,...)
 #endif
 }
 
-
-/*@}*/
diff --git a/webcit/useredit.c b/webcit/useredit.c
index bdd457dc2..2446b3c2e 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -1,21 +1,15 @@
 /*
  * $Id$
  */
-/**
- * \defgroup AdminTasks Administrative screen to add/change/delete user accounts
- * \ingroup CitadelConfig
- *
- */
-/*@{*/
 
 #include "webcit.h"
 #include "webserver.h"
 
 
 /**
- * \brief show a list of available users to edit them
- * \param message the header message???
- * \param preselect which user should be selected in the browser
+ *  show a list of available users to edit them
+ *  message the header message???
+ *  preselect which user should be selected in the browser
  */
 void select_user_to_edit(char *message, char *preselect)
 {/*
@@ -448,9 +442,9 @@ int ConditionalUserAccess(WCTemplateToken *Tokens, void *Context, int ContextTyp
 }
 
 /**
- * \brief Locate the message number of a user's vCard in the current room
- * \param username the plaintext name of the user
- * \param usernum the number of the user on the citadel server
+ *  Locate the message number of a user's vCard in the current room
+ *  username the plaintext name of the user
+ *  usernum the number of the user on the citadel server
  * \return the message id of his vcard
  */
 long locate_user_vcard(char *username, long usernum) {
@@ -521,9 +515,9 @@ TRYAGAIN:
 
 
 /**
- * \brief Display the form for editing a user's address book entry
- * \param username the name of the user
- * \param usernum the citadel-uid of the user
+ *  Display the form for editing a user's address book entry
+ *  username the name of the user
+ *  usernum the citadel-uid of the user
  */
 void display_edit_address_book_entry(char *username, long usernum) {
 	char roomname[SIZ];
@@ -605,14 +599,14 @@ void display_edituser(char *supplied_username, int is_new) {
 
 
 /* *
- * \brief Edit a user.  
+ *  Edit a user.  
  * If supplied_username is null, look in the "username"
  * web variable for the name of the user to edit.
  * 
  * If "is_new" is set to nonzero, this screen will set the web variables
  * to send the user to the vCard editor next.
- * \param supplied_username user to look up or NULL if to search in the environment
- * \param is_new should we create the user?
+ *  supplied_username user to look up or NULL if to search in the environment
+ *  is_new should we create the user?
  * /
 void display_edituser(char *supplied_username, int is_new) {
 	char buf[1024];
@@ -788,7 +782,7 @@ void display_edituser(char *supplied_username, int is_new) {
 */
 
 /**
- * \brief do the backend operation of the user edit on the server
+ *  do the backend operation of the user edit on the server
  */
 void edituser(void) {
 	char message[SIZ];
@@ -859,8 +853,8 @@ void edituser(void) {
 }
 
 /*
- * \brief burge a user 
- * \param username the name of the user to remove
+ *  burge a user 
+ *  username the name of the user to remove
  */
 void delete_user(char *username) {
 	char buf[SIZ];
@@ -882,7 +876,7 @@ void delete_user(char *username) {
 
 
 /**
- * \brief create a new user
+ *  create a new user
  * take the web environment username and create it on the citadel server
  */
 void create_user(void) {
@@ -949,4 +943,3 @@ InitModule_USEREDIT
 
 	RegisterIterator("USERLIST", 0, NULL, iterate_load_userlist, NULL, DeleteHash, CTX_USERLIST);
 }
-/*@}*/
diff --git a/webcit/userlist.c b/webcit/userlist.c
index 0733851d2..3a9df2987 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -1,24 +1,19 @@
 /*
  * $Id$
  */
-/**
- * \defgroup AccDisplay Display a list of all accounts on a Citadel system.
- * \ingroup CitadelConfig
- */
 
-/*@{*/
 #include "webcit.h"
 
-/** 
- * \brief structure to keep namelists in
+/* 
+ * structure to keep namelists in
  */
 struct namelist {
 	struct namelist *next; /**< next item of the linked list */
 	char name[32];         /**< name of the userentry */
 };
 
-/**
- * \brief display the userlist
+/*
+ * display the userlist
  */
 void userlist(void)
 {
@@ -109,8 +104,8 @@ DONE:	wDumpContent(1);
 }
 
 
-/**
- * \brief Display (non confidential) information about a particular user
+/*
+ * Display (non confidential) information about a particular user
  */
 void showuser(void)
 {
@@ -177,4 +172,3 @@ InitModule_USERLIST
 	WebcitAddUrlHandler(HKEY("userlist"), userlist, 0);
 	WebcitAddUrlHandler(HKEY("showuser"), showuser, 0);
 }
-/*@}*/
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index c8a22ebb6..c5deb9822 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,21 +1,14 @@
 /*
  * $Id$
  */
-/**
- * \defgroup vCardEdit Handles on-screen editing of vCard objects.
- * \ingroup VCards
- */
-/*@{*/
+
 #include "webcit.h"
 
-/**
- * \brief Edit the vCard component of a MIME message.  
+/*
+ * Edit the vCard component of a MIME message.  
  * Supply the message number
  * and MIME part number to fetch.  Or, specify -1 for the message number
  * to start with a blank card.
- * \param msgnum number of the item on the citadel server
- * \param partnum what???
- * \param return_to where to go back in the browser after edit ????
  */
 void do_edit_vcard(long msgnum, char *partnum, char *return_to, char *force_room) {
 	char buf[SIZ];
@@ -367,7 +360,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to, char *force_room
 
 
 /**
- * \brief commit the edits to the citadel server
+ *  commit the edits to the citadel server
  */
 void edit_vcard(void) {
 	long msgnum;
@@ -381,7 +374,7 @@ void edit_vcard(void) {
 
 
 /**
- * \brief parse edited vcard from the browser
+ *  parse edited vcard from the browser
  */
 void submit_vcard(void) {
 	struct vCard *v;
@@ -494,4 +487,3 @@ InitModule_VCARD
 	WebcitAddUrlHandler(HKEY("submit_vcard"), submit_vcard, 0);
 }
 
-/*@}*/
-- 
2.30.2