===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.178
retrieving revision 1.181
diff -u -p -r1.178 -r1.181
--- mandoc/cgi.c	2022/07/05 14:04:25	1.178
+++ mandoc/cgi.c	2023/04/28 19:11:03	1.181
@@ -1,4 +1,4 @@
-/* $Id: cgi.c,v 1.178 2022/07/05 14:04:25 schwarze Exp $ */
+/* $Id: cgi.c,v 1.181 2023/04/28 19:11:03 schwarze Exp $ */
 /*
  * Copyright (c) 2014-2019, 2021, 2022 Ingo Schwarze <schwarze@usta.de>
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -444,13 +444,14 @@ resp_searchform(const struct req *req, enum focus focu
 
 	/* Write query input box. */
 
-	printf("    <input type=\"search\" name=\"query\" value=\"");
+	printf("    <label>Search query:\n"
+	       "      <input type=\"search\" name=\"query\" value=\"");
 	if (req->q.query != NULL)
 		html_print(req->q.query);
-	printf( "\" size=\"40\"");
+	printf("\" size=\"40\"");
 	if (focus == FOCUS_QUERY)
 		printf(" autofocus");
-	puts(">");
+	puts(">\n    </label>");
 
 	/* Write submission buttons. */
 
@@ -462,7 +463,7 @@ resp_searchform(const struct req *req, enum focus focu
 
 	/* Write section selector. */
 
-	puts("    <select name=\"sec\" aria-label=\"manual section\">");
+	puts("    <select name=\"sec\" aria-label=\"Manual section\">");
 	for (i = 0; i < sec_MAX; i++) {
 		printf("      <option value=\"%s\"", sec_numbers[i]);
 		if (NULL != req->q.sec &&
@@ -491,7 +492,8 @@ resp_searchform(const struct req *req, enum focus focu
 	/* Write manpath selector. */
 
 	if (req->psz > 1) {
-		puts("    <select name=\"manpath\">");
+		puts("    <select name=\"manpath\""
+		     " aria-label=\"Manual path\">");
 		for (i = 0; i < (int)req->psz; i++) {
 			printf("      <option");
 			if (strcmp(req->q.manpath, req->p[i]) == 0)
@@ -564,7 +566,7 @@ pg_index(const struct req *req)
 	resp_searchform(req, FOCUS_QUERY);
 	printf("</header>\n"
 	       "<main>\n"
-	       "<p role=\"doc-notice\" aria-label=\"usage\">\n"
+	       "<p role=\"doc-notice\" aria-label=\"Usage\">\n"
 	       "This web interface is documented in the\n"
 	       "<a class=\"Xr\" href=\"/%s%sman.cgi.8\""
 	       " aria-label=\"man dot CGI, section 8\">man.cgi(8)</a>\n"
@@ -588,7 +590,7 @@ pg_noresult(const struct req *req, int code, const cha
 	resp_searchform(req, FOCUS_QUERY);
 	puts("</header>");
 	puts("<main>");
-	puts("<p role=\"doc-notice\" aria-label=\"no result\">");
+	puts("<p role=\"doc-notice\" aria-label=\"No result\">");
 	puts(user_msg);
 	puts("</p>");
 	puts("</main>");
@@ -1095,7 +1097,7 @@ main(void)
 #if HAVE_PLEDGE
 	/*
 	 * The "rpath" pledge could be revoked after mparse_readfd()
-	 * if the file desciptor to "/footer.html" would be opened
+	 * if the file descriptor to "/footer.html" would be opened
 	 * up front, but it's probably not worth the complication
 	 * of the code it would cause: it would require scattering
 	 * pledge() calls in multiple low-level resp_*() functions.