4 files changed, 39 insertions, 44 deletions
diff --git a/html/faq.html b/html/faq.html
index 3b4a051..19e5b3a 100644
--- a/html/faq.html
+++ b/html/faq.html
@@ -125,19 +125,21 @@ clear language!
 <br>
 <h3>General questions:<br></h3>
 
-<li><a href="#QG0">Is there any 'spyware' or 'adware' in this program? Can you prove that there isn't any?</a><br></li>
-
-<li><a href="#QG0c">This software is 'free', but I bought it from an authorized reseller. What's going on?</a><br></li>
+<li><a href="#QG0">Is there any 'spyware' or 'adware' in this program? Can you prove that there isn't any?</a><br></li>
+
+<li><a href="#QG0c">This software is 'free', but I bought it from an authorized reseller. What's going on?</a><br></li>
 
 <li><a href="#QG0b">Is there any risks of viruses with this software?</a><br></li>
 
-<li><a href="#QG1">The install is not working on NT without administrator rights!</a><br></li>
+<li><a href="#QG1">The install is not working on Windows without administrator rights!</a><br></li>
 
 <li><a href="#QG2">Where can I find French/other languages documentation?</a><br></li>
 
+<li><a href="#QG3b">Is HTTrack working on Windows Vista or Windows Seven?</a><br></li>
+
 <li><a href="#QG3">Is HTTrack working on NT/2000?</a><br></li>
 
-<li><a href="#QG4">What's the difference between HTTrack and WinHTTrack?</a><br></li>
+<li><a href="#QG4">What's the difference between HTTrack, WinHTTrack and WebHTTrack?</a><br></li>
 
 <li><a href="#QG5">Is HTTrack Mac compatible?</a><br></li>
 
@@ -265,8 +267,8 @@ clear language!
 
 <li><a href="#QM10">What's this hts-cache directory? Can I remove it?</a><br></li>
 
