diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-06-19 18:18:58 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-06-19 18:18:58 +0300 |
commit | 3b49db92dc4a67f72a4d641f3ac9492f4a44578c (patch) | |
tree | 8701771e3e5f3631b03b85e1a62f98f71ef6973d | |
parent | b4ff3aa84bd151a4a575c10b141be425ecc9b867 (diff) | |
download | smap-3b49db92dc4a67f72a4d641f3ac9492f4a44578c.tar.gz smap-3b49db92dc4a67f72a4d641f3ac9492f4a44578c.tar.bz2 |
Bugfixes
* doc/macros.texi: New file.
* doc/Makefile.am (smap_TEXINFOS): Add macros.texi
* doc/Config: Override $image hanlder.
* doc/ex-meta1.texi: Add indexing commands.
* doc/gendocs_template: Fix copy-paste errors.
* doc/smap.texi: Add indexing commands.
* configure.ac, NEWS: Version 0.0.94
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/Config | 36 | ||||
-rw-r--r-- | doc/Makefile.am | 7 | ||||
-rw-r--r-- | doc/ex-meta1.texi | 1 | ||||
-rwxr-xr-x | doc/gendocs_template | 4 | ||||
-rw-r--r-- | doc/macros.texi | 13 | ||||
-rw-r--r-- | doc/smap.texi | 140 |
8 files changed, 196 insertions, 11 deletions
@@ -1,11 +1,11 @@ | |||
1 | Smap NEWS -- history of user-visible changes. 2010-06-18 | 1 | Smap NEWS -- history of user-visible changes. 2010-06-19 |
2 | Copyright (C) 2006, 2007, 2008, 2009, 2010 Sergey Poznyakoff | 2 | Copyright (C) 2006, 2007, 2008, 2009, 2010 Sergey Poznyakoff |
3 | See the end of file for copying conditions. | 3 | See the end of file for copying conditions. |
4 | 4 | ||
5 | Please send Smap bug reports to <gray+smap@gnu.org.ua> | 5 | Please send Smap bug reports to <gray+smap@gnu.org.ua> |
6 | 6 | ||
7 | 7 | ||
8 | Version 0.0.93 (Git) | 8 | Version 0.0.94 (Git) |
9 | 9 | ||
10 | * First release | 10 | * First release |
11 | 11 | ||
diff --git a/configure.ac b/configure.ac index 7ccd286..5848e32 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -17,7 +17,7 @@ | |||
17 | AC_PREREQ(2.63) | 17 | AC_PREREQ(2.63) |
18 | m4_define([SMAP_VERSION_MAJOR], 0) | 18 | m4_define([SMAP_VERSION_MAJOR], 0) |
19 | m4_define([SMAP_VERSION_MINOR], 0) | 19 | m4_define([SMAP_VERSION_MINOR], 0) |
20 | m4_define([SMAP_VERSION_PATCH], 93) | 20 | m4_define([SMAP_VERSION_PATCH], 94) |
21 | AC_INIT([smap], | 21 | AC_INIT([smap], |
22 | SMAP_VERSION_MAJOR.SMAP_VERSION_MINOR[]m4_ifdef([SMAP_VERSION_PATCH],.SMAP_VERSION_PATCH), | 22 | SMAP_VERSION_MAJOR.SMAP_VERSION_MINOR[]m4_ifdef([SMAP_VERSION_PATCH],.SMAP_VERSION_PATCH), |
23 | [gray+smap@gnu.org.ua]) | 23 | [gray+smap@gnu.org.ua]) |
@@ -113,6 +113,7 @@ $print_foot_navigation = \&gray_print_foot_navigation; | |||
113 | $print_About = \&gray_print_About; | 113 | $print_About = \&gray_print_About; |
114 | $cell = \&gray_multitable_cell; | 114 | $cell = \&gray_multitable_cell; |
115 | $print_page_foot = \&gray_print_page_foot; | 115 | $print_page_foot = \&gray_print_page_foot; |
116 | $image = \&gray_default_image; | ||
116 | 117 | ||
117 | sub gray_multitable_cell($$) | 118 | sub gray_multitable_cell($$) |
118 | { | 119 | { |
@@ -363,3 +364,38 @@ sub gray_print_section | |||
363 | and $nw >= $WORDS_IN_PAGE)); | 364 | and $nw >= $WORDS_IN_PAGE)); |
364 | } | 365 | } |
365 | } | 366 | } |
367 | |||
368 | sub gray_default_image($$$$$$$$$$$) | ||
369 | { | ||
370 | my $file = shift; | ||
371 | my $base = shift; | ||
372 | my $preformatted = shift; | ||
373 | my $file_name = shift; | ||
374 | my $alt = shift; | ||
375 | my $width = shift; | ||
376 | my $height = shift; | ||
377 | my $raw_alt = shift; | ||
378 | my $extension = shift; | ||
379 | my $working_dir = shift; | ||
380 | my $file_path = shift; | ||
381 | |||
382 | if (!defined($file_path) or $file_path eq '') | ||
383 | { | ||
384 | if (defined($extension) and $extension ne '') | ||
385 | { | ||
386 | $file = "$base.$extension"; | ||
387 | } | ||
388 | else | ||
389 | { | ||
390 | $file = "$base.jpg"; | ||
391 | } | ||
392 | main::echo_warn ("no image file for $base, (using $file)"); | ||
393 | } | ||
394 | $alt = &$protect_text($base) if (!defined($alt) or ($alt eq '')); | ||
395 | return "[ $alt ]" if ($preformatted); | ||
396 | # it is possible that $file_name is more correct as it allows the user | ||
397 | # to chose the relative path. | ||
398 | $file = &$protect_text($file_name); | ||
399 | return "<img src=\"/software/smap/graphics/$file\" alt=\"$alt\">"; | ||
400 | } | ||
401 | |||
diff --git a/doc/Makefile.am b/doc/Makefile.am index 1a6e3b0..d1e8bdb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -19,7 +19,8 @@ smap_TEXINFOS=\ | |||
19 | fdl.texi\ | 19 | fdl.texi\ |
20 | sockmap.texi\ | 20 | sockmap.texi\ |
21 | debugcat.texi\ | 21 | debugcat.texi\ |
22 | ex-meta1.texi | 22 | ex-meta1.texi\ |
23 | macros.texi | ||
23 | 24 | ||
24 | EXTRA_DIST = \ | 25 | EXTRA_DIST = \ |
25 | gendocs_template\ | 26 | gendocs_template\ |
@@ -71,6 +72,8 @@ manual: | |||
71 | $(GENDOCS) --texi2html $(PACKAGE) '$(PACKAGE_NAME) manual' | 72 | $(GENDOCS) --texi2html $(PACKAGE) '$(PACKAGE_NAME) manual' |
72 | 73 | ||
73 | manual.tar.bz2: manual | 74 | manual.tar.bz2: manual |
74 | tar cfj manual.tar.bz2 manual | 75 | tar cf manual.tar manual |
76 | tar -r -f manual.tar --transform 's|^|graphics/|' smapflow.png | ||
77 | bzip2 -f manual.tar | ||
75 | 78 | ||
76 | man-tar: manual.tar.bz2 | 79 | man-tar: manual.tar.bz2 |
diff --git a/doc/ex-meta1.texi b/doc/ex-meta1.texi index 905e135..1cf02ac 100644 --- a/doc/ex-meta1.texi +++ b/doc/ex-meta1.texi | |||
@@ -2,6 +2,7 @@ | |||
2 | @c Copyright (C) 2010 Sergey Poznyakoff | 2 | @c Copyright (C) 2010 Sergey Poznyakoff |
3 | @c See file smap.texi for copying conditions. | 3 | @c See file smap.texi for copying conditions. |
4 | @c ******************************************************************* | 4 | @c ******************************************************************* |
5 | @cindex MeTA1 | ||
5 | In this appendix we will show how to use the @samp{mailutils} | 6 | In this appendix we will show how to use the @samp{mailutils} |
6 | module (@pxref{mailutils module}) to configure local user and alias maps for | 7 | module (@pxref{mailutils module}) to configure local user and alias maps for |
7 | @acronym{MeTA1}. For this purpose, we will assume that the actual | 8 | @acronym{MeTA1}. For this purpose, we will assume that the actual |
diff --git a/doc/gendocs_template b/doc/gendocs_template index 30bf3c4..0e0bb50 100755 --- a/doc/gendocs_template +++ b/doc/gendocs_template | |||
@@ -4,7 +4,7 @@ | |||
4 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | 4 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> |
5 | 5 | ||
6 | <head> | 6 | <head> |
7 | <title>Mailfromd - General-Purpose Mail Filter</title> | 7 | <title>SMAP - Socket Map Server</title> |
8 | <link rev="made" href="mailto:gray@gnu.org.ua" /> | 8 | <link rev="made" href="mailto:gray@gnu.org.ua" /> |
9 | <link rel="stylesheet" type="text/css" href="gray.css" /> | 9 | <link rel="stylesheet" type="text/css" href="gray.css" /> |
10 | <link rel="icon" type="image/png" href="/graphics/gnu-head-icon.png" /> | 10 | <link rel="icon" type="image/png" href="/graphics/gnu-head-icon.png" /> |
@@ -12,7 +12,7 @@ | |||
12 | <body> | 12 | <body> |
13 | <!--#include virtual="inc/header.html" --> | 13 | <!--#include virtual="inc/header.html" --> |
14 | <ul class='tabs'> | 14 | <ul class='tabs'> |
15 | <li><a href="mailfromd.html">Main</a></li> | 15 | <li><a href="smap.html">Main</a></li> |
16 | <li><a href="download.html">Downloads</a></li> | 16 | <li><a href="download.html">Downloads</a></li> |
17 | <li><a class="active" href="manual.html">Documentation</a></li> | 17 | <li><a class="active" href="manual.html">Documentation</a></li> |
18 | </ul> | 18 | </ul> |
diff --git a/doc/macros.texi b/doc/macros.texi new file mode 100644 index 0000000..810c6a0 --- /dev/null +++ b/doc/macros.texi | |||
@@ -0,0 +1,13 @@ | |||
1 | @c This file is part of the Smap manual. | ||
2 | @c Copyright (C) 2010 Sergey Poznyakoff | ||
3 | @c See file smap.texi for copying conditions. | ||
4 | @c ******************************************************************* | ||
5 | @macro smapdopidx{long,short} | ||
6 | @opindex \short\, -\short\ option, @command{smapd} | ||
7 | @opindex \long\, --\long\ option, @command{smapd} | ||
8 | @end macro | ||
9 | |||
10 | @macro smapcopidx{long,short} | ||
11 | @opindex \short\, -\short\ option, @command{smapc} | ||
12 | @opindex \long\, --\long\ option, @command{smapc} | ||
13 | @end macro | ||
diff --git a/doc/smap.texi b/doc/smap.texi index 452d4f5..6faef2c 100644 --- a/doc/smap.texi +++ b/doc/smap.texi | |||
@@ -21,6 +21,7 @@ | |||
21 | @syncodeindex fl cp | 21 | @syncodeindex fl cp |
22 | 22 | ||
23 | @include version.texi | 23 | @include version.texi |
24 | @include macros.texi | ||
24 | 25 | ||
25 | @ifinfo | 26 | @ifinfo |
26 | @dircategory Email | 27 | @dircategory Email |
@@ -284,6 +285,7 @@ this request. | |||
284 | 285 | ||
285 | @node smapd | 286 | @node smapd |
286 | @chapter The Socket Map Server | 287 | @chapter The Socket Map Server |
288 | @prindex smapd | ||
287 | Socket map server @command{smapd} is the main part of the package. | 289 | Socket map server @command{smapd} is the main part of the package. |
288 | When invoked, it reads the @dfn{configuration file} and parses its | 290 | When invoked, it reads the @dfn{configuration file} and parses its |
289 | command line to determine its configuration settings. Command line | 291 | command line to determine its configuration settings. Command line |
@@ -313,6 +315,7 @@ Comments are introduced with the @samp{#} character: the character | |||
313 | itself and everything after it up to next newline is ignored. For a | 315 | itself and everything after it up to next newline is ignored. For a |
314 | detailed description, see @ref{smapd-config}. | 316 | detailed description, see @ref{smapd-config}. |
315 | 317 | ||
318 | @cindex smapd, alternative configuration file for | ||
316 | You can instruct @command{smapd} to read an alternative | 319 | You can instruct @command{smapd} to read an alternative |
317 | configuration file instead of the default one. It may be necessary, | 320 | configuration file instead of the default one. It may be necessary, |
318 | for example, to test a new configuration. To do so, use the | 321 | for example, to test a new configuration. To do so, use the |
@@ -323,6 +326,7 @@ option. Its argument specifies the file name to read, e.g.: | |||
323 | $ smapd -c ./mysmapd.conf | 326 | $ smapd -c ./mysmapd.conf |
324 | @end example | 327 | @end example |
325 | 328 | ||
329 | @cindex smapd, configuration checking | ||
326 | To check whether your configuration is error-free, use the | 330 | To check whether your configuration is error-free, use the |
327 | @option{--lint} (@option{-t}) option. It instructs @command{smapd} to | 331 | @option{--lint} (@option{-t}) option. It instructs @command{smapd} to |
328 | parse the configuration file and exit after that. Any errors found | 332 | parse the configuration file and exit after that. Any errors found |
@@ -390,6 +394,7 @@ using @samp{inet-mode yes} statement. | |||
390 | @section Logging | 394 | @section Logging |
391 | @cindex logging | 395 | @cindex logging |
392 | @cindex diagnostics | 396 | @cindex diagnostics |
397 | @cindex syslog | ||
393 | The server determines automatically where its diagnostics output | 398 | The server determines automatically where its diagnostics output |
394 | should go. By default, it goes to standard error. However, after | 399 | should go. By default, it goes to standard error. However, after |
395 | detaching from the terminal in standalone mode, @command{smapd} | 400 | detaching from the terminal in standalone mode, @command{smapd} |
@@ -417,6 +422,9 @@ command line, using the @option{--log-tag} (@option{-L}) option, | |||
417 | 422 | ||
418 | @node debugging | 423 | @node debugging |
419 | @section Tracing and Debugging | 424 | @section Tracing and Debugging |
425 | @cindex debugging | ||
426 | @cindex query traces | ||
427 | @cindex tracing queries | ||
420 | The amount of information logged by the server is configurable. | 428 | The amount of information logged by the server is configurable. |
421 | By default, it is quite silent and outputs only diagnostics | 429 | By default, it is quite silent and outputs only diagnostics |
422 | that call to special attention, such as errors and the like. You may | 430 | that call to special attention, such as errors and the like. You may |
@@ -443,6 +451,8 @@ file. | |||
443 | priority. | 451 | priority. |