projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ec12c3
)
Various minor text tweaks.
author
David Crossley
<dcrossley@indexgeo.com.au>
Wed, 7 Oct 2015 01:57:33 +0000
(12:57 +1100)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 7 Oct 2015 09:11:00 +0000
(11:11 +0200)
12 files changed:
doc/bib1-attr-man.xml
patch
|
blob
|
history
doc/book.xml
patch
|
blob
|
history
doc/yaz-asncomp-man.xml
patch
|
blob
|
history
doc/yaz-client-man.xml
patch
|
blob
|
history
doc/yaz-iconv-man.xml
patch
|
blob
|
history
doc/yaz-icu-man.xml
patch
|
blob
|
history
doc/yaz-illclient-man.xml
patch
|
blob
|
history
doc/yaz-json-parse-man.xml
patch
|
blob
|
history
doc/yaz-log-man.xml
patch
|
blob
|
history
doc/yaz-marcdump-man.xml
patch
|
blob
|
history
doc/yaz-url-man.xml
patch
|
blob
|
history
doc/yaz-ztest-man.xml
patch
|
blob
|
history
diff --git
a/doc/bib1-attr-man.xml
b/doc/bib1-attr-man.xml
index
d61542e
..
8050297
100644
(file)
--- a/
doc/bib1-attr-man.xml
+++ b/
doc/bib1-attr-man.xml
@@
-34,8
+34,8
@@
<refsect1><title>TYPES</title>
<para>
<refsect1><title>TYPES</title>
<para>
- The Bib-1 attribute defines six attribute types: Use (1), Relation (2),
- Position (3), Structure (4), Truncation (5) and completeness (6).
+ The Bib-1 attribute set defines six attribute types: Use (1), Relation (2),
+ Position (3), Structure (4), Truncation (5) and Completeness (6).
</para>
</refsect1>
</para>
</refsect1>
@@
-218,7
+218,7
@@
</para>
</refsect1>
</para>
</refsect1>
- <refsect1><title>COMPLETENSS (6)</title>
+ <refsect1><title>COMPLETENESS (6)</title>
<para>
<screen>
1 Incomplete subfield
<para>
<screen>
1 Incomplete subfield
diff --git
a/doc/book.xml
b/doc/book.xml
index
f61011c
..
bb99baa
100644
(file)
--- a/
doc/book.xml
+++ b/
doc/book.xml
@@
-7883,7
+7883,7
@@
int cql_transform_rpn2cql_wrbuf(cql_transform_t ct,
<sect1 id="odr.introduction">
<title>Introduction</title>
<para>
<sect1 id="odr.introduction">
<title>Introduction</title>
<para>
- &odr; is the BER-encoding/decoding subsystem of &yaz;. Care as been taken
+ &odr; is the BER-encoding/decoding subsystem of &yaz;. Care has been taken
to isolate &odr; from the rest of the package - specifically from the
transport interface. &odr; may be used in any context where basic
ASN.1/BER representations are used.
to isolate &odr; from the rest of the package - specifically from the
transport interface. &odr; may be used in any context where basic
ASN.1/BER representations are used.
@@
-8207,7
+8207,7
@@
void do_nothing_useful(Odr_int value)
odr_setprint(ODR o, FILE *file);
</synopsis>
before encoders or decoders are being invoked.
odr_setprint(ODR o, FILE *file);
</synopsis>
before encoders or decoders are being invoked.
- It is also possible to direct the output to a buffer (of indeed
+ It is also possible to direct the output to a buffer (or indeed
another file), by using the more generic mechanism:
<synopsis>
void odr_set_stream(ODR o, void *handle,
another file), by using the more generic mechanism:
<synopsis>
void odr_set_stream(ODR o, void *handle,
@@
-8224,7
+8224,7
@@
void do_nothing_useful(Odr_int value)
The <replaceable>stream_write</replaceable> takes the ODR handle
as parameter, the user-defined handle, a type
<literal>ODR_OCTETSTRING</literal>, <literal>ODR_VISIBLESTRING</literal>
The <replaceable>stream_write</replaceable> takes the ODR handle
as parameter, the user-defined handle, a type
<literal>ODR_OCTETSTRING</literal>, <literal>ODR_VISIBLESTRING</literal>
- which indicates the type of contents is being written.
+ which indicates the type of contents being written.
</para>
<para>
Another utility useful for diagnostics (error handling) or as
</para>
<para>
Another utility useful for diagnostics (error handling) or as
@@
-8234,7
+8234,7
@@
void do_nothing_useful(Odr_int value)
</synopsis>
which returns a list of current elements that ODR deals with at the
moment. For the returned array, say <literal>ar</literal>,
</synopsis>
which returns a list of current elements that ODR deals with at the
moment. For the returned array, say <literal>ar</literal>,
- <literal>ar[0]</literal> is the top level element,
+ then <literal>ar[0]</literal> is the top level element,
<literal>ar[n]</literal> is the last. The last element has the
property that <literal>ar[n+1] == NULL</literal>.
</para>
<literal>ar[n]</literal> is the last. The last element has the
property that <literal>ar[n+1] == NULL</literal>.
</para>
@@
-8484,7
+8484,7
@@
int odr_octetstring(ODR o, Odr_oct **p, int optional,
The <literal>buf</literal> field should point to the character array
that holds the octetstring. The <literal>len</literal> field holds the
actual length.
The <literal>buf</literal> field should point to the character array
that holds the octetstring. The <literal>len</literal> field holds the
actual length.
- The character array need not be null terminated.
+ The character array need not be null-terminated.
</para>
<para>
To make things a little easier, an alternative is given for string
</para>
<para>
To make things a little easier, an alternative is given for string
@@
-8495,8
+8495,8
@@
int odr_octetstring(ODR o, Odr_oct **p, int optional,
int odr_cstring(ODR o, char **p, int optional, const char *name);
</synopsis>
<para>
int odr_cstring(ODR o, char **p, int optional, const char *name);
</synopsis>
<para>
- Which encoded or decodes between OCTETSTRING representations and
- null-terminates C strings.
+ which encodes or decodes between OCTETSTRING representations and
+ null-terminated C strings.
</para>
<para>
Functions are provided for the derived string types, e.g.:
</para>
<para>
Functions are provided for the derived string types, e.g.:
@@
-8626,7
+8626,7
@@
int odr_sequence_end(ODR o);
parameter is ignored. On decoding, it returns 1 if the type is found in
the data stream. <literal>size</literal> bytes of memory are allocated,
and <literal>*p</literal> is set to point to this space.
parameter is ignored. On decoding, it returns 1 if the type is found in
the data stream. <literal>size</literal> bytes of memory are allocated,
and <literal>*p</literal> is set to point to this space.
- <function>odr_sequence_end()</function> is called at the end of the
+ The <function>odr_sequence_end()</function> is called at the end of the
complex function. Assume that a type is defined like this:
</para>
<screen>
complex function. Assume that a type is defined like this:
</para>
<screen>
@@
-8752,7
+8752,7
@@
int odr_constructed_end(ODR o);
</synopsis>
<para>
Assume that the IMPLICIT in the type definition above were replaced
</synopsis>
<para>
Assume that the IMPLICIT in the type definition above were replaced
- with EXPLICIT (or that the IMPLICIT keyword were simply deleted, which
+ with EXPLICIT (or that the IMPLICIT keyword was simply deleted, which
would be equivalent). The structure definition would look the same,
but the function would look like this:
</para>
would be equivalent). The structure definition would look the same,
but the function would look like this:
</para>
@@
-8779,7
+8779,7
@@
int mySequence(ODR o, MySequence **p, int optional, const char *name)
Notice that the interface here gets kind of nasty. The reason is
simple: Explicitly tagged, constructed types are fairly rare in
the protocols that we care about, so the
Notice that the interface here gets kind of nasty. The reason is
simple: Explicitly tagged, constructed types are fairly rare in
the protocols that we care about, so the
- esthetic annoyance (not to mention the dangers of a cluttered
+ aesthetic annoyance (not to mention the dangers of a cluttered
interface) is less than the time that would be required to develop a
better interface. Nevertheless, it is far from satisfying, and it's a
point that will be worked on in the future. One option for you would
interface) is less than the time that would be required to develop a
better interface. Nevertheless, it is far from satisfying, and it's a
point that will be worked on in the future. One option for you would
@@
-8976,7
+8976,7
@@
int myChoice(ODR o, MyChoice **p, int optional, const char *name)
declaring sequence elements (including CHOICEs) optional.
</para>
<para>
declaring sequence elements (including CHOICEs) optional.
</para>
<para>
- The ASN.1 specifications naturally requires that each member of a
+ The ASN.1 specifications naturally require that each member of a
CHOICE have a distinct tag, so they can be told apart on decoding.
Sometimes it can be useful to define a CHOICE that has multiple types
that share the same tag. You'll need some other mechanism, perhaps
CHOICE have a distinct tag, so they can be told apart on decoding.
Sometimes it can be useful to define a CHOICE that has multiple types
that share the same tag. You'll need some other mechanism, perhaps
@@
-8993,7
+8993,7
@@
void odr_choice_bias(ODR o, int what);
<para>
provides this functionality. When called, it leaves a notice for the next
call to <function>odr_choice()</function> to be called on the decoding
<para>
provides this functionality. When called, it leaves a notice for the next
call to <function>odr_choice()</function> to be called on the decoding
- stream <literal>o</literal> that only the <literal>arm</literal> entry with
+ stream <literal>o</literal>, that only the <literal>arm</literal> entry with
a <literal>which</literal> field equal to <literal>what</literal>
should be tried.
</para>
a <literal>which</literal> field equal to <literal>what</literal>
should be tried.
</para>
@@
-9163,8
+9163,8
@@
void odr_choice_bias(ODR o, int what);
<para>
The <function>cs_create</function> function returns a null-pointer
if a system error occurs.
<para>
The <function>cs_create</function> function returns a null-pointer
if a system error occurs.
- The <literal>blocking</literal> parameter should be one if
- you wish the association to operate in blocking mode, zero otherwise.
+ The <literal>blocking</literal> parameter should be '1' if
+ you wish the association to operate in blocking mode, and '0' otherwise.
The <literal>protocol</literal> field should be
<literal>PROTO_Z3950</literal> or <literal>PROTO_HTTP</literal>.
Protocol <literal>PROTO_SR</literal> is no longer supported.
The <literal>protocol</literal> field should be
<literal>PROTO_Z3950</literal> or <literal>PROTO_HTTP</literal>.
Protocol <literal>PROTO_SR</literal> is no longer supported.
@@
-9201,7
+9201,7
@@
void odr_choice_bias(ODR o, int what);
should call it repeatedly with the same values of <literal>buf</literal>
and <literal>len</literal>, until the buffer has been transmitted.
When a full buffer has been sent, the function will return 0 for
should call it repeatedly with the same values of <literal>buf</literal>
and <literal>len</literal>, until the buffer has been transmitted.
When a full buffer has been sent, the function will return 0 for
- success. -1 indicates an error condition (see below).
+ success. The return value -1 indicates an error condition (see below).
</para>
<synopsis>
int cs_get(COMSTACK handle, char **buf, int *size);
</para>
<synopsis>
int cs_get(COMSTACK handle, char **buf, int *size);
@@
-9217,12
+9217,12
@@
void odr_choice_bias(ODR o, int what);
around internally by the subsystem when partial packages are read. Before
calling
<function>cs_get</function>
around internally by the subsystem when partial packages are read. Before
calling
<function>cs_get</function>
- for the fist time, the buffer can be initialized to the null pointer,
- and the length should also be set to 0 - cs_get will perform a
+ for the first time, the buffer can be initialized to the null pointer,
+ and the length should also be set to 0 (cs_get will perform a
<function>malloc(2)</function>
<function>malloc(2)</function>
- on the buffer for you. When a full buffer has been read, the size of
- the package is returned (which will always be greater than 1). -1
- indicates an error condition.
+ on the buffer for you). When a full buffer has been read, the size of
+ the package is returned (which will always be greater than 1).
+ The return value -1 indicates an error condition.
</para>
<para>
See also the <function>cs_more()</function> function below.
</para>
<para>
See also the <function>cs_more()</function> function below.
@@
-9325,7
+9325,7
@@
void odr_choice_bias(ODR o, int what);
int cs_fileno(COMSTACK h);
</synopsis>
<para>
int cs_fileno(COMSTACK h);
</synopsis>
<para>
- Returns the file descriptor of the association. Use this when
+ returns the file descriptor of the association. Use this when
file-level operations on the endpoint are required
(<function>select(2)</function> operations, specifically).
</para>
file-level operations on the endpoint are required
(<function>select(2)</function> operations, specifically).
</para>
@@
-9411,7
+9411,7
@@
void odr_choice_bias(ODR o, int what);
<note>
<para>
You may need to use this function with some care if your
<note>
<para>
You may need to use this function with some care if your
- name server service is slow or unreliable
+ name server service is slow or unreliable.
</para>
</note>
</sect1>
</para>
</note>
</sect1>
@@
-9471,8
+9471,8
@@
void odr_choice_bias(ODR o, int what);
<function>cs_straddr</function>. The <parameter>str</parameter>
is similar to that described for <function>cs_straddr</function>
but with a prefix denoting the &comstack; type. Prefixes supported
<function>cs_straddr</function>. The <parameter>str</parameter>
is similar to that described for <function>cs_straddr</function>
but with a prefix denoting the &comstack; type. Prefixes supported
- are <literal>tcp:</literal>, <literal>unix:</literal> and
- <literal>ssl:</literal> for TCP/IP, UNIX and SSL respectively.
+ are <literal>tcp:</literal> and <literal>unix:</literal> and
+ <literal>ssl:</literal> for TCP/IP and UNIX and SSL respectively.
If no prefix is given, then TCP/IP is used.
The <parameter>blocking</parameter> is passed to
function <function>cs_create</function>. The third parameter
If no prefix is given, then TCP/IP is used.
The <parameter>blocking</parameter> is passed to
function <function>cs_create</function>. The third parameter
@@
-9489,7
+9489,7
@@
void odr_choice_bias(ODR o, int what);
void *cs_get_ssl(COMSTACK cs);
</synopsis>
Returns the SSL handle, <literal>SSL *</literal> for comstack. If comstack
void *cs_get_ssl(COMSTACK cs);
</synopsis>
Returns the SSL handle, <literal>SSL *</literal> for comstack. If comstack
- is not of type SSL, NULL is returned.
+ is not of type SSL, then NULL is returned.
</para>
<para>
<synopsis>
</para>
<para>
<synopsis>
@@
-9539,15
+9539,15
@@
void odr_choice_bias(ODR o, int what);
</synopsis>
<para>
You can the textual representation of the error code
</synopsis>
<para>
You can the textual representation of the error code
- by using <function>cs_errmsg</function> - which
- works like <function>strerror(3)</function>
+ by using <function>cs_errmsg</function>, which
+ works like <function>strerror(3)</function>.
</para>
<synopsis>
const char *cs_errmsg(int n);
</synopsis>
<para>
</para>
<synopsis>
const char *cs_errmsg(int n);
</synopsis>
<para>
- It is also possible to get straight to the textual represenataion
- without the error code by using
+ It is also possible to get straight to the textual representation
+ without the error code, by using
<function>cs_strerror</function>.
</para>
<synopsis>
<function>cs_strerror</function>.
</para>
<synopsis>
diff --git
a/doc/yaz-asncomp-man.xml
b/doc/yaz-asncomp-man.xml
index
e551a56
..
18b6146
100644
(file)
--- a/
doc/yaz-asncomp-man.xml
+++ b/
doc/yaz-asncomp-man.xml
@@
-52,7
+52,7
@@
which is a library that encodes/decodes/prints BER packages.
<command>yaz-asncomp</command> allows you to specify name of
resulting source via options. Alternatively, you can specify
which is a library that encodes/decodes/prints BER packages.
<command>yaz-asncomp</command> allows you to specify name of
resulting source via options. Alternatively, you can specify
- a DEFINISIONS file, which provides customized output to
+ a DEFINITIONS file, which provides customized output to
many output files - if the ASN.1 specification file consists
of many modules.
</para>
many output files - if the ASN.1 specification file consists
of many modules.
</para>
@@
-135,7
+135,7
@@
The definitions file is really a Tcl script but follows
traditional rules for Shell like configuration files.
That is # denotes the beginning of a comment. Definitions
The definitions file is really a Tcl script but follows
traditional rules for Shell like configuration files.
That is # denotes the beginning of a comment. Definitions
- are line oriented. The definitions files usually consists of
+ are line oriented. The definitions files usually consist of
a series of variable assignments of the form:
</para>
<para>
a series of variable assignments of the form:
</para>
<para>
@@
-221,7
+221,7
@@
Maps member <replaceable>member</replaceable> in CHOICE of
<replaceable>name</replaceable> in module
<replaceable>module</replaceable> to value.
Maps member <replaceable>member</replaceable> in CHOICE of
<replaceable>name</replaceable> in module
<replaceable>module</replaceable> to value.
- Value consists of to or three tokens. The first token
+ Value consists of two or three tokens. The first token
is name of the integer in the <literal>union</literal> that
is used as selector for the <literal>union</literal> itself.
The second token is name of the <literal>union</literal>.
is name of the integer in the <literal>union</literal> that
is used as selector for the <literal>union</literal> itself.
The second token is name of the <literal>union</literal>.
diff --git
a/doc/yaz-client-man.xml
b/doc/yaz-client-man.xml
index
eb3137b
..
7b72019
100644
(file)
--- a/
doc/yaz-client-man.xml
+++ b/
doc/yaz-client-man.xml
@@
-90,7
+90,7
@@
<term>-a <replaceable>filename</replaceable></term>
<listitem><para>
If specified, logging of protocol packages will be appended
<term>-a <replaceable>filename</replaceable></term>
<listitem><para>
If specified, logging of protocol packages will be appended
- file given. If <replaceable>filename</replaceable> is
+ to the file given. If <replaceable>filename</replaceable> is
specified as <literal>-</literal>, the output is written
to <literal>stdout</literal>.
</para></listitem>
specified as <literal>-</literal>, the output is written
to <literal>stdout</literal>.
</para></listitem>
@@
-150,7
+150,7
@@
given. YAZ client will
connect to a proxy on the address and port given.
The actual target will be specified as part of the InitRequest
given. YAZ client will
connect to a proxy on the address and port given.
The actual target will be specified as part of the InitRequest
- to inform the proxy about actual target.
+ to inform the proxy about the actual target.
</para></listitem>
</varlistentry>
<varlistentry>
</para></listitem>
</varlistentry>
<varlistentry>
@@
-256,7
+256,7
@@
</term>
<listitem>
<para>Sets the name(s) of the database(s) to search. One or more
</term>
<listitem>
<para>Sets the name(s) of the database(s) to search. One or more
- databases may be specified separated by blanks. This commands overrides
+ databases may be specified, separated by blanks. This command overrides
the database given in <replaceable>zurl</replaceable>.
</para>
</listitem>
the database given in <replaceable>zurl</replaceable>.
</para>
</listitem>
@@
-269,9
+269,9
@@
<para>Fetches records by sending a Present Request from the start
position given by
<replaceable>start</replaceable>
<para>Fetches records by sending a Present Request from the start
position given by
<replaceable>start</replaceable>
- a number of records given by <replaceable>number</replaceable>. If
+ and a number of records given by <replaceable>number</replaceable>. If
<replaceable>start</replaceable> is not given, then the client
<replaceable>start</replaceable> is not given, then the client
- will fetch from position of the last retrieved record plus 1. If
+ will fetch from the position of the last retrieved record plus 1. If
<replaceable>number</replaceable> is not given, then one record will
be fetched at a time.
</para>
<replaceable>number</replaceable> is not given, then one record will
be fetched at a time.
</para>
@@
-313,7
+313,7
@@
<listitem>
<simpara>
Sets preferred position for scan. This value
<listitem>
<simpara>
Sets preferred position for scan. This value
- is used in next scan. By default position is 1.
+ is used in the next scan. By default, position is 1.
</simpara>
</listitem>
</varlistentry>
</simpara>
</listitem>
</varlistentry>
@@
-332,7
+332,7
@@
</term>
<listitem>
<simpara>
</term>
<listitem>
<simpara>
- Set step-size for scan. This value is used in next scan
+ Set step-size for scan. This value is used in the next scan
sent to the target. By default step-size is 0.
</simpara>
</listitem>
sent to the target. By default step-size is 0.
</simpara>
</listitem>
@@
-376,7
+376,7
@@
<literal>authentication</literal> <replaceable>openauth</replaceable>
</term>
<listitem>
<literal>authentication</literal> <replaceable>openauth</replaceable>
</term>
<listitem>
- <para>Sets up a authentication string if a server requires
+ <para>Sets up an authentication string if a server requires
authentication (v2 OpenStyle). The authentication string is first
sent to the server when the
<link linkend="command-open"><literal>open</literal></link> command is
authentication (v2 OpenStyle). The authentication string is first
sent to the server when the
<link linkend="command-open"><literal>open</literal></link> command is
@@
-449,7
+449,7
@@
<literal>mspn</literal> <replaceable>n</replaceable>
</term>
<listitem>
<literal>mspn</literal> <replaceable>n</replaceable>
</term>
<listitem>
- <para>Sets the number of records should be returned if the
+ <para>Sets the number of records that should be returned if the
number of records in the result set is between the values of
<literal>lslb</literal> and <literal>ssub</literal>.
See the
number of records in the result set is between the values of
<literal>lslb</literal> and <literal>ssub</literal>.
See the
@@
-507,7
+507,7
@@
</term>
<listitem>
<para>Sets the element set name for the records. Many targets support
</term>
<listitem>
<para>Sets the element set name for the records. Many targets support
- element sets are B (for brief) and F (for full).
+ element sets B (for brief) and F (for full).
</para>
</listitem>
</varlistentry>
</para>
</listitem>
</varlistentry>
@@
-531,7
+531,7
@@
<literal>ccl</literal> for CCL search (Type-2 Query),
<literal>cql</literal> for CQL (Type-104 search with CQL OID),
<literal>ccl2rpn</literal> for
<literal>ccl</literal> for CCL search (Type-2 Query),
<literal>cql</literal> for CQL (Type-104 search with CQL OID),
<literal>ccl2rpn</literal> for
- <link linkend="CCL">CCL</link> to RPN conversion (Type-1 Query).
+ <link linkend="CCL">CCL</link> to RPN conversion (Type-1 Query),
<literal>cql2rpn</literal> for
CQL to RPN conversion (Type-1 Query).
</para>
<literal>cql2rpn</literal> for
CQL to RPN conversion (Type-1 Query).
</para>
@@
-582,7
+582,7
@@
the record document for the request. If doc is preceded with
"<", then the following characters are treated as a filename
with the records to be updated. Otherwise doc is treated as
the record document for the request. If doc is preceded with
"<", then the following characters are treated as a filename
with the records to be updated. Otherwise doc is treated as
- a document itself. The doc may also be quited in double quotes.
+ a document itself. The doc may also be quoted in double quotes.
If doc is omitted, the last received record (as part of present
response or piggybacked search response) is used for the update.
</para>
If doc is omitted, the last received record (as part of present
response or piggybacked search response) is used for the update.
</para>
@@
-595,7
+595,7
@@
</term>
<listitem>
<para>Executes list of commands from
</term>
<listitem>
<para>Executes list of commands from
- file <replaceable>filename</replaceable>, just like source on
+ file <replaceable>filename</replaceable>, just like 'source' on
most UNIX shells. A single dot (<literal>.</literal>) can be used
as an alternative.
</para>
most UNIX shells. A single dot (<literal>.</literal>) can be used
as an alternative.
</para>
@@
-644,7
+644,7
@@
<replaceable>flag</replaceable>
</term>
<listitem>
<replaceable>flag</replaceable>
</term>
<listitem>
- <para>Specifies whether YAZ client automatically reconnect if
+ <para>Specifies whether YAZ client automatically reconnects if the
target closes connection (Z39.50 only).
</para>
<para>
target closes connection (Z39.50 only).
</para>
<para>
@@
-661,7
+661,7
@@
<listitem>
<para>Specifies whether YAZ client should wait for
response protocol packages after a request.
<listitem>
<para>Specifies whether YAZ client should wait for
response protocol packages after a request.
- By default YAZ client waits (on) for response packages immediately
+ By default YAZ client waits (<literal>on</literal>) for response packages immediately
after a command (find, show) has been issued. If <literal>off</literal>
is used, YAZ client does not attempt to receive packages automatically.
These will have to be manually received when command
after a command (find, show) has been issued. If <literal>off</literal>
is used, YAZ client does not attempt to receive packages automatically.
These will have to be manually received when command
@@
-727,9
+727,9
@@
terminal as returned by <function>nl_langinfo</function> call.
</para>
<para>
terminal as returned by <function>nl_langinfo</function> call.
</para>
<para>
- If <replaceable>marcharset</replaceable> is given, it specifies name
+ If <replaceable>marccharset</replaceable> is given, it specifies name
of the character set of retrieved MARC records from server. See
of the character set of retrieved MARC records from server. See
- also <literal>marcharset</literal> command.
+ also <literal>marccharset</literal> command.
</para>
<note>
<para>
</para>
<note>
<para>
@@
-840,7
+840,7
@@
The <replaceable>name</replaceable> is your
name for the OID, <replaceable>class</replaceable> is the
class, and <replaceable>OID</replaceable> is the raw OID in
The <replaceable>name</replaceable> is your
name for the OID, <replaceable>class</replaceable> is the
class, and <replaceable>OID</replaceable> is the raw OID in
- dot notation. Class is one <literal>appctx</literal>,
+ dot notation. Class is one of: <literal>appctx</literal>,
<literal>absyn</literal>, <literal>attet</literal>,
<literal>transyn</literal>, <literal>diagset</literal>,
<literal>recsyn</literal>, <literal>resform</literal>,
<literal>absyn</literal>, <literal>attet</literal>,
<literal>transyn</literal>, <literal>diagset</literal>,
<literal>recsyn</literal>, <literal>resform</literal>,
@@
-966,9
+966,9
@@
<screen>
f "donald knuth"
</screen>
<screen>
f "donald knuth"
</screen>
- In those queries no attributes was specified.
+ In those queries, no attributes were specified.
This leaves it up to the server what fields to search but
This leaves it up to the server what fields to search but
- most servers will search in all fields. Some servers does not
+ most servers will search in all fields. Some servers do not
support this feature though, and require that some attributes
are defined. To add one attribute you could do:
<screen>
support this feature though, and require that some attributes
are defined. To add one attribute you could do:
<screen>
diff --git
a/doc/yaz-iconv-man.xml
b/doc/yaz-iconv-man.xml
index
9952d2e
..
a920109
100644
(file)
--- a/
doc/yaz-iconv-man.xml
+++ b/
doc/yaz-iconv-man.xml
@@
-38,12
+38,12
@@
<refsect1><title>DESCRIPTION</title>
<para>
<refsect1><title>DESCRIPTION</title>
<para>
- <command>yaz-iconv</command> converts data in file in character
+ <command>yaz-iconv</command> converts data in the character
set specified by <replaceable>from</replaceable> to output in
set specified by <replaceable>from</replaceable> to output in
- character set as specified by <replaceable>to</replaceable>.
+ the character set as specified by <replaceable>to</replaceable>.
</para>
<para>
</para>
<para>
- This <command>yaz-iconv</command> utility similar to the
+ This <command>yaz-iconv</command> utility is similar to the
<command>iconv</command> found on many POSIX systems (Glibc, Solaris, etc).
</para>
<para>
<command>iconv</command> found on many POSIX systems (Glibc, Solaris, etc).
</para>
<para>
@@
-88,11
+88,11
@@
The yaz-iconv command and the API as defined in
<filename>yaz/yaz-iconv.h</filename> is a wrapper for the
library system call iconv. But YAZ' iconv utility also implements
The yaz-iconv command and the API as defined in
<filename>yaz/yaz-iconv.h</filename> is a wrapper for the
library system call iconv. But YAZ' iconv utility also implements
- conversions on its own. The table below lists characters sets (or encodings).
+ conversions on its own. The table below lists characters sets (or encodings)
that are supported by YAZ. Each character set is marked with either
<emphasis>encode</emphasis> or <emphasis>decode</emphasis>. If
that are supported by YAZ. Each character set is marked with either
<emphasis>encode</emphasis> or <emphasis>decode</emphasis>. If
- an encoding is encode-enabled YAZ may convert <emphasis>to</emphasis>
- to the designated encoding. If an encoding is decode-enabled, YAZ
+ an encoding is encode-enabled, YAZ may convert <emphasis>to</emphasis>
+ the designated encoding. If an encoding is decode-enabled, YAZ
may convert <emphasis>from</emphasis> the designated encoding.
</para>
<variablelist>
may convert <emphasis>from</emphasis> the designated encoding.
</para>
<variablelist>
@@
-109,7
+109,7
@@
<term>marc8s (encode, decode)</term>
<listitem>
<para>
<term>marc8s (encode, decode)</term>
<listitem>
<para>
- Like MARC8 but with conversion prefers non-combined characters
+ Like MARC8 but conversion prefers non-combined characters
in the Latin-1 plane over combined characters.
</para>
</listitem>
in the Latin-1 plane over combined characters.
</para>
</listitem>
diff --git
a/doc/yaz-icu-man.xml
b/doc/yaz-icu-man.xml
index
a32826f
..
d0fd43c
100644
(file)
--- a/
doc/yaz-icu-man.xml
+++ b/
doc/yaz-icu-man.xml
@@
-39,13
+39,13
@@
<refsect1><title>DESCRIPTION</title>
<para>
<refsect1><title>DESCRIPTION</title>
<para>
- <command>yaz-icu</command> is utility which demonstrates
+ <command>yaz-icu</command> is a utility which demonstrates
the ICU chain module of yaz. (<filename>yaz/icu.h</filename>).
</para>
<para>
The utility can be used in two ways. It may read some text
using an XML configuration for configuring ICU and show text analysis.
the ICU chain module of yaz. (<filename>yaz/icu.h</filename>).
</para>
<para>
The utility can be used in two ways. It may read some text
using an XML configuration for configuring ICU and show text analysis.
- This mode is triggered by option <literal>-c</literal> which specififies
+ This mode is triggered by option <literal>-c</literal> which specifies
the configuration to be used. The input file is read from standard
input or from a file if <literal>infile</literal> is specified.
</para>
the configuration to be used. The input file is read from standard
input or from a file if <literal>infile</literal> is specified.
</para>
@@
-71,10
+71,10
@@
Specifies extra information to be printed about the ICU system.
If <replaceable>type</replaceable> is <literal>c</literal>
then ICU converters are printed.
Specifies extra information to be printed about the ICU system.
If <replaceable>type</replaceable> is <literal>c</literal>
then ICU converters are printed.
- If <replaceable>type</replaceable> is <literal>l</literal>
- available locales are printed.
- If <replaceable>type</replaceable> is <literal>t</literal>
- available transliterators are printed.
+ If <replaceable>type</replaceable> is <literal>l</literal>,
+ then available locales are printed.
+ If <replaceable>type</replaceable> is <literal>t</literal>,
+ then available transliterators are printed.
</para></listitem>
</varlistentry>
</para></listitem>
</varlistentry>
@@
-98,7
+98,7
@@
</refsect1>
<refsect1><title>ICU chain configuration</title>
<para>
</refsect1>
<refsect1><title>ICU chain configuration</title>
<para>
- The ICU chain configuration speicifies one or more rules to convert
+ The ICU chain configuration specifies one or more rules to convert
text data into tokens. The configuration format is XML based.
</para>
<para>
text data into tokens. The configuration format is XML based.
</para>
<para>
@@
-121,13
+121,13
@@
<varlistentry>
<term>casemap</term>
<listitem><para>
<varlistentry>
<term>casemap</term>
<listitem><para>
- Converts case and rule specifies how:
+ Converts case (and rule specifies how):
<variablelist>
<varlistentry>
<term>l</term>
<listitem>
<variablelist>
<varlistentry>
<term>l</term>
<listitem>
- <para>Lowercase using ICU function u_strToLower. </para>
+ <para>Lower case using ICU function u_strToLower. </para>
</listitem>
</varlistentry>
</listitem>
</varlistentry>
@@
-141,7
+141,7
@@
<varlistentry>
<term>t</term>
<listitem>
<varlistentry>
<term>t</term>
<listitem>
- <para>To title using UCU function u_strToTitle.</para>
+ <para>To title using ICU function u_strToTitle.</para>
</listitem>
</varlistentry>
</listitem>
</varlistentry>
diff --git
a/doc/yaz-illclient-man.xml
b/doc/yaz-illclient-man.xml
index
71e2a74
..
5599a0a
100644
(file)
--- a/
doc/yaz-illclient-man.xml
+++ b/
doc/yaz-illclient-man.xml
@@
-42,7
+42,7
@@
<refsect1><title>DESCRIPTION</title>
<para>
<refsect1><title>DESCRIPTION</title>
<para>
- <command>yaz-illclient</command> is an client which sends an ISO
+ <command>yaz-illclient</command> is a client which sends an ISO
ILL request to a remote server and decodes the response from it.
Exactly one server address ( <replaceable>server-addr</replaceable> )
must be specified.
ILL request to a remote server and decodes the response from it.
Exactly one server address ( <replaceable>server-addr</replaceable> )
must be specified.
@@
-62,7
+62,7
@@
<varlistentry>
<term>-v <replaceable>loglevel</replaceable>]</term>
<listitem><para>
<varlistentry>
<term>-v <replaceable>loglevel</replaceable>]</term>
<listitem><para>
- Specify the log level
+ Specify the log level.
</para></listitem>
</varlistentry>
</para></listitem>
</varlistentry>
diff --git
a/doc/yaz-json-parse-man.xml
b/doc/yaz-json-parse-man.xml
index
11d31e4
..
1df0a22
100644
(file)
--- a/
doc/yaz-json-parse-man.xml
+++ b/
doc/yaz-json-parse-man.xml
@@
-35,14
+35,14
@@
<refsect1><title>DESCRIPTION</title>
<para>
<refsect1><title>DESCRIPTION</title>
<para>
- <command>yaz-json-parse</command> is utility which demonstrates
+ <command>yaz-json-parse</command> is a utility which demonstrates
the JSON API of YAZ. (<filename>yaz/json.h</filename>).
</para>
<para>
The program attempts to parse a JSON from standard input (stdin).
It will return exit code 1 if parsing fails and the parsing error message
will be printed to standard error (stderr). The program returns exit code
the JSON API of YAZ. (<filename>yaz/json.h</filename>).
</para>
<para>
The program attempts to parse a JSON from standard input (stdin).
It will return exit code 1 if parsing fails and the parsing error message
will be printed to standard error (stderr). The program returns exit code
- 0 parsing succeeds and return no output, unless -p is given (see below).
+ 0 if parsing succeeds, and returns no output unless -p is given (see below).
</para>
</refsect1>
</para>
</refsect1>
@@
-51,9
+51,9
@@
<varlistentry>
<term>-p</term>
<listitem><para>
<varlistentry>
<term>-p</term>
<listitem><para>
- Makes the JSON parser echo the JSON result string to standard output -
- if parsing from stdin was successful. If -p is given twice the
- output is a multi line output with indentation (pretty print).
+ Makes the JSON parser echo the JSON result string to standard output,
+ if parsing from stdin was successful. If -p is given twice, then the
+ output is a multi-line output with indentation (pretty print).
</para></listitem>
</varlistentry>
</para></listitem>
</varlistentry>
diff --git
a/doc/yaz-log-man.xml
b/doc/yaz-log-man.xml
index
aa37be9
..
367712b
100644
(file)
--- a/
doc/yaz-log-man.xml
+++ b/
doc/yaz-log-man.xml
@@
-168,14
+168,14
@@
</para>
<para>
<literal>request</literal> logs a one-liner for each request (init, search,
</para>
<para>
<literal>request</literal> logs a one-liner for each request (init, search,
- etc).
+ etc.).
</para>
<para>
<literal>requestdetail</literal> logs the details of every request, before
it is passed to the back-end, and the results received from it.
</para>
<para>
</para>
<para>
<literal>requestdetail</literal> logs the details of every request, before
it is passed to the back-end, and the results received from it.
</para>
<para>
- Each server program (zebra, etc) is supposed to define its own log levels
+ Each server program (zebra, etc.) is supposed to define its own log levels
in addition to these. As they depend on the server in question, they can
not be described here. See above how to find out about them.
</para>
in addition to these. As they depend on the server in question, they can
not be described here. See above how to find out about them.
</para>
@@
-237,10
+237,10
@@
<refsect1><title>LOG FILENAME EXAMPLES</title>
<para>
<refsect1><title>LOG FILENAME EXAMPLES</title>
<para>
- A file with format my_YYYYMMDD.log is where Y, M, D is year, month, and day
- digits is given as follows
+ A file with format my_YYYYMMDD.log (where Y, M, D is year, month, and day
+ digits) is given as follows:
<literal>-l my_%Y%m%d.log</literal> . And since the filename
<literal>-l my_%Y%m%d.log</literal> . And since the filename
- is depending on day, rotaion will occur on midnight.
+ is depending on day, rotation will occur on midnight.
</para>
<para>
A weekly log could be specified as
</para>
<para>
A weekly log could be specified as
diff --git
a/doc/yaz-marcdump-man.xml
b/doc/yaz-marcdump-man.xml
index
a44dde0
..
a96fc1a
100644
(file)
--- a/
doc/yaz-marcdump-man.xml
+++ b/
doc/yaz-marcdump-man.xml
@@
-110,7
+110,7
@@
<varlistentry>
<term>-f <replaceable>from</replaceable></term>
<listitem><para>
<varlistentry>
<term>-f <replaceable>from</replaceable></term>
<listitem><para>
- Specify the character set <replaceable>from</replaceable>
+ Specify the character set
of the input MARC record.
Should be used in conjunction with option <literal>-t</literal>.
Refer to the yaz-iconv man page for supported character sets.
of the input MARC record.
Should be used in conjunction with option <literal>-t</literal>.
Refer to the yaz-iconv man page for supported character sets.
@@
-120,7
+120,7
@@
<varlistentry>
<term>-t <replaceable>to</replaceable></term>
<listitem><para>
<varlistentry>
<term>-t <replaceable>to</replaceable></term>
<listitem><para>
- Specify the character set <replaceable>of</replaceable>
+ Specify the character set
of the output.
Should be used in conjunction with option <literal>-f</literal>.
Refer to the yaz-iconv man page for supported character sets.
of the output.
Should be used in conjunction with option <literal>-f</literal>.
Refer to the yaz-iconv man page for supported character sets.
@@
-144,7
+144,7
@@
<listitem><para>
Writes a chunk of records to a separate file with prefix given,
i.e. splits a record batch into files with only at most
<listitem><para>
Writes a chunk of records to a separate file with prefix given,
i.e. splits a record batch into files with only at most
- "chunk" ISO2709 record per file. By default chunk is 1 (one record
+ "chunk" ISO2709 records per file. By default chunk is 1 (one record
per file). See option <literal>-C</literal>.
</para></listitem>
</varlistentry>
per file). See option <literal>-C</literal>.
</para></listitem>
</varlistentry>
@@
-160,7
+160,7
@@
<varlistentry>
<term>-p</term>
<listitem><para>
<varlistentry>
<term>-p</term>
<listitem><para>
- Makes yaz-marcdump prints record number and input file offset
+ Makes yaz-marcdump print record number and input file offset
of each record read.
</para></listitem>
</varlistentry>
of each record read.
</para></listitem>
</varlistentry>
@@
-168,7
+168,7
@@
<varlistentry>
<term>-n</term>
<listitem><para>
<varlistentry>
<term>-n</term>
<listitem><para>
- MARC output is omitted so that MARC input is only checkecd.
+ MARC output is omitted so that MARC input is only checked.
</para></listitem>
</varlistentry>
</para></listitem>
</varlistentry>
diff --git
a/doc/yaz-url-man.xml
b/doc/yaz-url-man.xml
index
a1bc290
..
c389de8
100644
(file)
--- a/
doc/yaz-url-man.xml
+++ b/
doc/yaz-url-man.xml
@@
-47,7
+47,7
@@
limited in functionality compared to programs such as curl, wget.
</para>
<para>
limited in functionality compared to programs such as curl, wget.
</para>
<para>
- The options must be precede the URL given on the command line to take
+ The options must precede the URL given on the command line, to take
effect.
</para>
<para>
effect.
</para>
<para>
@@
-101,7
+101,7
@@
<listitem><para>
Specifies a user and a password to be uesd in HTTP
basic authentication in the following URL fetch. The user
<listitem><para>
Specifies a user and a password to be uesd in HTTP
basic authentication in the following URL fetch. The user
- and password must be separated by a slash (this it is not
+ and password must be separated by a slash (thus it is not
possible to specify a user with a slash in it).
</para></listitem>
</varlistentry>
possible to specify a user with a slash in it).
</para></listitem>
</varlistentry>
diff --git
a/doc/yaz-ztest-man.xml
b/doc/yaz-ztest-man.xml
index
30bcba1
..
6d1cc23
100644
(file)
--- a/
doc/yaz-ztest-man.xml
+++ b/
doc/yaz-ztest-man.xml
@@
-53,7
+53,7
@@
</screen>
</para>
<para>
</screen>
</para>
<para>
- For UNIX local socket the address is the filename of the local socket.
+ For UNIX local socket, the address is the filename of the local socket.
</para>
</refsect1>
<refsect1>
</para>
</refsect1>
<refsect1>
@@
-68,18
+68,18
@@
integer value of that term is used as hit count. This allows testers
to return any number of hits. <command>yaz-ztest</command> includes
24 MARC records for testing. Hit counts exceeding 24 will make
integer value of that term is used as hit count. This allows testers
to return any number of hits. <command>yaz-ztest</command> includes
24 MARC records for testing. Hit counts exceeding 24 will make
- <command>yaz-ztest</command> return the same record batch over and over..
- So record at position 1, 25, 49, etc .. are equivalent.
+ <command>yaz-ztest</command> return the same record batch over and over.
+ So record at position 1, 25, 49, etc. are equivalent.
</para>
<para>
</para>
<para>
- For XML if no element set is given or element has value "marcxml",
+ For XML, if no element set is given or element has value "marcxml",
MARCXML is returned (each of the 24 dummy records converted from
MARCXML is returned (each of the 24 dummy records converted from
- ISO2709 to XML). For element set OP, OPAC XML is returned.
+ ISO2709 to XML). For element set OP, then OPAC XML is returned.
</para>
<para>
yaz-ztest may also return predefined XML records (for testing).
This is enabled if <literal>YAZ_ZTEST_XML_FETCH</literal> environment
</para>
<para>
yaz-ztest may also return predefined XML records (for testing).
This is enabled if <literal>YAZ_ZTEST_XML_FETCH</literal> environment
- variable is defined. A record is fetched form a file (one record per file).
+ variable is defined. A record is fetched from a file (one record per file).
The path for the filename is
<replaceable>F</replaceable><replaceable>E</replaceable><literal>.</literal><replaceable>d</replaceable><literal>.xml</literal>
where <replaceable>F</replaceable> is the YAZ_ZTEST_XML_FETCH value
The path for the filename is
<replaceable>F</replaceable><replaceable>E</replaceable><literal>.</literal><replaceable>d</replaceable><literal>.xml</literal>
where <replaceable>F</replaceable> is the YAZ_ZTEST_XML_FETCH value
@@
-108,7
+108,7
@@
The value of the delay may either be a fixed floating point
value which specifies the delay in seconds.
Alternatively the value may be given as two floating point numbers
The value of the delay may either be a fixed floating point
value which specifies the delay in seconds.
Alternatively the value may be given as two floating point numbers
- separated by colon, which wil make <command>yaz-ztest</command> perform
+ separated by colon, which will make <command>yaz-ztest</command> perform
a random sleep between the first and second number.
</para>
<para>
a random sleep between the first and second number.
</para>
<para>