Changeset: a47be1383756 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a47be1383756 Modified Files: clients/mapiclient/mclient.1 documentation/source/manual_pages/monetdb.rst documentation/source/manual_pages/monetdbd.rst.in documentation/source/manual_pages/mserver5.rst.in tools/merovingian/client/monetdb.1 tools/merovingian/daemon/monetdbd.1.in tools/mserver/mserver5.1.in Branch: Jun2023 Log Message:
Some small updates to the manual pages. diffs (152 lines): diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1 --- a/clients/mapiclient/mclient.1 +++ b/clients/mapiclient/mclient.1 @@ -212,7 +212,7 @@ The possible values are .BR expanded , .BR x , .BR csv , -.BR csv-noquote , +.BR csv\-noquote , .BR tab , .BR raw , .BR xml , @@ -221,7 +221,7 @@ and .BR rowcount . .B csv is comma-separated values; -.B csv-noquote +.B csv\-noquote is comma-separated values without escaping any quotes; .B tab is tab-separated values; @@ -248,7 +248,7 @@ is a variation on where only the number of affected rows is printed. Normal \fBcsv\fP and \fBtab\fP formatting will use double quotes around any fields that contain double quotes, white space or the -separator. The \fBcsv-noquote\fP format will prevent that and dump +separator. The \fBcsv\-noquote\fP format will prevent that and dump the contents of the field without any interpretation. In addition to plain \fBcsv\fP, two other forms are possible. \fBcsv=\fP\fIc\fP uses \fIc\fP as column separator; \fBcsv+\fP\fIc\fP @@ -539,7 +539,7 @@ in the above query can also be a URL. I .IR e . g ., .IR https://www.example.org/dumpdata.csv . .PP -See https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/copy-from/ +See https://www.monetdb.org/documentation/user\-guide/sql\-manual/data\-loading/copy\-from/ for more information about the COPY INTO query. .SH SEE ALSO .IR msqldump (1), diff --git a/documentation/source/manual_pages/monetdb.rst b/documentation/source/manual_pages/monetdb.rst --- a/documentation/source/manual_pages/monetdb.rst +++ b/documentation/source/manual_pages/monetdb.rst @@ -71,7 +71,7 @@ allows to do wildcard matches. For detai maintenance mode. This allows the database administrator to perform initialization steps before releasing it to users, unless the **-p** argument is supplied. See also **monetdb lock**. The name of the - database must match the expression [A-Za-z0-9-_]+. + database must match the expression [A-Za-z0-9_-]+. **-m**\ *pattern* With the **-m** flag, instead of creating a database, a @@ -259,6 +259,17 @@ successful. server to use less parallelism when executing queries, or none at all if set to **1**. + **ncopyintothreads=**\ *number* + Defines the maximum number of worker threads the server should use + to perform COPY INTO from a CSV file. The actual number of threads + used is never higher than the number of columns, and is **1** if the + number of rows is small. Normally, this number is equal to the + value of the **nthreads** property. Using this number forces the + server to use more or less parallelism when executing COPY INTO. + Note, COPY INTO threads are created in addition to normal worker + threads for each COPY INTO query that is being executed and + therefore contend for the CPU with other queries. + **optpipe=**\ *string* Each server operates with a given optimizer pipeline. While the default usually is the best setting, for some experimental uses diff --git a/documentation/source/manual_pages/monetdbd.rst.in b/documentation/source/manual_pages/monetdbd.rst.in --- a/documentation/source/manual_pages/monetdbd.rst.in +++ b/documentation/source/manual_pages/monetdbd.rst.in @@ -373,8 +373,8 @@ used with the funnel, as the results wil limited query buffer. Applications using the funnel should aim for short and single-statement queries that require no transactions. -See the **create** command in the *monetdb*\ (1) man-page for details on -how to setup a multiplex-funnel. +See the **create** command in *monetdb*\ (1) for details on how to setup +a multiplex-funnel. SIGNALS ======= diff --git a/documentation/source/manual_pages/mserver5.rst.in b/documentation/source/manual_pages/mserver5.rst.in --- a/documentation/source/manual_pages/mserver5.rst.in +++ b/documentation/source/manual_pages/mserver5.rst.in @@ -23,7 +23,7 @@ Note that while *mserver5* is the proces is usually more common to start, monitor and connect to the *mserver5* process through *monetdbd*\ (1). -This man-page describes the options that *mserver5* understands. It is +This manual describes the options that *mserver5* understands. It is intended for people who really need to work with *mserver5* itself. In regular cases, the programs *monetdbd*\ (1) and *monetdb*\ (1) control the many options, and allow to adjust them to appropriate values where diff --git a/tools/merovingian/client/monetdb.1 b/tools/merovingian/client/monetdb.1 --- a/tools/merovingian/client/monetdb.1 +++ b/tools/merovingian/client/monetdb.1 @@ -110,7 +110,7 @@ steps before releasing it to users, unle .B \-p argument is supplied. See also .BR "monetdb lock" . -The name of the database must match the expression [A\-Za\-z0\-9\-_]+. +The name of the database must match the expression [A\-Za\-z0\-9_\-]+. .RS .TP \fB\-m\fP \fIpattern\fP diff --git a/tools/merovingian/daemon/monetdbd.1.in b/tools/merovingian/daemon/monetdbd.1.in --- a/tools/merovingian/daemon/monetdbd.1.in +++ b/tools/merovingian/daemon/monetdbd.1.in @@ -554,9 +554,9 @@ single-statement queries that require no .P See the .B create -command in the +command in .IR monetdb (1) -man-page for details on how to setup a multiplex-funnel. +for details on how to setup a multiplex-funnel. .SH SIGNALS .I Monetdbd acts upon a number of signals as is common for a daemon. diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in --- a/tools/mserver/mserver5.1.in +++ b/tools/mserver/mserver5.1.in @@ -30,7 +30,7 @@ start, monitor and connect to the process through .IR monetdbd (1). .P -This man-page describes the options that +This manual describes the options that .I mserver5 understands. It is intended for people who really need to work with @@ -80,7 +80,7 @@ option. If the value of .I path is -.BR in-memory , +.BR in\-memory , transient data is not stored on disk at all but kept in memory at all times. .TP @@ -132,7 +132,7 @@ in-memory. .B No data will be written to disk. The name of the database that a client can connect to is -.BR in-memory . +.BR in\-memory . .TP \fB\-\-debug\fP[\fB=\fP\fIvalue\fP] .PD 0 _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
