build: add regen target for html/httrack.man.html

The rendered HTML manual had no regeneration path. Add regen-man-html, which runs groff's html device over httrack.1, alongside the existing regen-man target.
docs: use www.example.com in examples instead of www.someweb.com
2026-06-13 22:04:07 +03:00 · 2026-06-13 10:38:31 +02:00 · 2026-06-13 10:38:31 +02:00 · 2026-06-13 09:58:03 +02:00 · 2026-06-13 09:55:19 +02:00 · 2026-06-13 09:18:39 +02:00
54 changed files with 2080 additions and 680 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,87 @@
+# Build and test on x86-64 and arm64, and lint the shell scripts.
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+  workflow_dispatch:
+
+# Least privilege: the workflow only needs to read the repo.
+permissions:
+  contents: read
+
+# Cancel superseded runs on the same branch or PR.
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: build (${{ matrix.arch }}, ${{ matrix.cc }})
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { arch: x86-64, runner: ubuntu-24.04, cc: gcc }
+          - { arch: x86-64, runner: ubuntu-24.04, cc: clang }
+          - { arch: arm64, runner: ubuntu-24.04-arm, cc: gcc }
+          - { arch: arm64, runner: ubuntu-24.04-arm, cc: clang }
+    env:
+      CC: ${{ matrix.cc }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install build dependencies
+        run: |
+          set -euo pipefail
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            build-essential clang autoconf automake libtool autoconf-archive \
+            zlib1g-dev libssl-dev
+
+      - name: Configure
+        run: |
+          set -euo pipefail
+          # autoreconf installs the automake test-driver (not committed) and
+          # validates configure.ac, so "make check" works on a fresh checkout.
+          autoreconf -fi
+          ./configure
+
+      - name: Build
+        run: make -j"$(nproc)"
+
+      - name: Test
+        run: make check
+
+      - name: Print the test log on failure
+        if: failure()
+        run: cat tests/test-suite.log 2>/dev/null || true
+
+  lint:
+    name: lint (shellcheck, shfmt)
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install linters
+        env:
+          SHFMT_VERSION: v3.8.0
+        run: |
+          set -euo pipefail
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends shellcheck
+          # shfmt is not packaged in apt; fetch a pinned release binary.
+          curl -fsSL -o /tmp/shfmt \
+            "https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/shfmt_${SHFMT_VERSION}_linux_$(dpkg --print-architecture)"
+          sudo install -m 0755 /tmp/shfmt /usr/local/bin/shfmt
+
+      # Lint the scripts we maintain; the legacy scripts are a separate cleanup.
+      - name: shellcheck
+        run: shellcheck man/makeman.sh tools/mkdeb.sh tests/*.test tests/check-network.sh
+
+      - name: shfmt
+        run: shfmt -d -i 4 man/makeman.sh tools/mkdeb.sh
--- a/0
+++ b/0
--- a/1
+++ b/1
@@ -0,0 +1 @@
+history.txt
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,4 +5,13 @@ ACLOCAL_AMFLAGS = -I m4

 EXTRA_DIST = INSTALL.Linux \
 		gpl-fr.txt license.txt greetings.txt history.txt \
-		httrack-doc.html lang.def README.md
+		httrack-doc.html lang.def README.md tools/mkdeb.sh
+
+# Build the signed Debian packages from a clean source export. Pass the signing
+# key and other options through DEB_FLAGS, e.g.:
+#   make deb DEB_FLAGS="--key BB71C7E6CB1AD8FAF53FE42A60C3AA7180598EFB"
+# See tools/mkdeb.sh --help for all options.
+DEB_FLAGS =
+deb:
+	$(SHELL) $(top_srcdir)/tools/mkdeb.sh $(DEB_FLAGS)
+.PHONY: deb
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,7 +160,7 @@ am__define_uniq_tagged_files = \
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
 	COPYING ChangeLog INSTALL NEWS README compile config.guess \
-	config.sub depcomp install-sh ltmain.sh missing
+	config.sub install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -349,8 +349,14 @@ SUBDIRS = src man m4 libtest templates lang html tests
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = INSTALL.Linux \
 		gpl-fr.txt license.txt greetings.txt history.txt \
-		httrack-doc.html lang.def README.md
+		httrack-doc.html lang.def README.md tools/mkdeb.sh

+
+# Build the signed Debian packages from a clean source export. Pass the signing
+# key and other options through DEB_FLAGS, e.g.:
+#   make deb DEB_FLAGS="--key BB71C7E6CB1AD8FAF53FE42A60C3AA7180598EFB"
+# See tools/mkdeb.sh --help for all options.
+DEB_FLAGS = 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -841,6 +847,9 @@ uninstall-am:

 .PRECIOUS: Makefile

+deb:
+	$(SHELL) $(top_srcdir)/tools/mkdeb.sh $(DEB_FLAGS)
+.PHONY: deb

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/0
+++ b/0
--- a/1
+++ b/1
@@ -0,0 +1 @@
+history.txt
--- a/7
+++ b/7
@@ -4,6 +4,13 @@ Copyright (C) 1998-2017 Xavier Roche and other contributors
 Welcome to HTTrack Website Copier!


+Ethical use:
+
+We ask that you do not use HTTrack to grab email addresses or to collect any
+other private information on people. This would disgrace our work and the many
+hours we have spent on it.
+
+
 Information:

 The folder html/ contains the documentation
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
 # HTTrack Website Copier - Development Repository

+[![CI](https://github.com/xroche/httrack/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/xroche/httrack/actions/workflows/ci.yml)
+[![License](https://img.shields.io/github/license/xroche/httrack)](COPYING)
+
 ## About
 _Copy websites to your computer (Offline browser)_

--- a/config.h.in
+++ b/config.h.in
@@ -109,9 +109,6 @@
 /* Check for setuid */
 #undef SETUID

-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
 /* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG

--- a/57
+++ b/57
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for httrack 3.49.6.
+# Generated by GNU Autoconf 2.71 for httrack 3.49.8.
 #
 # Report bugs to <roche+packaging@httrack.com>.
 #
@@ -647,8 +647,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='httrack'
 PACKAGE_TARNAME='httrack'
-PACKAGE_VERSION='3.49.6'
-PACKAGE_STRING='httrack 3.49.6'
+PACKAGE_VERSION='3.49.8'
+PACKAGE_STRING='httrack 3.49.8'
 PACKAGE_BUGREPORT='roche+packaging@httrack.com'
 PACKAGE_URL='http://www.httrack.com/'

@@ -1404,7 +1404,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.49.6 to adapt to many kinds of systems.
+\`configure' configures httrack 3.49.8 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1475,7 +1475,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of httrack 3.49.6:";;
+     short | recursive ) echo "Configuration of httrack 3.49.8:";;
   esac
  cat <<\_ACEOF

@@ -1596,7 +1596,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-httrack configure 3.49.6
+httrack configure 3.49.8
 generated by GNU Autoconf 2.71

 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2129,7 +2129,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.49.6, which was
+It was created by httrack $as_me 3.49.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was

  $ $0$ac_configure_args_raw
@@ -3406,7 +3406,7 @@ fi

 # Define the identity of the package.
 PACKAGE='httrack'
- VERSION='3.49.6'
+ VERSION='3.49.8'


 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -14988,40 +14988,9 @@ AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"
 #*) AC_DEFINE(HTS_PLATFORM, 3, [Default value used]);;
 #esac

-### Check size of long and long long.
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else $as_nop
-  if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
-
-
-
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
-
-
+### Probe long long size for 64-bit integer support. SIZEOF_LONG is not probed:
+### it varies by architecture and would break Multi-Arch co-installation of
+### libhttrack-dev (Debian #1133728). md5.h uses <stdint.h> instead.
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -16718,7 +16687,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.49.6, which was
+This file was extended by httrack $as_me 3.49.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -16787,7 +16756,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-httrack config.status 3.49.6
+httrack config.status 3.49.8
 configured by $0, generated by GNU Autoconf 2.71,
  with options \\"\$ac_cs_config\\"

--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.71])

-AC_INIT([httrack], [3.49.6], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.49.8], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_COPYRIGHT([
 HTTrack Website Copier, Offline Browser for Windows and Unix
 Copyright (C) 1998-2015 Xavier Roche and other contributors
@@ -114,8 +114,9 @@ AC_SUBST([AM_CFLAGS])
 #*) AC_DEFINE(HTS_PLATFORM, 3, [Default value used]);;
 #esac

-### Check size of long and long long.
-AC_CHECK_SIZEOF(long)
+### Probe long long size for 64-bit integer support. SIZEOF_LONG is not probed:
+### it varies by architecture and would break Multi-Arch co-installation of
+### libhttrack-dev (Debian #1133728). md5.h uses <stdint.h> instead.
 AC_CHECK_SIZEOF(long long)

 ### check for in_addr_t
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,38 @@
+httrack (3.49.8-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop the OpenSSL linking exception from the license: OpenSSL 3.0+ is
+    Apache-2.0 and GPL-compatible, so it is no longer needed. httrack is now
+    plain GPL-3.0-or-later. Updated debian/copyright accordingly.
+  * Fix a batch of lintian tags: depend on sensible-utils, point to
+    common-licenses/GPL-3, use a secure version=4 watch file, add
+    Rules-Requires-Root and Vcs-Browser, and override the false-positive
+    source-is-missing on the bundled HTML documentation.
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 07 Jun 2026 14:29:24 +0200
+
+httrack (3.49.7-2) unstable; urgency=medium
+
+  * Bump Standards-Version to 4.7.0 (no changes needed).
+  * Switch to debhelper-compat (= 13); drop the dh-autoreconf and
+    autotools-dev build dependencies.
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 07 Jun 2026 14:13:39 +0200
+
+httrack (3.49.7-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Make config.h architecture-independent for Multi-Arch: same. closes:#1133728
+  * Fix man page rendering of the -%! security warning. closes:#1061053
+
+ -- Xavier Roche <xavier@debian.org>  Sat, 06 Jun 2026 21:03:05 +0200
+
 httrack (3.49.6-1) unstable; urgency=medium

  * Updated to 3.49.6 (3.49-6)
    Fixed CVE-2017-14062

- -- Xavier Roche <roche@proliant.localnet>  Tue, 11 Mar 2025 19:43:39 +0100
+ -- Xavier Roche <xavier@debian.org>  Tue, 11 Mar 2025 19:43:39 +0100

 httrack (3.49.5-1) unstable; urgency=medium

@@ -909,7 +938,7 @@ httrack (3.39.6-1) unstable; urgency=low

 httrack (3.39.5-1) unstable; urgency=low

-  * Updated to 3.39.5 (3.40-alpha-5) 
+  * Updated to 3.39.5 (3.40-alpha-5)

 -- Xavier Roche <xavier@debian.org>  Fri, 29 Jul 2005 20:57:44 +0200

@@ -1591,4 +1620,3 @@ httrack (3.22-1) unstable; urgency=low
  * Initial Release.

 -- Xavier Roche <xavier@debian.org>  Fri, 27 Sep 2002 16:42:25 +0200
-
--- a/debian/compat
+++ b/debian/compat
@@ -1 +0,0 @@
-13
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,12 @@ Source: httrack
 Section: web
 Priority: optional
 Maintainer: Xavier Roche <roche@httrack.com>
-Standards-Version: 4.6.2
-Build-Depends: debhelper (>= 12.0.0), dh-autoreconf, autotools-dev, autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
+Standards-Version: 4.7.0
+Build-Depends: debhelper-compat (= 13), autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
+Rules-Requires-Root: no
 Homepage: http://www.httrack.com
 Vcs-Git: https://github.com/xroche/httrack.git
+Vcs-Browser: https://github.com/xroche/httrack

 Package: httrack
 Architecture: any
@@ -23,12 +25,12 @@ Description: Copy websites to your computer (Offline browser)
 browse the site from link to link, as if you were viewing it online.
 HTTrack can also update an existing mirrored site, and resume
 interrupted downloads. HTTrack is fully configurable, and has an
- integrated help system. 
+ integrated help system.

 Package: webhttrack
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, webhttrack-common, iceape-browser | iceweasel | icecat | mozilla | firefox | mozilla-firefox | www-browser | sensible-utils
+Depends: ${misc:Depends}, ${shlibs:Depends}, webhttrack-common, sensible-utils, iceape-browser | iceweasel | icecat | mozilla | firefox | mozilla-firefox | www-browser
 Replaces: webhttrack-common (<< 3.43.9-2)
 Breaks: webhttrack-common (<< 3.43.9-2)
 Suggests: httrack, httrack-doc
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,19 +13,9 @@ the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.

 On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+License version 3 can be found in /usr/share/common-licenses/GPL-3 file.

 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
-
-In addition, as a special exception, Xavier Roche gives permission to
-link the code of this program with the openSSL library (or with
-modified versions of openSSL that use the same license as openSSL),
-and distribute linked combinations including the two.  You must obey
-the GNU General Public License in all respects for all of the code
-used other than openSSL.  If you modify this file, you may extend this
-exception to your version of the file, but you are not obligated to do
-so.  If you do not wish to do so, delete this exception statement from
-your version.
--- a/debian/libhttrack-dev.lintian-overrides
+++ b/debian/libhttrack-dev.lintian-overrides
@@ -1,5 +1,4 @@
 libhttrack-dev: breakout-link *
 libhttrack-dev: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/httrack/libtest/*
-libhttrack-dev: library-not-linked-against-libc usr/lib/*/httrack/libtest/*
 libhttrack-dev: package-contains-documentation-outside-usr-share-doc usr/share/httrack/libtest/readme.txt
 libhttrack-dev: package-name-defined-in-config-h usr/include/httrack/config.h
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ build-indep:

 build-arch: build-stamp

-build-stamp: configure-stamp 
+build-stamp: configure-stamp
 	dh_testdir
 	dh_auto_build
 	dh_auto_test
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,8 @@
 httrack source: changelog-should-mention-nmu
 httrack source: source-nmu-has-incorrect-version-number
+
+# The bundled HTML pages are the genuine upstream documentation taken from
+# the httrack.com website. lintian's long-line heuristic mistakes them for
+# minified or generated content, but they are the actual source.
+httrack source: source-is-missing [html/*]
+httrack source: source-is-missing [templates/*]
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,6 @@
-# format version number, currently 3; this line is compulsory!
-version=3
+# format version number; this line is compulsory!
+version=4

 # main httrack.com download page ; fetch the mirror version number
-http://www.httrack.com/page/2/en/index.html\
-	.*/httrack-([\d\.]+).tar.gz
-
+https://www.httrack.com/page/2/en/index.html \
+	.*/httrack-([\d\.]+)\.tar\.gz
--- a/debian/webhttrack.lintian-overrides
+++ b/debian/webhttrack.lintian-overrides
@@ -1 +0,0 @@
-webhttrack: missing-depends-on-sensible-utils sensible-browser usr/bin/webhttrack
--- a/history.txt
+++ b/history.txt
@@ -4,6 +4,18 @@ HTTrack Website Copier release history:

 This file lists all changes and fixes that have been made for HTTrack

+3.49-8
+ Changed: dropped the obsolete OpenSSL linking exception (OpenSSL 3.0+ is Apache-2.0 and GPL-compatible); httrack is now plain GPLv3-or-later
+ Fixed: link libhtsjava and the libtest examples directly against libc
+ Fixed: in-place changes made by the postprocess callback were not applied (Roman Sęk)
+ Fixed: "preffered" typo in the help text and man page (yosinn1-blip)
+ Fixed: corrections and updates of the Russian translation (German Aizek)
+ Fixed: corrections and updates of the Danish translation (scootergrisen)
+
+3.49-7
+ Fixed: keep generated config.h architecture-independent (Debian #1133728)
+ Fixed: man page rendered the -%! warning as bogus options (Debian #1061053)
+
 3.49-6
 + Fixed: puny_decode CVE-2017-14062

--- a/html/cmddoc.html
+++ b/html/cmddoc.html
@@ -118,11 +118,11 @@ The command-line version
      <br>
      <br>
    <li>Add the URLs, separated by a blank space</li>
-      <br><small><tt>httrack www.someweb.com/foo/</tt></small>
+      <br><small><tt>httrack www.example.com/foo/</tt></small>
      <br>
      <br>
    <li>If you need, add some options (see the <a href="options.html">option list</a>)</li>
-      <br><small><tt>httrack www.someweb.com/foo/ -O "/webs" -N4 -P proxy.myhost.com:3128</tt></small>
+      <br><small><tt>httrack www.example.com/foo/ -O "/webs" -N4 -P proxy.myhost.com:3128</tt></small>
      <br>
      <br>
    <li>Launch the command line, and wait until the mirror is finishing</li>
--- a/html/faq.html
+++ b/html/faq.html
@@ -303,43 +303,43 @@ Okay, let me explain how to precisely control the capture process.<br>
 Let's take an example:<br>
 <br>
 Imagine you want to capture the following site:<br>
-<tt>www.someweb.com/gallery/flowers/</tt><br>
+<tt>www.example.com/gallery/flowers/</tt><br>
 <br>
-HTTrack, by default, will capture all links encountered in <tt>www.someweb.com/gallery/flowers/</tt> or in lower directories, like
-<tt>www.someweb.com/gallery/flowers/roses/</tt>.<br>
+HTTrack, by default, will capture all links encountered in <tt>www.example.com/gallery/flowers/</tt> or in lower directories, like
+<tt>www.example.com/gallery/flowers/roses/</tt>.<br>
 It will not follow links to other websites, because this behaviour might cause to capture the Web entirely!<br>
-It will not follow links located in higher directories, too (for example, <tt>www.someweb.com/gallery/flowers/</tt> itself) because this 
+It will not follow links located in higher directories, too (for example, <tt>www.example.com/gallery/flowers/</tt> itself) because this 
 might cause to capture too much data.<br>
 <br>
 This is the <b><u>default behaviour</b></u> of HTTrack, BUT, of course, if you want, you can tell HTTrack to capture other directorie(s), website(s)!..
 <br>
-In our example, we might want also to capture all links in <tt>www.someweb.com/gallery/trees/</tt>, and in <tt>www.someweb.com/photos/</tt><br>
+In our example, we might want also to capture all links in <tt>www.example.com/gallery/trees/</tt>, and in <tt>www.example.com/photos/</tt><br>
 <br>
 This can easily done by using filters: go to the Option panel, select the 'Scan rules' tab, and enter this line:
 (you can leave a blank space between each rules, instead of entering a carriage return)<br>
-<tt>+www.someweb.com/gallery/trees/*<br>
-+www.someweb.com/photos/*</tt><br>
+<tt>+www.example.com/gallery/trees/*<br>
+www.example.com/photos/*</tt><br>
 <br>
-This means "accept all links begining with <tt>www.someweb.com/gallery/trees/</tt> and <tt>www.someweb.com/photos/</tt>" 
+This means "accept all links begining with <tt>www.example.com/gallery/trees/</tt> and <tt>www.example.com/photos/</tt>" 
 - the <tt>+</tt> means "accept" and the final <tt>*</tt> means "any character will match after the previous ones".
 Remember the <tt>*.doc</tt> or <tt>*.zip</tt> encountered when you want to select all files from a certain type on your computer: 
 it is almost the same here, except the begining "+"<br>
 <br>
-Now, we might want to exclude all links in <tt>www.someweb.com/gallery/trees/hugetrees/</tt>, because with the previous filter,
+Now, we might want to exclude all links in <tt>www.example.com/gallery/trees/hugetrees/</tt>, because with the previous filter,
 we accepted too many files. Here again, you can add a filter rule to refuse these links. Modify the previous filters to:<br>
-<tt>+www.someweb.com/gallery/trees/*<br>
-+www.someweb.com/photos/*<br>
-www.someweb.com/gallery/trees/hugetrees/*</tt><br>
+<tt>+www.example.com/gallery/trees/*<br>
+www.example.com/photos/*<br>
+-www.example.com/gallery/trees/hugetrees/*</tt><br>
 <br>
 You have noticed the <tt>-</tt> in the begining of the third rule: this means "refuse links matching the rule" 
-; and the rule is "any files begining with <tt>www.someweb.com/gallery/trees/hugetrees/</tt><br>
+; and the rule is "any files begining with <tt>www.example.com/gallery/trees/hugetrees/</tt><br>

 Voila! With these three rules, you have precisely defined what you wanted to capture.<br>
 <br>
 A more complex example?<br>
 <br>
-Imagine that you want to accept all jpg files (files with .jpg type) that have "blue" in the name and located in www.someweb.com<br>
-<tt>+www.someweb.com/*blue*.jpg</tt><br>
+Imagine that you want to accept all jpg files (files with .jpg type) that have "blue" in the name and located in www.example.com<br>
+<tt>+www.example.com/*blue*.jpg</tt><br>
 <br>
 More detailed information can be found <a href="filters.html">here</a>!<br>
 <br>
@@ -440,7 +440,7 @@ This will cause a performance loss, but will increase the compatibility with som

 <a NAME="QT1">Q: <strong>Only the first page is caught. What's wrong?</a></strong></br>
 A: <em>First, check the <tt>hts-log.txt</tt> file (and/or <tt>hts-err.txt</tt> error log file) - this can give you precious information.<br>
-The problem can be a website that redirects you to another site (for example, <tt>www.someweb.com</tt> to <tt>public.someweb.com</tt>) : 
+The problem can be a website that redirects you to another site (for example, <tt>www.example.com</tt> to <tt>public.example.com</tt>) : 
 in this case, use filters to accept this site<br>
 This can be, also, a problem in the HTTrack options (link depth too low, for example)</em>

@@ -485,10 +485,10 @@ You may also want to capture files that are forbidden by default by the <a href=
 In these cases, HTTrack does not capture these links automatically, you have to tell it to do so. 
 <br><br>
 <ul><li>Either use the <a href="filters.html">filters</a>.<br>
-Example: You are downloading <tt>http://www.someweb.com/foo/</tt> and can not get .jpg images located
-in <tt>http://www.someweb.com/bar/</tt> (for example, http://www.someweb.com/bar/blue.jpg)<br>
-Then, add the filter rule <tt>+www.someweb.com/bar/*.jpg</tt> to accept all .jpg files from this location<br>
-You can, also, accept all files from the /bar folder with <tt>+www.someweb.com/bar/*</tt>, or only html files with <tt>+www.someweb.com/bar/*.html</tt> and so on..<br><br>
+Example: You are downloading <tt>http://www.example.com/foo/</tt> and can not get .jpg images located
+in <tt>http://www.example.com/bar/</tt> (for example, http://www.example.com/bar/blue.jpg)<br>
+Then, add the filter rule <tt>+www.example.com/bar/*.jpg</tt> to accept all .jpg files from this location<br>
+You can, also, accept all files from the /bar folder with <tt>+www.example.com/bar/*</tt>, or only html files with <tt>+www.example.com/bar/*.html</tt> and so on..<br><br>
 </li><li>
 If the problems are related to robots.txt rules, that do not let you access some folders (check in the logs if you are not sure),
 you may want to disable the default robots.txt rules in the options. (but only disable this option with great care, 
@@ -509,8 +509,8 @@ and rescan the website as described before. HTTrack will be obliged to recatch t
 <a NAME="Q1bb">Q: <strong>FTP links are not caught! What's happening?</strong><br>
 A: <em>FTP files might be seen as external links, especially if they are located in outside domain. You have either to accept all external links (See the links options, -n option) or
 only specific files (see <a href="filters.html">filters</a> section). <br>
-Example: You are downloading <tt>http://www.someweb.com/foo/</tt> and can not get ftp://ftp.someweb.com files<br>
-Then, add the filter rule <tt>+ftp.someweb.com/*</tt> to accept all files from this (ftp) location<br>
+Example: You are downloading <tt>http://www.example.com/foo/</tt> and can not get ftp://ftp.example.com files<br>
+Then, add the filter rule <tt>+ftp.example.com/*</tt> to accept all files from this (ftp) location<br>
 </em>
 <br>

@@ -551,10 +551,10 @@ Note: In some rare cases, duplicate data files can be found when the website red

 <a NAME="Q1b2">Q: <strong>I'm downloading too many files! What can I do?</strong><br>
 A: <em>This is often the case when you use too large a filter, for example <tt>+*.html</tt>, which asks the
-engine to catch all .html pages (even ones on other sites!). In this case, try to use more specific filters, like <tt>+www.someweb.com/specificfolder/*.html</tt><br>
-If you still have too many files, use filters to avoid somes files. For example, if you have too many files from www.someweb.com/big/, 
-use <tt>-www.someweb.com/big/*</tt> to avoid all files from this folder. Remember that the default behaviour of the engine, when
-mirroring http://www.someweb.com/big/index.html, is to catch everything in http://www.someweb.com/big/. Filters are your friends,
+engine to catch all .html pages (even ones on other sites!). In this case, try to use more specific filters, like <tt>+www.example.com/specificfolder/*.html</tt><br>
+If you still have too many files, use filters to avoid somes files. For example, if you have too many files from www.example.com/big/, 
+use <tt>-www.example.com/big/*</tt> to avoid all files from this folder. Remember that the default behaviour of the engine, when
+mirroring http://www.example.com/big/index.html, is to catch everything in http://www.example.com/big/. Filters are your friends,
 use them!
 </em>
 <br>
@@ -562,7 +562,7 @@ use them!

 <a NAME="Q1b22">Q: <strong>The engine turns crazy, getting thousands of files! What's going on?</strong><br>
 A: <em>This can happen if a loop occurs in some bogus website. For example, a page that refers to itself, with a timestamp
-in the query string (e.g. <tt>http://www.someweb.com/foo.asp?ts=2000/10/10,09:45:17:147</tt>). 
+in the query string (e.g. <tt>http://www.example.com/foo.asp?ts=2000/10/10,09:45:17:147</tt>). 
 These are really annoying, as it is VERY difficult to detect the loop (the timestamp might be a page number).
 To limit the problem: set a recurse level (for example to 6), or avoid the bogus pages (use the filters)
 </em>
@@ -571,7 +571,7 @@ To limit the problem: set a recurse level (for example to 6), or avoid the bogus

 <a NAME="Q1b3">Q: <strong>File are sometimes renamed (the type is changed)! Why?</strong><br>
 A: <em>By default, HTTrack tries to know the type of remote files. This is useful when links like
-<tt>http://www.someweb.com/foo.cgi?id=1</tt> can be either HTML pages, images or anything else. 
+<tt>http://www.example.com/foo.cgi?id=1</tt> can be either HTML pages, images or anything else. 
 Locally, foo.cgi will not be recognized as an html page, or as an image, by your browser. HTTrack has to rename the file
 as foo.html or foo.gif so that it can be viewed.<br>
 </em>
@@ -730,8 +730,8 @@ but this is a smart bug..
 the domain, too. How to retrieve them?</strong><br>
 A: <em>If you just want to retrieve files that can be reached through links, just activate
 the 'get file near links' option. But if you want to retrieve html pages too, you can both
-use wildcards or explicit addresses ; e.g. add <tt>www.someweb.com/*</tt> to accept all
-files and pages from www.someweb.com.<br>
+use wildcards or explicit addresses ; e.g. add <tt>www.example.com/*</tt> to accept all
+files and pages from www.example.com.<br>
 <br>
 </em></a><a NAME="Q6">Q: <strong>I have forgotten some URLs of files during a long
 mirror.. Should I redo all?</strong><br>
@@ -744,7 +744,7 @@ A: <em>You can use different methods. You can use the 'get files near a link' op
 files are in a foreign domain. You can use, too, a filter adress: adding <tt>+*.zip</tt>
 in the URL list (or in the filter list) will accept all ZIP files, even if these files are
 outside the address. <br>
-Example : <tt>httrack www.someweb.com/someaddress.html +*.zip</tt> will allow
+Example : <tt>httrack www.example.com/someaddress.html +*.zip</tt> will allow
 you to retrieve all zip files that are linked on the site.</em><br>
 <br>
 </a><a NAME="Q8">Q: <strong>There are ZIP files in a page, but I don't want to transfer
@@ -771,7 +771,7 @@ them on filters!</strong><br>
 A: <em>By default, HTTrack retrieves all types of files on authorized links. To avoid
 that, define filters like </a><a NAME="Q7"><tt>-* +&lt;website&gt;/*.html
 +&lt;website&gt;/*.htm +&lt;website&gt;/ +*.&lt;type wanted&gt;</tt></a><a NAME="Q10"><br>
-Example: <tt>httrack www.someweb.com/index.html -* +www.someweb.com/*.htm* +www.someweb.com/*.gif +www.someweb.com/*.jpg</tt><br>
+Example: <tt>httrack www.example.com/index.html -* +www.example.com/*.htm* +www.example.com/*.gif +www.example.com/*.jpg</tt><br>
 <br>
 </em><a NAME="Q10">Q: <strong>When I use filters, I get too many files!</strong><br>
 A: <em>You might use too large a filter, for example <tt>*.html</tt> will get ALL html
@@ -779,13 +779,13 @@ files identified. If you want to get all files on an address, use <tt>www.&lt;ad
 If you want to get ONLY files defined by your filters, use something like <tt>-* +www.foo.com/*</tt>, because 
 <tt>+www.foo.com/*</tt> will only accept selected links without forbidding other ones!<br>
 There are lots of possibilities using filters.<br>
-Example:<tt>httrack www.someweb.com +*.someweb.com/*.htm*</tt><br>
+Example:<tt>httrack www.example.com +*.example.com/*.htm*</tt><br>
 <br>
 </em></a><a NAME="Q11">Q: <strong>When I use filters, I can't access another domain, but I
 have filtered it!</strong><br>
-A: <em>You may have done a mistake declaring filters, for example <tt>+www.someweb.com/*
-*someweb* </tt></em>will not work, because -*someweb* has an upper priority (because it has
-been declared after +www.someweb.com)<br>
+A: <em>You may have done a mistake declaring filters, for example <tt>+www.example.com/*
+-*example* </tt></em>will not work, because -*example* has an upper priority (because it has
+been declared after +www.example.com)<br>
 <br>
 </a><a NAME="Q12">Q: <strong>Must I add a&nbsp; '+' or '-' in the filter list when I want
 to use filters?</strong><br>
@@ -800,7 +800,7 @@ filter list) and accept only html files and the file(s) you want to retrieve (BU
 forget to add <tt>+&lt;website&gt;*.html</tt> in the filter list, or pages will not be
 scanned! Add the name of files you want with a <tt>*/</tt> before ; i.e. if you want to
 retrieve file.zip, add <tt>*/file.zip</tt>)<br>
-Example:<tt>httrack www.someweb.com +www.someweb.com/*.htm* +thefileiwant.zip</tt><br>
+Example:<tt>httrack www.example.com +www.example.com/*.htm* +thefileiwant.zip</tt><br>
 <br>
 </em>

@@ -828,7 +828,7 @@ A: <em>Yes. See the URL capture abilities (--catchurl for command-line release,
 A: <em>Yes. See the shell system command option (-V option for command-line release)</em>

 <br><br><a NAME="QM6">Q: <strong>Can I use username/password authentication on a site?</strong></a><br>
-A: <em>Yes. Use user:password@your_url (example: <tt>http://foo:bar@www.someweb.com/private/mybox.html</tt>)</em>
+A: <em>Yes. Use user:password@your_url (example: <tt>http://foo:bar@www.example.com/private/mybox.html</tt>)</em>

 <br><br><a NAME="QM7">Q: <strong>Can I use username/password authentication for a proxy?</strong></a><br>
 A: <em>Yes. Use user:password@your_proxy_name as your proxy name (example: <tt>smith:foo@proxy.mycorp.com</tt>)</em>
--- a/html/fcguide.html
+++ b/html/fcguide.html
@@ -253,7 +253,7 @@ Spider options:
 Browser ID:
  F  user-agent field (-F "user-agent name") (--user-agent <param>)
 %F  footer string in Html code (-%F "Mirrored [from host %s [file %s [at %s]]]" (--footer <param>)
- %l  preffered language (-%l "fr, en, jp, *" (--language <param>)
+ %l  preferred language (-%l "fr, en, jp, *" (--language <param>)

 Log, index, cache
  C  create/use a cache for updates and retries (C0 no cache,C1 cache is prioritary,* C2 test update before) (--cache[=N])
@@ -332,7 +332,7 @@ Details: User-defined option N
  %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) (--http-10)
+  %h Host name (ex: www.example.com) (--http-10)
  %M URL MD5 (128 bits, 32 ascii bytes)
  %Q query string MD5 (128 bits, 32 ascii bytes)
  %q small query string MD5 (16 bits, 4 ascii bytes) (--include-query-string)
@@ -356,17 +356,17 @@ Shortcuts:

 --http10              force http/1.0 requests (-%h)

-example: httrack www.someweb.com/bob/
-means:   mirror site www.someweb.com/bob/ and only this site
+example: httrack www.example.com/bob/
+means:   mirror site www.example.com/bob/ and only this site

-example: httrack www.someweb.com/bob/ www.anothertest.com/mike/ +*.com/*.jpg
+example: httrack www.example.com/bob/ www.anothertest.com/mike/ +*.com/*.jpg
 means:   mirror the two sites together (with shared links) and accept any .jpg files on .com sites

-example: httrack www.someweb.com/bob/bobby.html +* -r6
+example: httrack www.example.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

-example: 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
+example: httrack www.example.com/bob/bobby.html --spider -P proxy.myhost.com:8080
+runs the spider on www.example.com/bob/bobby.html using a proxy

 example: httrack --update
 updates a mirror in the current folder
@@ -1387,7 +1387,7 @@ web servers leave footprints in the browser.
 Browser ID:
  F  user-agent field (-F "user-agent name")
 %F  footer string in Html code (-%F "Mirrored [from host %s [file %s [at %s]]]"
- %l  preffered language (-%l "fr, en, jp, *" (--language <param>)
+ %l  preferred language (-%l "fr, en, jp, *" (--language <param>)
 </i></b></pre>

 <p align=justify> The user-agent field is used by browsers to determine
@@ -2054,8 +2054,8 @@ generated automatically using the interface)
        <td>This will accept all zip files in .com addresses</td>
      </tr>
      <tr>
-        <td><b>-*someweb*/*.tar*</b></td>
-        <td>This will refuse all tar (or tar.gz etc.) files in hosts containing someweb</td>
+        <td><b>-*example*/*.tar*</b></td>
+        <td>This will refuse all tar (or tar.gz etc.) files in hosts containing example</td>
      </tr>
      <tr>
        <td><b>+*/*somepage*</b></td>
--- a/html/filters.html
+++ b/html/filters.html
@@ -109,8 +109,8 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>

    <i>You have to know that once you have defined
    starts links, the default mode is to mirror these links - i.e. if one of your start page is
-    www.someweb.com/test/index.html, all links starting with www.someweb.com/test/ will be
-    accepted. But links directly in www.someweb.com/.. will not be accepted, however, because
+    www.example.com/test/index.html, all links starting with www.example.com/test/ will be
+    accepted. But links directly in www.example.com/.. will not be accepted, however, because
    they are in a higher strcuture. This prevent HTTrack from mirroring the whole site. (All
    files in structure levels equal or lower than the primary links will be retrieved.)<br>
    </i>
@@ -278,8 +278,8 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
        <td>This will refuse/accept all zip files in .com addresses</td>
      </tr>
      <tr>
-        <td nowrap><tt>*someweb*/*.tar*</tt></td>
-        <td>This will refuse/accept all tar (or tar.gz etc.) files in hosts containing someweb</td>
+        <td nowrap><tt>*example*/*.tar*</tt></td>
+        <td>This will refuse/accept all tar (or tar.gz etc.) files in hosts containing example</td>
      </tr>
      <tr>
        <td nowrap><tt>*/*somepage*</tt></td>
@@ -289,13 +289,13 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
        <td nowrap><tt>*.html</tt></td>
        <td>This will refuse/accept all html files. <br>
        Warning! With this filter you will accept ALL html files, even those in other addresses.
-        (causing a global (!) web mirror..) Use www.someweb.com/*.html to accept all html files from
+        (causing a global (!) web mirror..) Use www.example.com/*.html to accept all html files from
        a web.</td>
      </tr>
      <tr>
        <td nowrap><tt>*.html*[]</tt></td>
        <td>Identical to <tt>*.html</tt>, but the link must not have any supplemental characters
-        at the end (links with parameters, like <tt>www.someweb.com/index.html?page=10</tt>, will be
+        at the end (links with parameters, like <tt>www.example.com/index.html?page=10</tt>, will be
        refused)</td>
      </tr>
    </table>
--- a/html/httrack.man.html
+++ b/html/httrack.man.html
@@ -123,12 +123,12 @@ mirrored site, and resume interrupted downloads.</p>


 <p style="margin-left:11%; margin-top: 1em"><b>httrack
-www.someweb.com/bob/</b></p>
+www.example.com/bob/</b></p>

 <p style="margin-left:22%;">mirror site
-www.someweb.com/bob/ and only this site</p>
+www.example.com/bob/ and only this site</p>

-<p style="margin-left:11%;"><b>httrack www.someweb.com/bob/
+<p style="margin-left:11%;"><b>httrack www.example.com/bob/
 www.anothertest.com/mike/ +*.com/*.jpg <br>
 -mime:application/*</b></p>

@@ -137,18 +137,18 @@ www.anothertest.com/mike/ +*.com/*.jpg <br>
 sites</p>

 <p style="margin-left:11%;"><b>httrack
-www.someweb.com/bob/bobby.html +* -r6</b></p>
+www.example.com/bob/bobby.html +* -r6</b></p>

 <p style="margin-left:22%;">means get all files starting
 from bobby.html, with 6 link-depth, and possibility of going
 everywhere on the web</p>

 <p style="margin-left:11%;"><b>httrack
-www.someweb.com/bob/bobby.html --spider -P <br>
+www.example.com/bob/bobby.html --spider -P <br>
 proxy.myhost.com:8080</b></p>

 <p style="margin-left:22%;">runs the spider on
-www.someweb.com/bob/bobby.html using a proxy</p>
+www.example.com/bob/bobby.html using a proxy</p>

 <p style="margin-left:11%;"><b>httrack --update</b></p>

@@ -958,7 +958,7 @@ host %s [file %s [at %s]]]&quot; (--footer
 <td width="78%">


-<p>preffered language (-%l &quot;fr, en, jp, *&quot;
+<p>preferred language (-%l &quot;fr, en, jp, *&quot;
 (--language &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1877,7 +1877,7 @@ User-defined option N</b> <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>
+%h Host name (ex: www.example.com) <br>
 %M URL MD5 (128 bits, 32 ascii bytes) <br>
 %Q query string MD5 (128 bits, 32 ascii bytes) <br>
 %k full query string <br>
--- a/html/options.html
+++ b/html/options.html
@@ -131,16 +131,16 @@ This is the default primary scanning option, the engine does not go out of domai

 d   stay on the same principal domain
 This option lets the engine go on all sites that exist on the same principal domain.
-Example: a link located at www.someweb.com that goes to members.someweb.com will be followed.
+Example: a link located at www.example.com that goes to members.example.com will be followed.

 l   stay on the same location (.com, etc.)
 This option lets the engine go on all sites that exist on the same location.
-Example: a link located at www.someweb.com that goes to www.anyotherweb.com will be followed.
+Example: a link located at www.example.com that goes to www.anyotherweb.com will be followed.
 Warning: this is a potentially dangerous option, limit the recurse depth with r option.

 e   go everywhere on the web
 This option lets the engine go on any sites.
-Example: a link located at www.someweb.com that goes to www.anyotherweb.org will be followed.
+Example: a link located at www.example.com that goes to www.anyotherweb.org will be followed.
 Warning: this is a potentially dangerous option, limit the recurse depth with r option.

 n   get non-html files 'near' an html file (ex: an image located outside)
--- a/html/step9_opt8.html
+++ b/html/step9_opt8.html
@@ -117,7 +117,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
  <li>HTML Footer</li>
  <br><small>Enter here the optionnal text that will be included as a comment in each HTML file to make archiving easier
  <br>The string entered is generally an HTML comment (<tt>&lt;!-- HTML comment --&gt;</tt>) with optionnal %s, which will be transformed into a specific string information:
-  <br>%s #1 : host name (for example, www.someweb.com)
+  <br>%s #1 : host name (for example, www.example.com)
  <br>%s #2 : file name (for example, /index.html)
  <br>%s #3 : date of the mirror
  <br><b>Example</b>: <tt>&lt;!-- Page mirrored from %s, file %s. Archive date: %s --&gt;</tt>
--- a/lang/Dansk.txt
+++ b/lang/Dansk.txt
@@ -21,21 +21,21 @@ Luk
 Cancel changes
 Annullér ændringer
 Click to confirm
-Klik OK for at godkende
+Klik for at bekræfte
 Click to get help!
 Klik for at få hjælp!
 Click to return to previous screen
-Klik for at se den forrige skærm
+Klik for at gå til den forrige skærm
 Click to go to next screen
-Klik for at se den næste skærm
+Klik for at gå til den næste skærm
 Hide password
 Skjul adgangskode
 Save project
 Gem projekt
 Close current project?
-Vil du lukke det aktuelle projekt ?
+Vil du lukke det aktuelle projekt?
 Delete this project?
-Slette dette projekt ?
+Slette dette projekt?
 Delete empty project %s?
 Vil du slette det tomme projekt med navnet: %s?
 Action not yet implemented
@@ -69,7 +69,7 @@ Udeluk link(s)
 Include link(s)
 Medtag link(s)
 Tip: To have ALL GIF files included, use something like +www.someweb.com/*.gif. \n(+*.gif / -*.gif will include/exclude ALL GIFs from ALL sites)
-Tip: For at medtage ALLE GIF-filer, så prøv at bruge: +www.eksempel.dk/*.gif. \n(+*.gif / -*.gif inkluderer/ekskluderer ALLE GIF-filer fra alle websteder)
+Tip: for at medtage ALLE GIF-filer, så prøv at bruge: +www.eksempel.dk/*.gif. \n(+*.gif / -*.gif inkluderer/ekskluderer ALLE GIF-filer fra ALLE steder)
 Save prefs
 Gem foretrukne indstillinger
 Matching links will be excluded:
@@ -97,7 +97,7 @@ www.eksempel.dk\r\nFinder links der matcher hele understrengen 'www.eksempel.dk'
 someweb\r\nWill find any links with matching sub-string such as www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.
 eksempel\r\nFinder ethvert link med matchende understreng, såsom www.eksempel.dk/.., www.test.abc/franogetweb/index.html, www.test.abc/test/eksempel.html osv.
 www.test.com/test/someweb.html\r\nWill only find the 'www.test.com/test/someweb.html' file. Note that you have to type the complete path (URL + site path)
-www.test.dk/test/eksempel.html\r\nFinder kun 'www.test.dk/test/eksempel.html' file. Bemærk at du skal skrive den fulde sti [URL + webstedsti]
+www.test.dk/test/eksempel.html\r\nFinder kun 'www.test.dk/test/eksempel.html' file. Bemærk at du skal skrive den fulde sti [URL + stedsti]
 All links will match
 Alle links vil matche
 Add exclusion filter
@@ -109,13 +109,13 @@ Eksisterende filtre
 Cancel changes
 Annullér ændringer
 Save current preferences as default values
-Gem nuværende indstillinger som standardindstillinger
+Gem aktuelle præferencer som standardværdier
 Click to confirm
 Klik for at bekræfte
 No log files in %s!
 Der findes ingen logfil i %s!
 No 'index.html' file in %s!
-Der er ingen 'index.html'-fil i %s!
+Der er ikke nogen 'index.html'-fil i %s!
 Click to quit WinHTTrack Website Copier
 Klik for at afslutte WinHTTrack Website Copier
 View log files
@@ -123,11 +123,11 @@ Vis logfiler
 Browse HTML start page
 Se HTML-startside
 End of mirror
-Kopieringen af websted er afsluttet
+Slut på spejlkopiering
 View log files
 Vis logfiler
 Browse Mirrored Website
-Gennemse kopi-websted
+Gennemse spejlkopieret websted
 New project...
 Nyt projekt...
 View error and warning reports
@@ -179,57 +179,59 @@ Indl
 Parsing HTML file (testing links)..
 Overfører HTML-fil (tester links)...
 Pause - Toggle [Mirror]/[Pause download] to resume operation
-Pause - Vælg fra menuen [Kopiér]/[Pause download] for at genoptage overførslen
+Pause - Vælg [Spejlkopiér]/[Sæt download på pause] for at genoptage overførslen
 Finishing pending transfers - Select [Cancel] to stop now!
-Afslutter igangværende overførsler - Vælg Annullér for at afslutte nu!
+Afslutter igangværende overførsler - Vælg [Annullér] for at afslutte nu!
 scanning
 skanner
 Waiting for scheduled time..
 Venter på planlagt tidspunkt...
+Transferring data..
+Overfører data...
 Connecting to provider
 Opretter forbindelse til udbyder
 [%d seconds] to go before start of operation
 [%d sekunder] inden denne handling starter
 Site mirroring in progress [%s, %s bytes]
-Websted kopieres nu [%s, %s byte]
+Igangværende spejlkopiering af sted [%s, %s byte]
 Site mirroring finished!
-Kopieringen af websted er afsluttet!
+Spejlkopieringen af sted er afsluttet!
 A problem occurred during the mirroring operation\n
-Der opstod et problem under kopieringen af websted\n
+Der opstod et problem under spejlkopieringen\n
 \nDuring:\n
 \nSamtidigt:\n
 \nSee the log file if necessary.\n\nClick FINISH to quit WinHTTrack Website Copier.\n\nThanks for using WinHTTrack!
-Se eventuelt logfilen.\n\nKlik AFSLUT for at lukke WinHTTrack Website Copier.\n\nTak for at du brugte WinHTTrack!
+Se eventuelt logfilen.\n\nKlik på UDFØR for at afslutte WinHTTrack Website Copier.\n\nTak for at du brugte WinHTTrack!
 Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) if necessary to ensure that everything is OK.\n\nThanks for using WinHTTrack!
-Kopiering af websted fuldført.\nKlik OK for at afslutte WinHTTrack.\nSe logfil(erne) for at kontrollere at alt forløb OK.\n\nTak for at du brugte WinHTTrack!\r\n
+Spejlkopieringen fuldført.\nKlik på Afslut for at afslutte WinHTTrack.\nSe logfil(erne) for at sikre at alt forløb OK.\n\nTak for at du brugte WinHTTrack!\r\n
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
-* * KOPIERINGEN ER AFBRUDT! * *\r\nDen nuværende cache er påkrævet for alle opdaterings operationer og indeholder kun data der er downloadet med den aktuelle afbrudte session.\r\nDen tidligere cache kan indeholde mere fyldestgørende information; hvis du ønsker at bevare den information, skal du gendanne den og slette den aktuelle cache.\r\n[Note: Dette kan nemt gøres ved at slette 'hts-cache/new.* files]\r\n\r\nTror du den tidligere cache-fil muligvis indeholder mere fyldestgørende information, og vil du gendanne denne?
+* * SPEJLKOPIERING AFBRUDT! * *\r\nDen aktuelle cache er påkrævet for alle opdaterings operationer og indeholder kun data der er downloadet med den aktuelle afbrudte session.\r\nDen tidligere cache kan indeholde mere fyldestgørende information; hvis du ønsker at bevare den information, skal du gendanne den og slette den aktuelle cache.\r\n[Bemærk: dette kan nemt gøres ved at slette 'hts-cache/new.* files]\r\n\r\nTror du den tidligere cache-fil muligvis indeholder mere fyldestgørende information, og vil du gendanne denne?
 * * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * KOPIERINGS FEJL! * *\r\nWinHTTrack har opdaget at den igangværende kopiering er tom. Hvis du var i gang med at opdatere en kopi, vil det tidligere indhold  blive gendannet.\r\nMulig årsag: Den første side kunne enten ikke findes eller der opstod et problem med forbindelsen.\r\n=> Kontroller at webstedet findes og/eller kontroller Proxy-indstillingerne! <=
+* * SPEJLKOPIERINGS FEJL! * *\r\nWinHTTrack har opdaget at den igangværende spejlkopiering er tom. Hvis du var i gang med at opdatere, vil den tidligere spejlkopiering blive gendannet.\r\nMulig årsag: den første side kunne enten ikke findes eller der opstod et problem med forbindelsen.\r\n=> Kontroller at webstedet findes og/eller kontroller proxy-indstillingerne! <=
 \n\nTip: Click [View log file] to see warning or error messages
-\n\nTip: Klik [Vis logfiler]  for at se advarsels- og fejlmeddelelser
+\n\nTip: klik på [Vis logfil] for at se advarsels- og fejlmeddelelser
 Error deleting a hts-cache/new.* file, please do it manually
 Der opstod en fejl i forbindelse med sletningen af hts-cache/new.*filen. Slet venligst filen manuelt.
 Do you really want to quit WinHTTrack Website Copier?
-Vil du afslutte WinHTTrack Website Copier?
+Er du sikker på, at du vil afslutte WinHTTrack Website Copier?
 - Mirroring Mode -\n\nEnter address(es) in URL box
- Kopiering af websted  -\n\nIndtast webadresse(r) i URL-feltet
+- Spejlkopieringstilstand -\n\nIndtast adresse(r) i URL-feltet
 - Interactive Wizard Mode (questions) -\n\nEnter address(es) in URL box
- Interaktiv guide-tilstand (spørgsmål) -\n\nIndtast webadresse(r) i URL-feltet
+- Interaktiv guide-tilstand (spørgsmål) -\n\nIndtast adresse(r) i URL-feltet
 - File Download Mode -\n\nEnter file address(es) in URL box
- Fil-download-tilstand-\n\nIndtast webadresse(r) i URL-feltet
+- Fil-download-tilstand-\n\nIndtast adresse(r) i URL-feltet
 - Link Testing Mode -\n\nEnter Web address(es) with links to test in URL box
- Links test tilstand-\n\nIndtast webadresse(r) i URL-feltet
+- Links test tilstand-\n\nIndtast webadresse(r) med links til test i URL-feltet
 - Update Mode -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
- Opdateringstilstand -\n\nBekræft webadresse(r) i URL-feltet. Kontroller eventuelt dine indstillinger og klik derefter på 'Næste'.
+- Opdateringstilstand -\n\nBekræft adresse(r) i URL-feltet. Tjek eventuelt dine indstillinger og klik derefter på 'Næste'.
 - Resume Mode (Interrupted Operation) -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
- Genoptag kopiering (hvis overførslen blev afbrudt) -\n\nBekræft webadresse(r) i URL-feltet. Kontroller eventuelt dine indstillinger og klik derefter på 'Næste'.
+- Genoptag kopiering (hvis overførslen blev afbrudt) -\n\nBekræft adresse(r) i URL-feltet. Tjek eventuelt dine indstillinger og klik derefter på 'Næste'.
 Log files Path
 Stinavn for logfil
 Path
 Sti
 - Links List Mode -\n\nUse URL box to enter address(es) of page(s) containing links to mirror
- Links liste -\n\nBrug URL-feltet til at angive adresse(r) på sider der indeholder links der skal kopieres.
+- Links liste -\n\nBrug URL-feltet til at angive adresse(r) på sider der indeholder links som skal spejlkopieres.
 New project / Import?
 Nyt projekt / Importér?
 Choose criterion
@@ -237,7 +239,7 @@ V
 Maximum link scanning depth
 Maksimal skanningsdybde for links
 Enter address(es) here
-Indtast webadresse(r) her
+Indtast adresse(r) her
 Define additional filtering rules
 Tilføj yderligere filtreringsregler
 Proxy Name (if needed)
@@ -261,31 +263,31 @@ Afslut WinHTTrack Website Copier
 About WinHTTrack
 Om WinHTTrack
 Save current preferences as default values
-Gem de nuværende indstillinger som standardindstillinger
+Gem de aktuelle præferencer som standardværdier
 Click to continue
 Klik for at fortsætte
 Click to define options
-Klik for at definere indstillinger
+Klik for at definere valgmuligheder
 Click to add a URL
-Klik for at tilføje URL
+Klik for at tilføje en URL
 Load URL(s) from text file
-Hent URL(er) fra tekstfil
+Indlæs URL(er) fra tekstfil
 WinHTTrack preferences (*.opt)|*.opt||
-WinHTTrack indstillinger (*.opt)|*.opt||
+WinHTTrack-præferencer (*.opt)|*.opt||
 Address List text file (*.txt)|*.txt||
 Adresseliste-tekstfil (*.txt)|*.txt||
 File not found!
 Filen blev ikke fundet!
 Do you really want to change the project name/path?
-Er du sikker på at ændre i projekt/sti-navnet ?
+Er du sikker på, at ændre i projekt/sti-navnet?
 Load user-default options?
-Indlæs brugerdefinerede standardindstillinger?
+Indlæs brugerdefinerede valgmuligheder?
 Save user-default options?
-Gem brugerdefinerede standardindstillinger?
+Gem brugerdefinerede valgmuligheder?
 Reset all default options?
-Nulstil alle standardindstillinger?
+Nulstil alle valgmuligheder?
 Welcome to WinHTTrack!
-Velkommen til WinHTTrack Website Copier!
+Velkommen til WinHTTrack!
 Action:
 Handling:
 Max Depth
@@ -293,7 +295,7 @@ Maksimal dybde:
 Maximum external depth:
 Maksimal ekstern dybde:
 Filters (refuse/accept links) :
-Filtrerings-regel (udeluk/medtag links) :
+Filtrerings-regel (udeluk/medtag links):
 Paths
 Sti
 Save prefs
@@ -301,23 +303,23 @@ Gem indstillinger
 Define..
 Angiv...
 Set options..
-Angiv indstillinger...
+Angiv valgmuligheder...
 Preferences and mirror options:
-Indstillinger og muligheder:
+Præferencer og spejlkopiering-valgmuligheder:
 Project name
 Projektnavn
 Add a URL...
 Tilføj URL...
 Web Addresses: (URL)
-Webadresse: (URL)
+Webadresser: (URL)
 Stop WinHTTrack?
 Stop WinHTTrack?
 No log files in %s!
-Der er ingen logfiler i %s!
+Der er ikke nogen logfiler i %s!
 Pause Download?
-Pause kopieringen?
+Sæt download på pause?
 Stop the mirroring operation
-Stop kopiering af websted?
+Stop spejlkopieringen?
 Minimize to System Tray
 Minimér til proceslinjen
 Click to skip a link or stop parsing
@@ -345,7 +347,7 @@ Informationer
 Files written:
 Filer skrevet:
 Files updated:
-Opdaterede filer:
+Filer opdateret:
 Errors:
 Fejl:
 In progress:
@@ -357,9 +359,9 @@ Test alle links p
 Try to ferret out all links
 Prøv at udvide alle links
 Download HTML files first (faster)
-Hent HTML-filer først (hurtigere)
+Download HTML-filer først (hurtigere)
 Choose local site structure
-Vælg lokal websted-struktur
+Vælg lokal sted-struktur
 Set user-defined structure on disk
 Sæt brugerdefinerede indstillinger for den lokale struktur
 Use a cache for updates and retries
@@ -367,9 +369,11 @@ Brug cache til opdateringer og opdateringsfors
 Do not update zero size or user-erased files
 Opdater ikke filer med nul-værdi eller filer som brugeren har slettet
 Create a Start Page
-Opret startside
+Opret en startside
 Create a word database of all html pages
-Opret ord-database fra alle html-sider
+Opret en ord-database af alle html-sider
+Build a complete RFC822 mail (MHT/EML) archive of the mirror
+Byg et komplet RFC822 mail (MHT/EML)-arkiv af spejlkopieringen
 Create error logging and report files
 Lav fejllog og rapport-filer
 Generate DOS 8-3 filenames ONLY
@@ -385,7 +389,7 @@ V
 Select global parsing direction
 Vælg overordnet overførselsretning
 Setup URL rewriting rules for internal links (downloaded ones) and external links (not downloaded ones)
-Opret URL-genskrivningsregel for interne links (downloadede links), og eksterne links (ikke downloadede)
+Opsæt URL-genskrivningsregel for interne links (downloadede links), og eksterne links (ikke downloadede)
 Max simultaneous connections
 Maks.antal samtidige forbindelser
 File timeout
@@ -403,11 +407,11 @@ Maksimal st
 Maximum size for any single non-HTML file
 Maksimal størrelse for ikke-HTML-filer
 Maximum amount of bytes to retrieve from the Web
-Maksimal antal byte der må hentes på Web
+Maksimal antal byte der modtages fra webbet
 Make a pause after downloading this amount of bytes
 Hold pause efter download af denne mængde byte
 Maximum duration time for the mirroring operation
-Maksimal varighed for kopieringen af websted
+Maksimal varighed for spejlkopieringen
 Maximum transfer rate
 Maksimal overførselshastighed
 Maximum connections/seconds (avoid server overload)
@@ -418,34 +422,40 @@ Browser identity
 Browser-identitet
 Comment to be placed in each HTML file
 Kommentarer der indsættes i alle HTML-filer
+Languages accepted by the browser
+Sprog som accepteres af browseren
+Additional HTTP headers to be sent in each requests
+Yderligere HTTP-headere som skal sendes i hver forespørgsel
+HTTP referer to be sent for initial URLs
+HTTP reference som skal sendes for indledende URL'er
 Back to starting page
 Tilbage til startsiden
 Save current preferences as default values
-Gem nuværende indstillinger som standardindstillinger
+Gem aktuelle præferencer som standardværdier
 Click to continue
 Klik for at fortsætte
 Click to cancel changes
 Klik for at annullere ændringerne
 Follow local robots rules on sites
-Følg lokale robot-regler på websteder
+Følg lokale robot-regler på steder
 Links to non-localised external pages will produce error pages
 Links til ikke-fundne eksterne sider, vil medføre fejlside(r)
 Do not erase obsolete files after update
-Slet ikke overflødige filer efter opdatering
+Slet ikke forældede filer efter opdatering
 Accept cookies?
 Acceptér cookies?
 Check document type when unknown?
-Kontroller dokumenttypen hvis ukendt?
+Tjek dokumenttypen hvis ukendt?
 Parse java applets to retrieve included files that must be downloaded?
 Overfør Java-applets sammen med inkluderede filer der skal downloades?
 Store all files in cache instead of HTML only
-Gem alle filer i cache fremfor kun HTML ?
+Opbevar alle filer i cache fremfor kun HTML?
 Log file type (if generated)
 Log filtype (hvis genereret)
 Maximum mirroring depth from root address
-Maksimal kopieringsdybde fra rod-adressen
+Maksimal spejlkopieringsdybde fra rod-adressen
 Maximum mirroring depth for external/forbidden addresses (0, that is, none, is the default)
-Maksimal kopieringsdybde for eksterne/forbudte adresser(0, altså ingen, er standard)
+Maksimal spejlkopieringsdybde for eksterne/forbudte adresser(0, altså ingen, er standard)
 Create a debugging file
 Opret en fejlfindings-fil
 Use non-standard requests to get round some server bugs
@@ -465,7 +475,7 @@ Hent ikke-HTML-filer relateret til et link, eksempelvis .ZIP -filer eller billed
 Test all links (even forbidden ones)
 Test alle links (også forbudte links)
 Try to catch all URLs (even in unknown tags/code)
-Forsøg at fange alle URL'er (også selvom html-tags eller kode er ukendt)
+Forsøg at fange alle URL'er (også i ukendte opmærkninger/kode)
 Get HTML files first!
 Hent HTML-filer først!
 Structure type (how links are saved)
@@ -473,11 +483,13 @@ Angiv struktur (hvordan links skal gemmes)
 Use a cache for updates
 Brug cache for opdateringer
 Do not re-download locally erased files
-Hent ikke filer der er slettet lokalt
+Download ikke filer igen der er slettet lokalt
 Make an index
 Opret et indeks
 Make a word database
 Opret en ord-database
+Build a mail archive
+Byg et mail-arkiv
 Log files
 Logfiler
 DOS names (8+3)
@@ -493,7 +505,7 @@ S
 Global travel mode
 Global søgemetode
 These options should be modified only exceptionally
-Disse indstillinger bør kun ændres undtagelsesvist!
+Disse valgmuligheder bør kun ændres undtagelsesvist
 Activate Debugging Mode (winhttrack.log)
 Aktivér fejlfindingstilstand (winhttrack.log)
 Rewrite links: internal / external
@@ -506,6 +518,12 @@ Identity
 Identitet
 HTML footer
 HTML-sidefod
+Languages
+Languages
+Additional HTTP Headers
+Yderligere HTTP Headere
+Default referer URL
+Standard reference URL
 N# connections
 Antal forbindelser
 Abandon host if error
@@ -533,7 +551,7 @@ Maksimal st
 Max size of any non-HTML file
 Maksimal størrelse for ikke-HTML-filer
 Max site size
-Maksimal størrelse af websted
+Maksimal størrelse af sted
 Max time
 Maksimal tid
 Save prefs
@@ -549,11 +567,11 @@ Slet ikke gamle filer
 Accept cookies
 Acceptér cookies
 Check document type
-Kontroller dokumenttypen
+Tjek dokumenttypen
 Parse java files
 Overfør Java-filer
 Store ALL files in cache
-Gem alle filer i cache
+Opbevar alle filer i cache
 Tolerant requests (for servers)
 Acceptér forespørgsler (for servere)
 Update hack (limit re-transfers)
@@ -595,21 +613,21 @@ Proxy
 MIME Types
 MIME-typer
 Do you really want to quit WinHTTrack Website Copier?
-Vil du afslutte WinHTTrack Website Copier?
+Er du sikker på, at du vil afslutte WinHTTrack Website Copier?
 Do not connect to a provider (already connected)
 Opret ikke forbindelse til en udbyder (er allerede forbundet)
 Do not use remote access connection
 Brug ikke en fjernadgangsforbindelse
 Schedule the mirroring operation
-Planlæg kopieringen
+Planlæg spejlkopieringen
 Quit WinHTTrack Website Copier
 Afslut WinHTTrack Website Copier
 Back to starting page
 Tilbage til startsiden
 Click to start!
-Klik for at starte
+Klik for at starte!
 No saved password for this connection!
-Der er ikke gemt en adgangskode for denne forbindelse
+Der er ikke gemt en adgangskode for denne forbindelse!
 Can not get remote connection settings
 Kan ikke hente fjernforbindelsesindstillinger
 Select a connection provider
@@ -617,13 +635,13 @@ V
 Start
 Start
 Please adjust connection parameters if necessary,\nthen press FINISH to launch the mirroring operation.
-Justér venligst forbindelsesparameterne hvis det er nødvendigt.\nKlik på Udfør for at starte kopieringen.
+Justér venligst forbindelsesparameterne hvis det er nødvendigt.\nKlik på UDFØR for at starte spejlkopieringen.
 Save settings only, do not launch download now.
 Gem indstillingerne, men start ikke download endnu.
 On hold
 På hold
 Transfer scheduled for: (hh/mm/ss)
-Overførslen planlagt til: (tt/mm/ss)
+Overførsel planlagt til: (tt/mm/ss)
 Start
 Start
 Connect to provider (RAS)
@@ -657,9 +675,9 @@ Ignorer dom
 Catch this page only
 Gem kun denne side
 Mirror site
-Kopiér websted
+Spejlkopiér sted
 Mirror domain
-Kopiér domæne
+Spejlkopiér domæne
 Ignore all
 Ignorer alt
 Wizard query
@@ -669,7 +687,7 @@ Nej
 File
 Fil
 Options
-Indstillinger
+Valgmuligheder
 Log
 Log
 Window
@@ -681,7 +699,7 @@ Pause overf
 Exit
 Afslut
 Modify options
-Rediger indstillinger
+Rediger valgmuligheder
 View log
 Vis log
 View error log
@@ -703,9 +721,9 @@ S&plit
 File
 Filer
 Preferences
-Indstillinger
+Præferencer
 Mirror
-Kopiér websted
+Spejlkopiér
 Log
 Log
 Window
@@ -715,15 +733,15 @@ Hj
 Exit
 Afslut
 Load default options
-Indlæs standardindstillinger
+Indlæs standard-valgmuligheder
 Save default options
-Gem standardindstillinger
+Gem standard-valgmuligheder
 Reset to default options
-Nulstil standardindstillinger
+Nulstil standard-valgmuligheder
 Load options...
-Indlæs indstillinger...
+Indlæs valgmuligheder...
 Save options as...
-Gem indstillinger som...
+Gem valgmuligheder som...
 Language preference...
 Foretrukne sprog...
 Contents...
@@ -741,13 +759,13 @@ Gem &som...
 &Delete...
 &Slet...
 &Browse sites...
-&Gennemse websteder...
+&Gennemse steder...
 User-defined structure
 Brugerdefineret struktur
 %n\tName of file without file type (ex: image)\r\n%N\tName of file including file type (ex: image.gif)\r\n%t\tFile type only (ex: gif)\r\n%p\tPath [without ending /] (ex: /someimages)\r\n%h\tHost name (ex: www.someweb.com)\r\n%M\tMD5 URL (128 bits, 32 ascii bytes)\r\n%Q\tMD5 query string (128 bits, 32 ascii bytes)\r\n%q\tMD5 small query string (16 bits, 4 ascii bytes)\r\n\r\n%s?\tShort name (ex: %sN)
 %n\tFilnavn uden type(eks: image)\r\n%N\tHele filnavnet inklusive filtype (eks: billede.gif)\r\n%t\tKun filtype (eks: gif)\r\n%p\tSti [uden endelsen /] (eks: /noglebilleder)\r\n%h\tVærts navn (eks: www.eksempel.dk)\r\n%M\tMD5 URL (128 bit, 32 ascii byte)\r\n%Q\tMD5 forespørgsel streng (128 bit, 32 ascii byte)\r\n%q\tMD5 kort forespørgselsstreng (16 bit, 4 ascii byte)\r\n\r\n%s?\tKort navn (eks: %sN)
 Example:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.someweb.com\\someimages\\image.gif
-Eksempel:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.eksempel.dk\\noglebilleder\\billede.gif
+Eksempel:\t%h%p/%n%q.%t\n->\t\tc:\\spejlkopiering\\www.eksempel.dk\\noglebilleder\\billede.gif
 Proxy settings
 Proxy-indstillinger
 Proxy address:
@@ -777,7 +795,7 @@ V
 Click here to select path
 Klik her for at vælge en stil
 Select or create a new category name, to sort your mirrors in categories
-Vælg eller opret et nyt kategorinavn, for at sortere dine kopierede websteder i kategorier
+Vælg eller opret et nyt kategorinavn, for at sortere dine spejlkopieringer i kategorier
 HTTrack Project Wizard...
 HTTrack-projektguide...
 New project name:
@@ -813,9 +831,9 @@ Fang URL...
 Enter URL address(es) here
 Indtast URL-adresse(r) her
 Enter site login
-Indtast websted-brugernavn
+Indtast sted-brugernavn
 Enter site password
-Indtast websted-adgangskode
+Indtast sted-adgangskode
 Use this capture tool for links that can only be accessed through forms or javascript code
 Brug dette værktøj til at 'fange' links der kun kan opnås adgang til via formularer eller JavaScript-kode
 Choose language according to preference
@@ -823,7 +841,7 @@ V
 Catch URL!
 'Fang' URL!
 Please set temporary browser proxy settings to the following values (Copy/Paste Proxy Address and Port).\nThen click on the Form SUBMIT button in your browser page, or click on the specific link you want to capture.
-Sæt venligst browserens proxy indstillinger til følgende værdier:(Kopiér/Indsæt proxy-adresse og port).\nKlik på  Form SUBMIT knappen på din browser-side,  eller klik på specifikke link du ønsker at hente.\r\n\r\n
+Sæt venligst browserens proxy indstillinger til følgende værdier:(Kopiér/Indsæt proxy-adresse og port).\nKlik på formularens SUBMIT-knap på din browser-side, eller klik på det specifikke link du ønsker at hente.\r\n\r\n
 This will send the desired link from your browser to WinHTTrack.
 Dette vil sende det ønskede link fra din browser til WinHTTrack.
 ABORT
@@ -843,11 +861,11 @@ Tr
 Please drag folders only
 Træk kun mapper
 Select user-defined structure?
-Vælg brugerdefineret struktur ?
+Vælg brugerdefineret struktur?
 Please ensure that the user-defined-string is correct,\notherwise filenames will be bogus!
-Vær sikker på at den brugerdefinerede streng er korrekt\nI modsat fald vil filnavnene være ugyldige!
+Vær sikker på, at den brugerdefinerede streng er korrekt\nI modsat fald vil filnavnene være ugyldige!
 Do you really want to use a user-defined structure?
-Er du sikker på at ville bruge en brugerdefineret struktur ?
+Er du sikker på, at ville bruge en brugerdefineret struktur?
 Too manu URLs, cannot handle so many links!!
 For mange URL' er, WinHTTrack kan ikke håndtere så mange links!!!
 Not enough memory, fatal internal error..
@@ -857,7 +875,7 @@ Ukendt handling!
 Add this URL?\r\n
 Tilføj denne URL?\r\n
 Warning: main process is still not responding, cannot add URL(s)..
-Advarsel:  Processen svarer stadigvæk ikke ,URL'en kan ikke tilføjes...
+Advarsel: hovedprocessen svarer stadigvæk ikke, URL'en kan ikke tilføjes...
 Type/MIME associations
 Type/MIME-tilknytning
 File types:
@@ -879,19 +897,19 @@ Frys vindue
 More information:
 Mere information
 Welcome to WinHTTrack Website Copier!\n\nPlease click on the NEXT button to\n\n- start a new project\n- or resume a partial download
-Velkommen til WinHTTrack Website Copier!\n\nKlik på Næste for at for at\n\n-starte et nyt projekt\n-eller genoptage et delvist download.
+Velkommen til WinHTTrack Website Copier!\n\nKlik på Næste for at for at\n\n- starte et nyt projekt\n- eller genoptage et delvist download.
 File names with extension:\nFile names containing:\nThis file name:\nFolder names containing:\nThis folder name:\nLinks on this domain:\nLinks on domains containing:\nLinks from this host:\nLinks containing:\nThis link:\nALL LINKS
 Filnavne med 'efternavn':\nFilnavne der indeholder:\nDette filnavn:\nMappenavne der indeholder:\nDette mappenavn:\nLinks på dette domæne:\nLinks på dette domæne der indeholder:\nLinks fra denne vært:\nLinks der indeholder:\nDette Link:\nAlle Links*/
 Show all\nHide debug\nHide infos\nHide debug and infos
 Vis alle\nSkjul fejlfinding\nSkjul information\nSkjul fejlfinding og information
 Site-structure (default)\nHtml in web/,       images/other files in web/images/\nHtml in web/html,   images/other in web/images\nHtml in web/,       images/other in web/\nHtml in web/,       images/other in web/xxx, where xxx is the file extension\nHtml in web/html,   images/other in web/xxx\nSite-structure, without www.domain.xxx/\nHtml in site_name/, images/other files in site_name/images/\nHtml in site_name/html, images/other in site_name/images\nHtml in site_name/, images/other in site_name/\nHtml in site_name/, images/other in site_name/xxx\nHtml in site_name/html, images/other in site_name/xxx\nAll files in web/, with random names (gadget !)\nAll files in site_name/, with random names (gadget !)\nUser-defined structure..
-Websted-struktur (standard)\nHtml i web/,       images/other-filer i web/images/\nHtml i web/html,   images/other i web/images\nHtml i web/,       images/other i web/\nHtml i web/,       images/other i web/xxx, hvor xxx er filendelsen\nHtml i web/html,   images/other i web/xxx\nWebsted-struktur, uden www.domæne.xxx/\nHtml i webstednavn/, images/other-filer i webstednavn/images/\nHtml i webstednavn/html, images/other i webstednavn/images\nHtml i webstednavn/, images/other i webstednavn/\nHtml i webstednavn/, images/other i webstednavn/xxx\nHtml i webstednavn/html, images/other i webstednavn/xxx\nAlle filer in web/, med tilfældige navne (gadget !)\nAlle filer i webstednavn/, med tilfældige navne (gadget !)\nBrugerdefineret struktur...
+Sted-struktur (standard)\nHtml i web/,       images/other-filer i web/images/\nHtml i web/html,   images/other i web/images\nHtml i web/,       images/other i web/\nHtml i web/,       images/other i web/xxx, hvor xxx er filendelsen\nHtml i web/html,   images/other i web/xxx\nWebsted-struktur, uden www.domæne.xxx/\nHtml i webstednavn/, images/other-filer i webstednavn/images/\nHtml i webstednavn/html, images/other i webstednavn/images\nHtml i webstednavn/, images/other i webstednavn/\nHtml i webstednavn/, images/other i webstednavn/xxx\nHtml i webstednavn/html, images/other i webstednavn/xxx\nAlle filer in web/, med tilfældige navne (gadget !)\nAlle filer i webstednavn/, med tilfældige navne (gadget !)\nBrugerdefineret struktur...
 Just scan\nStore html files\nStore non html files\nStore all files (default)\nStore html files first
-ust skan\nGem html-filer\nGem ikke-html-filer\nGem alle filer (standard)\nGem html-filer først
+ust skan\nOpbevar html-filer\nGem ikke-html-filer\nGem alle filer (standard)\nGem html-filer først
 Stay in the same directory\nCan go down (default)\nCan go up\nCan both go up & down
 Bliv i det samme bibliotek\nKan gå ned (standard]\nKan gå op\nKan gå både op og ned
 Stay on the same address (default)\nStay on the same domain\nStay on the same top level domain\nGo everywhere on the web
-Bliv på den samme adresse[standard]\nBliv på på samme domæne\nBliv på samme top level domæne\n Gå overalt på internettet.
+Bliv på den samme adresse (standard)\nBliv på det samme domæne\nBliv på det samme top-level-domæne\nGå overalt på webbet.
 Never\nIf unknown (except /)\nIf unknown
 Aldrig\nUkendt (undtaget /]\nhvis ukendt
 no robots.txt rules\nrobots.txt except wizard\nfollow robots.txt rules
@@ -899,7 +917,7 @@ Ingen robots.txt-regler\nrobots.txt med undtagelse af guiden\nf
 normal\nextended\ndebug
 Normal\nUdvidet\nFejlfinding
 Download web site(s)\nDownload web site(s) + questions\nGet individual files\nDownload all sites in pages (multiple mirror)\nTest links in pages (bookmark test)\n* Continue interrupted download\n* Update existing download
-Download websted(er)\nDownload websted(er) + spørgsmål\nHent enkelte filer\nDownload alle websteder på sider (flere kopieret websteder)\nTest links på siderne (bogmærke test)\n* Fortsæt afbrudt projekt\n* Opdater tidligere projekt
+Download websted(er)\nDownload websted(er) + spørgsmål\nHent enkelte filer\nDownload alle steder på sider (flere spejlkopiering)\nTest links på siderne (bogmærke test)\n* Fortsæt afbrudt projekt\n* Opdater tidligere projekt
 Relative URI / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
 Relativ URL / absolut URL (standard)\nAbsolut URL / absolut URL\nAbsolut URL / absolut URL\nOriginal URL / original URL
 Open Source offline browser
@@ -927,4 +945,34 @@ Du kan nu lukke vinduet
 Server terminated
 Server lukket
 A fatal error has occurred during this mirror
-Det opstod en fatal fejl under kopieringen
+Det opstod en fatal fejl under denne spejlkopiering
+View Documentation
+Vis dokumentation
+Go To HTTrack Website
+Gå til HTTrack website
+Go To HTTrack Forum
+Gå til HTTrack forum
+View License
+Vis licens
+Beware: you local browser might be unable to browse files with embedded filenames
+OBS: din lokale browser er måske ikke i stand til at browse filer med indlejrede filnavne
+Recreated HTTrack internal cached resources
+Genskabte HTTrack internt mellemlagret ressourcer
+Could not create internal cached resources
+Kunne ikke oprette internt mellemlagret ressourcer
+Could not get the system external storage directory
+Kunne ikke hente systemets eksterne lagringsmappe
+Could not write to:
+Kunne ikke skrive til:
+Read-only media (SDCARD)
+Skrivebeskyttet medie (SDCARD)
+No storage media (SDCARD)
+Intet lagringsmedie (SDCARD)
+HTTrack may not be able to download websites until this problem is fixed
+HTTrack er måske ikke i stand til at downloade websteder før dette problem er rettet
+HTTrack: mirror '%s' stopped!
+HTTrack: spejlkopiering '%s' stoppet!
+Click on this notification to restart the interrupted mirror
+Klik på denne notifikation for at genstarte den afbrudte spejlkopiering
+HTTrack: could not save profile for '%s'!
+HTTrack: kunne ikke gemme profil for '%s'!
--- a/lang/Russian.txt
+++ b/lang/Russian.txt
@@ -23,7 +23,7 @@ Cancel changes
 Click to confirm
 Ïîäòâåðäèòü
 Click to get help!
-Ïîëó÷èòü ñïðàâêó
+Ñïðàâêà
 Click to return to previous screen
 Âåðíóòüñÿ íàçàä
 Click to go to next screen
@@ -39,9 +39,9 @@ Delete this project?
 Delete empty project %s?
 Óäàëèòü ïóñòîé ïðîåêò %s?
 Action not yet implemented
-Ïîêà íå ðåàëèçîâàíî
+Äåéñòâèå íå ðåàëèçîâàíî
 Error deleting this project
-Îøèáêà óäàëåíèÿ ïðîåêòà
+Îøèáêà óäàëåíèÿ ýòîãî ïðîåêòà
 Select a rule for the filter
 Âûáðàòü òèï ôèëüòðà
 Enter keywords for the filter
@@ -51,11 +51,11 @@ Cancel
 Add this rule
 Äîáàâèòü ýòî óñëîâèå
 Please enter one or several keyword(s) for the rule
-Ââåäèòå çíà÷åíèÿ óñëîâèé ôèëüòðà
+Ââåäèòå îäíî èëè íåñêîëüêî çíà÷åíèé óñëîâèé ôèëüòðà
 Add Scan Rule
 Äîáàâèòü ôèëüòð
 Criterion
-Âûáðàòü òèï:
+Âûáðàòü êðèòåðèè:
 String
 Ââåñòè çíà÷åíèå:
 Add
@@ -63,19 +63,19 @@ Add
 Scan Rules
 Ôèëüòðû
 Use wildcards to exclude or include URLs or links.\nYou can put several scan strings on the same line.\nUse spaces as separators.\n\nExample: +*.zip -www.*.com -www.*.edu/cgi-bin/*.cgi
-Èñïîëüçóÿ ìàñêè âû ìîæåòå èñêëþ÷èòü/âêëþ÷èòü ñðàçó íåñêîëüêî àäðåñîâ\nÊàê ðàçäåëèòåëü ôèëüòðîâ èñïîëüçóéòå çàïÿòûå èëè ïðîáåëû.\nÏðèìåð: +*.zip -www.*.com,-www.*.edu/cgi-bin/*.cgi
+Èñïîëüçóÿ ìàñêè âû ìîæåòå èñêëþ÷èòü/âêëþ÷èòü ñðàçó íåñêîëüêî àäðåñîâ èëè ññûëîê.\nÊàê ðàçäåëèòåëü ôèëüòðîâ èñïîëüçóéòå çàïÿòûå èëè ïðîáåëû.\nÏðèìåð: +*.zip -www.*.com,-www.*.edu/cgi-bin/*.cgi
 Exclude links
-Èñêëþ÷èòü...
+Èñêëþ÷èòü
 Include link(s)
-Âêëþ÷èòü...
+Âêëþ÷èòü
 Tip: To have ALL GIF files included, use something like +www.someweb.com/*.gif. \n(+*.gif / -*.gif will include/exclude ALL GIFs from ALL sites)
-Ñîâåò: Åñëè âû õîòèòå ñêà÷àòü âñå gif-ôàéëû, èñïîëüçóéòå, íàïðèìåð, òàêîé ôèëüòð +www.someweb.com/*.gif. \n(+*.gif / -*.gif ðàçðåøàåò/çàïðåùàåò äëÿ ñêà÷èâàíèÿ ÂÑÅ gif-ôàéëû íà ÂÑÅÕ ñàéòàõ)
+Ñîâåò: Êàê ïðèìåð åñëè âû õîòèòå ñêà÷àòü âñå âêëþ÷åííûå gif-ôàéëû, èñïîëüçóéòå òàêîé ôèëüòð +www.someweb.com/*.gif. \n(+*.gif / -*.gif ðàçðåøàåò/çàïðåùàåò äëÿ ñêà÷èâàíèÿ ÂÑÅ gif-ôàéëû íà ÂÑÅÕ ñàéòàõ)
 Save prefs
 Ñîõðàíèòü íàñòðîéêè
 Matching links will be excluded:
-Ëèíêè, óäîâëåòâîðÿþùèå ýòîìó óñëîâèþ áóäóò èñêëþ÷åíû:
+Ññûëêè ïîäõîäÿùèå ïîä ýòî óñëîâèå áóäóò èñêëþ÷åíû:
 Matching links will be included:
-Ëèíêè, óäîâëåòâîðÿþùèå ýòîìó óñëîâèþ áóäóò âêëþ÷åíû:
+Ññûëêè ïîäõîäÿùèå ïîä ýòî óñëîâèå áóäóò âêëþ÷åíû:
 Example:
 Ïðèìåð:
 gif\r\nWill match all GIF files
@@ -83,9 +83,9 @@ gif\r\n
 blue\r\nWill find all files with a matching 'blue' sub-string such as 'bluesky-small.jpeg'
 blue\r\nÎòëîâèò âñå ôàéëû, ñîäåðæàùèå â èìåíè ïîäñòðîêó 'blue', íàïðèìåð 'bluesky-small.jpeg'
 bigfile.mov\r\nWill match the file 'bigfile.mov', but not 'bigfile2.mov'
-bigfile.mov\r\nÎòëîâèò ôàéë 'bigfile.mov', íî, â òîæå âðåìÿ, ïðîïóñòèò ôàéë 'bigfile2.mov'
+bigfile.mov\r\nÎòëîâèò ôàéë 'bigfile.mov', íî, â òî æå âðåìÿ, ïðîïóñòèò ôàéë 'bigfile2.mov'
 cgi\r\nWill find links with folder name matching sub-string 'cgi' such as /cgi-bin/somecgi.cgi
-cgi\r\nÎòëîâèò àäðåñà, ñîäåðæàùèå êàòàëîãè ñ ïîäñòðîêîé 'cgi', òàêèå êàê /cgi-bin/somecgi.cgi
+cgi\r\nÎòëîâèò àäðåñà, ñîäåðæàùèå êàòàëîãè ñ ïîäñòðîêîé 'cgi', òàêèå, êàê /cgi-bin/somecgi.cgi
 cgi-bin\r\nWill find links with folder name matching whole 'cgi-bin' string (but not cgi-bin-2, for example)
 cgi-bin\r\nÎòëîâèò àäðåñà, ñîäåðæàùèå êàòàëîã 'cgi-bin' (íî íå cgi-bin-2, íàïðèìåð)
 someweb.com\r\nWill find links with matching sub-string such as www.someweb.com, private.someweb.com etc.
@@ -109,7 +109,7 @@ Existing filters
 Cancel changes
 Îòìåíèòü èçìåíåíèÿ
 Save current preferences as default values
-Ñîõðàíèòü òåêóùèå íàñòðîéêè êàê çíà÷åíèÿ ïî óìîë÷àíèþ
+Ñîõðàíèòü òåêóùèå èçìåíåíèÿ êàê ïî óìîë÷àíèþ
 Click to confirm
 Ïîäòâåðäèòü
 No log files in %s!
@@ -117,7 +117,7 @@ No log files in %s!
 No 'index.html' file in %s!
 Îòñóòñòâóåò ôàéë index.html â %s!
 Click to quit WinHTTrack Website Copier
-Âûéòè èç ïðîãðàììû WinHTTrack Website Copier
+Âûéòè èç ïðîãðàììû
 View log files
 Ïðîñìîòð ëîã ôàéëîâ
 Browse HTML start page
@@ -181,7 +181,7 @@ Parsing HTML file (testing links)..
 Pause - Toggle [Mirror]/[Pause download] to resume operation
 Îñòàíîâëåíî (äëÿ ïðîäîëæåíèÿ âûáåðèòå [Çåðêàëî]/[Ïðèîñòàíîâèòü çàêà÷êó])
 Finishing pending transfers - Select [Cancel] to stop now!
-Çàâåðøàþòñÿ îòëîæåííûå çàêà÷êè - ÷òîáû ïðåðâàòü, íàæìèòå Cancel!
+Çàâåðøàþòñÿ îòëîæåííûå çàêà÷êè — ÷òîáû ïðåðâàòü, íàæìèòå Cancel!
 scanning
 ñêàíèðóåì
 Waiting for scheduled time..
@@ -205,11 +205,11 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * ÇÀÊÀ×ÊÀ ÏÐÅÐÂÀÍÀ! * *\r\nÂðåìåííûé êýø, ñîçäàííûé âî âðåìÿ òåêóùåé ñåññèé, ñîäåðæèò äàííûå, çàãðóæåííûå òîëüêî âî âðåìÿ äàííîé ñåññèè è ïîòðåáóåòñÿ òîëüêî â ñëó÷àå âîçîáíîâëåíèÿ çàêà÷êè.\r\nÎäíàêî, ïðåäûäóùèé êýø ìîæåò ñîäåðæàòü áîëåå ïîëíóþ èíôîðìàöèþ. Åñëè âû íå õîòèòå ïîòåðÿòü ýòè äàííûå, âàì íóæíî óäàëèòü òåêóùèé êýø è âîçîáíîâèòü ïðåäûäóùèé.\r\n(Ýòî ìîæíî ëåãêî ñäåëàòü ïðÿìî çäåñü, óäàëèâ ôàéëû hts-cache/new.]\r\n\r\nÑ÷èòàåòå ëè âû, ÷òî ïðåäûäóùèé êýø ìîæåò ñîäåðæàòü áîëåå ïîëíóþ èíôîðìàöèþ, è õîòèòå ëè âû âîññòàíîâèòü åãî?
 * * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * ÎØÈÁÊÀ! * *\r\nÒåêóùåå çåðêàëî - ïóñòî. Åñëè ýòî áûëî îáíîâëåíèå, ïðåäûäóùàÿ âåðñèÿ çåðêàëà âîññòàíîâëåíà.\r\nÏðè÷èíà: ïåðâàÿ ñòðàíèöà(û) èëè íå íàéäåíà, èëè áûëè ïðîáëåìû ñ ñîåäèíåíèåì.\r\n=> Óáåäèòåñü, ÷òî âåáñàéò âñå åùå ñóùåñòâóåò, è/èëè ïðîâåðüòå óñòàíîâêè ïðîêñè-ñåðâåðà! <=
+* * ÎØÈÁÊÀ! * *\r\nÒåêóùåå çåðêàëî — ïóñòî. Åñëè ýòî áûëî îáíîâëåíèå, ïðåäûäóùàÿ âåðñèÿ çåðêàëà âîññòàíîâëåíà.\r\nÏðè÷èíà: ïåðâàÿ ñòðàíèöà(û) èëè íå íàéäåíà, èëè áûëè ïðîáëåìû ñ ñîåäèíåíèåì.\r\n=> Óáåäèòåñü, ÷òî âåáñàéò âñå åùå ñóùåñòâóåò, è/èëè ïðîâåðüòå óñòàíîâêè ïðîêñè-ñåðâåðà! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \nÏîäñêàçêà: Äëÿ ïðîñìîòðà ñîîáùåíèé îá îøèáêàõ è ïðåäóïðåæäåíèé íàæìèòå [Ïðîñìîòð ëîã ôàéëà]
 Error deleting a hts-cache/new.* file, please do it manually
-Îøèáêà óäàëåíèÿ ôàéëà hts-cache/new.* , ïîæàëóéñòà, óäàëèòå åãî âðó÷íóþ.\r\n
+Îøèáêà óäàëåíèÿ ôàéëà hts-cache/new.*\r\nÏîæàëóéñòà, óäàëèòå ôàéë âðó÷íóþ.\r\n
 Do you really want to quit WinHTTrack Website Copier?
 Âû äåéñòâèòåëüíî õîòèòå âûéòè èç WinHTTrack?
 - Mirroring Mode -\n\nEnter address(es) in URL box
@@ -319,7 +319,7 @@ Pause Download?
 Stop the mirroring operation
 Ïðåðâàòü çàêà÷êó
 Minimize to System Tray
-Ñïðÿòàòü â ñèñòåìíûé òðýé
+Ñïðÿòàòü â ñèñòåìíûé òðåé
 Click to skip a link or stop parsing
 Ïðîïóñòèòü ëèíê èëè ïðåðâàòü àíàëèç ôàéëà
 Click to skip a link
@@ -327,7 +327,7 @@ Click to skip a link
 Bytes saved
 Ñîõðàíåíî áàéò:
 Links scanned
-Ïðîñêàíèðîâàíî ëèíêîâ:
+Ïðîñêàíèðîâàíî ññûëîê:
 Time:
 Âðåìÿ:
 Connections:
@@ -363,7 +363,7 @@ Choose local site structure
 Set user-defined structure on disk
 Óñòàíîâèòü çàäàííóþ ëîêàëüíóþ ñòðóêòóðó ñàéòà
 Use a cache for updates and retries
-Èñïîëüçîâàòü êýø äëÿ îáíîâëåíèÿ è äîêà÷êè
+Èñïîëüçîâàòü êýø äëÿ îáíîâëåíèÿ è ïîâòîðîâ ñêà÷èâàíèÿ
 Do not update zero size or user-erased files
 Íå êà÷àòü ôàéëû, êîòîðûå áûëè îäíàæäû ñêà÷àíû, äàæå åñëè îíè íóëåâîé äëèíû èëè óäàëåíû
 Create a Start Page
@@ -407,7 +407,7 @@ Maximum amount of bytes to retrieve from the Web
 Make a pause after downloading this amount of bytes
 Ïîñëå çàãðóçêè óêàçàííîãî ÷èñëà áàéòîâ, ñäåëàòü ïàóçó
 Maximum duration time for the mirroring operation
-Ìàêñ. ïðîäîëæèòåëüíîñòü çåðêàëèçàöèè
+Ìàêñ. ïðîäîëæèòåëüíîñòü ïðîöåññà ñîçäàíèÿ çåðêàë
 Maximum transfer rate
 Ìàêñ. ñêîðîñòü çàêà÷êè
 Maximum connections/seconds (avoid server overload)
@@ -445,7 +445,7 @@ Log file type (if generated)
 Maximum mirroring depth from root address
 Ìàêñ. ãëóáèíà ñîçäàíèÿ çåðêàëà îò íà÷àëüíîãî àäðåñà
 Maximum mirroring depth for external/forbidden addresses (0, that is, none, is the default)
-Ìàêñèìàëüíàÿ ãëóáèíà çàêà÷êè äëÿ âíåøíèõ/çàïðåùåííûõ àäðåñîâ (0, ò.å., íåò îãðàíè÷åíèé, ýòî çíà÷åíèå ïîóìîë÷àíèþ)
+Ìàêñèìàëüíàÿ ãëóáèíà çàêà÷êè äëÿ âíåøíèõ/çàïðåùåííûõ àäðåñîâ (0, ò.å., íåò îãðàíè÷åíèé, ýòî çíà÷åíèå ïî óìîë÷àíèþ)
 Create a debugging file
 Ñîçäàòü ôàéë ñ îòëàäî÷íîé èíôîðìàöèåé
 Use non-standard requests to get round some server bugs
@@ -453,19 +453,19 @@ Use non-standard requests to get round some server bugs
 Use old HTTP/1.0 requests (limits engine power!)
 Èñïîëüçîâàòü ñòàðûé ïðîòîêîë HTTP/1.0 (îãðàíè÷èò âîçìîæíîñòè ïðîãðàììû!)
 Attempt to limit retransfers through several tricks (file size test..)
-Ïîïûòêà îãðàíè÷èòü ïåðåêà÷êó èñïîëüóÿ íåêîòîðûå ïðèåìû (òåñò íà ðàçìåð ôàéëà..)
+Ïîïûòêà îãðàíè÷èòü ïåðåêà÷êó èñïîëüçóÿ íåêîòîðûå ïðèåìû (òåñò íà ðàçìåð ôàéëà..)
 Attempt to limit the number of links by skipping similar URLs (www.foo.com==foo.com, http=https ..)
 Îãðàíè÷èòü ÷èñëî ëèíêîâ, óäàëÿÿ àíàëîãè÷íûå ëèíêè (www.foo.com==foo.com, http=https ..)
 Write external links without login/password
 Ñîõðàíÿòü âíåøíèå ëèíêè áåç ëîãèíà/ïàðîëÿ
 Write internal links without query string
-Ñîõðàíÿòü âíóòðåííèå ëèíêè óñå÷åííî (äî çàíàêà ?)
+Ñîõðàíÿòü âíóòðåííèå ëèíêè óñå÷åííî (äî çíàêà ?)
 Get non-HTML files related to a link, eg external .ZIP or pictures
 Êà÷àòü íå-html ôàéëû âáëèçè ññûëêè (íàïð.: âíåøíèå .ZIP èëè ãðàô. ôàéëû)
 Test all links (even forbidden ones)
 Ïðîâåðÿòü âñå ëèíêè (äàæå çàïðåùåííûå ê çàêà÷êå)
 Try to catch all URLs (even in unknown tags/code)
-Ñòàðàòüñÿ îïðåäåëÿòü âñå URL'û (äàæå â íåîïîçíàííûõ òýãàõ/ñêðèïòàõ)
+Ñòàðàòüñÿ îïðåäåëÿòü âñå URL'û (äàæå â íåîïîçíàííûõ òåãàõ/ñêðèïòàõ)
 Get HTML files first!
 Ïîëó÷èòü âíà÷àëå HTML ôàéëû!
 Structure type (how links are saved)
@@ -599,7 +599,7 @@ Do you really want to quit WinHTTrack Website Copier?
 Do not connect to a provider (already connected)
 Íå ñîåäèíÿòüñÿ ñ ïðîâàéäåðîì (ñîåäèíåíèå óæå óñòàíîâëåíî)
 Do not use remote access connection
-Íå èñïîüçîâàòü óäàëåííîé ñîåäèíåíèÿ
+Íå èñïîëüçîâàòü óäàëåííîé ñîåäèíåíèÿ
 Schedule the mirroring operation
 Çàêà÷êà ïî ðàñïèñàíèþ
 Quit WinHTTrack Website Copier
@@ -633,9 +633,9 @@ Connect to this provider
 Disconnect when finished
 Îòñîåäèíèòüñÿ ïðè çàâåðøåíèè
 Disconnect modem on completion
-Îòñîåäåíèòü ïðè çàâåðøåíèè
+Îòñîåäèíèòü ïðè çàâåðøåíèè
 \r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Ñîîáùèòå íàì ïîæàëóéñòà î çàìå÷åííûõ ïðîáëåìàõ è îøèáêàõ)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÊà÷àëêà (spider): Xavier Roche\r\nÏàðñåð ÿâà-êëàññîâ: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Russian translations to:\r\nAndrei Iliev (andreiiliev@mail.ru)
+\r\n(Ñîîáùèòå íàì, ïîæàëóéñòà, î çàìå÷åííûõ ïðîáëåìàõ è îøèáêàõ)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÊà÷àëêà (spider): Xavier Roche\r\nÏàðñåð ÿâà-êëàññîâ: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Russian translations to:\r\nAndrei Iliev (andreiiliev@mail.ru)
 About WinHTTrack Website Copier
 Î ïðîãðàììå WinHTTrack Website Copier
 Please visit our Web page
@@ -657,9 +657,9 @@ Ignore domain
 Catch this page only
 Ñêà÷àòü òîëüêî ýòó ñòðàíè÷êó
 Mirror site
-Çåðêàëèçîâàòü ñàéò
+Ñäåëàòü çåðêàëî ñàéòó
 Mirror domain
-Çåðêàëèçîâàòü äîìåí
+Ñäåëàòü çåðêàëî äîìåíó
 Ignore all
 Èãíîðèðîâàòü âñå
 Wizard query
@@ -693,9 +693,9 @@ Hide
 About WinHTTrack Website Copier
 Î ïðîãðàììå...
 Check program updates...
-Ïðîâåðèòü íàëè÷èå îáíîâëåííèé ïðîãðàììû...
+Ïðîâåðèòü íàëè÷èå îáíîâëåíèé ïðîãðàììû...
 &Toolbar
-Ïàíåëü èíñòðóïåíòîâ
+Ïàíåëü èíñòðóìåíòîâ
 &Status Bar
 Ïàíåëü ñîñòîÿíèÿ
 S&plit
--- a/libtest/Makefile.am
+++ b/libtest/Makefile.am
@@ -14,9 +14,13 @@ AM_CPPFLAGS = \
 	-DLIBDIR=\""$(libdir)"\"
 AM_CPPFLAGS += -I../src

+# The callback examples reference libc only through libhttrack, so the direct
+# libc edge gets dropped from DT_NEEDED (library-not-linked-against-libc).
+# Force libc to be recorded as a dependency.
 AM_LDFLAGS = \
 	@DEFAULT_LDFLAGS@ \
-	-L../src
+	-L../src \
+	-Wl,--push-state,--no-as-needed,-lc,--pop-state

 # Examples
 libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
--- a/license.txt
+++ b/license.txt
@@ -1,38 +1,674 @@
-HTTrack Website Copier License Agreement:
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007

-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+                            Preamble

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.

-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.

-In addition, as a special exception, Xavier Roche gives permission to
-link the code of this program with the openSSL library (or with
-modified versions of openSSL that use the same license as openSSL),
-and distribute linked combinations including the two.  You must obey
-the GNU General Public License in all respects for all of the code
-used other than openSSL.  If you modify this file, you may extend this
-exception to your version of the file, but you are not obligated to do
-so.  If you do not wish to do so, delete this exception statement from
-your version.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.

-Important notes:
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.

-We hereby ask people using this source NOT to use it in purpose of grabbing
-emails addresses, or collecting any other private informations on persons.
-This would disgrace our work, and spoil the many hours we spent on it.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.

+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.

-Contacting us / support:
-Please refer to the README file
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.

+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -2,4 +2,20 @@
 # man_MANS = httrack.1
 man_MANS = httrack.1 webhttrack.1 htsserver.1 proxytrack.1

-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) makeman.sh
+
+# Regenerate httrack.1 from the "httrack --help" output and the top-level
+# README. Run by hand after changing options or help text:
+#   make -C man regen-man
+# The generated page is committed; this target only refreshes it. Honors
+# SOURCE_DATE_EPOCH for a reproducible date.
+regen-man: makeman.sh $(top_builddir)/src/httrack$(EXEEXT)
+	README='$(top_srcdir)/README' $(SHELL) $(srcdir)/makeman.sh \
+		'$(top_builddir)/src/httrack$(EXEEXT)' > $(srcdir)/httrack.1
+.PHONY: regen-man
+
+# Render html/httrack.man.html from httrack.1. Needs the groff html device
+# (Debian: full "groff" package, not "groff-base"). Run by hand: make -C man regen-man-html
+regen-man-html: httrack.1
+	groff -t -man -Thtml $(srcdir)/httrack.1 > $(top_srcdir)/html/httrack.man.html
+.PHONY: regen-man-html
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -297,7 +297,7 @@ top_srcdir = @top_srcdir@

 # man_MANS = httrack.1
 man_MANS = httrack.1 webhttrack.1 htsserver.1 proxytrack.1
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) makeman.sh
 all: all-am

 .SUFFIXES:
@@ -541,6 +541,22 @@ uninstall-man: uninstall-man1
 .PRECIOUS: Makefile


+# Regenerate httrack.1 from the "httrack --help" output and the top-level
+# README. Run by hand after changing options or help text:
+#   make -C man regen-man
+# The generated page is committed; this target only refreshes it. Honors
+# SOURCE_DATE_EPOCH for a reproducible date.
+regen-man: makeman.sh $(top_builddir)/src/httrack$(EXEEXT)
+	README='$(top_srcdir)/README' $(SHELL) $(srcdir)/makeman.sh \
+		'$(top_builddir)/src/httrack$(EXEEXT)' > $(srcdir)/httrack.1
+.PHONY: regen-man
+
+# Render html/httrack.man.html from httrack.1. Needs the groff html device
+# (Debian: full "groff" package, not "groff-base"). Run by hand: make -C man regen-man-html
+regen-man-html: httrack.1
+	groff -t -man -Thtml $(srcdir)/httrack.1 > $(top_srcdir)/html/httrack.man.html
+.PHONY: regen-man-html
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/man/httrack.1
+++ b/man/httrack.1
@@ -1,218 +1,122 @@
 .\" Process this file with
 .\" groff -man -Tascii httrack.1
 .\"
-.TH httrack 1 "27 January 2024" "httrack website copier"
+.\" This file is generated by man/makeman.sh; do not edit by hand.
+.TH httrack 1 "13 June 2026" "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 \-w, \-\-mirror 
-] [ 
-.B \-W, \-\-mirror\-wizard 
-] [ 
-.B \-g, \-\-get\-files 
-] [ 
-.B \-i, \-\-continue 
-] [ 
-.B \-Y, \-\-mirrorlinks 
-] [ 
-.B \-P, \-\-proxy 
-] [ 
-.B \-%f, \-\-httpproxy\-ftp[=N] 
-] [ 
-.B \-%b, \-\-bind 
-] [ 
-.B \-rN, \-\-depth[=N] 
-] [ 
-.B \-%eN, \-\-ext\-depth[=N] 
-] [ 
-.B \-mN, \-\-max\-files[=N] 
-] [ 
-.B \-MN, \-\-max\-size[=N] 
-] [ 
-.B \-EN, \-\-max\-time[=N] 
-] [ 
-.B \-AN, \-\-max\-rate[=N] 
-] [ 
-.B \-%cN, \-\-connection\-per\-second[=N] 
-] [ 
-.B \-GN, \-\-max\-pause[=N] 
-] [ 
-.B \-cN, \-\-sockets[=N] 
-] [ 
-.B \-TN, \-\-timeout[=N] 
-] [ 
-.B \-RN, \-\-retries[=N] 
-] [ 
-.B \-JN, \-\-min\-rate[=N] 
-] [ 
-.B \-HN, \-\-host\-control[=N] 
-] [ 
-.B \-%P, \-\-extended\-parsing[=N] 
-] [ 
-.B \-n, \-\-near 
-] [ 
-.B \-t, \-\-test 
-] [ 
-.B \-%L, \-\-list 
-] [ 
-.B \-%S, \-\-urllist 
-] [ 
-.B \-NN, \-\-structure[=N] 
-] [ 
-.B \-%D, \-\-cached\-delayed\-type\-check 
-] [ 
-.B \-%M, \-\-mime\-html 
-] [ 
-.B \-LN, \-\-long\-names[=N] 
-] [ 
-.B \-KN, \-\-keep\-links[=N] 
-] [ 
-.B \-x, \-\-replace\-external 
-] [ 
-.B \-%x, \-\-disable\-passwords 
-] [ 
-.B \-%q, \-\-include\-query\-string 
-] [ 
-.B \-o, \-\-generate\-errors 
-] [ 
-.B \-X, \-\-purge\-old[=N] 
-] [ 
-.B \-%p, \-\-preserve 
-] [ 
-.B \-%T, \-\-utf8\-conversion 
-] [ 
-.B \-bN, \-\-cookies[=N] 
-] [ 
-.B \-u, \-\-check\-type[=N] 
-] [ 
-.B \-j, \-\-parse\-java[=N] 
-] [ 
-.B \-sN, \-\-robots[=N] 
-] [ 
-.B \-%h, \-\-http\-10 
-] [ 
-.B \-%k, \-\-keep\-alive 
-] [ 
-.B \-%B, \-\-tolerant 
-] [ 
-.B \-%s, \-\-updatehack 
-] [ 
-.B \-%u, \-\-urlhack 
-] [ 
-.B \-%A, \-\-assume 
-] [ 
-.B \-@iN, \-\-protocol[=N] 
-] [ 
-.B \-%w, \-\-disable\-module 
-] [ 
-.B \-F, \-\-user\-agent 
-] [ 
-.B \-%R, \-\-referer 
-] [ 
-.B \-%E, \-\-from 
-] [ 
-.B \-%F, \-\-footer 
-] [ 
-.B \-%l, \-\-language 
-] [ 
-.B \-%a, \-\-accept 
-] [ 
-.B \-%X, \-\-headers 
-] [ 
-.B \-C, \-\-cache[=N] 
-] [ 
-.B \-k, \-\-store\-all\-in\-cache 
-] [ 
-.B \-%n, \-\-do\-not\-recatch 
-] [ 
-.B \-%v, \-\-display 
-] [ 
-.B \-Q, \-\-do\-not\-log 
-] [ 
-.B \-q, \-\-quiet 
-] [ 
-.B \-z, \-\-extra\-log 
-] [ 
-.B \-Z, \-\-debug\-log 
-] [ 
-.B \-v, \-\-verbose 
-] [ 
-.B \-f, \-\-file\-log 
-] [ 
-.B \-f2, \-\-single\-log 
-] [ 
-.B \-I, \-\-index 
-] [ 
-.B \-%i, \-\-build\-top\-index 
-] [ 
-.B \-%I, \-\-search\-index 
-] [ 
-.B \-pN, \-\-priority[=N] 
-] [ 
-.B \-S, \-\-stay\-on\-same\-dir 
-] [ 
-.B \-D, \-\-can\-go\-down 
-] [ 
-.B \-U, \-\-can\-go\-up 
-] [ 
-.B \-B, \-\-can\-go\-up\-and\-down 
-] [ 
-.B \-a, \-\-stay\-on\-same\-address 
-] [ 
-.B \-d, \-\-stay\-on\-same\-domain 
-] [ 
-.B \-l, \-\-stay\-on\-same\-tld 
-] [ 
-.B \-e, \-\-go\-everywhere 
-] [ 
-.B \-%H, \-\-debug\-headers 
-] [ 
-.B \-%!, \-\-disable\-security\-limits 
-] [ 
-.B \-V, \-\-userdef\-cmd 
-] [ 
-.B \-%W, \-\-callback 
-] [ 
-.B \-K, \-\-keep\-links[=N] 
-] [ 
-.B 
+.B httrack [ url ]... [ \-filter ]... [ +filter ]...
+[ \fB\-O, \-\-path\fR ]
+[ \fB\-w, \-\-mirror\fR ]
+[ \fB\-W, \-\-mirror\-wizard\fR ]
+[ \fB\-g, \-\-get\-files\fR ]
+[ \fB\-i, \-\-continue\fR ]
+[ \fB\-Y, \-\-mirrorlinks\fR ]
+[ \fB\-P, \-\-proxy\fR ]
+[ \fB\-%f, \-\-httpproxy\-ftp[=N]\fR ]
+[ \fB\-%b, \-\-bind\fR ]
+[ \fB\-rN, \-\-depth[=N]\fR ]
+[ \fB\-%eN, \-\-ext\-depth[=N]\fR ]
+[ \fB\-mN, \-\-max\-files[=N]\fR ]
+[ \fB\-MN, \-\-max\-size[=N]\fR ]
+[ \fB\-EN, \-\-max\-time[=N]\fR ]
+[ \fB\-AN, \-\-max\-rate[=N]\fR ]
+[ \fB\-%cN, \-\-connection\-per\-second[=N]\fR ]
+[ \fB\-GN, \-\-max\-pause[=N]\fR ]
+[ \fB\-cN, \-\-sockets[=N]\fR ]
+[ \fB\-TN, \-\-timeout[=N]\fR ]
+[ \fB\-RN, \-\-retries[=N]\fR ]
+[ \fB\-JN, \-\-min\-rate[=N]\fR ]
+[ \fB\-HN, \-\-host\-control[=N]\fR ]
+[ \fB\-%P, \-\-extended\-parsing[=N]\fR ]
+[ \fB\-n, \-\-near\fR ]
+[ \fB\-t, \-\-test\fR ]
+[ \fB\-%L, \-\-list\fR ]
+[ \fB\-%S, \-\-urllist\fR ]
+[ \fB\-NN, \-\-structure[=N]\fR ]
+[ \fB\-%D, \-\-cached\-delayed\-type\-check\fR ]
+[ \fB\-%M, \-\-mime\-html\fR ]
+[ \fB\-LN, \-\-long\-names[=N]\fR ]
+[ \fB\-KN, \-\-keep\-links[=N]\fR ]
+[ \fB\-x, \-\-replace\-external\fR ]
+[ \fB\-%x, \-\-disable\-passwords\fR ]
+[ \fB\-%q, \-\-include\-query\-string\fR ]
+[ \fB\-o, \-\-generate\-errors\fR ]
+[ \fB\-X, \-\-purge\-old[=N]\fR ]
+[ \fB\-%p, \-\-preserve\fR ]
+[ \fB\-%T, \-\-utf8\-conversion\fR ]
+[ \fB\-bN, \-\-cookies[=N]\fR ]
+[ \fB\-u, \-\-check\-type[=N]\fR ]
+[ \fB\-j, \-\-parse\-java[=N]\fR ]
+[ \fB\-sN, \-\-robots[=N]\fR ]
+[ \fB\-%h, \-\-http\-10\fR ]
+[ \fB\-%k, \-\-keep\-alive\fR ]
+[ \fB\-%B, \-\-tolerant\fR ]
+[ \fB\-%s, \-\-updatehack\fR ]
+[ \fB\-%u, \-\-urlhack\fR ]
+[ \fB\-%A, \-\-assume\fR ]
+[ \fB\-@iN, \-\-protocol[=N]\fR ]
+[ \fB\-%w, \-\-disable\-module\fR ]
+[ \fB\-F, \-\-user\-agent\fR ]
+[ \fB\-%R, \-\-referer\fR ]
+[ \fB\-%E, \-\-from\fR ]
+[ \fB\-%F, \-\-footer\fR ]
+[ \fB\-%l, \-\-language\fR ]
+[ \fB\-%a, \-\-accept\fR ]
+[ \fB\-%X, \-\-headers\fR ]
+[ \fB\-C, \-\-cache[=N]\fR ]
+[ \fB\-k, \-\-store\-all\-in\-cache\fR ]
+[ \fB\-%n, \-\-do\-not\-recatch\fR ]
+[ \fB\-%v, \-\-display\fR ]
+[ \fB\-Q, \-\-do\-not\-log\fR ]
+[ \fB\-q, \-\-quiet\fR ]
+[ \fB\-z, \-\-extra\-log\fR ]
+[ \fB\-Z, \-\-debug\-log\fR ]
+[ \fB\-v, \-\-verbose\fR ]
+[ \fB\-f, \-\-file\-log\fR ]
+[ \fB\-f2, \-\-single\-log\fR ]
+[ \fB\-I, \-\-index\fR ]
+[ \fB\-%i, \-\-build\-top\-index\fR ]
+[ \fB\-%I, \-\-search\-index\fR ]
+[ \fB\-pN, \-\-priority[=N]\fR ]
+[ \fB\-S, \-\-stay\-on\-same\-dir\fR ]
+[ \fB\-D, \-\-can\-go\-down\fR ]
+[ \fB\-U, \-\-can\-go\-up\fR ]
+[ \fB\-B, \-\-can\-go\-up\-and\-down\fR ]
+[ \fB\-a, \-\-stay\-on\-same\-address\fR ]
+[ \fB\-d, \-\-stay\-on\-same\-domain\fR ]
+[ \fB\-l, \-\-stay\-on\-same\-tld\fR ]
+[ \fB\-e, \-\-go\-everywhere\fR ]
+[ \fB\-%H, \-\-debug\-headers\fR ]
+[ \fB\-%!, \-\-disable\-security\-limits\fR ]
+[ \fB\-V, \-\-userdef\-cmd\fR ]
+[ \fB\-%W, \-\-callback\fR ]
+[ \fB\-K, \-\-keep\-links[=N]\fR ]
 .SH DESCRIPTION
 .B httrack
 allows you to download a World Wide Web site from the Internet to a local directory, building recursively all directories, getting HTML, images, and other files from the server to your computer. HTTrack arranges the original site's relative link-structure. Simply open a page of the "mirrored" website in your browser, and you can browse the site from link to link, as if you were viewing it online. HTTrack can also update an existing mirrored site, and resume interrupted downloads.
 .SH EXAMPLES
 .TP
-.B httrack www.someweb.com/bob/
- mirror site www.someweb.com/bob/ and only this site
+.B httrack www.example.com/bob/
+mirror site www.example.com/bob/ and only this site
 .TP
-.B httrack www.someweb.com/bob/ www.anothertest.com/mike/ +*.com/*.jpg \-mime:application/*
- mirror the two sites together (with shared links) and accept any .jpg files on .com sites
+.B httrack www.example.com/bob/ www.anothertest.com/mike/ +*.com/*.jpg \-mime:application/*
+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
+.B httrack www.example.com/bob/bobby.html +* \-r6
 .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
+.B httrack www.example.com/bob/bobby.html \-\-spider \-P proxy.myhost.com:8080
 .TP
 .B httrack \-\-update
-updates a mirror in the current folder
 .TP
 .B httrack
-will bring you to the interactive mode
 .TP
 .B httrack \-\-continue
-continues a mirror in the current folder
 .SH OPTIONS
 .SS General options:
 .IP \-O
-path for mirror/logfiles+cache (\-O path
-mirror[,path
-cache
-and
-logfiles]) (\-\-path <param>)
-
+path for mirror/logfiles+cache (\-O path_mirror[,path_cache_and_logfiles]) (\-\-path <param>)
 .SS Action options:
 .IP \-w
 *mirror web sites (\-\-mirror)
@@ -224,15 +128,13 @@ just get files (saved in the current directory) (\-\-get\-files)
 continue an interrupted mirror using the cache (\-\-continue)
 .IP \-Y
 mirror ALL links located in the first level pages (mirror links) (\-\-mirrorlinks)
-
 .SS Proxy options:
 .IP \-P
 proxy use (\-P proxy:port or \-P user:pass@proxy:port) (\-\-proxy <param>)
 .IP \-%f
-*use proxy for ftp (f0 don t use) (\-\-httpproxy\-ftp[=N])
+*use proxy for ftp (f0 don't use) (\-\-httpproxy\-ftp[=N])
 .IP \-%b
 use this local hostname to make/send requests (\-%b hostname) (\-\-bind <param>)
-
 .SS Limits options:
 .IP \-rN
 set the mirror depth to N (* r9999) (\-\-depth[=N])
@@ -252,7 +154,6 @@ maximum transfer rate in bytes/seconds (1000=1KB/s max) (\-\-max\-rate[=N])
 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])
-
 .SS Flow control:
 .IP \-cN
 number of multiple connections (*c8) (\-\-sockets[=N])
@@ -264,28 +165,26 @@ number of retries, in case of timeout or non\-fatal errors (*R1) (\-\-retries[=N
 traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a link (\-\-min\-rate[=N])
 .IP \-HN
 host is abandoned 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)
+get non\-html files 'near' an html file (ex: an image located outside) (\-\-near)
 .IP \-t
 test all URLs (even forbidden ones) (\-\-test)
 .IP \-%L
 <file> add all URL located in this text file (one URL per line) (\-\-list <param>)
 .IP \-%S
 <file> add all scan rules located in this text file (one scan rule per line) (\-\-urllist <param>)
-
 .SS Build options:
 .IP \-NN
 structure type (0 *original structure, 1+: see below) (\-\-structure[=N])
-.IP \-or
-user defined structure (\-N "%h%p/%n%q.%t")
+.br
+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
@@ -297,29 +196,28 @@ 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)
+*generate output html file in case of error (404..) (o0 don't generate) (\-\-generate\-errors)
 .IP \-X
 *purge old files after update (X0 keep delete) (\-\-purge\-old[=N])
 .IP \-%p
-preserve html files  as is  (identical to  \-K4 \-%F "" ) (\-\-preserve)
+preserve html files 'as is' (identical to '\-K4 \-%F ""') (\-\-preserve)
 .IP \-%T
 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])
 .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])
 .IP \-%h
 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)
 .IP \-%s
@@ -328,13 +226,14 @@ update hacks: various hacks to limit re\-transfers when updating (identical size
 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>)
-.IP \-can
-also be used to force a specific file type: \-\-assume foo.cgi=text/html
+.br
+shortcut: '\-\-assume standard' is equivalent to \-%A php2 php3 php4 php cgi asp jsp pl cfm nsf=text/html
+.br
+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])
 .IP \-%w
 disable a specific external mime module (\-%w htsswf \-%w htsjava) (\-\-disable\-module <param>)
-
 .SS Browser ID:
 .IP \-F
 user\-agent field sent in HTTP headers (\-F "user\-agent name") (\-\-user\-agent <param>)
@@ -345,12 +244,11 @@ 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>)
+preferred language (\-%l "fr, en, jp, *" (\-\-language <param>)
 .IP \-%a
 accepted formats (\-%a "text/html,image/png;q=0.9,*/*;q=0.1" (\-\-accept <param>)
 .IP \-%X
 additional HTTP header line (\-%X "X\-Magic: 42" (\-\-headers <param>)
-
 .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])
@@ -375,25 +273,24 @@ log on screen (\-\-verbose)
 .IP \-f2
 one single log file (\-\-single\-log)
 .IP \-I
-*make an index (I0 don t make) (\-\-index)
+*make an index (I0 don't make) (\-\-index)
 .IP \-%i
-make a top index for a project folder (* %i0 don t make) (\-\-build\-top\-index)
+make a top index for a project folder (* %i0 don't make) (\-\-build\-top\-index)
 .IP \-%I
-make an searchable index for this mirror (* %I0 don t make) (\-\-search\-index)
-
+make an searchable index for this mirror (* %I0 don't make) (\-\-search\-index)
 .SS Expert options:
 .IP \-pN
 priority mode: (* p3) (\-\-priority[=N])
-.IP \-p0
-just scan, don t save anything (for checking links)
-.IP \-p1
-save only html files
-.IP \-p2
-save only non html files
-.IP \-*p3
-save all files
-.IP \-p7
-get html files before, then treat other files
+.br
+p0 just scan, don't save anything (for checking links)
+.br
+p1 save only html files
+.br
+p2 save only non html files
+.br
+*p3 save all files
+.br
+p7 get html files before, then treat other files
 .IP \-S
 stay on the same directory (\-\-stay\-on\-same\-dir)
 .IP \-D
@@ -412,18 +309,17 @@ stay on the same TLD (eg: .com) (\-\-stay\-on\-same\-tld)
 go everywhere on the web (\-\-go\-everywhere)
 .IP \-%H
 debug HTTP headers in logfile (\-\-debug\-headers)
-
 .SS Guru options: (do NOT use if possible)
 .IP \-#X
 *use optimized engine (limited memory boundary checks) (\-\-fast\-engine)
 .IP \-#0
-filter test (\-#0  *.gif   www.bar.com/foo.gif ) (\-\-debug\-testfilters <param>)
+filter test (\-#0 '*.gif' 'www.bar.com/foo.gif') (\-\-debug\-testfilters <param>)
 .IP \-#1
 simplify test (\-#1 ./foo/bar/../foobar)
 .IP \-#2
 type test (\-#2 /foo/bar.php)
 .IP \-#C
-cache list (\-#C  *.com/spider*.gif  (\-\-debug\-cache <param>)
+cache list (\-#C '*.com/spider*.gif' (\-\-debug\-cache <param>)
 .IP \-#R
 cache repair (damaged cache) (\-\-repair\-cache)
 .IP \-#d
@@ -452,21 +348,18 @@ generate transfer ops. log every minutes (\-\-debug\-xfrstats)
 wait time (\-\-advanced\-wait)
 .IP \-#Z
 generate transfer rate statistics 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)
-.IP \-IMPORTANT
-NOTE: DANGEROUS OPTION, ONLY SUITABLE FOR EXPERTS
-.IP \-USE
-IT WITH EXTREME CARE
-
+.br
+IMPORTANT NOTE: DANGEROUS OPTION, ONLY SUITABLE FOR EXPERTS
+.br
+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>)
 .IP \-%W
 use an external library function as a wrapper (\-%W myfoo.so[,myparameters]) (\-\-callback <param>)
-
 .SS Details: Option N
 .IP \-N0
 Site\-structure (default)
@@ -485,17 +378,17 @@ All files in web/, with random names (gadget !)
 .IP \-N100
 Site\-structure, without www.domain.xxx/
 .IP \-N101
-Identical to N1 except that "web" is replaced by the site s name
+Identical to N1 except that "web" is replaced by the site's name
 .IP \-N102
-Identical to N2 except that "web" is replaced by the site s name
+Identical to N2 except that "web" is replaced by the site's name
 .IP \-N103
-Identical to N3 except that "web" is replaced by the site s name
+Identical to N3 except that "web" is replaced by the site's name
 .IP \-N104
-Identical to N4 except that "web" is replaced by the site s name
+Identical to N4 except that "web" is replaced by the site's name
 .IP \-N105
-Identical to N5 except that "web" is replaced by the site s name
+Identical to N5 except that "web" is replaced by the site's name
 .IP \-N199
-Identical to N99 except that "web" is replaced by the site s name
+Identical to N99 except that "web" is replaced by the site's name
 .IP \-N1001
 Identical to N1 except that there is no "web" directory
 .IP \-N1002
@@ -509,34 +402,47 @@ Identical to N5 except that there is no "web" directory
 .IP \-N1099
 Identical to N99 except 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)
-   %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)
-   %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)
-      %s?  Short name version (ex: %sN)
-   %[param]  param variable in query string
-   %[param:before:after:empty:notfound]  advanced variable extraction
+.IP \-%n
+Name of file without file type (ex: image)
+.IP \-%N
+Name of file, including file type (ex: image.gif)
+.IP \-%t
+File type (ex: gif)
+.IP \-%p
+Path [without ending /] (ex: /someimages)
+.IP \-%h
+Host name (ex: www.example.com)
+.IP \-%M
+URL MD5 (128 bits, 32 ascii bytes)
+.IP \-%Q
+query string MD5 (128 bits, 32 ascii bytes)
+.IP \-%k
+full query string
+.IP \-%r
+protocol name (ex: http)
+.IP \-%q
+small query string MD5 (16 bits, 4 ascii bytes)
+.br
+\&'%s?' Short name version (ex: %sN)
+.IP \-%[param]
+param variable in query string
+.IP \-%[param:before:after:empty:notfound]
+advanced variable extraction
 .SS Details: User\-defined option N and advanced variable extraction
-   %[param:before:after:empty:notfound]
-.IP \-param
-: parameter name
-.IP \-before
-: string to prepend if the parameter was found
-.IP \-after
-: string to append if the parameter was found
-.IP \-notfound
-: string replacement if the parameter could not be found
-.IP \-empty
-: string replacement if the parameter was empty
-.IP \-all
-fields, except the first one (the parameter name), can be empty
-
+.br
+%[param:before:after:empty:notfound]
+.br
+param : parameter name
+.br
+before : string to prepend if the parameter was found
+.br
+after : string to append if the parameter was found
+.br
+notfound : string replacement if the parameter could not be found
+.br
+empty : string replacement if the parameter was empty
+.br
+all 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)
@@ -548,37 +454,33 @@ foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI, default)
 \->  foo.cgi?q=45 (original URL)
 .IP \-K5
 \->  http://www.foobar.com/folder/foo4B54.html?q=45 (transparent proxy URL)
-
 .SS Shortcuts:
 .IP \-\-mirror
-     <URLs> *make a mirror of site(s) (default)
+<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)
+<text file>  add all URL located in this text file (\-%L)
 .IP \-\-mirrorlinks
 <URLs>  mirror all links in 1st level pages (\-Y)
 .IP \-\-testlinks
-  <URLs>  test links in pages (\-r1p0C0I0t)
+<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
+<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
+create a temporary proxy to capture an URL or a form post URL
 .IP \-\-clean
-              erase cache & log files
-
+erase cache & log files
 .IP \-\-http10
-             force http/1.0 requests (\-%h)
-
+force http/1.0 requests (\-%h)
 .SS Details: Option %W: External callbacks prototypes
 .SS see htsdefines.h
 .SH FILES
@@ -588,29 +490,28 @@ The system wide configuration file.
 .SH ENVIRONMENT
 .IP HOME
 Is being used if you defined in /etc/httrack.conf the line
-.I path ~/websites/# 
+.I path ~/websites/#
 .SH DIAGNOSTICS
-Errors/Warnings are reported to 
+Errors/Warnings are reported to
 .I hts\-log.txt
 by default, or to stderr if the
-.I -v
+.I \-v
 option was specified.
 .SH LIMITS
 These are the principals limits of HTTrack for that moment. Note that we did not heard about any other utility
 that would have solved them.
-
-
-.SM - Several scripts generating complex filenames may not find them (ex: img.src='image'+a+Mobj.dst+'.gif')
-
-.SM - Some java classes may not find some files on them (class included)
-
-.SM - Cgi-bin links may not work properly in some cases (parameters needed). To avoid them: use filters like -*cgi-bin*
+.SM
+\- Several scripts generating complex filenames may not find them (ex: img.src='image'+a+Mobj.dst+'.gif')
+.SM
+\- Some java classes may not find some files on them (class included)
+.SM
+\- Cgi\-bin links may not work properly in some cases (parameters needed). To avoid them: use filters like \-*cgi\-bin*
 .SH BUGS
 Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) 1998-2024 Xavier Roche and other contributors
+Copyright (C) 1998-2026 Xavier Roche and other contributors

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -631,8 +532,8 @@ The  most  recent released version of httrack can be found at:
 .SH AUTHOR
 Xavier Roche <roche@httrack.com>
 .SH "SEE ALSO"
-The 
-.B HTML 
+The
+.B HTML
 documentation (available online at
 .B http://www.httrack.com/html/
 ) contains more detailed information. Please also refer to the
--- a/man/makeman.sh
+++ b/man/makeman.sh
@@ -0,0 +1,189 @@
+#!/bin/sh
+#
+# Regenerate man/httrack.1 from "httrack --help" and the top-level README.
+#
+# Usage:
+#   man/makeman.sh [HTTRACK_BINARY] > man/httrack.1
+#
+# HTTRACK_BINARY defaults to "httrack" (looked up in $PATH). Set SOURCE_DATE_EPOCH
+# for a reproducible page date.
+#
+# The OPTIONS section is derived from --help by indentation, which is what makes
+# it robust (no more prose turning into bogus options, see Debian #1061053):
+#   column 0 starting with "--"  -> long option    (.IP)
+#   column 0 otherwise           -> section header  (.SS)
+#   1-2 leading spaces           -> option          (.IP)
+#   3+ leading spaces            -> continuation / sub-value (description text)
+#
+# This replaces the previous out-of-tree script that grepped the first token of
+# every indented line and mislabelled continuations as options.
+
+set -eu
+
+httrack=${1:-httrack}
+script_dir=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)
+topdir=${TOPDIR:-$(CDPATH='' cd -- "$script_dir/.." && pwd)}
+readme=${README:-$topdir/README}
+
+# Reproducible date when SOURCE_DATE_EPOCH is set, otherwise today.
+if [ -n "${SOURCE_DATE_EPOCH:-}" ]; then
+    date_str=$(LC_ALL=C date -u -d "@${SOURCE_DATE_EPOCH}" '+%d %B %Y' 2>/dev/null ||
+        LC_ALL=C date -u -r "${SOURCE_DATE_EPOCH}" '+%d %B %Y')
+else
+    date_str=$(LC_ALL=C date '+%d %B %Y')
+fi
+year=${date_str##* }
+
+help=$("$httrack" --quiet --help 2>/dev/null)
+
+st=$(printf '%s\n' "$help" | grep -n 'General options' | head -1 | cut -d: -f1)
+en=$(printf '%s\n' "$help" | grep -nE '^example' | head -1 | cut -d: -f1)
+en2=$(printf '%s\n' "$help" | grep -nE '^HTTrack version' | tail -1 | cut -d: -f1)
+
+# SYNOPSIS: one "[ -x, --long ]" per option carrying a long name (skip "#" guru
+# options, as the original did).
+synopsis=$(printf '%s\n' "$help" | awk '
+  $0 ~ /\(--/ && $0 !~ / #/ {
+    short = $1
+    if (match($0, /\(--[^ )]+/)) {
+      lng = substr($0, RSTART + 3, RLENGTH - 3)
+      gsub(/-/, "\\-", short); gsub(/-/, "\\-", lng)
+      printf "[ \\fB\\-%s, \\-\\-%s\\fR ]\n", short, lng
+    }
+  }')
+
+# OPTIONS: indentation-driven classifier (see header comment).
+options=$(printf '%s\n' "$help" | sed -n "${st},$((en - 2))p" | awk '
+  function esc(s) {
+    gsub(/\\/, "\\\\", s)
+    gsub(/-/, "\\-", s)
+    return s
+  }
+  function emit(s) {                       # body text: escape + guard ./%apostrophe leaders
+    s = esc(s)
+    if (substr(s, 1, 1) == "." || substr(s, 1, 1) == "\x27") s = "\\&" s
+    print s
+  }
+  /^[ \t]*$/ { next }
+  {
+    match($0, /^ */); ind = RLENGTH
+    if (ind == 0 && substr($0, 1, 2) == "--") {        # long option
+      opt = $1
+      rest = $0; sub(/^[^ \t]+[ \t]+/, "", rest)
+      printf ".IP %s\n", esc(opt)
+      emit(rest)
+    } else if (ind == 0) {                             # section header
+      printf ".SS %s\n", esc($0)
+    } else if (ind <= 2) {                             # option
+      opt = $1
+      gsub(/^\x27|\x27$/, "", opt)                     # drop quotes around tokens like %t
+      rest = $0; sub(/^[ \t]+[^ \t]+[ \t]*/, "", rest)
+      printf ".IP \\-%s\n", esc(opt)
+      if (rest != "") emit(rest)
+    } else {                                           # continuation / sub-value
+      line = $0; sub(/^[ \t]+/, "", line)
+      print ".br"
+      emit(line)
+    }
+  }')
+
+# EXAMPLES: "example: <cmd>" / "means: <text>" pairs after the options block.
+examples=$(printf '%s\n' "$help" | sed -n "${en},$((en2 - 1))p" | awk '
+  function esc(s) { gsub(/\\/, "\\\\", s); gsub(/-/, "\\-", s); return s }
+  /^example:/ { sub(/^example:[ \t]*/, ""); printf ".TP\n.B %s\n", esc($0); next }
+  /^means:/   { sub(/^means:[ \t]*/, "");   if ($0 != "") print esc($0); next }
+')
+
+# LIMITS: the "Engine limits" block from the README.
+limits=$(awk '
+  function esc(s) { gsub(/\\/, "\\\\", s); gsub(/-/, "\\-", s); return s }
+  /^Engine limits/ { grab = 1; next }
+  /^Advanced options/ { grab = 0 }
+  grab {
+    if ($0 ~ /^-/) { print ".SM"; print esc($0) }
+    else if ($0 !~ /^[ \t]*$/) print esc($0)
+  }' "$readme")
+
+# --- assemble the page: static prose in quoted heredocs, dynamic parts printf'd ---
+cat <<'EOF'
+.\" Process this file with
+.\" groff -man -Tascii httrack.1
+.\"
+.\" This file is generated by man/makeman.sh; do not edit by hand.
+EOF
+printf '.TH httrack 1 "%s" "httrack website copier"\n' "$date_str"
+cat <<'EOF'
+.SH NAME
+httrack \- offline browser : copy websites to a local directory
+.SH SYNOPSIS
+.B httrack [ url ]... [ \-filter ]... [ +filter ]...
+EOF
+printf '%s\n' "$synopsis"
+cat <<'EOF'
+.SH DESCRIPTION
+.B httrack
+allows you to download a World Wide Web site from the Internet to a local directory, building recursively all directories, getting HTML, images, and other files from the server to your computer. HTTrack arranges the original site's relative link-structure. Simply open a page of the "mirrored" website in your browser, and you can browse the site from link to link, as if you were viewing it online. HTTrack can also update an existing mirrored site, and resume interrupted downloads.
+.SH EXAMPLES
+EOF
+printf '%s\n' "$examples"
+cat <<'EOF'
+.SH OPTIONS
+EOF
+printf '%s\n' "$options"
+cat <<'EOF'
+.SH FILES
+.I /etc/httrack.conf
+.RS
+The system wide configuration file.
+.SH ENVIRONMENT
+.IP HOME
+Is being used if you defined in /etc/httrack.conf the line
+.I path ~/websites/#
+.SH DIAGNOSTICS
+Errors/Warnings are reported to
+.I hts\-log.txt
+by default, or to stderr if the
+.I \-v
+option was specified.
+.SH LIMITS
+EOF
+printf '%s\n' "$limits"
+cat <<'EOF'
+.SH BUGS
+Please reports bugs to
+.B <bugs@httrack.com>.
+Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
+.SH COPYRIGHT
+EOF
+printf 'Copyright (C) 1998-%s Xavier Roche and other contributors\n' "$year"
+cat <<'EOF'
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+.SH AVAILABILITY
+The  most  recent released version of httrack can be found at:
+.B http://www.httrack.com
+.SH AUTHOR
+Xavier Roche <roche@httrack.com>
+.SH "SEE ALSO"
+The
+.B HTML
+documentation (available online at
+.B http://www.httrack.com/html/
+) contains more detailed information. Please also refer to the
+.B httrack FAQ
+(available online at
+.B http://www.httrack.com/html/faq.html
+)
+EOF
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,7 +83,10 @@ libhttrack_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO)

 libhtsjava_la_SOURCES = htsjava.c htsjava.h
 libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
-libhtsjava_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO)
+# This thin JNI wrapper reaches libc only through libhttrack, so the direct
+# libc edge is dropped from DT_NEEDED (library-not-linked-against-libc). Force
+# libc to be recorded as a dependency.
+libhtsjava_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO) -Wl,--push-state,--no-as-needed,-lc,--pop-state

 EXTRA_DIST = httrack.h webhttrack \
 		coucal/murmurhash3.h.diff \
--- a/src/htsbauth.c
+++ b/src/htsbauth.c
@@ -133,8 +133,8 @@ static int cookie_cmp_wildcard_domain(const char *chk_dom, const char *domain) {
  const size_t n = strlen(chk_dom);
  const size_t m = strlen(domain);
  const size_t l = n < m ? n : m;
-  size_t i;
-  for (i = l - 1; i >= 0; i--) {
+  int i;
+  for (i = (int) l - 1; i >= 0; i--) {
    if (chk_dom[n - i - 1] != domain[m - i - 1]) {
      return 1;
    }
--- a/src/htscoremain.c
+++ b/src/htscoremain.c
@@ -2899,7 +2899,9 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
  }

  {
-    char n_lock[256];
+    /* Sized to the concat-buffer capacity so it can always hold the lock-file
+       path produced by fconcat(), even with a long log path (issue #183). */
+    char n_lock[OPT_GET_BUFF_SIZE(opt)];

    // on peut pas avoir un affichage ET un fichier log
    // ca sera pour la version 2
--- 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.49-6"
-#define HTTRACK_VERSIONID    "3.49.6"
+#define HTTRACK_VERSION      "3.49-8"
+#define HTTRACK_VERSIONID    "3.49.8"
 #define HTTRACK_AFF_VERSION  "3.x"
 #define HTTRACK_LIB_VERSION  "2.0"

--- a/src/htshelp.c
+++ b/src/htshelp.c
@@ -604,7 +604,7 @@ void help(const char *app, int more) {
  infomsg(" %E  from email address sent in HTTP headers");
  infomsg
    (" %F  footer string in Html code (-%F \"Mirrored [from host %s [file %s [at %s]]]\"");
-  infomsg(" %l  preffered language (-%l \"fr, en, jp, *\"");
+  infomsg(" %l  preferred language (-%l \"fr, en, jp, *\"");
  infomsg(" %a  accepted formats (-%a \"text/html,image/png;q=0.9,*/*;q=0.1\"");
  infomsg(" %X  additional HTTP header line (-%X \"X-Magic: 42\"");
  infomsg("");
@@ -712,7 +712,7 @@ void help(const char *app, int more) {
  infomsg("  '%N' Name of file, including file type (ex: image.gif)");
  infomsg("  '%t' File type (ex: gif)");
  infomsg("  '%p' Path [without ending /] (ex: /someimages)");
-  infomsg("  '%h' Host name (ex: www.someweb.com)");
+  infomsg("  '%h' Host name (ex: www.example.com)");
  infomsg("  '%M' URL MD5 (128 bits, 32 ascii bytes)");
  infomsg("  '%Q' query string MD5 (128 bits, 32 ascii bytes)");
  infomsg("  '%k' full query string");
@@ -767,21 +767,21 @@ void help(const char *app, int more) {
  infomsg("Details: Option %W: External callbacks prototypes");
  infomsg("see htsdefines.h");
  infomsg("");
-  infomsg("example: httrack www.someweb.com/bob/");
-  infomsg("means:   mirror site www.someweb.com/bob/ and only this site");
+  infomsg("example: httrack www.example.com/bob/");
+  infomsg("means:   mirror site www.example.com/bob/ and only this site");
  infomsg("");
  infomsg
-    ("example: httrack www.someweb.com/bob/ www.anothertest.com/mike/ +*.com/*.jpg -mime:application/*");
+    ("example: httrack www.example.com/bob/ www.anothertest.com/mike/ +*.com/*.jpg -mime:application/*");
  infomsg
    ("means:   mirror the two sites together (with shared links) and accept any .jpg files on .com sites");
  infomsg("");
-  infomsg("example: httrack www.someweb.com/bob/bobby.html +* -r6");
+  infomsg("example: httrack www.example.com/bob/bobby.html +* -r6");
  infomsg
    ("means get all files starting from bobby.html, with 6 link-depth, and possibility of going everywhere on the web");
  infomsg("");
  infomsg
-    ("example: httrack www.someweb.com/bob/bobby.html --spider -P proxy.myhost.com:8080");
-  infomsg("runs the spider on www.someweb.com/bob/bobby.html using a proxy");
+    ("example: httrack www.example.com/bob/bobby.html --spider -P proxy.myhost.com:8080");
+  infomsg("runs the spider on www.example.com/bob/bobby.html using a proxy");
  infomsg("");
  infomsg("example: httrack --update");
  infomsg("updates a mirror in the current folder");
--- a/src/htslib.c
+++ b/src/htslib.c
@@ -895,9 +895,9 @@ int http_sendhead(httrackp * opt, t_cookie * cookie, int mode,

  // possibilité non documentée: >post: et >postfile:
  // si présence d'un tag >post: alors executer un POST
-  // exemple: http://www.someweb.com/test.cgi?foo>post:posteddata=10&foo=5
+  // exemple: http://www.example.com/test.cgi?foo>post:posteddata=10&foo=5
  // si présence d'un tag >postfile: alors envoyer en tête brut contenu dans le fichier en question
-  // exemple: http://www.someweb.com/test.cgi?foo>postfile:post0.txt
+  // exemple: http://www.example.com/test.cgi?foo>postfile:post0.txt
  search_tag = strstr(fil, POSTTOK ":");
  if (!search_tag) {
    search_tag = strstr(fil, POSTTOK "file:");
@@ -5177,25 +5177,34 @@ HTSEXT_API int hts_init(void) {
   */
  if (!openssl_ctx) {
    const char *version;
+    const SSL_METHOD *method;

+    /* OpenSSL >= 1.1.0 / LibreSSL >= 2.7.0 auto-init and provide the generic
+       methods. The legacy init and SSLv23/SSLeay calls (deprecated since 1.1.0,
+       likely gone in 4.0) are kept only for older OpenSSL. */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L \
+  || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
    SSL_load_error_strings();
    SSL_library_init();
+    version = SSLeay_version(SSLEAY_VERSION);
+    method = SSLv23_client_method();
+#else
+    version = OpenSSL_version(OPENSSL_VERSION);
+    method = TLS_client_method();
+#endif

    // Check CVE-2014-0160.
-    version = SSLeay_version(SSLEAY_VERSION);
    if (ssl_vulnerable(version)) {
-      fprintf(stderr,
-              "SSLeay_version(SSLEAY_VERSION) == '%s'\n", version);
+      fprintf(stderr, "OpenSSL version == '%s'\n", version);
      abortLog("unable to initialize TLS: OpenSSL version seems vulnerable to heartbleed bug (CVE-2014-0160)");
      assertf("OpenSSL version seems vulnerable to heartbleed bug (CVE-2014-0160)" == NULL);
    }

    // OpenSSL_add_all_algorithms();
-    openssl_ctx = SSL_CTX_new(SSLv23_client_method());
+    openssl_ctx = SSL_CTX_new(method);
    if (!openssl_ctx) {
-      fprintf(stderr,
-              "fatal: unable to initialize TLS: SSL_CTX_new(SSLv23_client_method)\n");
-      abortLog("unable to initialize TLS: SSL_CTX_new(SSLv23_client_method)");
+      fprintf(stderr, "fatal: unable to initialize TLS: SSL_CTX_new()\n");
+      abortLog("unable to initialize TLS: SSL_CTX_new()");
      assertf("unable to initialize TLS" == NULL);
    }
  }
--- a/src/htsparse.c
+++ b/src/htsparse.c
@@ -274,6 +274,28 @@ Please visit our Website: http://www.httrack.com
  } \
 } while(0)

+/* Percent-encode the angle brackets of a string so it is safe to embed inside
+   an HTML comment (the default footer) or any other HTML context. A URL holding
+   "-->" would otherwise close the footer comment and inject markup (issue #165).
+   Raw '<' and '>' are not valid URL characters, so encoding them is harmless. */
+static const char *html_inline_safe(const char *src, char *dst, size_t size) {
+  size_t i, j;
+
+  for(i = 0, j = 0; src[i] != '\0' && j + 4 < size; i++) {
+    const char c = src[i];
+
+    if (c == '<' || c == '>') {
+      dst[j++] = '%';
+      dst[j++] = '3';
+      dst[j++] = (c == '<') ? 'C' : 'E';
+    } else {
+      dst[j++] = c;
+    }
+  }
+  dst[j] = '\0';
+  return dst;
+}
+
 /* Main parser */
 int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
  char catbuff[CATBUFF_SIZE];
@@ -719,13 +741,16 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
                if (StringNotEmpty(opt->footer)) {
                  char BIGSTK tempo[1024 + HTS_URLMAXSIZE * 2];
                  char gmttime[256];
+                  char BIGSTK safe_adr[HTS_URLMAXSIZE * 3 + 4];
+                  char BIGSTK safe_fil[HTS_URLMAXSIZE * 3 + 4];

                  tempo[0] = '\0';
                  time_gmt_rfc822(gmttime);
                  strcatbuff(tempo, eol);
                  hts_template_format_str(tempo + strlen(tempo), sizeof(tempo) - strlen(tempo),
                          StringBuff(opt->footer),
-                          jump_identification_const(urladr()), urlfil(), gmttime,
+                          html_inline_safe(jump_identification_const(urladr()), safe_adr, sizeof(safe_adr)),
+                          html_inline_safe(urlfil(), safe_fil, sizeof(safe_fil)), gmttime,
                          HTTRACK_VERSIONID, /* EOF */ NULL);
                  strcatbuff(tempo, eol);
                  //fwrite(tempo,1,strlen(tempo),fp);
@@ -3341,12 +3366,10 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
          hts_log_print(opt, LOG_DEBUG, "engine: postprocess-html: %s%s",
                        urladr(), urlfil());
          if (RUN_CALLBACK4(opt, postprocess, &cAddr, &cSize, urladr(), urlfil()) == 1) {
-            if (cAddr != TypedArrayElts(output_buffer)) {
-              hts_log_print(opt, LOG_DEBUG, 
-                "engine: postprocess-html: callback modified data, applying %d bytes", cSize);
-              TypedArraySize(output_buffer) = 0;
-              TypedArrayAppend(output_buffer, cAddr, cSize);
-            }
+            hts_log_print(opt, LOG_DEBUG,
+              "engine: postprocess-html: callback modified data, applying %d bytes", cSize);
+            TypedArraySize(output_buffer) = 0;
+            TypedArrayAppend(output_buffer, cAddr, cSize);
          }
        }

--- a/src/htsthread.c
+++ b/src/htsthread.c
@@ -193,7 +193,23 @@ HTSEXT_API void hts_mutexfree(htsmutex * mutex) {
 HTSEXT_API void hts_mutexlock(htsmutex * mutex) {
  assertf(mutex != NULL);
  if (*mutex == HTSMUTEX_INIT) {        /* must be initialized */
-    hts_mutexinit(mutex);
+    /* Initialize exactly once, even when several threads race to lock the same
+       mutex for the first time. Build our own object, then publish it with a
+       single atomic compare-and-swap; the threads that lose the race free the
+       object they built (issue #297). No static guard is needed, which keeps
+       this safe on Windows 2000 (no statically-initializable lock there). */
+    htsmutex created = HTSMUTEX_INIT;
+
+    hts_mutexinit(&created);
+#ifdef _WIN32
+    if (InterlockedCompareExchangePointer((PVOID volatile *) mutex, created,
+                                          HTSMUTEX_INIT) != HTSMUTEX_INIT)
+#else
+    if (!__sync_bool_compare_and_swap(mutex, HTSMUTEX_INIT, created))
+#endif
+    {
+      hts_mutexfree(&created);
+    }
  }
  assertf(*mutex != NULL);
 #ifdef _WIN32
--- a/src/md5.h
+++ b/src/md5.h
@@ -1,21 +1,11 @@
 #ifndef MD5_H
 #define MD5_H

-#ifdef _WIN32
-#ifndef SIZEOF_LONG
-#define SIZEOF_LONG 4
-#endif
-#else
-#include "config.h"
-#endif
+#include <stdint.h>

-#if SIZEOF_LONG==8
-typedef unsigned int uint32;
-#elif SIZEOF_LONG==4
-typedef unsigned long uint32;
-#else
-#error undefined: SIZEOF_LONG
-#endif
+/* Exact 32-bit type for the MD5 state. uint32_t replaces a SIZEOF_LONG-derived
+   type so config.h stays architecture-independent (Debian #1133728). */
+typedef uint32_t uint32;

 struct MD5Context {
  union {
--- a/tests/01_engine-charset.test
+++ b/tests/01_engine-charset.test
@@ -1,5 +1,36 @@
 #!/bin/bash
 #

-# minimalistic charset test
-test "$(httrack -O /dev/null -#3 "iso-8859-1" "café")" == "cafÃ©"	|| exit 1
+# charset -> UTF-8 conversion (hts_convertStringToUTF8).
+# -#3 <charset> <string> prints the string re-decoded from <charset> as UTF-8.
+conv() {
+	test "$(httrack -O /dev/null -#3 "$1" "$2")" == "$3" || exit 1
+}
+# crash probe: malformed input must exit cleanly, not abort.
+runs() {
+	httrack -O /dev/null -#3 "$1" "$2" >/dev/null 2>&1 || exit 1
+}
+
+# the source bytes below are UTF-8 (this file is UTF-8); "café" is 0x63 61 66 C3 A9.
+
+# already UTF-8: identity
+conv 'utf-8' 'café' 'café'
+
+# bytes reinterpreted as latin-1: each input byte becomes one codepoint
+conv 'iso-8859-1' 'café' 'cafÃ©'
+
+# windows-1252 is NOT latin-1: 0x80 is the euro sign, not U+0080. This is the
+# case that actually exercises the cp1252 table (the 0x80-0x9F range).
+conv 'windows-1252' $'\x80' '€'
+
+# pure ASCII is charset-invariant
+conv 'us-ascii' 'hello' 'hello'
+
+# unknown charset: ASCII passes through unchanged, but non-ASCII input cannot be
+# decoded and yields empty output (an error is printed to stderr).
+conv 'no-such-charset-xyz' 'abc' 'abc'
+test "$(httrack -O /dev/null -#3 'no-such-charset-xyz' 'café' 2>/dev/null)" == "" || exit 1
+
+# malformed UTF-8 (lone continuation byte, truncated lead byte) must not crash
+runs 'utf-8' $'\x80'
+runs 'utf-8' $'\xc3'
--- a/tests/01_engine-entities.test
+++ b/tests/01_engine-entities.test
@@ -1,5 +1,49 @@
 #!/bin/bash
 #

-# basic entities handling (with boggy entities handling)
-test "$(httrack -O /dev/null -#6 "&foo;&nbsp;th&eacute;&amp;caf&#xe9;&#e9;&#x3082;&#12398;&#x306e;&#x3051;&#x59eb;")" == "&foo; thé&café&#e9;もののけ姫"	|| exit 1
+# HTML entity unescaping (hts_unescapeEntitiesWithCharset).
+# -#6 <string> prints the string with entities decoded (UTF-8 output).
+ent() {
+	test "$(httrack -O /dev/null -#6 "$1")" == "$2" || exit 1
+}
+# crash probe: malformed input must exit cleanly, not abort.
+runs() {
+	httrack -O /dev/null -#6 "$1" >/dev/null 2>&1 || exit 1
+}
+
+# named entities
+ent '&amp;' '&'
+ent '&lt;&gt;' '<>'
+ent '&eacute;' 'é'
+
+# numeric: decimal and hex
+ent '&#65;&#66;' 'AB'
+ent '&#x41;' 'A'
+ent '&#xe9;' 'é'
+
+# malformed numeric reference (decimal 'e9' has no digits) is left verbatim
+ent '&#e9;' '&#e9;'
+
+# U+0000 is not emitted; the reference is left verbatim
+ent '&#0;' '&#0;'
+
+# unknown entity is left verbatim
+ent '&unknownentity;' '&unknownentity;'
+
+# no entities: pass-through
+ent 'plain text' 'plain text'
+
+# decoding is a single pass: &amp;amp; -> &amp; (not &)
+ent '&amp;amp;' '&amp;'
+
+# KNOWN BUG: &nbsp; (U+00A0) decodes to a plain space (0x20), not C2 A0. The
+# engine forces 160 -> 32 in htsencoding.c (FIXME hack). Locked here; if that
+# hack is ever removed, update this to expect the C2 A0 byte.
+ent '&nbsp;' ' '
+
+# overflowing numeric reference must not crash (value far above U+10FFFF)
+runs '&#9999999999;'
+
+# original compound case. NOTE: the space after '&foo;' is the &nbsp; known bug
+# above (U+00A0 -> 0x20), not a real space in the source.
+ent '&foo;&nbsp;th&eacute;&amp;caf&#xe9;&#e9;&#x3082;&#12398;&#x306e;&#x3051;&#x59eb;' '&foo; thé&café&#e9;もののけ姫'
--- a/tests/01_engine-filter.test
+++ b/tests/01_engine-filter.test
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+
+# wildcard filter engine (strjoker), the core of +/- include/exclude rules.
+# -#0 <filter> <string> prints "<string> does match <filter>" or "... does NOT match ...".
+
+match() {
+	test "$(httrack -O /dev/null -#0 "$1" "$2")" == "$2 does match $1" || exit 1
+}
+nomatch() {
+	test "$(httrack -O /dev/null -#0 "$1" "$2")" == "$2 does NOT match $1" || exit 1
+}
+
+# bare star matches everything
+match '*' 'anything/at/all'
+
+# prefix / suffix
+match 'foo*' 'foobar'
+nomatch 'foo*' 'xfoobar'
+match '*.gif' 'a/b/c.gif'
+
+# extension match is case-insensitive
+match '*.GIF' 'a.gif'
+
+# character classes
+match '*[A-Z].txt' 'B.txt'
+nomatch '*[A-Z].txt' 'b.txt'
+match '*[0-9]' '5'
+nomatch '*[0-9]' 'x'
+
+# comma-separated class: both ranges are active, the comma is not matched
+# literally and a char in neither range fails
+match '*[A-Z,0-9]' 'Q'
+match '*[A-Z,0-9]' '3'
+nomatch '*[A-Z,0-9]' 'a'
+
+# named groups: [file] stops at '/', [path] spans it
+match '*[file].html' 'foo.html'
+nomatch '*[file].html' 'foo/bar.html'
+match '*[path]x' 'a/b/x'
+
+# *[] means "nothing more after the star"
+nomatch '*[]' 'abc'
+
+# multiple stars
+match '*foo*bar' 'foozbar'
+
+# '?' is the query-string marker, not a single-char wildcard
+nomatch 'a?c' 'abc'
--- a/tests/01_engine-idna.test
+++ b/tests/01_engine-idna.test
@@ -1,10 +1,36 @@
 #!/bin/bash
 #

-# IDNA routine
-test "$(httrack -O /dev/null -#4 "www.café.com")" == "www.xn--caf-dma.com"	|| exit 1
-test "$(httrack -O /dev/null -#4 "www.もののけ姫-the-movie.com")" == "www.xn---the-movie-g63irla2z8297c.com"	|| exit 1
+# IDNA / punycode encode (-#4) and decode (-#5). This code has a CVE history,
+# so the edge cases below cover passthrough, round-trips, and malformed input.

-# reverse IDNA
-test "$(httrack -O /dev/null -#5 "www.xn--caf-dma.com")" == "www.café.com"	|| exit 1
-test "$(httrack -O /dev/null -#5 "www.xn---the-movie-g63irla2z8297c.com")" == "www.もののけ姫-the-movie.com"	|| exit 1
+enc() { test "$(httrack -O /dev/null -#4 "$1")" == "$2" || exit 1; }
+dec() { test "$(httrack -O /dev/null -#5 "$1")" == "$2" || exit 1; }
+# crash probe: malformed ACE input must exit cleanly, not abort.
+runs() { httrack -O /dev/null -#5 "$1" >/dev/null 2>&1 || exit 1; }
+
+# encode
+enc 'www.café.com' 'www.xn--caf-dma.com'
+enc 'www.もののけ姫-the-movie.com' 'www.xn---the-movie-g63irla2z8297c.com'
+enc 'münchen.de' 'xn--mnchen-3ya.de'
+
+# decode (reverse of the above)
+dec 'www.xn--caf-dma.com' 'www.café.com'
+dec 'www.xn---the-movie-g63irla2z8297c.com' 'www.もののけ姫-the-movie.com'
+dec 'xn--mnchen-3ya.de' 'münchen.de'
+
+# pure-ASCII hostnames are unchanged either way
+enc 'plain.example.com' 'plain.example.com'
+dec 'plain.example.com' 'plain.example.com'
+enc 'a.b.c.example.org' 'a.b.c.example.org'
+
+# an all-ASCII label (even one starting with the xn-- prefix) is passed through
+# by the encoder untouched, since there is nothing to encode
+enc 'xn--already-encoded.com' 'xn--already-encoded.com'
+
+# an empty punycode payload decodes back to the bare xn-- label
+dec 'xn--' 'xn--'
+
+# malformed ACE payloads (invalid base-36, garbage) must not crash
+runs 'xn--!!!'
+runs 'xn--already-encoded.com'
--- a/tests/01_engine-mime.test
+++ b/tests/01_engine-mime.test
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+
+# MIME type guessing from extension (get_httptype / give_mimext).
+# -#2 <path> prints "<path> is '<mime>'" then "and its local type is '.<ext>'".
+
+mime() {
+	test "$(httrack -O /dev/null -#2 "$1" | head -1)" == "$1 is '$2'" || exit 1
+}
+unknown() {
+	test "$(httrack -O /dev/null -#2 "$1" | head -1)" == "$1 is of an unknown MIME type" || exit 1
+}
+
+mime '/a/b.html' 'text/html'
+mime '/a/b.htm' 'text/html'
+mime '/x.css' 'text/css'
+mime '/x.js' 'application/x-javascript'
+mime '/x.png' 'image/png'
+mime '/x.jpg' 'image/jpeg'
+mime '/x.gif' 'image/gif'
+mime '/x.txt' 'text/plain'
+mime '/x.xml' 'application/xml'
+mime '/x.pdf' 'application/pdf'
+
+# no extension, or one not in the table
+unknown '/noext'
+unknown '/x.unknownext'
--- a/tests/01_engine-simplify.test
+++ b/tests/01_engine-simplify.test
@@ -1,9 +1,26 @@
 #!/bin/bash
 #

-# simplify engine
-test "$(httrack -O /dev/null -#1 ./foo/bar/)" == "simplified=foo/bar/"	|| exit 1
-test "$(httrack -O /dev/null -#1 ./foo/bar)" == "simplified=foo/bar"	|| exit 1
-test "$(httrack -O /dev/null -#1 ./foo/./bar)" == "simplified=foo/bar"	|| exit 1
-test "$(httrack -O /dev/null -#1 ./foo/bar/.././tmp/foobar)" == "simplified=foo/tmp/foobar"	|| exit 1
-test "$(httrack -O /dev/null -#1 ./foo/bar/.././tmp/foobar/../foobaz)" == "simplified=foo/tmp/foobaz"	|| exit 1
+# path simplify engine (fil_simplifie): collapses ./ and ../ segments.
+simp() {
+	test "$(httrack -O /dev/null -#1 "$1")" == "simplified=$2" || exit 1
+}
+
+simp './foo/bar/' 'foo/bar/'
+simp './foo/bar' 'foo/bar'
+simp './foo/./bar' 'foo/bar'
+simp './foo/bar/.././tmp/foobar' 'foo/tmp/foobar'
+simp './foo/bar/.././tmp/foobar/../foobaz' 'foo/tmp/foobaz'
+
+# single '..' collapses one segment
+simp './a/../b' 'b'
+simp './a/b/../../c' 'c'
+
+# repeated './' is squeezed
+simp './a/./././b' 'a/b'
+
+# leading '..' that would go above the root is discarded, per RFC 3986 §5.2.4
+simp './a/../../b' 'b'
+
+# empty segments ('//') are not dot-segments and are preserved, per RFC 3986
+simp 'a//b' 'a//b'
--- a/tests/02_manpage-regen.test
+++ b/tests/02_manpage-regen.test
@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# The committed man/httrack.1 must match what man/makeman.sh produces from the
+# current "httrack --help" output. This catches a --help change that was not
+# followed by "make -C man regen-man".
+
+: "${top_srcdir:=..}"
+
+gen="$top_srcdir/man/makeman.sh"
+committed="$top_srcdir/man/httrack.1"
+
+# Need the generator and a runnable httrack.
+test -f "$gen" || {
+    echo "makeman.sh not found; skipping" >&2
+    exit 77
+}
+command -v httrack >/dev/null 2>&1 || {
+    echo "httrack not in PATH; skipping" >&2
+    exit 77
+}
+
+tmp=$(mktemp) || exit 1
+trap 'rm -f "$tmp"' EXIT
+
+README="$top_srcdir/README" bash "$gen" httrack >"$tmp" 2>/dev/null || {
+    echo "makeman.sh failed" >&2
+    exit 1
+}
+
+# Ignore the two intentionally date-dependent lines (page date, copyright year).
+strip_volatile() { grep -vE '^\.TH httrack |^Copyright \(C\) 1998-'; }
+
+if diff <(strip_volatile <"$committed") <(strip_volatile <"$tmp") >/dev/null; then
+    exit 0
+fi
+
+echo "man/httrack.1 is out of date. Regenerate with: make -C man regen-man" >&2
+diff <(strip_volatile <"$committed") <(strip_volatile <"$tmp") | head -40 >&2
+exit 1
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,8 +6,9 @@ TESTS_ENVIRONMENT += PATH=$(top_builddir)/src$(PATH_SEPARATOR)$$PATH
 ### TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+$(PATH_SEPARATOR)}$$$(SHLIBPATH_VAR)"
 TESTS_ENVIRONMENT += ONLINE_UNIT_TESTS=$(ONLINE_UNIT_TESTS)
 TESTS_ENVIRONMENT += HTTPS_SUPPORT=$(HTTPS_SUPPORT)
+TESTS_ENVIRONMENT += top_srcdir=$(top_srcdir)

 TEST_EXTENSIONS = .test
-TESTS = 00_runnable.test 01_engine-charset.test 01_engine-entities.test 01_engine-hashtable.test 01_engine-idna.test 01_engine-simplify.test 10_crawl-simple.test 11_crawl-cookies.test 11_crawl-idna.test 11_crawl-international.test 11_crawl-longurl.test 11_crawl-parsing.test 12_crawl_https.test 
+TESTS = 00_runnable.test 01_engine-charset.test 01_engine-entities.test 01_engine-filter.test 01_engine-hashtable.test 01_engine-idna.test 01_engine-mime.test 01_engine-simplify.test 02_manpage-regen.test 10_crawl-simple.test 11_crawl-cookies.test 11_crawl-idna.test 11_crawl-international.test 11_crawl-longurl.test 11_crawl-parsing.test 12_crawl_https.test

 CLEANFILES = check-network_sh.cache
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -470,9 +470,9 @@ EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh check-network.sh
 ### TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+$(PATH_SEPARATOR)}$$$(SHLIBPATH_VAR)"
 TESTS_ENVIRONMENT = PATH=$(top_builddir)/src$(PATH_SEPARATOR)$$PATH \
 	ONLINE_UNIT_TESTS=$(ONLINE_UNIT_TESTS) \
-	HTTPS_SUPPORT=$(HTTPS_SUPPORT)
+	HTTPS_SUPPORT=$(HTTPS_SUPPORT) top_srcdir=$(top_srcdir)
 TEST_EXTENSIONS = .test
-TESTS = 00_runnable.test 01_engine-charset.test 01_engine-entities.test 01_engine-hashtable.test 01_engine-idna.test 01_engine-simplify.test 10_crawl-simple.test 11_crawl-cookies.test 11_crawl-idna.test 11_crawl-international.test 11_crawl-longurl.test 11_crawl-parsing.test 12_crawl_https.test 
+TESTS = 00_runnable.test 01_engine-charset.test 01_engine-entities.test 01_engine-filter.test 01_engine-hashtable.test 01_engine-idna.test 01_engine-mime.test 01_engine-simplify.test 02_manpage-regen.test 10_crawl-simple.test 11_crawl-cookies.test 11_crawl-idna.test 11_crawl-international.test 11_crawl-longurl.test 11_crawl-parsing.test 12_crawl_https.test
 CLEANFILES = check-network_sh.cache
 all: all-am

--- a/tools/mkdeb.sh
+++ b/tools/mkdeb.sh
@@ -0,0 +1,195 @@
+#!/usr/bin/env bash
+#
+# Build the httrack Debian packages from a clean, committed source export.
+#
+# It exports HEAD (plus the coucal submodule) into a scratch directory, refreshes
+# the build system and man page, builds the upstream tarball, overlays debian/,
+# and runs debuild (which builds, runs lintian, and signs). Nothing is built in
+# the working tree, and no hard-coded paths are used.
+#
+# Output (in --outdir, default <repo>/dist):
+#   httrack_<ver>.orig.tar.gz            upstream tarball (Debian orig name)
+#   httrack_<ver>-*.dsc / .debian.tar.*  source package
+#   *.deb                                binary packages
+#   *.changes / *.buildinfo              build metadata
+#   httrack_<ver>.orig.tar.gz.{asc,md5,sha1}   release artifacts (unless disabled)
+#
+# Usage:
+#   tools/mkdeb.sh [options]
+#
+# Options:
+#   -k, --key KEYID            GPG key for signing (default: $DEBSIGN_KEYID)
+#   -o, --outdir DIR           output directory (default: <repo>/dist)
+#   -s, --source-only          build only the source package
+#   -u, --unsigned             do not sign anything (implies no release sigs)
+#       --no-release-artifacts skip the orig tarball .asc/.md5/.sha1
+#   -h, --help                 show this help
+#
+# SOURCE_DATE_EPOCH is honored for reproducible output.
+
+set -euo pipefail
+
+readonly PROGNAME=${0##*/}
+
+# Scratch dir, global so the EXIT trap can see it.
+scratch=""
+
+die() {
+    printf '%s: error: %s\n' "$PROGNAME" "$*" >&2
+    exit 1
+}
+
+info() {
+    printf '==> %s\n' "$*" >&2
+}
+
+usage() {
+    sed -n '2,/^set -euo/{/^set -euo/!p}' "$0" | sed 's/^# \{0,1\}//'
+}
+
+need() {
+    local tool
+    for tool in "$@"; do
+        command -v "$tool" >/dev/null 2>&1 || die "required tool not found: $tool"
+    done
+}
+
+main() {
+    local key=${DEBSIGN_KEYID:-}
+    local outdir=""
+    local source_only=0
+    local unsigned=0
+    local release_artifacts=1
+
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+        -k | --key)
+            [[ $# -ge 2 ]] || die "missing argument for $1"
+            key=$2
+            shift 2
+            ;;
+        -o | --outdir)
+            [[ $# -ge 2 ]] || die "missing argument for $1"
+            outdir=$2
+            shift 2
+            ;;
+        -s | --source-only)
+            source_only=1
+            shift
+            ;;
+        -u | --unsigned)
+            unsigned=1
+            shift
+            ;;
+        --no-release-artifacts)
+            release_artifacts=0
+            shift
+            ;;
+        -h | --help)
+            usage
+            exit 0
+            ;;
+        *)
+            die "unknown option: $1 (try --help)"
+            ;;
+        esac
+    done
+
+    need git autoreconf debuild dcmd
+    if [[ $unsigned -eq 0 ]]; then
+        need gpg
+        [[ -n $key ]] || die "no signing key (pass --key or set DEBSIGN_KEYID, or use --unsigned)"
+    fi
+
+    local repo
+    repo=$(git rev-parse --show-toplevel) || die "not inside a git repository"
+    : "${outdir:=$repo/dist}"
+    mkdir -p "$outdir"
+    outdir=$(cd "$outdir" && pwd)
+
+    scratch=$(mktemp -d "${TMPDIR:-/tmp}/httrack-mkdeb.XXXXXX")
+    trap 'rm -rf -- "$scratch"' EXIT
+
+    # Pristine export of committed HEAD plus the coucal submodule.
+    info "exporting committed sources"
+    local export_dir=$scratch/src
+    mkdir -p "$export_dir"
+    git -C "$repo" archive --format=tar HEAD | tar -x -C "$export_dir"
+    git -C "$repo/src/coucal" archive --format=tar --prefix=src/coucal/ HEAD |
+        tar -x -C "$export_dir"
+
+    # Refresh build system and man page, then build and validate the tarball.
+    info "regenerating build system and man page"
+    (
+        cd "$export_dir"
+        autoreconf -fi
+        ./configure --quiet
+        make -s -j"$(nproc)"
+        make -s -C man regen-man
+        info "running test suite"
+        make -s check
+        # Build the tarball from a clean tree so no object files leak into it.
+        make -s clean
+        make -s dist
+    )
+
+    local tarball ver
+    local -a tarballs
+    shopt -s nullglob
+    tarballs=("$export_dir"/httrack-*.tar.gz)
+    shopt -u nullglob
+    [[ ${#tarballs[@]} -ge 1 ]] || die "make dist produced no tarball"
+    tarball=${tarballs[0]##*/}
+    ver=${tarball#httrack-}
+    ver=${ver%.tar.gz}
+    info "version $ver"
+
+    # 3.0 (quilt): orig tarball is upstream-only; debian/ is overlaid on top.
+    local orig=httrack_${ver}.orig.tar.gz
+    cp -- "$export_dir/$tarball" "$scratch/$orig"
+    (
+        cd "$scratch"
+        tar -xf "$orig"
+        cp -a "$export_dir/debian" "httrack-$ver/debian"
+    )
+
+    # Build (debuild also runs lintian and signs).
+    local -a debuild_opts=(--lintian-opts -I -i)
+    local -a build_opts=()
+    [[ $source_only -eq 1 ]] && build_opts+=(-S)
+    if [[ $unsigned -eq 1 ]]; then
+        build_opts+=(-us -uc)
+    else
+        build_opts+=("-k$key")
+    fi
+    info "building packages with debuild"
+    (
+        cd "$scratch/httrack-$ver"
+        debuild "${build_opts[@]}" "${debuild_opts[@]}"
+    )
+
+    # Collect every file the .changes references (orig, dsc, debs, ddebs, buildinfo).
+    info "collecting artifacts into $outdir"
+    local -a changes
+    shopt -s nullglob
+    changes=("$scratch"/*.changes)
+    shopt -u nullglob
+    [[ ${#changes[@]} -ge 1 ]] || die "debuild produced no .changes file"
+    dcmd cp -- "${changes[@]}" "$outdir/"
+
+    # Release artifacts for the upstream tarball (detached sig + checksums).
+    if [[ $release_artifacts -eq 1 && $unsigned -eq 0 ]]; then
+        info "signing upstream tarball"
+        (
+            cd "$outdir"
+            gpg --armor --detach-sign --yes -u "$key" -- "$orig"
+            md5sum -- "$orig" >"$orig.md5"
+            sha1sum -- "$orig" >"$orig.sha1"
+        )
+    fi
+
+    info "done. artifacts in $outdir:"
+    ls -1 "$outdir" >&2
+}
+
+main "$@"
Author	SHA1	Message	Date
Xavier Roche	9d39a57576	build: add regen target for html/httrack.man.html The rendered HTML manual had no regeneration path. Add regen-man-html, which runs groff's html device over httrack.1, alongside the existing regen-man target.	2026-06-13 10:38:31 +02:00
Xavier Roche	e3d4ec01f7	docs: use www.example.com in examples instead of www.someweb.com someweb.com is a real registrable domain; example.com is reserved for documentation (RFC 2606). Replace it across the HTML guides, the CLI --help text (htshelp.c) and code comments, then regenerate man/httrack.1 and the rendered html/httrack.man.html. Other placeholder domains are left alone: they appear inside filter/wildcard examples where the host interacts with the pattern.	2026-06-13 10:38:31 +02:00
Xavier Roche	89b25e418b	Merge pull request #322 from xroche/test/expand-engine-coverage test: expand offline engine self-test coverage	2026-06-13 09:58:03 +02:00
Xavier Roche	43f72afbad	test: expand offline engine self-test coverage Add filter (-#0) and MIME (-#2) tests, and broaden the charset, entity, IDNA, and path-simplify cases that previously had one or two assertions each. Cover the punycode, charset, and entity parsers (areas with a CVE history) with malformed-input probes that check the hardened build exits cleanly rather than overflowing. The IDNA and path-simplify edge cases are pinned to RFC 3492 and RFC 3986 semantics. The   entity case documents the known U+00A0 -> space behavior in htsencoding.c instead of asserting the spec byte, so a future fix is not blocked by a stale test.	2026-06-13 09:55:19 +02:00
Xavier Roche	017c634c53	Merge pull request #321 from xroche/fix/mutex-init-race-297 Fix race in lazy mutex initialization	2026-06-13 09:18:39 +02:00
Xavier Roche	f2b36c4b29	Merge pull request #320 from xroche/fix/lockpath-overflow-183 Fix abort on long log path (lock-file buffer too small)	2026-06-13 09:18:10 +02:00
Xavier Roche	19947efd74	Merge pull request #319 from xroche/fix/footer-xss-165 Fix XSS via unescaped URL in the page footer comment	2026-06-13 09:18:02 +02:00
Xavier Roche	de26ad881a	fix: synchronize lazy mutex initialization (closes #297 ) Two threads locking the same mutex for the first time could both run the unsynchronized lazy init, corrupting the underlying pthread mutex and aborting or deadlocking. Build the object and publish it with a single atomic compare-and-swap; threads that lose the race free the object they built. This needs no statically-initializable guard, so it stays valid on Windows 2000.	2026-06-13 09:15:31 +02:00
Xavier Roche	106d34d82c	fix: size the lock-file path buffer to the concat buffer (closes #183 ) A long log path made the lock-file path overflow the fixed 256-byte n_lock buffer, tripping the guarded copy and aborting with signal 6. Size n_lock to the concat-buffer capacity so it holds any path fconcat can produce. (cherry picked from commit 15144ffd24667712cca2ac0fee96bd355239eff6)	2026-06-12 23:24:20 +02:00
Xavier Roche	61e0b3250b	fix: escape angle brackets in the page footer URL (closes #165 ) The default footer embeds the page URL inside an HTML comment. A URL containing "-->" closed the comment and let an attacker inject script into the mirrored page. Percent-encode < and > before the URL reaches the footer. (cherry picked from commit 606883229244dc233d16915678e63cfa62000ff0)	2026-06-12 23:24:20 +02:00
Xavier Roche	827c227b94	history: document the Russian and Danish translation updates	2026-06-12 22:42:38 +02:00
Xavier Roche	17678fcee3	Merge pull request #117 from scootergrisen/master Updated Danish translation, folded into Dansk.txt (the file the UI loads), with stale/corrupted English keys restored and CRLF line endings kept	2026-06-12 22:42:05 +02:00
Xavier Roche	9ee8cbc58d	Merge pull request #210 from GermanAizek/master Updated Russian translation	2026-06-12 22:31:00 +02:00
Xavier Roche	418255c038	history: document the postprocess and help-text fixes	2026-06-12 22:14:44 +02:00
Xavier Roche	aa285715b3	Merge pull request #135 from RomanSek/plugin-postprocess-fix Fix for handling changes introduced in postprocess	2026-06-12 22:13:02 +02:00
Xavier Roche	547c77062e	Merge pull request #305 from yosinn1-blip/codex/typo-253-preferred-language-help-text docs: fix preferred spelling in help text	2026-06-12 22:12:55 +02:00
Xavier Roche	58bdfde2a9	debian: document the lintian cleanup in changelog and history	2026-06-12 22:00:57 +02:00
Xavier Roche	3e30f4e572	Merge pull request #318 from xroche/fix/lintian-cleanup debian: clean up lintian tags	2026-06-12 21:50:54 +02:00
Xavier Roche	46b7b8ed3f	debian: override source-is-missing for upstream HTML docs The bundled html/ and templates/ pages are the genuine upstream documentation from the httrack.com website. lintian's long-line heuristic flags them as missing source; they are the actual source.	2026-06-12 21:44:44 +02:00
Xavier Roche	2f40122bec	debian: fix assorted lintian tags - webhttrack: depend firmly on sensible-utils (it calls sensible-browser), drop the missing-depends-on-sensible-utils override. - copyright: point to /usr/share/common-licenses/GPL-3, not the GPL symlink. - watch: use https and version=4. - control: add Rules-Requires-Root: no and Vcs-Browser. - strip trailing whitespace in control, rules and changelog.	2026-06-12 21:27:11 +02:00
Xavier Roche	26b62369c5	build: link libhtsjava and libtest examples against libc libhtsjava and the libtest callback examples reach libc only through libhttrack, so the linker drops the direct libc edge from DT_NEEDED. lintian flags this as library-not-linked-against-libc. Force libc to be recorded as a dependency and drop the now-redundant override.	2026-06-12 21:23:29 +02:00
Xavier Roche	b21f85c53f	Merge pull request #317 from xroche/fix/cookie-cmp-loop Fix never-matching wildcard cookie domain comparison	2026-06-09 20:12:01 +02:00
Xavier Roche	0a20aa8522	Fix never-matching wildcard cookie domain comparison cookie_cmp_wildcard_domain used an unsigned loop counter, so i >= 0 was always true (infinite loop and out-of-bounds reads) and an empty domain underflowed l - 1. Use a signed counter. Found and fixed by greenrd in #172. closes #171	2026-06-09 20:09:23 +02:00
Xavier Roche	abd19b8cfa	Merge pull request #316 from xroche/chore/changelog-news-symlink build: symlink ChangeLog and NEWS to history.txt	2026-06-08 20:40:51 +02:00
Xavier Roche	4797749d4d	build: symlink ChangeLog and NEWS to history.txt They were empty automake stubs (GNU strictness requires the files to exist). Pointing them at history.txt satisfies automake, drops the confusing empty files, and ships a real changelog in the dist tarball without duplicating content in git.	2026-06-08 20:40:27 +02:00
Xavier Roche	566b9d5008	Merge pull request #315 from xroche/docs/readme-badges docs: add CI and license badges to README.md	2026-06-08 20:22:21 +02:00
Xavier Roche	8b6bc1d0ed	docs: add CI and license badges to README.md	2026-06-08 20:21:52 +02:00
Xavier Roche	e4fc8ca26f	Merge pull request #314 from xroche/ci/github-actions ci: add GitHub Actions build/test matrix and shell lint	2026-06-08 20:19:11 +02:00
Xavier Roche	52692668cd	ci: add GitHub Actions build/test matrix and shell lint Build and test (autoreconf, configure, make, make check) on x86-64 and arm64 with gcc and clang. A lint job runs shellcheck and shfmt -i 4 on the maintained scripts.	2026-06-08 20:16:38 +02:00
Xavier Roche	a2b3dc93a3	Merge pull request #313 from xroche/feat/license-gpl3-simplify Drop the OpenSSL linking exception, simplify to GPL-3.0	2026-06-07 14:38:17 +02:00
Xavier Roche	308f071910	Updated to 3.49.8	2026-06-07 14:29:33 +02:00
Xavier Roche	62a9643fc5	license: drop the obsolete OpenSSL linking exception OpenSSL 3.0+ is Apache-2.0 (GPL-compatible) and LibreSSL is BSD, so the GPL linking exception is no longer needed; httrack is now plain GPL-3.0-or-later. license.txt now carries the verbatim GPLv3 (matching COPYING); the ethical-use request moves to README. debian/copyright updated to match.	2026-06-07 14:29:33 +02:00
Xavier Roche	a88019560b	Merge pull request #312 from xroche/chore/debhelper-compat-13 debian: switch to debhelper-compat (= 13)	2026-06-07 14:18:44 +02:00
Xavier Roche	e6cae4343a	debian: switch to debhelper-compat (= 13) Replace the debian/compat file and the unversioned debhelper build-dep with debhelper-compat (= 13), and drop the now-redundant dh-autoreconf and obsolete autotools-dev build deps. Compat level is unchanged (13). Clears the no-versioned-debhelper-prerequisite and useless-autoreconf-build-depends lintian tags. Folded into the not-yet-uploaded 3.49.7-2 stanza.	2026-06-07 14:14:03 +02:00
Xavier Roche	7047e3ddd9	Merge pull request #311 from xroche/chore/standards-version-4.7.0 debian: bump Standards-Version to 4.7.0	2026-06-07 13:09:06 +02:00
Xavier Roche	074965d38a	debian: bump Standards-Version to 4.7.0 No packaging changes required. The 4.7.0 normative items do not apply to httrack: it ships no maintainer scripts (so the systemd config diversion/alternatives rule is moot), no services or init scripts (so the systemd-unit requirement is moot), and it is in main (so the contrib/non-free no-network rules target rule is moot).	2026-06-07 13:06:23 +02:00
Xavier Roche	87452f3b89	Merge pull request #310 from xroche/feat/in-tree-mkdeb Build Debian packages in-tree via tools/mkdeb.sh	2026-06-07 11:47:18 +02:00
Xavier Roche	3220085797	tools: collect artifacts with dcmd, tidy tool checks dcmd expands the .changes to its full file set (orig, dsc, debs, dbgsym ddebs, buildinfo), replacing the hand-rolled copy loop that silently dropped the dbgsym packages. need() now takes several tools at once; drop the unused dpkg-parsechangelog check and require dcmd.	2026-06-07 11:45:40 +02:00
Xavier Roche	ba41415c15	scripts: shellcheck and shfmt -i 4 cleanup makeman.sh: use CDPATH='' (SC1007) and 4-space indent; the manpage regen test reformatted with shfmt -i 4. No behavior change.	2026-06-07 11:31:25 +02:00
Xavier Roche	49a6698ca5	debian: fix bogus maintainer email in the 3.49.6-1 changelog entry roche@proliant.localnet was a local hostname that leaked into a released entry; lintian flags it as bogus-mail-host. Use xavier@debian.org like the other entries.	2026-06-07 11:31:25 +02:00
Xavier Roche	0de1b405e4	tools: add mkdeb.sh and a make deb target for signed packages Replaces an external workstation script. mkdeb.sh exports committed HEAD plus the coucal submodule to a scratch dir, refreshes the build system and man page (reusing make -C man regen-man), builds a clean upstream tarball, overlays debian/, and runs debuild (build + lintian + signing). It takes the GPG key and options as arguments and writes nothing in the working tree. 'make deb DEB_FLAGS=...' is a thin wrapper. Honors SOURCE_DATE_EPOCH.	2026-06-07 11:31:25 +02:00
Xavier Roche	dc50f25420	Merge pull request #309 from xroche/feat/manpage-generator Generate the man page in-tree from --help (indent-aware)	2026-06-07 10:56:55 +02:00
Xavier Roche	7bab8263a1	man: regenerate httrack.1 with an in-tree, indent-aware script The external makeman.sh turned the first token of every indented --help line into an option, so prose like the -%! warning rendered as bogus -IMPORTANT and -USE options (Debian #1061053). man/makeman.sh classifies lines by indentation, reads README from the source tree, and honors SOURCE_DATE_EPOCH. 'make -C man regen-man' refreshes the page; tests/02_manpage-regen.test fails if the committed page drifts from --help.	2026-06-07 10:53:03 +02:00
Xavier Roche	000017bce7	Merge pull request #308 from xroche/fix/openssl4-tls-init Modernize OpenSSL TLS init for the 3.x->4.x transition	2026-06-07 08:55:44 +02:00
Xavier Roche	98b6b1e2e7	tls: modernize OpenSSL init for the 3.x->4.x transition Use TLS_client_method() and OpenSSL_version() on OpenSSL 1.1.0+ / LibreSSL 2.7.0+; the deprecated SSLv23/SSLeay init may be removed in OpenSSL 4.0. Legacy path kept for older OpenSSL.	2026-06-07 08:53:39 +02:00
Xavier Roche	dcf300c211	Merge pull request #307 from xroche/fix/multiarch-config-h-coinstall Fix Multi-Arch co-installation and man page rendering (3.49.7)	2026-06-06 21:18:13 +02:00
Xavier Roche	f907ac5264	Updated to 3.49.7 New upstream release for the Multi-Arch config.h fix (Debian #1133728) and the man page rendering fix (Debian #1061053).	2026-06-06 21:15:24 +02:00
Xavier Roche	072464b501	man: fix -%! security warning rendered as bogus options (Debian #1061053 ) The IMPORTANT NOTE / USE IT lines used .IP \-... tags, so groff showed them as -IMPORTANT and -USE options. Render them as continuation text of the -%! description instead.	2026-06-06 21:15:24 +02:00
Xavier Roche	d4b6e05aeb	build: keep SIZEOF_LONG out of config.h for Multi-Arch (Debian #1133728 ) SIZEOF_LONG was the only config.h macro differing across architectures (8 vs 4), which broke libhttrack-dev Multi-Arch: same co-installation. md5.h was its only non-Windows user and now uses uint32_t from <stdint.h>. Regenerated configure and config.h.in.	2026-06-06 21:00:49 +02:00
yosinn1-blip	47e59b670b	docs: fix preferred spelling in help text Signed-off-by: Yoshiki <yosinn1@gmail.com>	2026-05-24 06:03:47 +09:00
GermanAizek	e003396432	Corrected spelling, text made more understandable of the Russian translations (Andrei Iliev)	2021-02-10 19:45:31 +03:00
Roman Sęk of Clearcode	5c1ba37adb	Fix for handling changes introduced in postprocess	2017-05-04 15:22:56 +02:00
scootergrisen	2f1bde915a	Updated danish translation. Please fix the filenames (Danish.txt/Dansk.txt) which ever way you want to use.	2016-11-28 00:53:00 +01:00
				`@@ -1 +0,0 @@`
				`webhttrack: missing-depends-on-sensible-utils sensible-browser usr/bin/webhttrack`