Module Name: src
Committed By: gutteridge
Date: Sun Sep 11 20:32:38 UTC 2022
Modified Files:
src/usr.sbin/makemandb: apropos-utils.3 apropos-utils.c close_db.3
init_db.3 makemandb.8 makemandb.c run_query.3 whatis.1
Log Message:
makemandb/*: fix spelling of database and consistency of SQLite
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makemandb/apropos-utils.3 \
src/usr.sbin/makemandb/run_query.3 src/usr.sbin/makemandb/whatis.1
cvs rdiff -u -r1.49 -r1.50 src/usr.sbin/makemandb/apropos-utils.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makemandb/close_db.3
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/makemandb/init_db.3
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/makemandb/makemandb.8
cvs rdiff -u -r1.63 -r1.64 src/usr.sbin/makemandb/makemandb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makemandb/apropos-utils.3
diff -u src/usr.sbin/makemandb/apropos-utils.3:1.4 src/usr.sbin/makemandb/apropos-utils.3:1.5
--- src/usr.sbin/makemandb/apropos-utils.3:1.4 Tue May 24 18:06:42 2016
+++ src/usr.sbin/makemandb/apropos-utils.3 Sun Sep 11 20:32:37 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: apropos-utils.3,v 1.4 2016/05/24 18:06:42 abhinav Exp $
+.\" $NetBSD: apropos-utils.3,v 1.5 2022/09/11 20:32:37 gutteridge Exp $
.\"
.\" Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
.\" All rights reserved.
@@ -49,7 +49,7 @@ These functions all live in the
header file.
They operate on
.Pa /var/db/man.db
-which is an Sqlite database containing a full text search index of the manual
+which is an SQLite database containing a full text search index of the manual
pages.
The functions provide an easy to use interface to query the database and
develop applications on top of it.
Index: src/usr.sbin/makemandb/run_query.3
diff -u src/usr.sbin/makemandb/run_query.3:1.4 src/usr.sbin/makemandb/run_query.3:1.5
--- src/usr.sbin/makemandb/run_query.3:1.4 Tue May 24 18:06:42 2016
+++ src/usr.sbin/makemandb/run_query.3 Sun Sep 11 20:32:37 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: run_query.3,v 1.4 2016/05/24 18:06:42 abhinav Exp $
+.\" $NetBSD: run_query.3,v 1.5 2022/09/11 20:32:37 gutteridge Exp $
.\"
.\" Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
.\" All rights reserved.
@@ -161,7 +161,7 @@ function will return 0 and in case of an
.Sh FILES
.Bl -hang -width /var/db/man.db -compact
.It Pa /var/db/man.db
-The Sqlite FTS database which contains an index of the manual pages.
+The SQLite FTS database which contains an index of the manual pages.
.El
.Sh EXAMPLES
Following is a code excerpt of how
Index: src/usr.sbin/makemandb/whatis.1
diff -u src/usr.sbin/makemandb/whatis.1:1.4 src/usr.sbin/makemandb/whatis.1:1.5
--- src/usr.sbin/makemandb/whatis.1:1.4 Thu Jun 16 14:07:16 2016
+++ src/usr.sbin/makemandb/whatis.1 Sun Sep 11 20:32:37 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: whatis.1,v 1.4 2016/06/16 14:07:16 abhinav Exp $
+.\" $NetBSD: whatis.1,v 1.5 2022/09/11 20:32:37 gutteridge Exp $
.\"
.\" Copyright (c) 2012 Joerg Sonnenberger <[email protected]>
.\" All rights reserved.
@@ -58,7 +58,7 @@ configuration file than the default,
.Sh FILES
.Bl -hang -width /etc/man.conf -compact
.It Pa /etc/man.conf
-The location of the Sqlite FTS database can be configured using the
+The location of the SQLite FTS database can be configured using the
.Cd _mandb
tag.
.El
Index: src/usr.sbin/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.49 src/usr.sbin/makemandb/apropos-utils.c:1.50
--- src/usr.sbin/makemandb/apropos-utils.c:1.49 Thu May 19 04:08:03 2022
+++ src/usr.sbin/makemandb/apropos-utils.c Sun Sep 11 20:32:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.c,v 1.49 2022/05/19 04:08:03 gutteridge Exp $ */
+/* $NetBSD: apropos-utils.c,v 1.50 2022/09/11 20:32:37 gutteridge Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: apropos-utils.c,v 1.49 2022/05/19 04:08:03 gutteridge Exp $");
+__RCSID("$NetBSD: apropos-utils.c,v 1.50 2022/09/11 20:32:37 gutteridge Exp $");
#include <sys/queue.h>
#include <sys/stat.h>
@@ -241,7 +241,7 @@ out:
/*
* zip --
- * User defined Sqlite function to compress the FTS table
+ * User defined SQLite function to compress the FTS table
*/
static void
zip(sqlite3_context *pctx, int nval, sqlite3_value **apval)
@@ -262,7 +262,7 @@ zip(sqlite3_context *pctx, int nval, sql
/*
* unzip --
- * User defined Sqlite function to uncompress the FTS table.
+ * User defined SQLite function to uncompress the FTS table.
*/
static void
unzip(sqlite3_context *pctx, int nval, sqlite3_value **apval)
@@ -459,7 +459,7 @@ error:
/*
* rank_func --
- * Sqlite user defined function for ranking the documents.
+ * SQLite user defined function for ranking the documents.
* For each phrase of the query, it computes the tf and idf and adds them over.
* It computes the final rank, by multiplying tf and idf together.
* Weight of term t for document d = (term frequency of t in d *
Index: src/usr.sbin/makemandb/close_db.3
diff -u src/usr.sbin/makemandb/close_db.3:1.2 src/usr.sbin/makemandb/close_db.3:1.3
--- src/usr.sbin/makemandb/close_db.3:1.2 Tue May 24 18:06:42 2016
+++ src/usr.sbin/makemandb/close_db.3 Sun Sep 11 20:32:37 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: close_db.3,v 1.2 2016/05/24 18:06:42 abhinav Exp $
+.\" $NetBSD: close_db.3,v 1.3 2022/09/11 20:32:37 gutteridge Exp $
.\"
.\" Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
.\" All rights reserved.
@@ -50,7 +50,7 @@ and release any resources being used by
.Sh FILES
.Bl -hang -width /var/db/man.db -compact
.It Pa /var/db/man.db
-The Sqlite FTS database which contains an index of the manual pages.
+The SQLite FTS database which contains an index of the manual pages.
.El
.Sh SEE ALSO
.Xr apropos-utils 3 ,
Index: src/usr.sbin/makemandb/init_db.3
diff -u src/usr.sbin/makemandb/init_db.3:1.3 src/usr.sbin/makemandb/init_db.3:1.4
--- src/usr.sbin/makemandb/init_db.3:1.3 Tue May 24 18:06:42 2016
+++ src/usr.sbin/makemandb/init_db.3 Sun Sep 11 20:32:37 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: init_db.3,v 1.3 2016/05/24 18:06:42 abhinav Exp $
+.\" $NetBSD: init_db.3,v 1.4 2022/09/11 20:32:37 gutteridge Exp $
.\"
.\" Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
.\" All rights reserved.
@@ -45,7 +45,7 @@ The
function will try to initialize a connection to
.Pa man.db
which is an
-Sqlite database and return a pointer to a sqlite3 structure.
+SQLite database and return a pointer to a sqlite3 structure.
The connection should subsequentially be closed by calling
.Fn close_db
which will also release any resources being used by it.
@@ -88,7 +88,7 @@ will be returned.
.Sh FILES
.Bl -hang -width /etc/man.conf -compact
.It Pa /etc/man.conf
-The location of the Sqlite FTS database can be configured using the
+The location of the SQLite FTS database can be configured using the
.Cd _mandb
tag.
.El
Index: src/usr.sbin/makemandb/makemandb.8
diff -u src/usr.sbin/makemandb/makemandb.8:1.10 src/usr.sbin/makemandb/makemandb.8:1.11
--- src/usr.sbin/makemandb/makemandb.8:1.10 Sat Jun 18 06:36:18 2016
+++ src/usr.sbin/makemandb/makemandb.8 Sun Sep 11 20:32:37 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: makemandb.8,v 1.10 2016/06/18 06:36:18 abhinav Exp $
+.\" $NetBSD: makemandb.8,v 1.11 2022/09/11 20:32:37 gutteridge Exp $
.\"
.\" Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
.\" All rights reserved.
@@ -46,7 +46,7 @@ The
utility traverses the directories containing man pages, parses the manual
pages with the help of
.Xr mandoc 3
-and builds an Sqlite database
+and builds an SQLite database
to support full text searches by
.Xr apropos 1 .
It obtains the list of directories to traverse using the
@@ -112,7 +112,7 @@ page is relevant.
.Sh FILES
.Bl -hang -width /etc/man.conf -compact
.It Pa /etc/man.conf
-The location of the Sqlite FTS database can be configured using the
+The location of the SQLite FTS database can be configured using the
.Cd _mandb
tag.
.El
Index: src/usr.sbin/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.63 src/usr.sbin/makemandb/makemandb.c:1.64
--- src/usr.sbin/makemandb/makemandb.c:1.63 Mon Jun 6 07:41:23 2022
+++ src/usr.sbin/makemandb/makemandb.c Sun Sep 11 20:32:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemandb.c,v 1.63 2022/06/06 07:41:23 skrll Exp $ */
+/* $NetBSD: makemandb.c,v 1.64 2022/09/11 20:32:37 gutteridge Exp $ */
/*
* Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
* Copyright (c) 2011 Kristaps Dzonsons <[email protected]>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.63 2022/06/06 07:41:23 skrll Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.64 2022/09/11 20:32:37 gutteridge Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -696,7 +696,7 @@ update_existing_entry(sqlite3 *db, const
* Does an incremental updation of the database by checking the file_cache.
* It parses and adds the pages which are present in file_cache,
* but not in the database.
- * It also removes the pages which are present in the databse,
+ * It also removes the pages which are present in the database,
* but not in the file_cache.
*/
static void
@@ -1454,7 +1454,7 @@ man_parse_section(enum man_sec sec, cons
/*
* insert_into_db --
- * Inserts the parsed data of the man page in the Sqlite databse.
+ * Inserts the parsed data of the man page in the SQLite database.
* If any of the values is NULL, then we cleanup and return -1 indicating
* an error.
* Otherwise, store the data in the database and return 0.
