Doxygen merge from head

(This used to be commit 38fa2898967f607a17fd7fbd324f2940a05fb551)

diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 43350d9349207f035d9fcae2bb4132e43760b93d..e4845e47349fe6f2bbf6a00441b8dc6bc790bad3 100644 (file)
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -69,11 +69,12 @@ static size_t sys_iconv(void *cd,
 #endif
 }
 
-/*
-  this is a simple portable iconv() implementaion. It only knows about
-  a very small number of character sets - just enough that Samba works
-  on systems that don't have iconv
- */
+/**
+ * This is a simple portable iconv() implementaion.
+ *
+ * It only knows about a very small number of character sets - just
+ * enough that Samba works on systems that don't have iconv.
+ **/
 size_t smb_iconv(smb_iconv_t cd, 
                 const char **inbuf, size_t *inbytesleft,
                 char **outbuf, size_t *outbytesleft)