Lose the empty doxygen markers

- nothing wrong with comments but empty comment placeholders
  are not exactly useful

20 files changed, 3 insertions, 319 deletions

diff --git a/python/header-py.c b/python/header-py.c
index f99cf5e48..f8ce93d7d 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/header-py.c
- */
-
 #include "system.h"
 
 #include <rpm/rpmlib.h>		/* rpmvercmp */
@@ -128,15 +124,11 @@
  * \name Class: rpm.hdr
  */
 
-/** \ingroup py_c
- */
 struct hdrObject_s {
     PyObject_HEAD
     Header h;
 } ;
 
-/** \ingroup py_c
- */
 static PyObject * hdrKeyList(hdrObject * s)
 {
     PyObject * list, *o;
@@ -174,8 +166,6 @@ static PyObject * hdrKeyList(hdrObject * s)
     return list;
 }
 
-/** \ingroup py_c
- */
 static PyObject * hdrUnload(hdrObject * s, PyObject * args, PyObject *keywords)
 {
     char * buf;
@@ -208,8 +198,6 @@ static PyObject * hdrUnload(hdrObject * s, PyObject * args, PyObject *keywords)
     return rc;
 }
 
-/** \ingroup py_c
- */
 static PyObject * hdrExpandFilelist(hdrObject * s)
 {
     headerConvert(s->h, HEADERCONV_EXPANDFILELIST);
@@ -217,8 +205,6 @@ static PyObject * hdrExpandFilelist(hdrObject * s)
     Py_RETURN_NONE;
 }
 
-/** \ingroup py_c
- */
 static PyObject * hdrCompressFilelist(hdrObject * s)
 {
     headerConvert(s->h, HEADERCONV_COMPRESSFILELIST);
@@ -227,8 +213,6 @@ static PyObject * hdrCompressFilelist(hdrObject * s)
 }
 
 /* make a header with _all_ the tags we need */
-/** \ingroup py_c
- */
 static void mungeFilelist(Header h)
 {
     rpmtd fileNames = rpmtdNew();
@@ -246,8 +230,6 @@ static void mungeFilelist(Header h)
     rpmtdFree(fileNames);
 }
 
-/** \ingroup py_c
- */
 static PyObject * hdrFullFilelist(hdrObject * s)
 {
     mungeFilelist (s->h);
@@ -255,8 +237,6 @@ static PyObject * hdrFullFilelist(hdrObject * s)
     Py_RETURN_NONE;
 }
 
-/** \ingroup py_c
- */
 static PyObject * hdrSprintf(hdrObject * s, PyObject * args, PyObject * kwds)
 {
     char * fmt;
@@ -285,8 +265,6 @@ static PyObject *hdrIsSource(hdrObject *s)
     return PyBool_FromLong(headerIsSource(s->h));
 }
 
-/**
- */
 static int hdr_compare(hdrObject * a, hdrObject * b)
 {
     return rpmVersionCompare(a->h, b->h);
@@ -297,8 +275,6 @@ static long hdr_hash(PyObject * h)
     return (long) h;
 }
 
-/** \ingroup py_c
- */
 static struct PyMethodDef hdr_methods[] = {
     {"keys",		(PyCFunction) hdrKeyList,	METH_NOARGS,
 	NULL },
@@ -325,8 +301,6 @@ static struct PyMethodDef hdr_methods[] = {
     {NULL,		NULL}		/* sentinel */
 };
 
-/** \ingroup py_c
- */
 static void hdr_dealloc(hdrObject * s)
 {
     if (s->h) headerFree(s->h);
@@ -350,8 +324,6 @@ rpmTag tagNumFromPyObject (PyObject *item)
     return tag;
 }
 
-/** \ingroup py_c
- */
 static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
 {
     rpmTagType tagtype, type;
@@ -484,21 +456,15 @@ static int hdr_setattro(PyObject * o, PyObject * n, PyObject * v)
     return PyObject_GenericSetAttr(o, n, v);
 }
 
-/** \ingroup py_c
- */
 static PyMappingMethods hdr_as_mapping = {
 	(lenfunc) 0,			/* mp_length */
 	(binaryfunc) hdr_subscript,	/* mp_subscript */
 	(objobjargproc)0,		/* mp_ass_subscript */
 };
 
-/**
- */
 static char hdr_doc[] =
 "";
 
-/** \ingroup py_c
- */
 PyTypeObject hdr_Type = {
 	PyObject_HEAD_INIT(&PyType_Type)
 	0,				/* ob_size */
@@ -557,8 +523,6 @@ Header hdrGetHeader(hdrObject * s)
     return s->h;
 }
 
-/**
- */
 PyObject * hdrLoad(PyObject * self, PyObject * args, PyObject * kwds)
 {
     PyObject * hdr;
@@ -588,8 +552,6 @@ PyObject * hdrLoad(PyObject * self, PyObject * args, PyObject * kwds)
     return hdr;
 }
 
-/**
- */
 PyObject * rpmReadHeaders (FD_t fd)
 {
     PyObject * list;
@@ -626,8 +588,6 @@ PyObject * rpmReadHeaders (FD_t fd)
     return list;
 }
 
-/**
- */
 PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args, PyObject * kwds)
 {
     FD_t fd;
@@ -646,8 +606,6 @@ PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args, PyObject * kwds)
     return list;
 }
 