-<li><a href="#QM10b">What is the meaning of the <tt>Links scanned: 12/34 (+5)</tt> line in WinHTTrack/WebHTTrack?</a><br></li>
-
+<li><a href="#QM10b">What is the meaning of the <tt>Links scanned: 12/34 (+5)</tt> line in WinHTTrack/WebHTTrack?</a><br></li>
+
 <li><a href="#QM11">Can I start a mirror from my bookmarks?</a><br></li>
 
 <li><a href="#QM11c">Can I convert a local website (file:// links) to a standard website?</a><br></li>
@@ -350,16 +352,16 @@ More detailed information can be found <a href="filters.html">here</a>!<br>
 <a NAME="QG0">Q: <strong>Is there any 'spyware' or 'adware' in this program? Can you prove that there isn't any?</strong></a><br>
 A: <em>No ads (banners), and absolutely no 'spy' features inside the program.<br>
 The best proof is the software status: all sources are released, and everybody can check them. Open source is the best protection against privacy problems - HTTrack is an open source project, free of charge and free of any spy 'features'.</em>
-
-<br><br><a NAME="QG0c">Q: <strong>This software is 'free', but I bought it from an authorized reseller . What's going on?</strong></a><br>
-A: <em>
-HTTrack is free (free as in 'freedom') as it is covered by the <a href="http://www.gnu.org/licenses/gpl.txt" target="_new">GNU General Public License (GPL)</a>. 
-You can freely download it, without paying any fees, copy it to your friends, and modify it if you respect the license.
-There are NO official/authorized resellers, because HTTrack is <b>NOT</b> a commercial product. 
-But you can be charged for duplication fees, or any other services (example: software CDroms or shareware collections, or fees for maintenance), 
-but you should have been informed that the software was free software/GPL, and you <b><u>MUST</u></b> have received a copy of the GNU General Public License.
-Otherwise this is dishonnest and unfair.
-</em>
+
+<br><br><a NAME="QG0c">Q: <strong>This software is 'free', but I bought it from an authorized reseller . What's going on?</strong></a><br>
+A: <em>
+HTTrack is free (free as in 'freedom') as it is covered by the <a href="http://www.gnu.org/licenses/gpl.txt" target="_new">GNU General Public License (GPL)</a>. 
+You can freely download it, without paying any fees, copy it to your friends, and modify it if you respect the license.
+There are NO official/authorized resellers, because HTTrack is <b>NOT</b> a commercial product. 
+But you can be charged for duplication fees, or any other services (example: software CDroms or shareware collections, or fees for maintenance), 
+but you should have been informed that the software was free software/GPL, and you <b><u>MUST</u></b> have received a copy of the GNU General Public License.
+Otherwise this is dishonnest and unfair.
+</em>
 
 <br><br><a NAME="QG0b">Q: <strong>Are there any risks of viruses with this software?</strong></a><br>
 A: <em>For the software itself: 
@@ -367,28 +369,23 @@ All official releases (at httrack.com) are checked against all known viruses, an
 For files you are downloading on the WWW using HTTrack: You may encounter websites which were corrupted by viruses, and downloading data on these websites might be dangerous (as dangerous as if using a regular Browser). Always ensure that websites you are crawling are safe.
  (Note: remember that using an antivirus software is a good idea once you are connected to the Internet)</em>
 
-<br><br><a NAME="QG1">Q: <strong>The install is not working on NT without administrator rights!</strong></a><br>
+<br><br><a NAME="QG1">Q: <strong>The install is not working on Windows without administrator rights!</strong></a><br>
 A: <em>That's right. You can, however, install WinHTTrack on your own machine, and then copy your <tt>WinHTTrack</tt> folder from your <tt>Program Files</tt> folder to another machine, in a temporary directory (e.g. <tt>C:\temp\</tt>)</em>
 
 <br><br><a NAME="QG2">Q: <strong>Where can I find French/other languages documentation?</strong></a><br>
 A: <em>Windows interface is available on several languages, but not yet the documentation!</em>
 
+<br><br><a NAME="QG3b">Q: <strong>Is HTTrack working on Windows Vista or Windows Seven?</strong></a><br>
+A: <em>Yes, it does</em>
+
 <br><br><a NAME="QG3">Q: <strong>Is HTTrack working on NT/2000?</strong></a><br>
 A: <em>Yes, it does</em>
 
-<br><br><a NAME="QG4">Q: <strong>What's the difference between HTTrack and WinHTTrack?</strong></a><br>
-A: <em>WinHTTrack is the Windows release of HTTrack (with a graphic shell)</em>
+<br><br><a NAME="QG4">Q: <strong>What's the difference between HTTrack, WinHTTrack and WebHTTrack?</strong></a><br>
+A: <em>WinHTTrack is the Windows GUI release of HTTrack (with a native graphic shell) and WebHTTrack is the Linux/Posix release of HTTrack (with an html graphic shell)</em>
 
 <br><br><a NAME="QG5">Q: <strong>Is HTTrack Mac compatible?</strong></a><br>
-A: <em>Yes, using the original sources:
-
-<pre>
-tar xvfz httrack-*.tar.gz
-cd httrack-*
-./configure --prefix=/usr/local && make && make install
-/usr/local/bin/httrack
-</pre>
-But there are no official binaries, because of a lack of time</em>
+A: <em>Yes, using the original sources, or with MacPorts.
 
 <br><br><a NAME="QG6">Q: <strong>Can HTTrack be compiled on all Un*x?</strong></a><br>
 A: <em>It should. The <tt>Makefile</tt> may be modified in some cases, however</em>
@@ -396,16 +393,16 @@ A: <em>It should. The <tt>Makefile</tt> may be modified in some cases, however</
 <br><br><a NAME="QG7">Q: <strong>I use HTTrack for professional purpose. What about restrictions/license fee?</strong></a><br>
 A: <em>HTTrack is covered by the GNU General Public License (GPL). There is no restrictions using HTTrack for professional purpose, 
 except if you develop a software which uses HTTrack components (parts of the source, or any other component).
-See the <tt>license.txt</tt> file for more information</em>
+See the <tt>license.txt</tt> file for more information</em>. See also the next question regarding copyright issues when reditributing downloaded material.
 
 <br><br><a NAME="QG7b">Q: <strong>Is there any license royalties for distributing a mirror made with HTTrack?</strong></a><br>
-A: <em>No.</em>
+A: <em>On the HTTrack side, no. However, sharing, publishing or reusing copyrighted material downloaded from a site requires the authorization of the copyright holders, and possibly paying royalty fees. Always ask the authorization before creating a mirror of a site, even if the site appears to be royalty-free and/or without copyright notice.</em>
 
 <br><br><a NAME="QG8">Q: <strong>Is a DLL/library version available?</strong></a><br>
 A: <em>Yes. The default distribution includes a DLL (Windows) or a .so (Un*X), used by the program</em>
 
-<br><br><a NAME="QG9">Q: <strong>Is there a X11/KDE shell available for Linux and Un*x?</strong></a><br>
-A: <em>Yes. See the download/contribution section at <a href="http://www.httrack.com">www.httrack.com!</a></em>
+<br><br><a NAME="QG9">Q: <strong>Is there a GUI version available for Linux and Un*x?</strong></a><br>
+A: <em>Yes. It is called WebHTTrack. See the download section at <a href="http://www.httrack.com">www.httrack.com!</a></em>
 
 <br><br>
 <u><strong>Troubleshooting:<br>
@@ -464,10 +461,10 @@ A: <em>Yes, but .ra/.rm associated file should be captured together - except if
 <br><br><a NAME="QT6">Q: <strong>Using user:password@address is not working!</a></strong></a></br>
 A: <em>Again, first check the <tt>hts-log.txt</tt> and <tt>hts-err.txt</tt> error log files - this can give you precious information<br>
 The site may have a different authentication scheme - form based authentication, for example.
-In this case, use the URL capture features of HTTrack, it might work.
-<br>Note: If your username and/or password contains a '<tt>@</tt>' character, you may have to replace all '<tt>@</tt>' 
-occurences by '<tt>%40</tt>' so that it can work, such as in <tt>user%40domain.com:foobar@www.foo.com/auth/. 
-You may have to do the same for all "special" characters like spaces (%20), quotes (%22)..</tt>
+In this case, use the URL capture features of HTTrack, it might work.
+<br>Note: If your username and/or password contains a '<tt>@</tt>' character, you may have to replace all '<tt>@</tt>' 
+occurences by '<tt>%40</tt>' so that it can work, such as in <tt>user%40domain.com:foobar@www.foo.com/auth/. 
+You may have to do the same for all "special" characters like spaces (%20), quotes (%22)..</tt>
 </em>
 <br><br>
 
@@ -844,10 +841,10 @@ A: <em>Not yet!</em>
 <br><br><a NAME="QM10">Q: <strong>What's this hts-cache directory? Can I remove it?</strong></a><br>
 A: <em>NO if you want to update the site, because this directory is used by HTTrack for this purpose. 
 If you remove it, options and URLs will not be available for updating the site</em>
-
-<br><br><a NAME="QM10b">Q: <strong>What is the meaning of the <tt>Links scanned: 12/34 (+5)</tt> line in WinHTTrack/WebHTTrack?</strong></a><br>
-A: <em>12 is the number of links scanned and stored, 34 the total number of links detected to be parsed, and 5 the number of files downloaded in background.
-In this example, 17 links were downloaded out of a (temporary) total of 34 links.</em>
+
+<br><br><a NAME="QM10b">Q: <strong>What is the meaning of the <tt>Links scanned: 12/34 (+5)</tt> line in WinHTTrack/WebHTTrack?</strong></a><br>
+A: <em>12 is the number of links scanned and stored, 34 the total number of links detected to be parsed, and 5 the number of files downloaded in background.
+In this example, 17 links were downloaded out of a (temporary) total of 34 links.</em>
 
 <br><br><a NAME="QM11">Q: <strong>Can I start a mirror from my bookmarks?</strong></a><br>
 A: <em>Yes. Drag&Drop your bookmark.html file to the WinHTTrack window (or use file://filename for command-line release) and select
diff --git a/html/httrack.man.html b/html/httrack.man.html
index f887383..6427bef 100644
--- a/html/httrack.man.html
+++ b/html/httrack.man.html
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.18.1 -->
-<!-- CreationDate: Wed May 20 19:13:56 2009 -->
+<!-- CreationDate: Tue Dec 21 11:30:04 2010 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
diff --git a/html/server/div/WebHTTrack-Websites.desktop b/html/server/div/WebHTTrack-Websites.desktop
index 3ddb987..92688ed 100644
--- a/html/server/div/WebHTTrack-Websites.desktop
+++ b/html/server/div/WebHTTrack-Websites.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Categories=Network;
diff --git a/html/server/div/WebHTTrack.desktop b/html/server/div/WebHTTrack.desktop
index 8a2f8af..b6d75ef 100644
--- a/html/server/div/WebHTTrack.desktop
+++ b/html/server/div/WebHTTrack.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Categories=Network;