Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Pazpar2.
SUBDIRS = common

SUFFIXES=.1 .5 .7 .8 .pdf .esp .xml
SUFFIXES=.1 .5 .7 .8 .pdf .esp .xml

XMLFILES = book.xml ajaxdev.xml manref.xml gpl-2.0.xml local.ent

Expand Down Expand Up @@ -51,7 +51,7 @@ jade-check: $(XMLFILES)
manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl local.ent
rm -f manref.xml
for i in $(XMLMAN); do \
xsltproc $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
$(XSLTPROC_COMPILE) $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
done

clean-data-hook:
Expand Down
10 changes: 5 additions & 5 deletions doc/book.xml
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
<para>
Apache 2 has a
<ulink
url="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">
url="https://httpd.apache.org/docs/2.2/mod/mod_proxy.html">
proxy module
</ulink>
which allows Pazpar2 to become a backend to an Apache 2
Expand All @@ -448,7 +448,7 @@
<literal>/search.pz2</literal>.
The
<ulink
url="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass">
url="https://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass">
ProxyPass
</ulink>
directive of Apache must be used to map a URL path
Expand Down Expand Up @@ -681,7 +681,7 @@
search. You start a new search using the 'search' command. Once the
search has been started, you can follow its progress using the
'stat', 'bytarget', 'termlist', or 'show' commands. Detailed records
can be fetched using the 'record' command.
can be fetched using the 'record' command.
</para>
</section>

Expand Down Expand Up @@ -723,7 +723,7 @@
requests to Pazpar2, this set up can be easily extended to include
load balancing capabilites.
To do so, you need to enable the
<ulink url="http://httpd.apache.org/docs/2.2/mod/mod_proxy_balancer.html">
<ulink url="https://httpd.apache.org/docs/2.2/mod/mod_proxy_balancer.html">
mod_proxy_balance
</ulink>
module in your Apache2 installation.
Expand Down Expand Up @@ -866,7 +866,7 @@
]]></screen>
<para>
For controlling the ranking parameters, refer to the
<link linkend="service-rank">rank</link> element of the
<link linkend="service-rank">rank</link> element of the
service definition.
Refer to the <link linkend="metadata-rank">rank</link> attribute
of the metadata element for how to control ranking for individual
Expand Down
2 changes: 1 addition & 1 deletion doc/common
Submodule common updated 3 files
+19 −19 common.ent
+3 −0 id.htmlhelp.xsl
+435 −39 style1.css
28 changes: 14 additions & 14 deletions doc/pazpar2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<manvolnum>8</manvolnum>
<refmiscinfo class="manual">System management commands</refmiscinfo>
</refmeta>

<refnamediv>
<refname>pazpar2</refname>
<refpurpose>Metasearch daemon.</refpurpose>
</refnamediv>

<refsynopsisdiv>
<cmdsynopsis>
<command>pazpar2</command>
Expand All @@ -47,7 +47,7 @@
<arg choice="opt"><option>-remove</option></arg>
</cmdsynopsis>
</refsynopsisdiv>

<refsect1>
<title>DESCRIPTION</title>
<para>
Expand All @@ -61,10 +61,10 @@
<option>-f</option>.
</para>
</refsect1>

<refsect1>
<title>OPTIONS</title>

<variablelist>
<varlistentry>
<term><option>-d</option></term>
Expand Down Expand Up @@ -124,7 +124,7 @@
Sets the format of time-stamps for logging.
Refer to the
<ulink
url="http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html">
url="https://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html">
strftime(3)</ulink>
man page for the format.
</para></listitem>
Expand Down Expand Up @@ -252,16 +252,16 @@
</varlistentry>

</variablelist>

</refsect1>

<refsect1>
<title>EXAMPLES</title>
<para>The Debian package of pazpar2 starts the server with:
<screen>
pazpar2 -D -f /etc/pazpar2/pazpar2.cfg -l /var/log/pazpar2.log -p /var/run/pazpar2.pid -u nobody
</screen>
(one line).
(one line).
</para>
<para>
This will put pazpar2 in the background (-D), read config from from
Expand All @@ -284,17 +284,17 @@
(gdb) run -X -f ../etc/pazpar2.cfg
</screen>
</para>
</refsect1>
</refsect1>

<refsect1>
<title>FILES</title>
<para><filename>/usr/sbin/pazpar2</filename>: pazpar2 daemon</para>

<para><filename>/usr/share/pazpar2</filename>: pazpar2 shared files</para>

<para><filename>/etc/pazpar2</filename>: pazpar2 config area</para>
</refsect1>

<refsect1>
<title>SEE ALSO</title>
<para>
Expand Down
2 changes: 1 addition & 1 deletion doc/pazpar2_conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@
'name' and 'value' respectively. Refer to possible list of names
in the
<ulink
url="http://www.indexdata.com/yaz/doc/tools.html#ccl.directives.table">
url="https://www.indexdata.com/yaz/doc/tools.html#ccl.directives.table">
YAZ manual
</ulink>.
</para>
Expand Down
2 changes: 1 addition & 1 deletion m4
Submodule m4 updated 7 files
+20 −0 .editorconfig
+2 −2 ac_check_icu.m4
+56 −11 boost.m4
+6 −0 common.nsi
+1 −1 id-config.sh
+10 −10 yaz.m4
+1 −1 yaz_libxml2.m4