-/**
- */
 PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args, PyObject *kwds)
 {
     char * filespec;
@@ -764,8 +722,6 @@ rpmMergeHeadersFromFD(PyObject * self, PyObject * args, PyObject * kwds)
     Py_RETURN_NONE;
 }
 
-/**
- */
 PyObject *
 rpmSingleHeaderFromFD(PyObject * self, PyObject * args, PyObject * kwds)
 {
@@ -810,8 +766,6 @@ rpmSingleHeaderFromFD(PyObject * self, PyObject * args, PyObject * kwds)
     return tuple;
 }
 
-/**
- */
 PyObject * versionCompare (PyObject * self, PyObject * args, PyObject * kwds)
 {
     hdrObject * h1, * h2;
@@ -824,8 +778,6 @@ PyObject * versionCompare (PyObject * self, PyObject * args, PyObject * kwds)
     return Py_BuildValue("i", hdr_compare(h1, h2));
 }
 
-/**
- */
 static int compare_values(const char *str1, const char *str2)
 {
     if (!str1 && !str2)
diff --git a/python/header-py.h b/python/header-py.h
index 25cf30b8b..2eb6229c8 100644
--- a/python/header-py.h
+++ b/python/header-py.h
@@ -3,18 +3,10 @@
 
 #include <rpm/rpmtypes.h>
 
-/** \ingroup py_c
- * \file python/header-py.h
- */
-
-/** \ingroup py_c
- */
 typedef struct hdrObject_s hdrObject;
 
 extern PyTypeObject hdr_Type;
 
-/** \ingroup py_c
- */
 extern PyObject * pyrpmError;
 
 PyObject * hdr_Wrap(Header h);
diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index 0c3a45928..c6d1ceeb7 100644
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/rpmds-py.c
- */
-
 #include "system.h"
 
 #include <rpm/rpmtypes.h>
@@ -13,8 +9,6 @@
 
 #include "debug.h"
 
-/**
- */
 struct rpmdsObject_s {
     PyObject_HEAD
     PyObject *md_dict;		/*!< to look like PyModuleObject */
@@ -137,8 +131,6 @@ rpmds_Refs(rpmdsObject * s)
     return Py_BuildValue("i", rpmdsRefs(s->ds));
 }
 
-/**
- */
 static int compare_values(const char *str1, const char *str2)
 {
     if (!str1 && !str2)
@@ -445,16 +437,12 @@ static PyMappingMethods rpmds_as_mapping = {
         (objobjargproc)0,		/* mp_ass_subscript */
 };
 
-/** \ingroup py_c
- */
 static int rpmds_init(rpmdsObject * s, PyObject *args, PyObject *kwds)
 {
     s->active = 0;
     return 0;
 }
 
-/** \ingroup py_c
- */
 static void rpmds_free(rpmdsObject * s)
 {
 if (_rpmds_debug)
@@ -464,8 +452,6 @@ fprintf(stderr, "%p -- ds %p\n", s, s->ds);
     PyObject_Del((PyObject *)s);
 }
 
-/** \ingroup py_c
- */
 static PyObject * rpmds_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds)
 {
     hdrObject * ho = NULL;
@@ -488,8 +474,6 @@ static PyObject * rpmds_new(PyTypeObject * subtype, PyObject *args, PyObject *kw
     return rpmds_Wrap(ds);
 }
 
-/**
- */
 static char rpmds_doc[] =
 "";
 
diff --git a/python/rpmds-py.h b/python/rpmds-py.h
index 8fd42f6f8..8fb83750b 100644
--- a/python/rpmds-py.h
+++ b/python/rpmds-py.h
@@ -3,34 +3,18 @@
 
 #include <rpm/rpmds.h>
 
-/** \ingroup py_c
- * \file python/rpmds-py.h
- */
-
 typedef struct rpmdsObject_s rpmdsObject;
 
-/**
- */
 extern PyTypeObject rpmds_Type;
 
-/**
- */
 rpmds dsFromDs(rpmdsObject * ds);
 
-/**
- */
 PyObject * rpmds_Wrap(rpmds ds);
 
-/**
- */
 PyObject * rpmds_Single(PyObject * s, PyObject * args, PyObject * kwds);
 
-/**
- */
 PyObject * hdr_dsFromHeader(PyObject * s, PyObject * args, PyObject * kwds);
 
-/**
- */
 PyObject * hdr_dsOfHeader(PyObject * s);
 
 #endif
diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index fbe7955b1..394830a17 100644
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/rpmfi-py.c
- */
-
 #include "system.h"
 
 #include <rpm/rpmtypes.h>
@@ -319,16 +315,12 @@ static PyMappingMethods rpmfi_as_mapping = {
         (objobjargproc)0,		/* mp_ass_subscript */
 };
 
-/** \ingroup py_c
- */
 static int rpmfi_init(rpmfiObject * s, PyObject *args, PyObject *kwds)
 {
     s->active = 0;
     return 0;
 }
 
-/** \ingroup py_c
- */
 static void rpmfi_free(rpmfiObject * s)
 {
 if (_rpmfi_debug)
@@ -338,8 +330,6 @@ fprintf(stderr, "%p -- fi %p\n", s, s->fi);
     PyObject_Del((PyObject *)s);
 }
 
-/** \ingroup py_c
- */
 static PyObject * rpmfi_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds)
 {
     hdrObject * ho = NULL;
@@ -362,8 +352,6 @@ static PyObject * rpmfi_new(PyTypeObject * subtype, PyObject *args, PyObject *kw
     return rpmfi_Wrap(fi);
 }
 
-/**
- */
 static char rpmfi_doc[] =
 "";
 
diff --git a/python/rpmfi-py.h b/python/rpmfi-py.h
index 783dfb078..6147d6d76 100644
--- a/python/rpmfi-py.h
+++ b/python/rpmfi-py.h
@@ -3,10 +3,6 @@
 
 #include <rpm/rpmfi.h>
 
-/** \ingroup py_c
- * \file python/rpmfi-py.h
- */
-
 typedef struct rpmfiObject_s rpmfiObject;
 
 extern PyTypeObject rpmfi_Type;
diff --git a/python/rpmmacro-py.c b/python/rpmmacro-py.c
index 1b54f6ad0..37b036e7f 100644
--- a/python/rpmmacro-py.c
+++ b/python/rpmmacro-py.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/rpmmacro-py.c
- */
-
 #include "system.h"
 
 #include <structmember.h>
@@ -12,8 +8,6 @@
 
 #include "debug.h"
 
-/**
- */
 PyObject *
 rpmmacro_AddMacro(PyObject * self, PyObject * args, PyObject * kwds)
 {
@@ -29,8 +23,6 @@ rpmmacro_AddMacro(PyObject * self, PyObject * args, PyObject * kwds)
     Py_RETURN_NONE;
 }
 
-/**
- */
 PyObject *
 rpmmacro_DelMacro(PyObject * self, PyObject * args, PyObject * kwds)
 {
@@ -45,8 +37,6 @@ rpmmacro_DelMacro(PyObject * self, PyObject * args, PyObject * kwds)
     Py_RETURN_NONE;
 }
 
-/**
- */
 PyObject * 
 rpmmacro_ExpandMacro(PyObject * self, PyObject * args, PyObject * kwds)
 {
diff --git a/python/rpmmacro-py.h b/python/rpmmacro-py.h
index 31816ec25..c9abffe28 100644
--- a/python/rpmmacro-py.h
+++ b/python/rpmmacro-py.h
@@ -1,13 +1,6 @@
 #ifndef H_RPMMACRO_PY
 #define H_RPMMACRO_PY
 
-/** \ingroup py_c
- * \file python/rpmmacro-py.h
- */
-
-/** \ingroup py_c
- */
-
 PyObject * rpmmacro_AddMacro(PyObject * self, PyObject * args, PyObject * kwds);
 PyObject * rpmmacro_DelMacro(PyObject * self, PyObject * args, PyObject * kwds);
 PyObject * rpmmacro_ExpandMacro(PyObject * self, PyObject * args, PyObject * kwds);
diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c
index 755a02960..eb4d77e46 100644
--- a/python/rpmmi-py.c
+++ b/python/rpmmi-py.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/rpmmi-py.c
- */
-
 #include "system.h"
 
 #include <rpm/rpmdb.h>
@@ -64,8 +60,6 @@
  * \name Class: Rpmmi
  */
 
-/** \ingroup py_c
- */
 struct rpmmiObject_s {
     PyObject_HEAD
     PyObject *md_dict;		/*!< to look like PyModuleObject */
@@ -73,8 +67,6 @@ struct rpmmiObject_s {
     rpmdbMatchIterator mi;
 } ;
 
-/**
- */
 static PyObject *
 rpmmi_iternext(rpmmiObject * s)
 {
@@ -87,8 +79,6 @@ rpmmi_iternext(rpmmiObject * s)
     return hdr_Wrap(h);
 }
 
-/**
- */
 static PyObject *
 rpmmi_Instance(rpmmiObject * s)
 {
@@ -100,8 +90,6 @@ rpmmi_Instance(rpmmiObject * s)
     return Py_BuildValue("i", rc);
 }
 
-/**
- */
 static PyObject *
 rpmmi_Count(rpmmiObject * s)
 {
@@ -113,8 +101,6 @@ rpmmi_Count(rpmmiObject * s)
     return Py_BuildValue("i", rc);
 }
 
-/**
- */
 static PyObject *
 rpmmi_Pattern(rpmmiObject * s, PyObject * args, PyObject * kwds)
 {
@@ -136,8 +122,6 @@ rpmmi_Pattern(rpmmiObject * s, PyObject * args, PyObject * kwds)
     Py_RETURN_NONE;
 }
 
-/** \ingroup py_c
- */
 static struct PyMethodDef rpmmi_methods[] = {
     {"instance",    (PyCFunction) rpmmi_Instance,	METH_NOARGS,
 	NULL },
@@ -149,8 +133,6 @@ static struct PyMethodDef rpmmi_methods[] = {
     {NULL,		NULL}		/* sentinel */
 };
 
-/** \ingroup py_c
- */
 static void rpmmi_dealloc(rpmmiObject * s)
 {
     if (s) {
@@ -160,13 +142,9 @@ static void rpmmi_dealloc(rpmmiObject * s)
     }
 }
 
-/**
- */
 static char rpmmi_doc[] =
 "";
 
-/** \ingroup py_c
- */
 PyTypeObject rpmmi_Type = {
 	PyObject_HEAD_INIT(&PyType_Type)
 	0,				/* ob_size */
diff --git a/python/rpmmi-py.h b/python/rpmmi-py.h
index b55760679..b832c2d68 100644
--- a/python/rpmmi-py.h
+++ b/python/rpmmi-py.h
@@ -1,12 +1,6 @@
 #ifndef H_RPMMI_PY
 #define H_RPMMI_PY
 
-/** \ingroup py_c
- * \file python/rpmmi-py.h
- */
-
-/** \ingroup py_c
- */
 typedef struct rpmmiObject_s rpmmiObject;
 
 extern PyTypeObject rpmmi_Type;
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 8fa82e3e5..c0224b9e0 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/rpmmodule.c
- */
-
 #include "system.h"
 
 #include <rpm/rpmlib.h>		/* rpmMachineScore, rpmReadConfigFiles */
@@ -26,12 +22,8 @@
  * \name Module: rpm
  */
 
-/**
- */
 PyObject * pyrpmError;
 
-/**
- */
 static PyObject * archScore(PyObject * self, PyObject * args, PyObject * kwds)
 {
     char * arch;
@@ -46,8 +38,6 @@ static PyObject * archScore(PyObject * self, PyObject * args, PyObject * kwds)
     return Py_BuildValue("i", score);
 }
 
-/**
- *  */
 static PyObject * signalsCaught(PyObject * self, PyObject * check)
 {
     PyObject *caught, *o;
@@ -79,8 +69,6 @@ static PyObject * signalsCaught(PyObject * self, PyObject * check)
     return caught;
 }
 
-/**
- *  */
 static PyObject * checkSignals(PyObject * self, PyObject * args)
 {
     if (!PyArg_ParseTuple(args, ":checkSignals")) return NULL;
@@ -88,9 +76,6 @@ static PyObject * checkSignals(PyObject * self, PyObject * args)
     Py_RETURN_NONE;
 }
 
-
-/**
- */
 static PyObject * setLogFile (PyObject * self, PyObject * args, PyObject *kwds)
 {
     PyObject * fop = NULL;
@@ -114,8 +99,6 @@ static PyObject * setLogFile (PyObject * self, PyObject * args, PyObject *kwds)
     return (PyObject *) Py_None;
 }
 
-/**
- */
 static PyObject *
 setVerbosity (PyObject * self, PyObject * args, PyObject *kwds)
 {
@@ -131,8 +114,6 @@ setVerbosity (PyObject * self, PyObject * args, PyObject *kwds)
     return (PyObject *) Py_None;
 }
 
-/**
- */
 static PyObject *
 setEpochPromote (PyObject * self, PyObject * args, PyObject * kwds)
 {
@@ -146,8 +127,6 @@ setEpochPromote (PyObject * self, PyObject * args, PyObject * kwds)
     return (PyObject *) Py_None;
 }
 
-/**
- */
 static PyObject * setStats (PyObject * self, PyObject * args, PyObject * kwds)
 {
     char * kwlist[] = {"stats", NULL};
@@ -159,8 +138,6 @@ static PyObject * setStats (PyObject * self, PyObject * args, PyObject * kwds)
     return (PyObject *) Py_None;
 }
 
-/**
- */
 static PyMethodDef rpmModuleMethods[] = {
     { "TransactionSet", (PyCFunction) rpmts_Create, METH_VARARGS|METH_KEYWORDS,
 "rpm.TransactionSet([rootDir, [db]]) -> ts\n\
@@ -220,8 +197,6 @@ static void rpm_exithook(void)
    rpmdbCheckTerminate(1);
 }
 
-/**
- */
 static char rpm__doc__[] =
 "";
 
@@ -253,8 +228,7 @@ static void addRpmTags(PyObject *module)
 }
 
 void init_rpm(void);	/* XXX eliminate gcc warning */
-/**
- */
+
 void init_rpm(void)
 {
     PyObject * d, *m;
diff --git a/python/rpmps-py.c b/python/rpmps-py.c
index 652d83b6c..c7bd864f7 100644
--- a/python/rpmps-py.c
+++ b/python/rpmps-py.c
@@ -1,15 +1,9 @@
-/** \ingroup py_c
- * \file python/rpmps-py.c
- */
-
 #include "system.h"
 
 #include "rpmps-py.h"
 
 #include "debug.h"
 
-/**
- */
 struct rpmpsObject_s {
     PyObject_HEAD
     PyObject *md_dict;		/*!< to look like PyModuleObject */
@@ -80,8 +74,6 @@ static struct PyMethodDef rpmps_methods[] = {
  {NULL,		NULL}		/* sentinel */
 };
 
-/* ---------- */
-
 static void
 rpmps_dealloc(rpmpsObject * s)
 {
@@ -150,8 +142,6 @@ static PyMappingMethods rpmps_as_mapping = {
         (binaryfunc) rpmps_subscript,	/* mp_subscript */
 };
 
-/** \ingroup py_c
- */
 static void rpmps_free(rpmpsObject * s)
 {
 if (_rpmps_debug)
@@ -161,16 +151,12 @@ fprintf(stderr, "%p -- ps %p\n", s, s->ps);
     PyObject_Del((PyObject *)s);
 }
 
-/** \ingroup py_c
- */
 static PyObject * rpmps_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds)
 {
     rpmps ps = rpmpsCreate();
     return rpmps_Wrap(ps);
 }
 
-/**
- */
 static char rpmps_doc[] =
 "";
 
@@ -219,8 +205,6 @@ PyTypeObject rpmps_Type = {
 	0,				/* tp_is_gc */
 };
 
-/* ---------- */
-
 rpmps psFromPs(rpmpsObject * s)
 {
     return s->ps;
diff --git a/python/rpmps-py.h b/python/rpmps-py.h
index 297460ee8..350bccda4 100644
--- a/python/rpmps-py.h
+++ b/python/rpmps-py.h
@@ -3,22 +3,12 @@
 
 #include <rpm/rpmps.h>
 
-/** \ingroup py_c
- * \file python/rpmps-py.h
- */
-
 typedef struct rpmpsObject_s rpmpsObject;
 
-/**
- */
 extern PyTypeObject rpmps_Type;
 
-/**
- */
 rpmps psFromPs(rpmpsObject * ps);
 
-/**
- */
 PyObject * rpmps_Wrap(rpmps ps);
 
 #endif
diff --git a/python/rpmte-py.c b/python/rpmte-py.c
index 54a9dfaa3..6abc2c743 100644
--- a/python/rpmte-py.c
+++ b/python/rpmte-py.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/rpmte-py.c
- */
-
 #include "system.h"
 
 #include "header-py.h"	/* XXX tagNumFromPyObject */
@@ -219,8 +215,6 @@ rpmte_FI(rpmteObject * s, PyObject * args, PyObject * kwds)
     return rpmfi_Wrap(rpmfiLink(fi, RPMDBG_M("rpmte_FI")));
 }
 
-/** \ingroup py_c
- */
 static struct PyMethodDef rpmte_methods[] = {
     {"Debug",	(PyCFunction)rpmte_Debug,	METH_VARARGS|METH_KEYWORDS,
 	NULL},
@@ -295,13 +289,9 @@ rpmte_print(rpmteObject * s, FILE * fp, int flags)
     return 0;
 }
 
-/**
- */
 static char rpmte_doc[] =
 "";
 
-/** \ingroup py_c
- */
 PyTypeObject rpmte_Type = {
 	PyObject_HEAD_INIT(&PyType_Type)
 	0,				/* ob_size */
diff --git a/python/rpmte-py.h b/python/rpmte-py.h
index 3d13f3dd5..e6bfda951 100644
--- a/python/rpmte-py.h
+++ b/python/rpmte-py.h
@@ -3,10 +3,6 @@
 
 #include <rpm/rpmte.h>
 
-/** \ingroup py_c
- * \file python/rpmte-py.h
- */
-
 typedef struct rpmteObject_s rpmteObject;
 
 extern PyTypeObject rpmte_Type;
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 704d5f35c..7406ac8d3 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/rpmts-py.c
- */
-
 #include "system.h"
 
 #include <rpm/rpmlib.h>	/* rpmReadPackageFile, headerCheck */
@@ -151,8 +147,6 @@ struct rpmtsObject_s {
     rpmprobFilterFlags ignoreSet;
 };
 
-/** \ingroup py_c
- */
 struct rpmtsCallbackType_s {
     PyObject * cb;
     PyObject * data;
@@ -160,8 +154,6 @@ struct rpmtsCallbackType_s {
     PyThreadState *_save;
 };
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_Debug(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -195,8 +187,6 @@ static void die(PyObject *cb)
     exit(EXIT_FAILURE);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_AddInstall(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -241,9 +231,7 @@ fprintf(stderr, "*** rpmts_AddInstall(%p,%p,%p,%s) ts %p\n", s, h, key, how, s->
     Py_RETURN_NONE;
 }
 
-/** \ingroup py_c
- * @todo Permit finer control (i.e. not just --allmatches) of deleted elments.
- */
+/* TODO Permit finer control (i.e. not just --allmatches) of deleted elments.*/
 static PyObject *
 rpmts_AddErase(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -284,8 +272,6 @@ fprintf(stderr, "*** rpmts_AddErase(%p) ts %p\n", s, s->ts);
     }
 }
 
-/** \ingroup py_c
- */
 static int
 rpmts_SolveCallback(rpmts ts, rpmds ds, const void * data)
 {
@@ -319,8 +305,6 @@ fprintf(stderr, "*** rpmts_SolveCallback(%p,%p,%p) \"%s\"\n", ts, ds, data, rpmd
     return res;
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_Check(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -417,8 +401,6 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
     Py_RETURN_NONE;
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_Order(rpmtsObject * s)
 {
@@ -434,8 +416,6 @@ fprintf(stderr, "*** rpmts_Order(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rc);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_Clean(rpmtsObject * s)
 {
@@ -447,8 +427,6 @@ fprintf(stderr, "*** rpmts_Clean(%p) ts %p\n", s, s->ts);
     Py_RETURN_NONE;
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_OpenDB(rpmtsObject * s)
 {
@@ -464,8 +442,6 @@ fprintf(stderr, "*** rpmts_OpenDB(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rpmtsOpenDB(s->ts, dbmode));
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_CloseDB(rpmtsObject * s)
 {
@@ -480,8 +456,6 @@ fprintf(stderr, "*** rpmts_CloseDB(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rc);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_InitDB(rpmtsObject * s)
 {
@@ -497,8 +471,6 @@ fprintf(stderr, "*** rpmts_InitDB(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rc);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_RebuildDB(rpmtsObject * s)
 {
@@ -514,8 +486,6 @@ fprintf(stderr, "*** rpmts_RebuildDB(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rc);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_VerifyDB(rpmtsObject * s)
 {
@@ -531,8 +501,6 @@ fprintf(stderr, "*** rpmts_VerifyDB(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rc);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_HdrFromFdno(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -579,8 +547,6 @@ fprintf(stderr, "*** rpmts_HdrFromFdno(%p) ts %p rc %d\n", s, s->ts, rpmrc);
     return result;
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_HdrCheck(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -634,8 +600,6 @@ fprintf(stderr, "*** rpmts_HdrCheck(%p) ts %p\n", s, s->ts);
     return result;
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_SetVSFlags(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -655,16 +619,12 @@ fprintf(stderr, "*** rpmts_SetVSFlags(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rpmtsSetVSFlags(s->ts, vsflags));
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_GetVSFlags(rpmtsObject * s)
 {
     return Py_BuildValue("i", rpmtsVSFlags(s->ts));
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_SetColor(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -683,8 +643,6 @@ fprintf(stderr, "*** rpmts_SetColor(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rpmtsSetColor(s->ts, tscolor));
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_PgpPrtPkts(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -715,8 +673,6 @@ fprintf(stderr, "*** rpmts_PgpPrtPkts(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rc);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_PgpImportPubkey(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -748,8 +704,6 @@ fprintf(stderr, "*** rpmts_PgpImportPubkey(%p) ts %p\n", s, s->ts);
     return Py_BuildValue("i", rc);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_GetKeys(rpmtsObject * s)
 {
@@ -780,8 +734,6 @@ fprintf(stderr, "*** rpmts_GetKeys(%p) ts %p\n", s, s->ts);
     return tuple;
 }
 
-/** \ingroup py_c
- */
 static void *
 rpmtsCallback(const void * hd, const rpmCallbackType what,
 		         const rpm_loff_t amount, const rpm_loff_t total,
@@ -849,8 +801,6 @@ fprintf(stderr, "\t%llu:%llu key %p\n", (long long) amount, (long long) total, p
     return NULL;
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_SetFlags(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -870,8 +820,6 @@ fprintf(stderr, "*** rpmts_SetFlags(%p) ts %p transFlags %x\n", s, s->ts, transF
     return Py_BuildValue("i", rpmtsSetFlags(s->ts, transFlags));
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_SetProbFilter(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -892,8 +840,6 @@ fprintf(stderr, "*** rpmts_SetProbFilter(%p) ts %p ignoreSet %x\n", s, s->ts, ig
     return Py_BuildValue("i", oignoreSet);
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_Problems(rpmtsObject * s)
 {
@@ -904,8 +850,6 @@ fprintf(stderr, "*** rpmts_Problems(%p) ts %p\n", s, s->ts);
     return rpmps_Wrap( rpmtsProblems(s->ts) );
 }
 
-/** \ingroup py_c
- */
 static PyObject *
 rpmts_Run(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -969,9 +913,7 @@ fprintf(stderr, "*** rpmts_Run(%p) ts %p ignore %x\n", s, s->ts, s->ignoreSet);
     return list;
 }
 
-/**
- * @todo Add TR_ADDED filter to iterator.
- */
+/* TODO Add TR_ADDED filter to iterator. */
 static PyObject *
 rpmts_iternext(rpmtsObject * s)
 {
@@ -1000,8 +942,6 @@ fprintf(stderr, "*** rpmts_iternext(%p) ts %p tsi %p %d\n", s, s->ts, s->tsi, s-
     return result;
 }
 
-/**
- */
 static PyObject *
 spec_Parse(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -1028,8 +968,6 @@ spec_Parse(rpmtsObject * s, PyObject * args, PyObject * kwds)
     return spec_Wrap(spec);
 }
 
-/**
- */
 static PyObject *
 rpmts_Match(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
@@ -1084,8 +1022,6 @@ fprintf(stderr, "*** rpmts_Match(%p) ts %p\n", s, s->ts);
     return rpmmi_Wrap( rpmtsInitIterator(s->ts, tag, key, len), (PyObject*)s);
 }
 
-/** \ingroup py_c
- */
 static struct PyMethodDef rpmts_methods[] = {
  {"Debug",	(PyCFunction)rpmts_Debug,	METH_VARARGS|METH_KEYWORDS,
         NULL},
@@ -1170,8 +1106,6 @@ static struct PyMethodDef rpmts_methods[] = {
     {NULL,		NULL}		/* sentinel */
 };
 
-/** \ingroup py_c
- */
 static void rpmts_dealloc(rpmtsObject * s)
 {
 
@@ -1191,8 +1125,6 @@ static PyObject * rpmts_getattro(PyObject * o, PyObject * n)
     return PyObject_GenericGetAttr(o, n);
 }
 
-/** \ingroup py_c
- */
 static int rpmts_setattro(PyObject * o, PyObject * n, PyObject * v)
 {
     rpmtsObject *s = (rpmtsObject *)o;
@@ -1216,8 +1148,6 @@ static int rpmts_setattro(PyObject * o, PyObject * n, PyObject * v)
     return 0;
 }
 
-/** \ingroup py_c
- */
 static void rpmts_free(rpmtsObject * s)
 {
 if (_rpmts_debug)
@@ -1234,8 +1164,6 @@ fprintf(stderr, "%p -- ts %p db %p\n", s, s->ts, rpmtsGetRdb(s->ts));
     PyObject_Del((PyObject *)s);
 }
 
-/** \ingroup py_c
- */
 static PyObject * rpmts_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds)
 {
     char * rootDir = "/";
@@ -1257,13 +1185,9 @@ static PyObject * rpmts_new(PyTypeObject * subtype, PyObject *args, PyObject *kw
     return rpmts_Wrap(ts);
 }
 
-/**
- */
 static char rpmts_doc[] =
 "";
 
-/** \ingroup py_c
- */
 PyTypeObject rpmts_Type = {
 	PyObject_HEAD_INIT(&PyType_Type)
 	0,				/* ob_size */
@@ -1308,8 +1232,6 @@ PyTypeObject rpmts_Type = {
 	0,				/* tp_is_gc */
 };
 
-/**
- */
 PyObject *
 rpmts_Create(PyObject * self, PyObject * args, PyObject * kwds)
 {
diff --git a/python/rpmts-py.h b/python/rpmts-py.h
index 9fae1e1e9..cad663eeb 100644
--- a/python/rpmts-py.h
+++ b/python/rpmts-py.h
@@ -3,10 +3,6 @@
 
 #include <rpm/rpmts.h>
 
-/** \ingroup py_c
- * \file python/rpmts-py.h
- */
-
 typedef struct rpmtsObject_s rpmtsObject;
 
 extern PyTypeObject rpmts_Type;
diff --git a/python/spec-py.c b/python/spec-py.c
index e3614cee0..717c1dc6b 100644
--- a/python/spec-py.c
+++ b/python/spec-py.c
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/spec-py.c
- */
-
 #include "system.h"
 
 #include "spec-py.h"
@@ -140,9 +136,6 @@ spec_get_sources(specObject *s)
 
 }
 
-/**
- */
-
 static char spec_doc[] = "RPM Spec file object";
 
 static PyMethodDef spec_Spec_methods[] = {
diff --git a/python/spec-py.h b/python/spec-py.h
index 19b4df25e..0ed16e6e5 100644
--- a/python/spec-py.h
+++ b/python/spec-py.h
@@ -3,20 +3,12 @@
 
 #include <rpm/rpmbuild.h>
 
-/** \ingroup py_c
- * \file python/spec-py.h
- */
-
 typedef struct specObject_s specObject;
 
 extern PyTypeObject spec_Type;
 
-/**
- */
 rpmSpec specFromSpec(specObject * spec);
 
-/**
- */
 PyObject * spec_Wrap(rpmSpec spec);
 
 #endif /* RPMPYTHON_SPEC */
diff --git a/python/system.h b/python/system.h
index 56d2c4c8d..86563a346 100644
--- a/python/system.h
+++ b/python/system.h
@@ -1,7 +1,3 @@
-/** \ingroup py_c
- * \file python/system.h
- */
-
 #ifndef H_SYSTEM_PYTHON
 #define	H_SYSTEM_PYTHON