Tagged 3.48.6

2026-06-19 16:53:18 +03:00 · 2014-05-13 19:42:59 +00:00
8 changed files with 322 additions and 333 deletions
--- a/20
+++ b/20
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for httrack 3.48.6.
+# Generated by GNU Autoconf 2.69 for httrack 3.48.5.
 #
 # Report bugs to <roche+packaging@httrack.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='httrack'
 PACKAGE_TARNAME='httrack'
-PACKAGE_VERSION='3.48.6'
+PACKAGE_VERSION='3.48.5'
-PACKAGE_STRING='httrack 3.48.6'
+PACKAGE_STRING='httrack 3.48.5'
 PACKAGE_BUGREPORT='roche+packaging@httrack.com'
 PACKAGE_URL='http://www.httrack.com/'
@@ -1337,7 +1337,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures httrack 3.48.6 to adapt to many kinds of systems.
+\`configure' configures httrack 3.48.5 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1407,7 +1407,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of httrack 3.48.6:";;
+     short | recursive ) echo "Configuration of httrack 3.48.5:";;
   esac
  cat <<\_ACEOF
@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-httrack configure 3.48.6
+httrack configure 3.48.5
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2248,7 +2248,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by httrack $as_me 3.48.6, which was
+It was created by httrack $as_me 3.48.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  $ $0 $@
@@ -3067,7 +3067,7 @@ fi
 # Define the identity of the package.
 PACKAGE='httrack'
- VERSION='3.48.6'
+ VERSION='3.48.5'
 cat >>confdefs.h <<_ACEOF
@@ -16892,7 +16892,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by httrack $as_me 3.48.6, which was
+This file was extended by httrack $as_me 3.48.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@@ -16959,7 +16959,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-httrack config.status 3.48.6
+httrack config.status 3.48.5
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([httrack], [3.48.6], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.48.5], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
 httrack (3.48.6-1) unstable; urgency=low
  * Updated to 3.48.6 (3.48-6)
 -- Xavier Roche <xavier@debian.org>  Tue, 13 May 2014 21:23:02 +0200
 httrack (3.48.5-1) unstable; urgency=low
  * Updated to 3.48.5 (3.48-5)
--- a/history.txt
+++ b/history.txt
@@ -4,9 +4,7 @@ HTTrack Website Copier release history:
 This file lists all changes and fixes that have been made for HTTrack.
-3.48-6
+3.48-3
 + Fixed: mitigate the "hashtable internal error: cuckoo/stash collision" errors
 + Fixed: safety cleanup in many strings operations
 + Fixed: buggy option pannels
 + New: Enforce check against CVE-2014-0160
 + New: improved hashtables to speedup large mirrors
--- a/html/httrack.man.html
+++ b/html/httrack.man.html
@@ -51,99 +51,98 @@ offline browser : copy websites to a local directory</p>
 <p style="margin-left:11%; margin-top: 1em"><b>httrack [
-url ]... [ &minus;filter ]... [ +filter ]... [ &minus;O,
+url ]... [ &minus;filter ]... [ +filter ]... [ &minus;O
-&minus;&minus;path</b> ] [ <b>&minus;w,
+&minus;&minus;path</b> ] [ <b>&minus;w
-&minus;&minus;mirror</b> ] [ <b>&minus;W,
+&minus;&minus;mirror</b> ] [ <b>&minus;W
-&minus;&minus;mirror&minus;wizard</b> ] [ <b>&minus;g,
+&minus;&minus;mirror&minus;wizard</b> ] [ <b>&minus;g
-&minus;&minus;get&minus;files</b> ] [ <b>&minus;i,
+&minus;&minus;get&minus;files</b> ] [ <b>&minus;i
-&minus;&minus;continue</b> ] [ <b>&minus;Y,
+&minus;&minus;continue</b> ] [ <b>&minus;Y
-&minus;&minus;mirrorlinks</b> ] [ <b>&minus;P,
+&minus;&minus;mirrorlinks</b> ] [ <b>&minus;P
-&minus;&minus;proxy</b> ] [ <b>&minus;%f,
+&minus;&minus;proxy</b> ] [ <b>&minus;%f
-&minus;&minus;httpproxy&minus;ftp[=N]</b> ] [ <b>&minus;%b,
+&minus;&minus;httpproxy&minus;ftp[=N]</b> ] [ <b>&minus;%b
-&minus;&minus;bind</b> ] [ <b>&minus;rN,
+&minus;&minus;bind</b> ] [ <b>&minus;rN
-&minus;&minus;depth[=N]</b> ] [ <b>&minus;%eN,
+&minus;&minus;depth[=N]</b> ] [ <b>&minus;%eN
-&minus;&minus;ext&minus;depth[=N]</b> ] [ <b>&minus;mN,
+&minus;&minus;ext&minus;depth[=N]</b> ] [ <b>&minus;mN
-&minus;&minus;max&minus;files[=N]</b> ] [ <b>&minus;MN,
+&minus;&minus;max&minus;files[=N]</b> ] [ <b>&minus;MN
-&minus;&minus;max&minus;size[=N]</b> ] [ <b>&minus;EN,
+&minus;&minus;max&minus;size[=N]</b> ] [ <b>&minus;EN
-&minus;&minus;max&minus;time[=N]</b> ] [ <b>&minus;AN,
+&minus;&minus;max&minus;time[=N]</b> ] [ <b>&minus;AN
-&minus;&minus;max&minus;rate[=N]</b> ] [ <b>&minus;%cN,
+&minus;&minus;max&minus;rate[=N]</b> ] [ <b>&minus;%cN
 &minus;&minus;connection&minus;per&minus;second[=N]</b> ] [
-<b>&minus;GN, &minus;&minus;max&minus;pause[=N]</b> ] [
+<b>&minus;GN &minus;&minus;max&minus;pause[=N]</b> ] [
-<b>&minus;cN, &minus;&minus;sockets[=N]</b> ] [
+<b>&minus;cN &minus;&minus;sockets[=N]</b> ] [ <b>&minus;TN
-<b>&minus;TN, &minus;&minus;timeout[=N]</b> ] [
+&minus;&minus;timeout[=N]</b> ] [ <b>&minus;RN
-<b>&minus;RN, &minus;&minus;retries[=N]</b> ] [
+&minus;&minus;retries[=N]</b> ] [ <b>&minus;JN
-<b>&minus;JN, &minus;&minus;min&minus;rate[=N]</b> ] [
+&minus;&minus;min&minus;rate[=N]</b> ] [ <b>&minus;HN
-<b>&minus;HN, &minus;&minus;host&minus;control[=N]</b> ] [
+&minus;&minus;host&minus;control[=N]</b> ] [ <b>&minus;%P
-<b>&minus;%P, &minus;&minus;extended&minus;parsing[=N]</b> ]
+&minus;&minus;extended&minus;parsing[=N]</b> ] [ <b>&minus;n
-[ <b>&minus;n, &minus;&minus;near</b> ] [ <b>&minus;t,
+&minus;&minus;near</b> ] [ <b>&minus;t
-&minus;&minus;test</b> ] [ <b>&minus;%L,
+&minus;&minus;test</b> ] [ <b>&minus;%L
-&minus;&minus;list</b> ] [ <b>&minus;%S,
+&minus;&minus;list</b> ] [ <b>&minus;%S
-&minus;&minus;urllist</b> ] [ <b>&minus;NN,
+&minus;&minus;urllist</b> ] [ <b>&minus;NN
-&minus;&minus;structure[=N]</b> ] [ <b>&minus;%D,
+&minus;&minus;structure[=N]</b> ] [ <b>&minus;%D
 &minus;&minus;cached&minus;delayed&minus;type&minus;check</b>
-] [ <b>&minus;%M, &minus;&minus;mime&minus;html</b> ] [
+] [ <b>&minus;%M &minus;&minus;mime&minus;html</b> ] [
-<b>&minus;LN, &minus;&minus;long&minus;names[=N]</b> ] [
+<b>&minus;LN &minus;&minus;long&minus;names[=N]</b> ] [
-<b>&minus;KN, &minus;&minus;keep&minus;links[=N]</b> ] [
+<b>&minus;KN &minus;&minus;keep&minus;links[=N]</b> ] [
-<b>&minus;x, &minus;&minus;replace&minus;external</b> ] [
+<b>&minus;x &minus;&minus;replace&minus;external</b> ] [
-<b>&minus;%x, &minus;&minus;disable&minus;passwords</b> ] [
+<b>&minus;%x &minus;&minus;disable&minus;passwords</b> ] [
-<b>&minus;%q,
+<b>&minus;%q
 &minus;&minus;include&minus;query&minus;string</b> ] [
-<b>&minus;o, &minus;&minus;generate&minus;errors</b> ] [
+<b>&minus;o &minus;&minus;generate&minus;errors</b> ] [
-<b>&minus;X, &minus;&minus;purge&minus;old[=N]</b> ] [
+<b>&minus;X &minus;&minus;purge&minus;old[=N]</b> ] [
-<b>&minus;%p, &minus;&minus;preserve</b> ] [ <b>&minus;%T,
+<b>&minus;%p &minus;&minus;preserve</b> ] [ <b>&minus;%T
-&minus;&minus;utf8&minus;conversion</b> ] [ <b>&minus;bN,
+&minus;&minus;utf8&minus;conversion</b> ] [ <b>&minus;bN
-&minus;&minus;cookies[=N]</b> ] [ <b>&minus;u,
+&minus;&minus;cookies[=N]</b> ] [ <b>&minus;u
-&minus;&minus;check&minus;type[=N]</b> ] [ <b>&minus;j,
+&minus;&minus;check&minus;type[=N]</b> ] [ <b>&minus;j
-&minus;&minus;parse&minus;java[=N]</b> ] [ <b>&minus;sN,
+&minus;&minus;parse&minus;java[=N]</b> ] [ <b>&minus;sN
-&minus;&minus;robots[=N]</b> ] [ <b>&minus;%h,
+&minus;&minus;robots[=N]</b> ] [ <b>&minus;%h
-&minus;&minus;http&minus;10</b> ] [ <b>&minus;%k,
+&minus;&minus;http&minus;10</b> ] [ <b>&minus;%k
-&minus;&minus;keep&minus;alive</b> ] [ <b>&minus;%B,
+&minus;&minus;keep&minus;alive</b> ] [ <b>&minus;%B
-&minus;&minus;tolerant</b> ] [ <b>&minus;%s,
+&minus;&minus;tolerant</b> ] [ <b>&minus;%s
-&minus;&minus;updatehack</b> ] [ <b>&minus;%u,
+&minus;&minus;updatehack</b> ] [ <b>&minus;%u
-&minus;&minus;urlhack</b> ] [ <b>&minus;%A,
+&minus;&minus;urlhack</b> ] [ <b>&minus;%A
-&minus;&minus;assume</b> ] [ <b>&minus;@iN,
+&minus;&minus;assume</b> ] [ <b>&minus;@iN
-&minus;&minus;protocol[=N]</b> ] [ <b>&minus;%w,
+&minus;&minus;protocol[=N]</b> ] [ <b>&minus;%w
-&minus;&minus;disable&minus;module</b> ] [ <b>&minus;F,
+&minus;&minus;disable&minus;module</b> ] [ <b>&minus;F
-&minus;&minus;user&minus;agent</b> ] [ <b>&minus;%R,
+&minus;&minus;user&minus;agent</b> ] [ <b>&minus;%R
-&minus;&minus;referer</b> ] [ <b>&minus;%E,
+&minus;&minus;referer</b> ] [ <b>&minus;%E
-&minus;&minus;from</b> ] [ <b>&minus;%F,
+&minus;&minus;from</b> ] [ <b>&minus;%F
-&minus;&minus;footer</b> ] [ <b>&minus;%l,
+&minus;&minus;footer</b> ] [ <b>&minus;%l
-&minus;&minus;language</b> ] [ <b>&minus;%a,
+&minus;&minus;language</b> ] [ <b>&minus;%a
-&minus;&minus;accept</b> ] [ <b>&minus;%X,
+&minus;&minus;accept</b> ] [ <b>&minus;%X
-&minus;&minus;headers</b> ] [ <b>&minus;C,
+&minus;&minus;headers</b> ] [ <b>&minus;C
-&minus;&minus;cache[=N]</b> ] [ <b>&minus;k,
+&minus;&minus;cache[=N]</b> ] [ <b>&minus;k
 &minus;&minus;store&minus;all&minus;in&minus;cache</b> ] [
-<b>&minus;%n, &minus;&minus;do&minus;not&minus;recatch</b> ]
+<b>&minus;%n &minus;&minus;do&minus;not&minus;recatch</b> ]
-[ <b>&minus;%v, &minus;&minus;display</b> ] [ <b>&minus;Q,
+[ <b>&minus;%v &minus;&minus;display</b> ] [ <b>&minus;Q
-&minus;&minus;do&minus;not&minus;log</b> ] [ <b>&minus;q,
+&minus;&minus;do&minus;not&minus;log</b> ] [ <b>&minus;q
-&minus;&minus;quiet</b> ] [ <b>&minus;z,
+&minus;&minus;quiet</b> ] [ <b>&minus;z
-&minus;&minus;extra&minus;log</b> ] [ <b>&minus;Z,
+&minus;&minus;extra&minus;log</b> ] [ <b>&minus;Z
-&minus;&minus;debug&minus;log</b> ] [ <b>&minus;v,
+&minus;&minus;debug&minus;log</b> ] [ <b>&minus;v
-&minus;&minus;verbose</b> ] [ <b>&minus;f,
+&minus;&minus;verbose</b> ] [ <b>&minus;f
-&minus;&minus;file&minus;log</b> ] [ <b>&minus;f2,
+&minus;&minus;file&minus;log</b> ] [ <b>&minus;f2
-&minus;&minus;single&minus;log</b> ] [ <b>&minus;I,
+&minus;&minus;single&minus;log</b> ] [ <b>&minus;I
-&minus;&minus;index</b> ] [ <b>&minus;%i,
+&minus;&minus;index</b> ] [ <b>&minus;%i
 &minus;&minus;build&minus;top&minus;index</b> ] [
-<b>&minus;%I, &minus;&minus;search&minus;index</b> ] [
+<b>&minus;%I &minus;&minus;search&minus;index</b> ] [
-<b>&minus;pN, &minus;&minus;priority[=N]</b> ] [
+<b>&minus;pN &minus;&minus;priority[=N]</b> ] [ <b>&minus;S
 <b>&minus;S,
 &minus;&minus;stay&minus;on&minus;same&minus;dir</b> ] [
-<b>&minus;D, &minus;&minus;can&minus;go&minus;down</b> ] [
+<b>&minus;D &minus;&minus;can&minus;go&minus;down</b> ] [
-<b>&minus;U, &minus;&minus;can&minus;go&minus;up</b> ] [
+<b>&minus;U &minus;&minus;can&minus;go&minus;up</b> ] [
-<b>&minus;B,
+<b>&minus;B
 &minus;&minus;can&minus;go&minus;up&minus;and&minus;down</b>
-] [ <b>&minus;a,
+] [ <b>&minus;a
 &minus;&minus;stay&minus;on&minus;same&minus;address</b> ] [
-<b>&minus;d,
+<b>&minus;d
 &minus;&minus;stay&minus;on&minus;same&minus;domain</b> ] [
-<b>&minus;l,
+<b>&minus;l
 &minus;&minus;stay&minus;on&minus;same&minus;tld</b> ] [
-<b>&minus;e, &minus;&minus;go&minus;everywhere</b> ] [
+<b>&minus;e &minus;&minus;go&minus;everywhere</b> ] [
-<b>&minus;%H, &minus;&minus;debug&minus;headers</b> ] [
+<b>&minus;%H &minus;&minus;debug&minus;headers</b> ] [
-<b>&minus;%!,
+<b>&minus;%!
 &minus;&minus;disable&minus;security&minus;limits</b> ] [
-<b>&minus;V, &minus;&minus;userdef&minus;cmd</b> ] [
+<b>&minus;V &minus;&minus;userdef&minus;cmd</b> ] [
-<b>&minus;%W, &minus;&minus;callback</b> ] [ <b>&minus;K,
+<b>&minus;%W &minus;&minus;callback</b> ] [ <b>&minus;K
 &minus;&minus;keep&minus;links[=N]</b> ] [</p>
 <h2>DESCRIPTION
@@ -185,7 +184,7 @@ sites</p>
 www.someweb.com/bob/bobby.html +* &minus;r6</b></p>
 <p style="margin-left:22%;">means get all files starting
-from bobby.html, with 6 link&minus;depth, and possibility of
+from bobby.html with 6 link&minus;depth and possibility of
 going everywhere on the web</p>
 <p style="margin-left:11%;"><b>httrack
@@ -234,7 +233,7 @@ options:</b></p>
 <p>path for mirror/logfiles+cache (&minus;O path
-mirror[,path cache and logfiles]) (&minus;&minus;path
+mirror[path cache and logfiles]) (&minus;&minus;path
 &lt;param&gt;)</p> </td></tr>
 </table>
@@ -265,7 +264,7 @@ options:</b></p>
 <td width="78%">
-<p>mirror web sites, semi&minus;automatic (asks questions)
+<p>mirror web sites semi&minus;automatic (asks questions)
 (&minus;&minus;mirror&minus;wizard)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -356,11 +355,11 @@ options:</b></p>
       cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 <p style="margin-top: 1em">&minus;rN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
@@ -368,11 +367,11 @@ options:</b></p>
 r9999) (&minus;&minus;depth[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 <p>&minus;%eN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
@@ -380,11 +379,11 @@ r9999) (&minus;&minus;depth[=N])</p></td></tr>
 (&minus;&minus;ext&minus;depth[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 <p>&minus;mN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
@@ -392,22 +391,22 @@ r9999) (&minus;&minus;depth[=N])</p></td></tr>
 (&minus;&minus;max&minus;files[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
-<p>&minus;mN,N2</p></td>
+<p>&minus;mNN2</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 <p>maximum file length for non html (N) and html (N2)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 <p>&minus;MN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
@@ -415,23 +414,23 @@ r9999) (&minus;&minus;depth[=N])</p></td></tr>
 (&minus;&minus;max&minus;size[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 <p>&minus;EN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
-<p>maximum mirror time in seconds (60=1 minute, 3600=1
+<p>maximum mirror time in seconds (60=1 minute 3600=1 hour)
-hour) (&minus;&minus;max&minus;time[=N])</p></td></tr>
+(&minus;&minus;max&minus;time[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 <p>&minus;AN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
@@ -439,11 +438,11 @@ hour) (&minus;&minus;max&minus;time[=N])</p></td></tr>
 (&minus;&minus;max&minus;rate[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 <p>&minus;%cN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
@@ -451,15 +450,15 @@ hour) (&minus;&minus;max&minus;time[=N])</p></td></tr>
 (&minus;&minus;connection&minus;per&minus;second[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 <p>&minus;GN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
-<p>pause transfer if N bytes reached, and wait until lock
+<p>pause transfer if N bytes reached and wait until lock
 file is deleted (&minus;&minus;max&minus;pause[=N])</p></td></tr>
 </table>
@@ -490,7 +489,7 @@ control:</b></p>
 <td width="78%">
-<p>timeout, number of seconds after a non&minus;responding
+<p>timeout number of seconds after a non&minus;responding
 link is shutdown (&minus;&minus;timeout[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -502,7 +501,7 @@ link is shutdown (&minus;&minus;timeout[=N])</p></td></tr>
 <td width="78%">
-<p>number of retries, in case of timeout or non&minus;fatal
+<p>number of retries in case of timeout or non&minus;fatal
 errors (*R1) (&minus;&minus;retries[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -514,7 +513,7 @@ errors (*R1) (&minus;&minus;retries[=N])</p></td></tr>
 <td width="78%">
-<p>traffic jam control, minimum transfert rate
+<p>traffic jam control minimum transfert rate
 (bytes/seconds) tolerated for a link
 (&minus;&minus;min&minus;rate[=N])</p> </td></tr>
 <tr valign="top" align="left">
@@ -527,7 +526,7 @@ errors (*R1) (&minus;&minus;retries[=N])</p></td></tr>
 <td width="78%">
-<p>host is abandonned if: 0=never, 1=timeout, 2=slow,
+<p>host is abandonned if: 0=never 1=timeout 2=slow
 3=timeout or slow (&minus;&minus;host&minus;control[=N])</p></td></tr>
 </table>
@@ -546,8 +545,8 @@ options:</b></p>
 <td width="78%">
-<p style="margin-top: 1em">*extended parsing, attempt to
+<p style="margin-top: 1em">*extended parsing attempt to
-parse all links, even in unknown tags or Javascript (%P0 don
+parse all links even in unknown tags or Javascript (%P0 don
 t use) (&minus;&minus;extended&minus;parsing[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -616,7 +615,7 @@ options:</b></p>
 <p style="margin-top: 1em">structure type (0 *original
-structure, 1+: see below) (&minus;&minus;structure[=N])</p></td></tr>
+structure 1+: see below) (&minus;&minus;structure[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="4%">
@@ -639,9 +638,9 @@ structure, 1+: see below) (&minus;&minus;structure[=N])</p></td></tr>
 <td width="78%">
-<p>delayed type check, don t make any link test but wait
+<p>delayed type check don t make any link test but wait for
-for files download to start instead (experimental) (%N0 don
+files download to start instead (experimental) (%N0 don t
-t use, %N1 use for unknown extensions, * %N2 always use)</p></td></tr>
+use %N1 use for unknown extensions * %N2 always use)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="4%">
@@ -652,8 +651,8 @@ t use, %N1 use for unknown extensions, * %N2 always use)</p></td></tr>
 <td width="78%">
-<p>cached delayed type check, don t wait for remote type
+<p>cached delayed type check don t wait for remote type
-during updates, to speedup them (%D0 wait, * %D1 don t wait)
+during updates to speedup them (%D0 wait * %D1 don t wait)
 (&minus;&minus;cached&minus;delayed&minus;type&minus;check)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -692,8 +691,8 @@ L2 ISO9660 compatible)
 <p>keep original links (e.g. http://www.adr/link) (K0
-*relative link, K absolute links, K4 original links, K3
+*relative link K absolute links K4 original links K3
-absolute URI links, K5 transparent proxy link)
+absolute URI links K5 transparent proxy link)
 (&minus;&minus;keep&minus;links[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -730,7 +729,7 @@ protected websites (%x0 include)
 <td width="78%">
-<p>*include query string for local files (useless, for
+<p>*include query string for local files (useless for
 information purpose only) (%q0 don t include)
 (&minus;&minus;include&minus;query&minus;string)</p> </td></tr>
 <tr valign="top" align="left">
@@ -799,7 +798,7 @@ options:</b></p>
 <p style="margin-top: 1em">accept cookies in cookies.txt
-(0=do not accept,* 1=accept) (&minus;&minus;cookies[=N])</p></td></tr>
+(0=do not accept* 1=accept) (&minus;&minus;cookies[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -810,8 +809,8 @@ options:</b></p>
 <td width="78%">
-<p>check document type if unknown (cgi,asp..) (u0 don t
+<p>check document type if unknown (cgiasp..) (u0 don t
-check, * u1 check but /, u2 check always)
+check * u1 check but / u2 check always)
 (&minus;&minus;check&minus;type[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -823,9 +822,9 @@ check, * u1 check but /, u2 check always)
 <td width="78%">
-<p>*parse Java Classes (j0 don t parse, bitmask: |1 parse
+<p>*parse Java Classes (j0 don t parse bitmask: |1 parse
-default, |2 don t parse .class |4 don t parse .js |8 don t
+default |2 don t parse .class |4 don t parse .js |8 don t be
-be aggressive) (&minus;&minus;parse&minus;java[=N])</p></td></tr>
+aggressive) (&minus;&minus;parse&minus;java[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -837,8 +836,8 @@ be aggressive) (&minus;&minus;parse&minus;java[=N])</p></td></tr>
 <p>follow robots.txt and meta robots tags
-(0=never,1=sometimes,* 2=always, 3=always (even strict
+(0=never1=sometimes* 2=always 3=always (even strict rules))
-rules)) (&minus;&minus;robots[=N])</p></td></tr>
+(&minus;&minus;robots[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -849,9 +848,8 @@ rules)) (&minus;&minus;robots[=N])</p></td></tr>
 <td width="78%">
-<p>force HTTP/1.0 requests (reduce update features, only
+<p>force HTTP/1.0 requests (reduce update features only for
-for old servers or proxies)
+old servers or proxies) (&minus;&minus;http&minus;10)</p></td></tr>
 (&minus;&minus;http&minus;10)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -862,7 +860,7 @@ for old servers or proxies)
 <td width="78%">
-<p>use keep&minus;alive if possible, greately reducing
+<p>use keep&minus;alive if possible greately reducing
 latency for small files and test requests (%k0 don t use)
 (&minus;&minus;keep&minus;alive)</p> </td></tr>
 <tr valign="top" align="left">
@@ -876,7 +874,7 @@ latency for small files and test requests (%k0 don t use)
 <p>tolerant requests (accept bogus responses on some
-servers, but not standard!) (&minus;&minus;tolerant)</p></td></tr>
+servers but not standard!) (&minus;&minus;tolerant)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -888,7 +886,7 @@ servers, but not standard!) (&minus;&minus;tolerant)</p></td></tr>
 <p>update hacks: various hacks to limit re&minus;transfers
-when updating (identical size, bogus response..)
+when updating (identical size bogus response..)
 (&minus;&minus;updatehack)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -901,7 +899,7 @@ when updating (identical size, bogus response..)
 <p>url hacks: various hacks to limit duplicate URLs (strip
-//, www.foo.com==foo.com..) (&minus;&minus;urlhack)</p></td></tr>
+// www.foo.com==foo.com..) (&minus;&minus;urlhack)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -912,9 +910,9 @@ when updating (identical size, bogus response..)
 <td width="78%">
-<p>assume that a type (cgi,asp..) is always linked with a
+<p>assume that a type (cgiasp..) is always linked with a
 mime type (&minus;%A
-php3,cgi=text/html;dat,bin=application/x&minus;zip)
+php3cgi=text/html;datbin=application/x&minus;zip)
 (&minus;&minus;assume &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -938,7 +936,7 @@ php3,cgi=text/html;dat,bin=application/x&minus;zip)
 <td width="78%">
-<p>internet protocol (0=both ipv6+ipv4, 4=ipv4 only, 6=ipv6
+<p>internet protocol (0=both ipv6+ipv4 4=ipv4 only 6=ipv6
 only) (&minus;&minus;protocol[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1020,7 +1018,7 @@ HTTP headers (&minus;F &quot;user&minus;agent name&quot;)
 <td width="78%">
-<p>preffered language (&minus;%l &quot;fr, en, jp, *&quot;
+<p>preffered language (&minus;%l &quot;fr en jp *&quot;
 (&minus;&minus;language &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1033,7 +1031,7 @@ HTTP headers (&minus;F &quot;user&minus;agent name&quot;)
 <p>accepted formats (&minus;%l
-&quot;text/html,image/png,image/jpeg,image/gif;q=0.9,*/*;q=0.1&quot;
+&quot;text/htmlimage/pngimage/jpegimage/gif;q=0.9*/*;q=0.1&quot;
 (&minus;&minus;accept &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1050,7 +1048,7 @@ HTTP headers (&minus;F &quot;user&minus;agent name&quot;)
 &lt;param&gt;)</p> </td></tr>
 </table>
-<p style="margin-left:11%; margin-top: 1em"><b>Log, index,
+<p style="margin-left:11%; margin-top: 1em"><b>Log index
 cache</b></p>
 <table width="100%" border="0" rules="none" frame="void"
@@ -1066,7 +1064,7 @@ cache</b></p>
 <p style="margin-top: 1em">create/use a cache for updates
-and retries (C0 no cache,C1 cache is prioritary,* C2 test
+and retries (C0 no cacheC1 cache is prioritary* C2 test
 update before) (&minus;&minus;cache[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1249,7 +1247,7 @@ options:</b></p>
 <td width="78%">
-<p>just scan, don t save anything (for checking links)</p></td></tr>
+<p>just scan don t save anything (for checking links)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -1293,7 +1291,7 @@ options:</b></p>
 <td width="78%">
-<p>get html files before, then treat other files</p></td></tr>
+<p>get html files before then treat other files</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -1650,14 +1648,14 @@ doing)</b></p>
 <p style="margin-top: 1em">bypass built&minus;in security
-limits aimed to avoid bandwidth abuses (bandwidth,
+limits aimed to avoid bandwidth abuses (bandwidth
 simultaneous connections)
 (&minus;&minus;disable&minus;security&minus;limits)</p> </td></tr>
 </table>
 <p style="margin-left:11%;">&minus;IMPORTANT</p>
-<p style="margin-left:22%;">NOTE: DANGEROUS OPTION, ONLY
+<p style="margin-left:22%;">NOTE: DANGEROUS OPTION ONLY
 SUITABLE FOR EXPERTS</p>
 <table width="100%" border="0" rules="none" frame="void"
@@ -1694,7 +1692,7 @@ specific options:</b></p>
 <p style="margin-top: 1em">execute system command after
-each files ($0 is the filename: &minus;V &quot;rm \$0&quot;)
+each files ($0 is the filename: &minus;V &quot;rm &quot;)
 (&minus;&minus;userdef&minus;cmd &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1707,7 +1705,7 @@ each files ($0 is the filename: &minus;V &quot;rm \$0&quot;)
 <p>use an external library function as a wrapper (&minus;%W
-myfoo.so[,myparameters]) (&minus;&minus;callback
+myfoo.so[myparameters]) (&minus;&minus;callback
 &lt;param&gt;)</p> </td></tr>
 </table>
@@ -1738,7 +1736,7 @@ Option N</b></p>
 <td width="78%">
-<p>HTML in web/, images/other files in web/images/</p></td></tr>
+<p>HTML in web/ images/other files in web/images/</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1749,7 +1747,7 @@ Option N</b></p>
 <td width="78%">
-<p>HTML in web/HTML, images/other in web/images</p></td></tr>
+<p>HTML in web/HTML images/other in web/images</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1760,7 +1758,7 @@ Option N</b></p>
 <td width="78%">
-<p>HTML in web/, images/other in web/</p></td></tr>
+<p>HTML in web/ images/other in web/</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1771,8 +1769,8 @@ Option N</b></p>
 <td width="78%">
-<p>HTML in web/, images/other in web/xxx, where xxx is the
+<p>HTML in web/ images/other in web/xxx where xxx is the
-file extension (all gif will be placed onto web/gif, for
+file extension (all gif will be placed onto web/gif for
 example)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1795,7 +1793,7 @@ example)</p> </td></tr>
 <td width="78%">
-<p>All files in web/, with random names (gadget !)</p></td></tr>
+<p>All files in web/ with random names (gadget !)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1806,7 +1804,7 @@ example)</p> </td></tr>
 <td width="78%">
-<p>Site&minus;structure, without www.domain.xxx/</p></td></tr>
+<p>Site&minus;structure without www.domain.xxx/</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1956,15 +1954,15 @@ directory</p> </td></tr>
 <p style="margin-left:11%; margin-top: 1em"><b>Details:
 User&minus;defined option N</b> <br>
 %n Name of file without file type (ex: image) <br>
-%N Name of file, including file type (ex: image.gif) <br>
+%N Name of file including file type (ex: image.gif) <br>
 %t File type (ex: gif) <br>
 %p Path [without ending /] (ex: /someimages) <br>
 %h Host name (ex: www.someweb.com) <br>
-%M URL MD5 (128 bits, 32 ascii bytes) <br>
+%M URL MD5 (128 bits 32 ascii bytes) <br>
-%Q query string MD5 (128 bits, 32 ascii bytes) <br>
+%Q query string MD5 (128 bits 32 ascii bytes) <br>
 %k full query string <br>
 %r protocol name (ex: http) <br>
-%q small query string MD5 (16 bits, 4 ascii bytes) <br>
+%q small query string MD5 (16 bits 4 ascii bytes) <br>
 %s? Short name version (ex: %sN) <br>
 %[param] param variable in query string <br>
 %[param:before:after:empty:notfound] advanced variable
@@ -2042,8 +2040,8 @@ parameter could not be found</p>
 <td width="78%">
-<p>fields, except the first one (the parameter name), can
+<p>fields except the first one (the parameter name) can be
-be empty</p></td></tr>
+empty</p> </td></tr>
 </table>
 <p style="margin-left:11%; margin-top: 1em"><b>Details:
@@ -2062,7 +2060,7 @@ Option K</b></p>
 <p style="margin-top: 1em">foo.cgi?q=45 &minus;&gt;
-foo4B54.html?q=45 (relative URI, default)</p></td></tr>
+foo4B54.html?q=45 (relative URI default)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="4%">
@@ -2132,7 +2130,7 @@ site(s) (default)</p>
 <td width="78%">
-<p>&lt;URLs&gt; get the files indicated, do not seek other
+<p>&lt;URLs&gt; get the files indicated do not seek other
 URLs (&minus;qg)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -2160,7 +2158,7 @@ pages (&minus;r1p0C0I0t)</p>
 <p style="margin-left:11%;">&minus;&minus;spider</p>
-<p style="margin-left:22%;">&lt;URLs&gt; spider site(s), to
+<p style="margin-left:22%;">&lt;URLs&gt; spider site(s) to
 test links: reports Errors &amp; Warnings
 (&minus;p0C0I0t)</p>
@@ -2171,17 +2169,17 @@ test links: reports Errors &amp; Warnings
 <p style="margin-left:11%;">&minus;&minus;skeleton</p>
-<p style="margin-left:22%;">&lt;URLs&gt; make a mirror, but
+<p style="margin-left:22%;">&lt;URLs&gt; make a mirror but
 gets only html files (&minus;p1)</p>
 <p style="margin-left:11%;">&minus;&minus;update</p>
-<p style="margin-left:22%;">update a mirror, without
+<p style="margin-left:22%;">update a mirror without
 confirmation (&minus;iC2)</p>
 <p style="margin-left:11%;">&minus;&minus;continue</p>
-<p style="margin-left:22%;">continue a mirror, without
+<p style="margin-left:22%;">continue a mirror without
 confirmation (&minus;iC1)</p>
 <p style="margin-left:11%;">&minus;&minus;catchurl</p>
--- a/man/httrack.1
+++ b/man/httrack.1
@@ -1,182 +1,182 @@
 .\" Process this file with
 .\" groff -man -Tascii httrack.1
 .\"
-.TH httrack 1 "12 May 2014" "httrack website copier"
+.TH httrack 1 "02 May 2014" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory
 .SH SYNOPSIS
 .B httrack [ url ]... [ \-filter ]... [ +filter ]... [ 
-.B \-O, \-\-path 
+.B \-O\, \-\-path 
 ] [ 
-.B \-w, \-\-mirror 
+.B \-w\, \-\-mirror 
 ] [ 
-.B \-W, \-\-mirror\-wizard 
+.B \-W\, \-\-mirror\-wizard 
 ] [ 
-.B \-g, \-\-get\-files 
+.B \-g\, \-\-get\-files 
 ] [ 
-.B \-i, \-\-continue 
+.B \-i\, \-\-continue 
 ] [ 
-.B \-Y, \-\-mirrorlinks 
+.B \-Y\, \-\-mirrorlinks 
 ] [ 
-.B \-P, \-\-proxy 
+.B \-P\, \-\-proxy 
 ] [ 
-.B \-%f, \-\-httpproxy\-ftp[=N] 
+.B \-%f\, \-\-httpproxy\-ftp[=N] 
 ] [ 
-.B \-%b, \-\-bind 
+.B \-%b\, \-\-bind 
 ] [ 
-.B \-rN, \-\-depth[=N] 
+.B \-rN\, \-\-depth[=N] 
 ] [ 
-.B \-%eN, \-\-ext\-depth[=N] 
+.B \-%eN\, \-\-ext\-depth[=N] 
 ] [ 
-.B \-mN, \-\-max\-files[=N] 
+.B \-mN\, \-\-max\-files[=N] 
 ] [ 
-.B \-MN, \-\-max\-size[=N] 
+.B \-MN\, \-\-max\-size[=N] 
 ] [ 
-.B \-EN, \-\-max\-time[=N] 
+.B \-EN\, \-\-max\-time[=N] 
 ] [ 
-.B \-AN, \-\-max\-rate[=N] 
+.B \-AN\, \-\-max\-rate[=N] 
 ] [ 
-.B \-%cN, \-\-connection\-per\-second[=N] 
+.B \-%cN\, \-\-connection\-per\-second[=N] 
 ] [ 
-.B \-GN, \-\-max\-pause[=N] 
+.B \-GN\, \-\-max\-pause[=N] 
 ] [ 
-.B \-cN, \-\-sockets[=N] 
+.B \-cN\, \-\-sockets[=N] 
 ] [ 
-.B \-TN, \-\-timeout[=N] 
+.B \-TN\, \-\-timeout[=N] 
 ] [ 
-.B \-RN, \-\-retries[=N] 
+.B \-RN\, \-\-retries[=N] 
 ] [ 
-.B \-JN, \-\-min\-rate[=N] 
+.B \-JN\, \-\-min\-rate[=N] 
 ] [ 
-.B \-HN, \-\-host\-control[=N] 
+.B \-HN\, \-\-host\-control[=N] 
 ] [ 
-.B \-%P, \-\-extended\-parsing[=N] 
+.B \-%P\, \-\-extended\-parsing[=N] 
 ] [ 
-.B \-n, \-\-near 
+.B \-n\, \-\-near 
 ] [ 
-.B \-t, \-\-test 
+.B \-t\, \-\-test 
 ] [ 
-.B \-%L, \-\-list 
+.B \-%L\, \-\-list 
 ] [ 
-.B \-%S, \-\-urllist 
+.B \-%S\, \-\-urllist 
 ] [ 
-.B \-NN, \-\-structure[=N] 
+.B \-NN\, \-\-structure[=N] 
 ] [ 
-.B \-%D, \-\-cached\-delayed\-type\-check 
+.B \-%D\, \-\-cached\-delayed\-type\-check 
 ] [ 
-.B \-%M, \-\-mime\-html 
+.B \-%M\, \-\-mime\-html 
 ] [ 
-.B \-LN, \-\-long\-names[=N] 
+.B \-LN\, \-\-long\-names[=N] 
 ] [ 
-.B \-KN, \-\-keep\-links[=N] 
+.B \-KN\, \-\-keep\-links[=N] 
 ] [ 
-.B \-x, \-\-replace\-external 
+.B \-x\, \-\-replace\-external 
 ] [ 
-.B \-%x, \-\-disable\-passwords 
+.B \-%x\, \-\-disable\-passwords 
 ] [ 
-.B \-%q, \-\-include\-query\-string 
+.B \-%q\, \-\-include\-query\-string 
 ] [ 
-.B \-o, \-\-generate\-errors 
+.B \-o\, \-\-generate\-errors 
 ] [ 
-.B \-X, \-\-purge\-old[=N] 
+.B \-X\, \-\-purge\-old[=N] 
 ] [ 
-.B \-%p, \-\-preserve 
+.B \-%p\, \-\-preserve 
 ] [ 
-.B \-%T, \-\-utf8\-conversion 
+.B \-%T\, \-\-utf8\-conversion 
 ] [ 
-.B \-bN, \-\-cookies[=N] 
+.B \-bN\, \-\-cookies[=N] 
 ] [ 
-.B \-u, \-\-check\-type[=N] 
+.B \-u\, \-\-check\-type[=N] 
 ] [ 
-.B \-j, \-\-parse\-java[=N] 
+.B \-j\, \-\-parse\-java[=N] 
 ] [ 
-.B \-sN, \-\-robots[=N] 
+.B \-sN\, \-\-robots[=N] 
 ] [ 
-.B \-%h, \-\-http\-10 
+.B \-%h\, \-\-http\-10 
 ] [ 
-.B \-%k, \-\-keep\-alive 
+.B \-%k\, \-\-keep\-alive 
 ] [ 
-.B \-%B, \-\-tolerant 
+.B \-%B\, \-\-tolerant 
 ] [ 
-.B \-%s, \-\-updatehack 
+.B \-%s\, \-\-updatehack 
 ] [ 
-.B \-%u, \-\-urlhack 
+.B \-%u\, \-\-urlhack 
 ] [ 
-.B \-%A, \-\-assume 
+.B \-%A\, \-\-assume 
 ] [ 
-.B \-@iN, \-\-protocol[=N] 
+.B \-@iN\, \-\-protocol[=N] 
 ] [ 
-.B \-%w, \-\-disable\-module 
+.B \-%w\, \-\-disable\-module 
 ] [ 
-.B \-F, \-\-user\-agent 
+.B \-F\, \-\-user\-agent 
 ] [ 
-.B \-%R, \-\-referer 
+.B \-%R\, \-\-referer 
 ] [ 
-.B \-%E, \-\-from 
+.B \-%E\, \-\-from 
 ] [ 
-.B \-%F, \-\-footer 
+.B \-%F\, \-\-footer 
 ] [ 
-.B \-%l, \-\-language 
+.B \-%l\, \-\-language 
 ] [ 
-.B \-%a, \-\-accept 
+.B \-%a\, \-\-accept 
 ] [ 
-.B \-%X, \-\-headers 
+.B \-%X\, \-\-headers 
 ] [ 
-.B \-C, \-\-cache[=N] 
+.B \-C\, \-\-cache[=N] 
 ] [ 
-.B \-k, \-\-store\-all\-in\-cache 
+.B \-k\, \-\-store\-all\-in\-cache 
 ] [ 
-.B \-%n, \-\-do\-not\-recatch 
+.B \-%n\, \-\-do\-not\-recatch 
 ] [ 
-.B \-%v, \-\-display 
+.B \-%v\, \-\-display 
 ] [ 
-.B \-Q, \-\-do\-not\-log 
+.B \-Q\, \-\-do\-not\-log 
 ] [ 
-.B \-q, \-\-quiet 
+.B \-q\, \-\-quiet 
 ] [ 
-.B \-z, \-\-extra\-log 
+.B \-z\, \-\-extra\-log 
 ] [ 
-.B \-Z, \-\-debug\-log 
+.B \-Z\, \-\-debug\-log 
 ] [ 
-.B \-v, \-\-verbose 
+.B \-v\, \-\-verbose 
 ] [ 
-.B \-f, \-\-file\-log 
+.B \-f\, \-\-file\-log 
 ] [ 
-.B \-f2, \-\-single\-log 
+.B \-f2\, \-\-single\-log 
 ] [ 
-.B \-I, \-\-index 
+.B \-I\, \-\-index 
 ] [ 
-.B \-%i, \-\-build\-top\-index 
+.B \-%i\, \-\-build\-top\-index 
 ] [ 
-.B \-%I, \-\-search\-index 
+.B \-%I\, \-\-search\-index 
 ] [ 
-.B \-pN, \-\-priority[=N] 
+.B \-pN\, \-\-priority[=N] 
 ] [ 
-.B \-S, \-\-stay\-on\-same\-dir 
+.B \-S\, \-\-stay\-on\-same\-dir 
 ] [ 
-.B \-D, \-\-can\-go\-down 
+.B \-D\, \-\-can\-go\-down 
 ] [ 
-.B \-U, \-\-can\-go\-up 
+.B \-U\, \-\-can\-go\-up 
 ] [ 
-.B \-B, \-\-can\-go\-up\-and\-down 
+.B \-B\, \-\-can\-go\-up\-and\-down 
 ] [ 
-.B \-a, \-\-stay\-on\-same\-address 
+.B \-a\, \-\-stay\-on\-same\-address 
 ] [ 
-.B \-d, \-\-stay\-on\-same\-domain 
+.B \-d\, \-\-stay\-on\-same\-domain 
 ] [ 
-.B \-l, \-\-stay\-on\-same\-tld 
+.B \-l\, \-\-stay\-on\-same\-tld 
 ] [ 
-.B \-e, \-\-go\-everywhere 
+.B \-e\, \-\-go\-everywhere 
 ] [ 
-.B \-%H, \-\-debug\-headers 
+.B \-%H\, \-\-debug\-headers 
 ] [ 
-.B \-%!, \-\-disable\-security\-limits 
+.B \-%!\, \-\-disable\-security\-limits 
 ] [ 
-.B \-V, \-\-userdef\-cmd 
+.B \-V\, \-\-userdef\-cmd 
 ] [ 
-.B \-%W, \-\-callback 
+.B \-%W\, \-\-callback 
 ] [ 
-.B \-K, \-\-keep\-links[=N] 
+.B \-K\, \-\-keep\-links[=N] 
 ] [ 
 .B 
 .SH DESCRIPTION
@@ -191,7 +191,7 @@ allows you to download a World Wide Web site from the Internet to a local direct
 mirror the two sites together (with shared links) and accept any .jpg files on .com sites
 .TP
 .B httrack www.someweb.com/bob/bobby.html +* \-r6
-means get all files starting from bobby.html, with 6 link\-depth, and possibility of going everywhere on the web
+means get all files starting from bobby.html\, with 6 link\-depth\, and possibility of going everywhere on the web
 .TP
 .B httrack www.someweb.com/bob/bobby.html \-\-spider \-P proxy.myhost.com:8080
 runs the spider on www.someweb.com/bob/bobby.html using a proxy
@@ -208,7 +208,7 @@ continues a mirror in the current folder
 .SS General options:
 .IP \-O
 path for mirror/logfiles+cache (\-O path
-mirror[,path
+mirror[\,path
 cache
 and
 logfiles]) (\-\-path <param>)
@@ -217,7 +217,7 @@ logfiles]) (\-\-path <param>)
 .IP \-w
 *mirror web sites (\-\-mirror)
 .IP \-W
-mirror web sites, semi\-automatic (asks questions) (\-\-mirror\-wizard)
+mirror web sites\, semi\-automatic (asks questions) (\-\-mirror\-wizard)
 .IP \-g
 just get files (saved in the current directory) (\-\-get\-files)
 .IP \-i
@@ -240,34 +240,34 @@ set the mirror depth to N (* r9999) (\-\-depth[=N])
 set the external links depth to N (* %e0) (\-\-ext\-depth[=N])
 .IP \-mN
 maximum file length for a non\-html file (\-\-max\-files[=N])
-.IP \-mN,N2
+.IP \-mN\,N2
 maximum file length for non html (N) and html (N2)
 .IP \-MN
 maximum overall size that can be uploaded/scanned (\-\-max\-size[=N])
 .IP \-EN
-maximum mirror time in seconds (60=1 minute, 3600=1 hour) (\-\-max\-time[=N])
+maximum mirror time in seconds (60=1 minute\, 3600=1 hour) (\-\-max\-time[=N])
 .IP \-AN
 maximum transfer rate in bytes/seconds (1000=1KB/s max) (\-\-max\-rate[=N])
 .IP \-%cN
 maximum number of connections/seconds (*%c10) (\-\-connection\-per\-second[=N])
 .IP \-GN
-pause transfer if N bytes reached, and wait until lock file is deleted (\-\-max\-pause[=N])
+pause transfer if N bytes reached\, and wait until lock file is deleted (\-\-max\-pause[=N])
 .SS Flow control:
 .IP \-cN
 number of multiple connections (*c8) (\-\-sockets[=N])
 .IP \-TN
-timeout, number of seconds after a non\-responding link is shutdown (\-\-timeout[=N])
+timeout\, number of seconds after a non\-responding link is shutdown (\-\-timeout[=N])
 .IP \-RN
-number of retries, in case of timeout or non\-fatal errors (*R1) (\-\-retries[=N])
+number of retries\, in case of timeout or non\-fatal errors (*R1) (\-\-retries[=N])
 .IP \-JN
-traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a link (\-\-min\-rate[=N])
+traffic jam control\, minimum transfert rate (bytes/seconds) tolerated for a link (\-\-min\-rate[=N])
 .IP \-HN
-host is abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow (\-\-host\-control[=N])
+host is abandonned if: 0=never\, 1=timeout\, 2=slow\, 3=timeout or slow (\-\-host\-control[=N])
 .SS Links options:
 .IP \-%P
-*extended parsing, attempt to parse all links, even in unknown tags or Javascript (%P0 don t use) (\-\-extended\-parsing[=N])
+*extended parsing\, attempt to parse all links\, even in unknown tags or Javascript (%P0 don t use) (\-\-extended\-parsing[=N])
 .IP \-n
 get non\-html files  near  an html file (ex: an image located outside) (\-\-near)
 .IP \-t
@@ -279,25 +279,25 @@ test all URLs (even forbidden ones) (\-\-test)
 .SS Build options:
 .IP \-NN
-structure type (0 *original structure, 1+: see below) (\-\-structure[=N])
+structure type (0 *original structure\, 1+: see below) (\-\-structure[=N])
 .IP \-or
 user defined structure (\-N "%h%p/%n%q.%t")
 .IP \-%N
-delayed type check, don t make any link test but wait for files download to start instead (experimental) (%N0 don t use, %N1 use for unknown extensions, * %N2 always use)
+delayed type check\, don t make any link test but wait for files download to start instead (experimental) (%N0 don t use\, %N1 use for unknown extensions\, * %N2 always use)
 .IP \-%D
-cached delayed type check, don t wait for remote type during updates, to speedup them (%D0 wait, * %D1 don t wait) (\-\-cached\-delayed\-type\-check)
+cached delayed type check\, don t wait for remote type during updates\, to speedup them (%D0 wait\, * %D1 don t wait) (\-\-cached\-delayed\-type\-check)
 .IP \-%M
 generate a RFC MIME\-encapsulated full\-archive (.mht) (\-\-mime\-html)
 .IP \-LN
 long names (L1 *long names / L0 8\-3 conversion / L2 ISO9660 compatible) (\-\-long\-names[=N])
 .IP \-KN
-keep original links (e.g. http://www.adr/link) (K0 *relative link, K absolute links, K4 original links, K3 absolute URI links, K5 transparent proxy link) (\-\-keep\-links[=N])
+keep original links (e.g. http://www.adr/link) (K0 *relative link\, K absolute links\, K4 original links\, K3 absolute URI links\, K5 transparent proxy link) (\-\-keep\-links[=N])
 .IP \-x
 replace external html links by error pages (\-\-replace\-external)
 .IP \-%x
 do not include any password for external password protected websites (%x0 include) (\-\-disable\-passwords)
 .IP \-%q
-*include query string for local files (useless, for information purpose only) (%q0 don t include) (\-\-include\-query\-string)
+*include query string for local files (useless\, for information purpose only) (%q0 don t include) (\-\-include\-query\-string)
 .IP \-o
 *generate output html file in case of error (404..) (o0 don t generate) (\-\-generate\-errors)
 .IP \-X
@@ -309,29 +309,29 @@ links conversion to UTF\-8 (\-\-utf8\-conversion)
 .SS Spider options:
 .IP \-bN
-accept cookies in cookies.txt (0=do not accept,* 1=accept) (\-\-cookies[=N])
+accept cookies in cookies.txt (0=do not accept\,* 1=accept) (\-\-cookies[=N])
 .IP \-u
-check document type if unknown (cgi,asp..) (u0 don t check, * u1 check but /, u2 check always) (\-\-check\-type[=N])
+check document type if unknown (cgi\,asp..) (u0 don t check\, * u1 check but /\, u2 check always) (\-\-check\-type[=N])
 .IP \-j
-*parse Java Classes (j0 don t parse, bitmask: |1 parse default, |2 don t parse .class |4 don t parse .js |8 don t be aggressive) (\-\-parse\-java[=N])
+*parse Java Classes (j0 don t parse\, bitmask: |1 parse default\, |2 don t parse .class |4 don t parse .js |8 don t be aggressive) (\-\-parse\-java[=N])
 .IP \-sN
-follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always, 3=always (even strict rules)) (\-\-robots[=N])
+follow robots.txt and meta robots tags (0=never\,1=sometimes\,* 2=always\, 3=always (even strict rules)) (\-\-robots[=N])
 .IP \-%h
-force HTTP/1.0 requests (reduce update features, only for old servers or proxies) (\-\-http\-10)
+force HTTP/1.0 requests (reduce update features\, only for old servers or proxies) (\-\-http\-10)
 .IP \-%k
-use keep\-alive if possible, greately reducing latency for small files and test requests (%k0 don t use) (\-\-keep\-alive)
+use keep\-alive if possible\, greately reducing latency for small files and test requests (%k0 don t use) (\-\-keep\-alive)
 .IP \-%B
-tolerant requests (accept bogus responses on some servers, but not standard!) (\-\-tolerant)
+tolerant requests (accept bogus responses on some servers\, but not standard!) (\-\-tolerant)
 .IP \-%s
-update hacks: various hacks to limit re\-transfers when updating (identical size, bogus response..) (\-\-updatehack)
+update hacks: various hacks to limit re\-transfers when updating (identical size\, bogus response..) (\-\-updatehack)
 .IP \-%u
-url hacks: various hacks to limit duplicate URLs (strip //, www.foo.com==foo.com..) (\-\-urlhack)
+url hacks: various hacks to limit duplicate URLs (strip //\, www.foo.com==foo.com..) (\-\-urlhack)
 .IP \-%A
-assume that a type (cgi,asp..) is always linked with a mime type (\-%A php3,cgi=text/html;dat,bin=application/x\-zip) (\-\-assume <param>)
+assume that a type (cgi\,asp..) is always linked with a mime type (\-%A php3\,cgi=text/html;dat\,bin=application/x\-zip) (\-\-assume <param>)
 .IP \-can
 also be used to force a specific file type: \-\-assume foo.cgi=text/html
 .IP \-@iN
-internet protocol (0=both ipv6+ipv4, 4=ipv4 only, 6=ipv6 only) (\-\-protocol[=N])
+internet protocol (0=both ipv6+ipv4\, 4=ipv4 only\, 6=ipv6 only) (\-\-protocol[=N])
 .IP \-%w
 disable a specific external mime module (\-%w htsswf \-%w htsjava) (\-\-disable\-module <param>)
@@ -345,15 +345,15 @@ from email address sent in HTTP headers (\-\-from <param>)
 .IP \-%F
 footer string in Html code (\-%F "Mirrored [from host %s [file %s [at %s]]]" (\-\-footer <param>)
 .IP \-%l
-preffered language (\-%l "fr, en, jp, *" (\-\-language <param>)
+preffered language (\-%l "fr\, en\, jp\, *" (\-\-language <param>)
 .IP \-%a
-accepted formats (\-%l "text/html,image/png,image/jpeg,image/gif;q=0.9,*/*;q=0.1" (\-\-accept <param>)
+accepted formats (\-%l "text/html\,image/png\,image/jpeg\,image/gif;q=0.9\,*/*;q=0.1" (\-\-accept <param>)
 .IP \-%X
 additional HTTP header line (\-%X "X\-Magic: 42" (\-\-headers <param>)
-.SS Log, index, cache
+.SS Log\, index\, cache
 .IP \-C
-create/use a cache for updates and retries (C0 no cache,C1 cache is prioritary,* C2 test update before) (\-\-cache[=N])
+create/use a cache for updates and retries (C0 no cache\,C1 cache is prioritary\,* C2 test update before) (\-\-cache[=N])
 .IP \-k
 store all files in cache (not useful if files on disk) (\-\-store\-all\-in\-cache)
 .IP \-%n
@@ -385,7 +385,7 @@ make an searchable index for this mirror (* %I0 don t make) (\-\-search\-index)
 .IP \-pN
 priority mode: (* p3) (\-\-priority[=N])
 .IP \-p0
-just scan, don t save anything (for checking links)
+just scan\, don t save anything (for checking links)
 .IP \-p1
 save only html files
 .IP \-p2
@@ -393,7 +393,7 @@ save only non html files
 .IP \-*p3
 save all files
 .IP \-p7
-get html files before, then treat other files
+get html files before\, then treat other files
 .IP \-S
 stay on the same directory (\-\-stay\-on\-same\-dir)
 .IP \-D
@@ -455,35 +455,35 @@ generate transfer rate statictics every minutes (\-\-debug\-ratestats)
 .SS Dangerous options: (do NOT use unless you exactly know what you are doing)
 .IP \-%!
-bypass built\-in security limits aimed to avoid bandwidth abuses (bandwidth, simultaneous connections) (\-\-disable\-security\-limits)
+bypass built\-in security limits aimed to avoid bandwidth abuses (bandwidth\, simultaneous connections) (\-\-disable\-security\-limits)
 .IP \-IMPORTANT
-NOTE: DANGEROUS OPTION, ONLY SUITABLE FOR EXPERTS
+NOTE: DANGEROUS OPTION\, ONLY SUITABLE FOR EXPERTS
 .IP \-USE
 IT WITH EXTREME CARE
 .SS Command\-line specific options:
 .IP \-V
-execute system command after each files ($0 is the filename: \-V "rm \\$0") (\-\-userdef\-cmd <param>)
+execute system command after each files ($0 is the filename: \-V "rm \$0") (\-\-userdef\-cmd <param>)
 .IP \-%W
-use an external library function as a wrapper (\-%W myfoo.so[,myparameters]) (\-\-callback <param>)
+use an external library function as a wrapper (\-%W myfoo.so[\,myparameters]) (\-\-callback <param>)
 .SS Details: Option N
 .IP \-N0
 Site\-structure (default)
 .IP \-N1
-HTML in web/, images/other files in web/images/
+HTML in web/\, images/other files in web/images/
 .IP \-N2
-HTML in web/HTML, images/other in web/images
+HTML in web/HTML\, images/other in web/images
 .IP \-N3
-HTML in web/,  images/other in web/
+HTML in web/\,  images/other in web/
 .IP \-N4
-HTML in web/, images/other in web/xxx, where xxx is the file extension (all gif will be placed onto web/gif, for example)
+HTML in web/\, images/other in web/xxx\, where xxx is the file extension (all gif will be placed onto web/gif\, for example)
 .IP \-N5
 Images/other in web/xxx and HTML in web/HTML
 .IP \-N99
-All files in web/, with random names (gadget !)
+All files in web/\, with random names (gadget !)
 .IP \-N100
-Site\-structure, without www.domain.xxx/
+Site\-structure\, without www.domain.xxx/
 .IP \-N101
 Identical to N1 exept that "web" is replaced by the site s name
 .IP \-N102
@@ -510,15 +510,15 @@ Identical to N5 exept that there is no "web" directory
 Identical to N99 exept that there is no "web" directory
 .SS Details: User\-defined option N
   %n  Name of file without file type (ex: image)
-   %N  Name of file, including file type (ex: image.gif)
+   %N  Name of file\, including file type (ex: image.gif)
   %t  File type (ex: gif)
   %p  Path [without ending /] (ex: /someimages)
   %h  Host name (ex: www.someweb.com)
-   %M  URL MD5 (128 bits, 32 ascii bytes)
+   %M  URL MD5 (128 bits\, 32 ascii bytes)
-   %Q  query string MD5 (128 bits, 32 ascii bytes)
+   %Q  query string MD5 (128 bits\, 32 ascii bytes)
   %k  full query string
   %r  protocol name (ex: http)
-   %q  small query string MD5 (16 bits, 4 ascii bytes)
+   %q  small query string MD5 (16 bits\, 4 ascii bytes)
      %s?  Short name version (ex: %sN)
   %[param]  param variable in query string
   %[param:before:after:empty:notfound]  advanced variable extraction
@@ -535,11 +535,11 @@ Identical to N99 exept that there is no "web" directory
 .IP \-empty
 : string replacement if the parameter was empty
 .IP \-all
-fields, except the first one (the parameter name), can be empty
+fields\, except the first one (the parameter name)\, can be empty
 .SS Details: Option K
 .IP \-K0
-foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI, default)
+foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI\, default)
 .IP \-K
 \->  http://www.foobar.com/folder/foo.cgi?q=45 (absolute URL) (\-\-keep\-links[=N])
 .IP \-K3
@@ -553,7 +553,7 @@ foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI, default)
 .IP \-\-mirror
     <URLs> *make a mirror of site(s) (default)
 .IP \-\-get
-        <URLs>  get the files indicated, do not seek other URLs (\-qg)
+        <URLs>  get the files indicated\, do not seek other URLs (\-qg)
 .IP \-\-list
  <text file>  add all URL located in this text file (\-%L)
 .IP \-\-mirrorlinks
@@ -561,15 +561,15 @@ foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI, default)
 .IP \-\-testlinks
  <URLs>  test links in pages (\-r1p0C0I0t)
 .IP \-\-spider
-     <URLs>  spider site(s), to test links: reports Errors & Warnings (\-p0C0I0t)
+     <URLs>  spider site(s)\, to test links: reports Errors & Warnings (\-p0C0I0t)
 .IP \-\-testsite
   <URLs>  identical to \-\-spider
 .IP \-\-skeleton
-   <URLs>  make a mirror, but gets only html files (\-p1)
+   <URLs>  make a mirror\, but gets only html files (\-p1)
 .IP \-\-update
-             update a mirror, without confirmation (\-iC2)
+             update a mirror\, without confirmation (\-iC2)
 .IP \-\-continue
-           continue a mirror, without confirmation (\-iC1)
+           continue a mirror\, without confirmation (\-iC1)
 .IP \-\-catchurl
           create a temporary proxy to capture an URL or a form post URL
--- a/src/htsglobal.h
+++ b/src/htsglobal.h
@@ -36,8 +36,8 @@ Please visit our Website: http://www.httrack.com
 #define HTTRACK_GLOBAL_DEFH
 // Version (also check external version information)
-#define HTTRACK_VERSION      "3.48-6"
+#define HTTRACK_VERSION      "3.48-5"
-#define HTTRACK_VERSIONID    "3.48.6"
+#define HTTRACK_VERSIONID    "3.48.5"
 #define HTTRACK_AFF_VERSION  "3.x"
 #define HTTRACK_LIB_VERSION  "2.0"
--- a/src/htsthread.c
+++ b/src/htsthread.c
@@ -36,7 +36,6 @@ Please visit our Website: http://www.httrack.com
 #include "htsglobal.h"
 #include "htsbase.h"
 #include "htsthread.h"
 #include "httrack-library.h"
 #if USE_BEGINTHREAD
 #ifdef _WIN32