===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.225
retrieving revision 1.229
diff -u -p -r1.225 -r1.229
--- mandoc/mandocdb.c	2016/08/01 20:53:13	1.225
+++ mandoc/mandocdb.c	2016/09/01 15:08:04	1.229
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.225 2016/08/01 20:53:13 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.229 2016/09/01 15:08:04 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2016 Ingo Schwarze <schwarze@openbsd.org>
@@ -448,10 +448,10 @@ mandocdb(int argc, char *argv[])
 			if (nodb == 0)
 				dbprune(dba);
 		} else {
-			/*
-			 * Database missing or corrupt.
-			 * Recreate from scratch.
-			 */
+			/* Database missing or corrupt. */
+			say(MANDOC_DB,
+			    "%s: Automatically recreating from scratch",
+			    strerror(errno));
 			exitcode = (int)MANDOCLEVEL_OK;
 			op = OP_DEFAULT;
 			if (0 == treescan())
@@ -1049,7 +1049,7 @@ mlink_check(struct mpage *mpage, struct mlink *mlink)
 	 * architectures.
 	 * A few manuals are even shared across completely
 	 * different architectures, for example fdformat(1)
-	 * on amd64, i386, sparc, and sparc64.
+	 * on amd64, i386, and sparc64.
 	 */
 
 	if (strcasecmp(mpage->arch, mlink->arch))
@@ -1693,7 +1693,7 @@ parse_mdoc_Nm(struct mpage *mpage, const struct roff_m
 	if ( ! (mpage->name_head_done ||
 	    n->child == NULL || n->child->string == NULL ||
 	    strcasecmp(n->child->string, meta->title))) {
-		putkey(mpage, n->child->string, ROFFT_HEAD);
+		putkey(mpage, n->child->string, NAME_HEAD);
 		mpage->name_head_done = 1;
 	}
 	return 0;
@@ -2013,11 +2013,12 @@ dbadd(struct dba *dba, struct mpage *mpage)
 	cp = mpage->desc;
 	i = strlen(cp);
 	mustfree = render_string(&cp, &i);
-	mpage->dba = dba_page_new(dba->pages, mlink->name, mpage->sec,
+	mpage->dba = dba_page_new(dba->pages,
 	    *mpage->arch == '\0' ? mlink->arch : mpage->arch,
 	    cp, mlink->file, mpage->form);
 	if (mustfree)
 		free(cp);
+	dba_page_add(mpage->dba, DBP_SECT, mpage->sec);
 
 	while (mlink != NULL) {
 		dbadd_mlink(mlink);