Changed mention of piwik to matomo in docs.

3 files changed, 366 insertions, 353 deletions

diff --git a/docs/librejs.info b/docs/librejs.info
index 0b12979..f1c35bd 100644
--- a/docs/librejs.info
+++ b/docs/librejs.info
@@ -1,7 +1,7 @@
 This is librejs.info, produced by makeinfo version 6.8 from
 librejs.texi.
 
-This manual is for GNU LibreJS (version 7.20, 18 April 2022), a GNU
+This manual is for GNU LibreJS (version 7.20, 28 April 2022), a GNU
 IceCat extension to detect and block nonfree nontrivial JavaScript on
 webpages.
 
@@ -10,9 +10,10 @@ webpages.
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
      Version 1.3 or any later version published by the Free Software
-     Foundation; with no Invariant Sections, with no Front-Cover Texts,
-     and with no Back-Cover Texts.  A copy of the license is included in
-     the section entitled "GNU Free Documentation License".
+     Foundation; with no Invariant Sections, with no Front-Cover
+     Texts, and with no Back-Cover Texts.  A copy of the license is
+     included in the section entitled "GNU Free Documentation
+     License".
 INFO-DIR-SECTION GNUzilla
 START-INFO-DIR-ENTRY
 * LibreJS: (librejs).               Detect nonfree nontrivial in GNU Icecat
@@ -24,7 +25,7 @@ File: librejs.info,  Node: Top,  Next: Overview,  Up: (dir)
 LibreJS
 *******
 
-This manual is for GNU LibreJS (version 7.20, 18 April 2022).
+This manual is for GNU LibreJS (version 7.20, 28 April 2022).
 
 * Menu:
 
@@ -54,20 +55,20 @@ File: librejs.info,  Node: Overview,  Next: Disclaimer,  Prev: Top,  Up: Top
 1 Overview
 **********
 
-GNU LibreJS --an add-on for GNU IceCat and Mozilla Firefox-- detects and
-blocks nonfree nontrivial JavaScript while allowing its execution on
-pages containing code that is either trivial and/or free.
+GNU LibreJS --an add-on for GNU IceCat and Mozilla Firefox-- detects
+and blocks nonfree nontrivial JavaScript while allowing its execution
+on pages containing code that is either trivial and/or free.
 
    Many websites run nontrivial JavaScript on your computer.  Some use
-it for complex tasks; many use it gratuitously for minor jobs that could
-be done easily with plain HTML. Sometimes this JavaScript code is
-malicious.  Either way, the JavaScript code is often nonfree.  For
+it for complex tasks; many use it gratuitously for minor jobs that
+could be done easily with plain HTML. Sometimes this JavaScript code
+is malicious.  Either way, the JavaScript code is often nonfree.  For
 explanation of the issue, see "The JavaScript
 Trap"(<http://www.gnu.org/philosophy/javascript-trap.html>).
 
    If you care about freedom in your computing, and don't wish to let
-all and sundry make you run nonfree programs, now you can prevent it by
-using LibreJS.
+all and sundry make you run nonfree programs, now you can prevent it
+by using LibreJS.
 
 
 File: librejs.info,  Node: Disclaimer,  Next: Installation,  Prev: Overview,  Up: Top
@@ -92,8 +93,9 @@ File: librejs.info,  Node: Installation,  Next: How to Use,  Prev: Disclaimer,
 You can install LibreJS directly using a generated 'librejs.xpi' file,
 or by building it from source (*Note LibreJS Development Notes::).
 
-   You can also download it from <https://www.gnu.org/software/librejs/>
-or <https://addons.mozilla.org/addon/librejs/>, but due to Mozilla's
+   You can also download it from
+<https://www.gnu.org/software/librejs/> or
+<https://addons.mozilla.org/addon/librejs/>, but due to Mozilla's
 review process the download isn't always up to date.
 
 
@@ -121,15 +123,15 @@ will always get rejected.
 
    It is important to note that this feature recognizes which scripts
 are blacklisted and whitelisted based on hash.  This means that even a
-slight difference in a script's code will cause it to be recognized as a
-separate script.
+slight difference in a script's code will cause it to be recognized as
+a separate script.
 
    Sometimes, JavaScript will be dynamically generated so that it is
-different every time a website is loaded.  These types of scripts cannot
-be whitelisted or blacklisted since they cannot be recognized.
+different every time a website is loaded.  These types of scripts
+cannot be whitelisted or blacklisted since they cannot be recognized.
 
-   LibreJS has a default whitelist of scripts that are known to be free
-but may not declare their license in a format that LibreJS can
+   LibreJS has a default whitelist of scripts that are known to be
+free but may not declare their license in a format that LibreJS can
 understand.
 
 4.3 Complaint Feature
@@ -139,44 +141,44 @@ It is very important to complain when a site has nonfree JavaScript
 code, especially if it won't work without that code.  LibreJS makes it
 easy to complain by heuristically finding where to send the complaint.
 
-   When nonfree/nontrivial code is detected in a page, LibreJS attempts
-to find a relevant contact link or email for the website you are
-visiting.  In order to do so, it will attempt to visit a few links from
-the current page (for instance, a link labeled "contact" on the same
-domain as the current page, ...)
+   When nonfree/nontrivial code is detected in a page, LibreJS
+attempts to find a relevant contact link or email for the website you
+are visiting.  In order to do so, it will attempt to visit a few links
+from the current page (for instance, a link labeled "contact" on the
+same domain as the current page, ...)
 
-   LibreJS detects contact pages, email addresses that are likely to be
-owned by the maintainer of the site, Twitter and identi.ca links, and
-phone numbers.
+   LibreJS detects contact pages, email addresses that are likely to
+be owned by the maintainer of the site, Twitter and identi.ca links,
+and phone numbers.
 
    When you complain to the website for their nonfree nontrivial
 JavaScript, provide them with the link to the JavaScript Trap essay so
-that they can get more information on what the issue is and how they can
-solve it on their own site.
+that they can get more information on what the issue is and how they
+can solve it on their own site.
 
    LibreJS includes a default subject line and body for the complaint
-email, with a link to the JavaScript Trap essay.  This can be configured
-in the LibreJS add-on preferences in your web browser.
+email, with a link to the JavaScript Trap essay.  This can be
+configured in the LibreJS add-on preferences in your web browser.
 
 4.4 Options
 ===========
 
      You can manage LibreJS's preferences either from the extension's
-     entry in your browser's Add-ons Manager page ('about:addons') or by
-     clicking the LibreJS toolbar icon and then the "Settings..."
+     entry in your browser's Add-ons Manager page ('about:addons') or
+     by clicking the LibreJS toolbar icon and then the "Settings..."
      button on the top right of the popup.  This will open a panel
-     containing a whitelist/blacklist manager and a section to configure
-     your complaints messages to site owners.
+     containing a whitelist/blacklist manager and a section to
+     configure your complaints messages to site owners.
 
 "Whitelist/Blacklist"
 
      LibreJS lets you whitelist or blacklist domain names and
-     subdomains, to bypass the regular JavaScript checks.  This might be
-     useful, for example, if you are running your own code in a local
-     web server, or if you don't want to waste computing resources on
-     script origins you already know you can't trust.  librejs provides
-     a lists manager UI to handle both the lists on the top of its
-     Options panel.
+     subdomains, to bypass the regular JavaScript checks.  This might
+     be useful, for example, if you are running your own code in a
+     local web server, or if you don't want to waste computing
+     resources on script origins you already know you can't trust.
+     librejs provides a lists manager UI to handle both the lists on
+     the top of its Options panel.
 
 "Complaint email subject"
      Configure the default subject used in complaint emails.
@@ -191,8 +193,9 @@ File: librejs.info,  Node: JavaScript Detection,  Next: Free Licenses Detection,
 **********************
 
 LibreJS considers a very strict subset of JavaScript to be acceptable
-for use in non-free scripts.  This is meant to maximimize compatibility
-with websites that haven't tried to be LibreJS compatible.
+for use in non-free scripts.  This is meant to maximimize
+compatibility with websites that haven't tried to be LibreJS
+compatible.
 
    We consider modification of the document non-trivial.  There isn't
 much that javascript could do that we would consider trivial, for
@@ -228,9 +231,10 @@ File: librejs.info,  Node: Free Licenses Detection,  Next: Setting Your JavaScri
 *************************
 
 The machine readable format for license declarations that LibreJS uses
-has changed in the most recent version.  This was necessary in order to
-not break the asynchronous JS loading model that browsers use.  Scripts
-are now evaluated independent of eachother and strictly as they arrive.
+has changed in the most recent version.  This was necessary in order
+to not break the asynchronous JS loading model that browsers use.
+Scripts are now evaluated independent of eachother and strictly as
+they arrive.
 
 
 File: librejs.info,  Node: Setting Your JavaScript Free,  Next: LibreJS Development Notes,  Prev: Free Licenses Detection,  Up: Top
@@ -243,32 +247,32 @@ you are already using a free library, or you're not using any
 third-party libraries, it might only take a few minutes.
 
    On your website, take a look at your HTML source.  You can identify
-distinct pieces of JavaScript that might be free and some other that are
-nonfree.
+distinct pieces of JavaScript that might be free and some other that
+are nonfree.
 
    This might be the case with an analytics tracker, social media
 widgets, and code that runs ads.  Removing these pieces of code from
 your site is required to have the rest accepted as free.  There are
 often alternatives to nonfree libraries or to third-party services:
 
-   * If you have used nonfree third-party code as the base to write your
-     own code, try to find a free alternative.
+   * If you have used nonfree third-party code as the base to write
+     your own code, try to find a free alternative.
 
-   * If you're using a third-party service such as an analytics service,
-     replace it with a free alternative like Piwik.
+   * If you're using a third-party service such as an analytics
+     service, replace it with a free alternative like Matomo.
 
-   * If you can't find free JavaScript that has already been developed,
-     write it yourself!  Who knows, your own solution might be the start
-     of a brilliant project!
+   * If you can't find free JavaScript that has already been
+     developed, write it yourself!  Who knows, your own solution might
+     be the start of a brilliant project!
 
 7.1 License tags
 ================
 
-LibreJS will allow non-trivial scripts to run as long as they use a free
-license.
+LibreJS will allow non-trivial scripts to run as long as they use a
+free license.
 
-   In order for the license of a script to be recognized by LibreJS, it
-must be declared using a machine-readable license format.
+   In order for the license of a script to be recognized by LibreJS,
+it must be declared using a machine-readable license format.
 
    This format is the same for both remote in-line scripts.
 
@@ -564,11 +568,11 @@ corresponding magnet link.
 7.2 Undetected Free Licenses
 ============================
 
-If you are using a free license that isn't detected by LibreJS and isn't
-listed in the previous section, please send a message to
-<bug-librejs@gnu.org> regarding this license, where code released under
-this license can be found, and where to find the license text and
-information.
+If you are using a free license that isn't detected by LibreJS and
+isn't listed in the previous section, please send a message to
+<bug-librejs@gnu.org> regarding this license, where code released
+under this license can be found, and where to find the license text
+and information.
 
    Many free licenses are listed in this page:
 <http://www.gnu.org/licenses/license-list.html>
@@ -576,10 +580,10 @@ information.
 7.3 Known limitations
 =====================
 
-Service workers may cause false positives and false negatives, and there
-are multiple ways to disable them.  The cleanest way is by setting
-'dom.serviceWorkers.enabled' to 'false' in the 'about:config' page of
-your browser.
+Service workers may cause false positives and false negatives, and
+there are multiple ways to disable them.  The cleanest way is by
+setting 'dom.serviceWorkers.enabled' to 'false' in the 'about:config'
+page of your browser.
 
 
 File: librejs.info,  Node: LibreJS Development Notes,  Next: Installation Requirements,  Prev: Setting Your JavaScript Free,  Up: Top
@@ -590,11 +594,10 @@ File: librejs.info,  Node: LibreJS Development Notes,  Next: Installation Requir
 8.1 Dependencies
 ================
 
-LibreJS 7.20 depends on a number of Node.js-based libraries that can be
-installed using the 'npm' utility:
+LibreJS 7.20 depends on a number of Node.js-based libraries that can
+be installed using the 'npm' utility:
 
-  $ npm install jssha
-  $ npm install browserify
+  $ npm install acorn-loose jassha browserify
   $ export PATH=$PATH:./node_modules/.bin
 
 8.2 Building
@@ -623,8 +626,8 @@ To debug LibreJS, visit the special URL 'about:debugging'.  Click on
 LibreJS's unpacked source directory and select 'manifest.json'.
 
    Lines 39 and 40 in 'main_background.js' assign two variables
-controlling the verbosity of 'dbg_print()' statements.  Make sure these
-are set to false before building a release.
+controlling the verbosity of 'dbg_print()' statements.  Make sure
+these are set to false before building a release.
 
 8.4 Testing
 ===========
@@ -640,8 +643,7 @@ clicking the "Automated self test..."  button.
 To launch the test suite from the command line, ensure the xpi package
 has been built with automated test suite.  Then install
 selenium-webdriver and geckodriver, and ensure the latter is in $PATH:
-  $ npm install selenium-webdriver
-  $ npm install geckodriver
+  $ npm install selenium-webdriver geckodriver
   $ export PATH=$PATH:./node_modules/.bin
 
    Now you can invoke the test with
@@ -657,8 +659,8 @@ selenium-webdriver and geckodriver, and ensure the latter is in $PATH:
 
 To check whether a webpage is LibreJS-compliant from the command line,
 ensure that the xpi package has been built WITHOUT the automated test
-suite.  Then install selenium-webdriver and geckodriver, and ensure the
-latter is in $PATH:
+suite.  Then install selenium-webdriver and geckodriver, and ensure
+the latter is in $PATH:
   $ npm install selenium-webdriver
   $ npm install geckodriver
   $ export PATH=$PATH:./node_modules/.bin
@@ -675,13 +677,13 @@ output the compliance check result.
 8.7 Adding new whitelisted libraries
 ====================================
 
-The script index.js in './hash_script' generates the default whitelist.
-Run it with the following command:
+The script index.js in './hash_script' generates the default
+whitelist.  Run it with the following command:
 
    'node index.js > output'
 
-   Then, just copy the contents of the file "output" to the appropriate
-place in main_background.js.
+   Then, just copy the contents of the file "output" to the
+appropriate place in main_background.js.
 
 8.8 Releasing a new version
 ===========================
@@ -724,9 +726,10 @@ analyzing JavaScript within them.  It does not remove script nodes and
 attributes from the page, but instead "deactivates" them by replacing
 their content with a commented notice.
 
-   LibreJS detects the most common cases using the HTTP response method
-described above, but in less common edge cases, or when running code
-locally, LibreJS cannot detect JavaScript during the response stage.
+   LibreJS detects the most common cases using the HTTP response
+method described above, but in less common edge cases, or when running
+code locally, LibreJS cannot detect JavaScript during the response
+stage.
 
 
 File: librejs.info,  Node: GNU Free Documentation License,  Prev: LibreJS Internals,  Up: Top
@@ -734,7 +737,7 @@ File: librejs.info,  Node: GNU Free Documentation License,  Prev: LibreJS Intern
 Appendix C GNU Free Documentation License
 *****************************************
 
-                     Version 1.3, 3 November 2008
+                    Version 1.3, 3 November 2008
 
      Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
      <http://fsf.org/>
@@ -744,132 +747,136 @@ Appendix C GNU Free Documentation License
 
   0. PREAMBLE
 
-     The purpose of this License is to make a manual, textbook, or other
-     functional and useful document "free" in the sense of freedom: to
-     assure everyone the effective freedom to copy and redistribute it,
-     with or without modifying it, either commercially or
-     noncommercially.  Secondarily, this License preserves for the
-     author and publisher a way to get credit for their work, while not
-     being considered responsible for modifications made by others.
+     The purpose of this License is to make a manual, textbook, or
+     other functional and useful document "free" in the sense of
+     freedom: to assure everyone the effective freedom to copy and
+     redistribute it, with or without modifying it, either
+     commercially or noncommercially.  Secondarily, this License
+     preserves for the author and publisher a way to get credit for
+     their work, while not being considered responsible for
+     modifications made by others.
 
      This License is a kind of "copyleft", which means that derivative
      works of the document must themselves be free in the same sense.
-     It complements the GNU General Public License, which is a copyleft
-     license designed for free software.
+     It complements the GNU General Public License, which is a
+     copyleft license designed for free software.
 
      We have designed this License in order to use it for manuals for
      free software, because free software needs free documentation: a
      free program should come with manuals providing the same freedoms
      that the software does.  But this License is not limited to
      software manuals; it can be used for any textual work, regardless
-     of subject matter or whether it is published as a printed book.  We
-     recommend this License principally for works whose purpose is
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
      instruction or reference.
 
   1. APPLICABILITY AND DEFINITIONS
 
      This License applies to any manual or other work, in any medium,
-     that contains a notice placed by the copyright holder saying it can
-     be distributed under the terms of this License.  Such a notice
-     grants a world-wide, royalty-free license, unlimited in duration,
-     to use that work under the conditions stated herein.  The
-     "Document", below, refers to any such manual or work.  Any member
-     of the public is a licensee, and is addressed as "you".  You accept
-     the license if you copy, modify or distribute the work in a way
-     requiring permission under copyright law.
-
-     A "Modified Version" of the Document means any work containing the
-     Document or a portion of it, either copied verbatim, or with
+     that contains a notice placed by the copyright holder saying it
+     can be distributed under the terms of this License.  Such a
+     notice grants a world-wide, royalty-free license, unlimited in
+     duration, to use that work under the conditions stated herein.
+     The "Document", below, refers to any such manual or work.  Any
+     member of the public is a licensee, and is addressed as "you".
+     You accept the license if you copy, modify or distribute the work
+     in a way requiring permission under copyright law.
+
+     A "Modified Version" of the Document means any work containing
+     the Document or a portion of it, either copied verbatim, or with
      modifications and/or translated into another language.
 
-     A "Secondary Section" is a named appendix or a front-matter section
-     of the Document that deals exclusively with the relationship of the
-     publishers or authors of the Document to the Document's overall
-     subject (or to related matters) and contains nothing that could
-     fall directly within that overall subject.  (Thus, if the Document
-     is in part a textbook of mathematics, a Secondary Section may not
-     explain any mathematics.)  The relationship could be a matter of
-     historical connection with the subject or with related matters, or
-     of legal, commercial, philosophical, ethical or political position
-     regarding them.
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (Thus, if the Document is in part a textbook of mathematics, a
+     Secondary Section may not explain any mathematics.)  The
+     relationship could be a matter of historical connection with the
+     subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
 
      The "Invariant Sections" are certain Secondary Sections whose
-     titles are designated, as being those of Invariant Sections, in the
-     notice that says that the Document is released under this License.
-     If a section does not fit the above definition of Secondary then it
-     is not allowed to be designated as Invariant.  The Document may
-     contain zero Invariant Sections.  If the Document does not identify
-     any Invariant Sections then there are none.
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.  If a section does not fit the above definition of
+     Secondary then it is not allowed to be designated as Invariant.
+     The Document may contain zero Invariant Sections.  If the
+     Document does not identify any Invariant Sections then there are
+     none.
 
      The "Cover Texts" are certain short passages of text that are
      listed, as Front-Cover Texts or Back-Cover Texts, in the notice
      that says that the Document is released under this License.  A
-     Front-Cover Text may be at most 5 words, and a Back-Cover Text may
-     be at most 25 words.
-
-     A "Transparent" copy of the Document means a machine-readable copy,
-     represented in a format whose specification is available to the
-     general public, that is suitable for revising the document
-     straightforwardly with generic text editors or (for images composed
-     of pixels) generic paint programs or (for drawings) some widely
-     available drawing editor, and that is suitable for input to text
-     formatters or for automatic translation to a variety of formats
-     suitable for input to text formatters.  A copy made in an otherwise
-     Transparent file format whose markup, or absence of markup, has
-     been arranged to thwart or discourage subsequent modification by
-     readers is not Transparent.  An image format is not Transparent if
-     used for any substantial amount of text.  A copy that is not
-     "Transparent" is called "Opaque".
+     Front-Cover Text may be at most 5 words, and a Back-Cover Text
+     may be at most 25 words.
+
+     A "Transparent" copy of the Document means a machine-readable
+     copy, represented in a format whose specification is available to
+     the general public, that is suitable for revising the document
+     straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input
+     to text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup, or absence of
+     markup, has been arranged to thwart or discourage subsequent
+     modification by readers is not Transparent.  An image format is
+     not Transparent if used for any substantial amount of text.  A
+     copy that is not "Transparent" is called "Opaque".
 
      Examples of suitable formats for Transparent copies include plain
      ASCII without markup, Texinfo input format, LaTeX input format,
-     SGML or XML using a publicly available DTD, and standard-conforming
-     simple HTML, PostScript or PDF designed for human modification.
-     Examples of transparent image formats include PNG, XCF and JPG.
-     Opaque formats include proprietary formats that can be read and
-     edited only by proprietary word processors, SGML or XML for which
-     the DTD and/or processing tools are not generally available, and
-     the machine-generated HTML, PostScript or PDF produced by some word
-     processors for output purposes only.
-
-     The "Title Page" means, for a printed book, the title page itself,
-     plus such following pages as are needed to hold, legibly, the
-     material this License requires to appear in the title page.  For
-     works in formats which do not have any title page as such, "Title
-     Page" means the text near the most prominent appearance of the
-     work's title, preceding the beginning of the body of the text.
-
-     The "publisher" means any person or entity that distributes copies
-     of the Document to the public.
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML, PostScript or PDF designed for
+     human modification.  Examples of transparent image formats
+     include PNG, XCF and JPG. Opaque formats include proprietary
+     formats that can be read and edited only by proprietary word
+     processors, SGML or XML for which the DTD and/or processing tools
+     are not generally available, and the machine-generated HTML,
+     PostScript or PDF produced by some word processors for output
+     purposes only.
+
+     The "Title Page" means, for a printed book, the title page
+     itself, plus such following pages as are needed to hold, legibly,
+     the material this License requires to appear in the title page.
+     For works in formats which do not have any title page as such,
+     "Title Page" means the text near the most prominent appearance of
+     the work's title, preceding the beginning of the body of the
+     text.
+
+     The "publisher" means any person or entity that distributes
+     copies of the Document to the public.
 
      A section "Entitled XYZ" means a named subunit of the Document
-     whose title either is precisely XYZ or contains XYZ in parentheses
-     following text that translates XYZ in another language.  (Here XYZ
-     stands for a specific section name mentioned below, such as
-     "Acknowledgements", "Dedications", "Endorsements", or "History".)
-     To "Preserve the Title" of such a section when you modify the
-     Document means that it remains a section "Entitled XYZ" according
-     to this definition.
+     whose title either is precisely XYZ or contains XYZ in
+     parentheses following text that translates XYZ in another
+     language.  (Here XYZ stands for a specific section name mentioned
+     below, such as "Acknowledgements", "Dedications", "Endorsements",
+     or "History".)  To "Preserve the Title" of such a section when
+     you modify the Document means that it remains a section "Entitled
+     XYZ" according to this definition.
 
      The Document may include Warranty Disclaimers next to the notice
      which states that this License applies to the Document.  These
-     Warranty Disclaimers are considered to be included by reference in
-     this License, but only as regards disclaiming warranties: any other
-     implication that these Warranty Disclaimers may have is void and
-     has no effect on the meaning of this License.
+     Warranty Disclaimers are considered to be included by reference
+     in this License, but only as regards disclaiming warranties: any
+     other implication that these Warranty Disclaimers may have is
+     void and has no effect on the meaning of this License.
 
   2. VERBATIM COPYING
 
      You may copy and distribute the Document in any medium, either
      commercially or noncommercially, provided that this License, the
      copyright notices, and the license notice saying this License
-     applies to the Document are reproduced in all copies, and that you
-     add no other conditions whatsoever to those of this License.  You
-     may not use technical measures to obstruct or control the reading
-     or further copying of the copies you make or distribute.  However,
-     you may accept compensation in exchange for copies.  If you
-     distribute a large enough number of copies you must also follow the
-     conditions in section 3.
+     applies to the Document are reproduced in all copies, and that
+     you add no other conditions whatsoever to those of this License.
+     You may not use technical measures to obstruct or control the
+     reading or further copying of the copies you make or distribute.
+     However, you may accept compensation in exchange for copies.  If
+     you distribute a large enough number of copies you must also
+     follow the conditions in section 3.
 
      You may also lend copies, under the same conditions stated above,
      and you may publicly display copies.
@@ -877,17 +884,18 @@ Appendix C GNU Free Documentation License
   3. COPYING IN QUANTITY
 
      If you publish printed copies (or copies in media that commonly
-     have printed covers) of the Document, numbering more than 100, and
-     the Document's license notice requires Cover Texts, you must
+     have printed covers) of the Document, numbering more than 100,
+     and the Document's license notice requires Cover Texts, you must
      enclose the copies in covers that carry, clearly and legibly, all
      these Cover Texts: Front-Cover Texts on the front cover, and
-     Back-Cover Texts on the back cover.  Both covers must also clearly
-     and legibly identify you as the publisher of these copies.  The
-     front cover must present the full title with all words of the title
-     equally prominent and visible.  You may add other material on the
-     covers in addition.  Copying with changes limited to the covers, as
-     long as they preserve the title of the Document and satisfy these
-     conditions, can be treated as verbatim copying in other respects.
+     Back-Cover Texts on the back cover.  Both covers must also
+     clearly and legibly identify you as the publisher of these
+     copies.  The front cover must present the full title with all
+     words of the title equally prominent and visible.  You may add
+     other material on the covers in addition.  Copying with changes
+     limited to the covers, as long as they preserve the title of the
+     Document and satisfy these conditions, can be treated as verbatim
+     copying in other respects.
 
      If the required texts for either cover are too voluminous to fit
      legibly, you should put the first ones listed (as many as fit
@@ -895,39 +903,40 @@ Appendix C GNU Free Documentation License
      adjacent pages.
 
      If you publish or distribute Opaque copies of the Document
-     numbering more than 100, you must either include a machine-readable
-     Transparent copy along with each Opaque copy, or state in or with
-     each Opaque copy a computer-network location from which the general
-     network-using public has access to download using public-standard
-     network protocols a complete Transparent copy of the Document, free
-     of added material.  If you use the latter option, you must take
-     reasonably prudent steps, when you begin distribution of Opaque
-     copies in quantity, to ensure that this Transparent copy will
-     remain thus accessible at the stated location until at least one
-     year after the last time you distribute an Opaque copy (directly or
-     through your agents or retailers) of that edition to the public.
-
-     It is requested, but not required, that you contact the authors of
-     the Document well before redistributing any large number of copies,
-     to give them a chance to provide you with an updated version of the
-     Document.
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a computer-network location
+     from which the general network-using public has access to
+     download using public-standard network protocols a complete
+     Transparent copy of the Document, free of added material.  If you
+     use the latter option, you must take reasonably prudent steps,
+     when you begin distribution of Opaque copies in quantity, to
+     ensure that this Transparent copy will remain thus accessible at
+     the stated location until at least one year after the last time
+     you distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors
+     of the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
 
   4. MODIFICATIONS
 
      You may copy and distribute a Modified Version of the Document
      under the conditions of sections 2 and 3 above, provided that you
-     release the Modified Version under precisely this License, with the
-     Modified Version filling the role of the Document, thus licensing
-     distribution and modification of the Modified Version to whoever
-     possesses a copy of it.  In addition, you must do these things in
-     the Modified Version:
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version
+     to whoever possesses a copy of it.  In addition, you must do
+     these things in the Modified Version:
 
        A. Use in the Title Page (and on the covers, if any) a title
-          distinct from that of the Document, and from those of previous
-          versions (which should, if there were any, be listed in the
-          History section of the Document).  You may use the same title
-          as a previous version if the original publisher of that
-          version gives permission.
+          distinct from that of the Document, and from those of
+          previous versions (which should, if there were any, be
+          listed in the History section of the Document).  You may use
+          the same title as a previous version if the original
+          publisher of that version gives permission.
 
        B. List on the Title Page, as authors, one or more persons or
           entities responsible for authorship of the modifications in
@@ -946,8 +955,8 @@ Appendix C GNU Free Documentation License
 
        F. Include, immediately after the copyright notices, a license
           notice giving the public permission to use the Modified
-          Version under the terms of this License, in the form shown in
-          the Addendum below.
+          Version under the terms of this License, in the form shown
+          in the Addendum below.
 
        G. Preserve in that license notice the full lists of Invariant
           Sections and required Cover Texts given in the Document's
@@ -957,30 +966,32 @@ Appendix C GNU Free Documentation License
 
        I. Preserve the section Entitled "History", Preserve its Title,
           and add to it an item stating at least the title, year, new
-          authors, and publisher of the Modified Version as given on the
-          Title Page.  If there is no section Entitled "History" in the
-          Document, create one stating the title, year, authors, and
-          publisher of the Document as given on its Title Page, then add
-          an item describing the Modified Version as stated in the
-          previous sentence.
+          authors, and publisher of the Modified Version as given on
+          the Title Page.  If there is no section Entitled "History"
+          in the Document, create one stating the title, year,
+          authors, and publisher of the Document as given on its Title
+          Page, then add an item describing the Modified Version as
+          stated in the previous sentence.
 
        J. Preserve the network location, if any, given in the Document
           for public access to a Transparent copy of the Document, and
           likewise the network locations given in the Document for
-          previous versions it was based on.  These may be placed in the
-          "History" section.  You may omit a network location for a work
-          that was published at least four years before the Document
-          itself, or if the original publisher of the version it refers
-          to gives permission.
-
-       K. For any section Entitled "Acknowledgements" or "Dedications",
-          Preserve the Title of the section, and preserve in the section
-          all the substance and tone of each of the contributor
-          acknowledgements and/or dedications given therein.
-
-       L. Preserve all the Invariant Sections of the Document, unaltered
-          in their text and in their titles.  Section numbers or the
-          equivalent are not considered part of the section titles.
+          previous versions it was based on.  These may be placed in
+          the "History" section.  You may omit a network location for
+          a work that was published at least four years before the
+          Document itself, or if the original publisher of the version
+          it refers to gives permission.
+
+       K. For any section Entitled "Acknowledgements" or
+          "Dedications", Preserve the Title of the section, and
+          preserve in the section all the substance and tone of each
+          of the contributor acknowledgements and/or dedications given
+          therein.
+
+       L. Preserve all the Invariant Sections of the Document,
+          unaltered in their text and in their titles.  Section
+          numbers or the equivalent are not considered part of the
+          section titles.
 
        M. Delete any section Entitled "Endorsements".  Such a section
           may not be included in the Modified Version.
@@ -993,52 +1004,52 @@ Appendix C GNU Free Documentation License
 
      If the Modified Version includes new front-matter sections or
      appendices that qualify as Secondary Sections and contain no
-     material copied from the Document, you may at your option designate
-     some or all of these sections as invariant.  To do this, add their
-     titles to the list of Invariant Sections in the Modified Version's
-     license notice.  These titles must be distinct from any other
-     section titles.
-
-     You may add a section Entitled "Endorsements", provided it contains
-     nothing but endorsements of your Modified Version by various
-     parties--for example, statements of peer review or that the text
-     has been approved by an organization as the authoritative
-     definition of a standard.
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do
+     this, add their titles to the list of Invariant Sections in the
+     Modified Version's license notice.  These titles must be distinct
+     from any other section titles.
+
+     You may add a section Entitled "Endorsements", provided it
+     contains nothing but endorsements of your Modified Version by
+     various parties--for example, statements of peer review or that
+     the text has been approved by an organization as the
+     authoritative definition of a standard.
 
      You may add a passage of up to five words as a Front-Cover Text,
-     and a passage of up to 25 words as a Back-Cover Text, to the end of
-     the list of Cover Texts in the Modified Version.  Only one passage
-     of Front-Cover Text and one of Back-Cover Text may be added by (or
-     through arrangements made by) any one entity.  If the Document
-     already includes a cover text for the same cover, previously added
-     by you or by arrangement made by the same entity you are acting on
-     behalf of, you may not add another; but you may replace the old
-     one, on explicit permission from the previous publisher that added
-     the old one.
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If
+     the Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
 
      The author(s) and publisher(s) of the Document do not by this
-     License give permission to use their names for publicity for or to
-     assert or imply endorsement of any Modified Version.
+     License give permission to use their names for publicity for or
+     to assert or imply endorsement of any Modified Version.
 
   5. COMBINING DOCUMENTS
 
      You may combine the Document with other documents released under
      this License, under the terms defined in section 4 above for
-     modified versions, provided that you include in the combination all
-     of the Invariant Sections of all of the original documents,
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
      unmodified, and list them all as Invariant Sections of your
      combined work in its license notice, and that you preserve all
      their Warranty Disclaimers.
 
      The combined work need only contain one copy of this License, and
-     multiple identical Invariant Sections may be replaced with a single
-     copy.  If there are multiple Invariant Sections with the same name
-     but different contents, make the title of each such section unique
-     by adding at the end of it, in parentheses, the name of the
-     original author or publisher of that section if known, or else a
-     unique number.  Make the same adjustment to the section titles in
-     the list of Invariant Sections in the license notice of the
-     combined work.
+     multiple identical Invariant Sections may be replaced with a
+     single copy.  If there are multiple Invariant Sections with the
+     same name but different contents, make the title of each such
+     section unique by adding at the end of it, in parentheses, the
+     name of the original author or publisher of that section if
+     known, or else a unique number.  Make the same adjustment to the
+     section titles in the list of Invariant Sections in the license
+     notice of the combined work.
 
      In the combination, you must combine any sections Entitled
      "History" in the various original documents, forming one section
@@ -1050,56 +1061,57 @@ Appendix C GNU Free Documentation License
 
      You may make a collection consisting of the Document and other
      documents released under this License, and replace the individual
-     copies of this License in the various documents with a single copy
-     that is included in the collection, provided that you follow the
-     rules of this License for verbatim copying of each of the documents
-     in all other respects.
+     copies of this License in the various documents with a single
+     copy that is included in the collection, provided that you follow
+     the rules of this License for verbatim copying of each of the
+     documents in all other respects.
 
      You may extract a single document from such a collection, and
-     distribute it individually under this License, provided you insert
-     a copy of this License into the extracted document, and follow this
-     License in all other respects regarding verbatim copying of that
-     document.
+     distribute it individually under this License, provided you
+     insert a copy of this License into the extracted document, and
+     follow this License in all other respects regarding verbatim
+     copying of that document.
 
   7. AGGREGATION WITH INDEPENDENT WORKS
 
      A compilation of the Document or its derivatives with other
-     separate and independent documents or works, in or on a volume of a
-     storage or distribution medium, is called an "aggregate" if the
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, is called an "aggregate" if the
      copyright resulting from the compilation is not used to limit the
-     legal rights of the compilation's users beyond what the individual
-     works permit.  When the Document is included in an aggregate, this
-     License does not apply to the other works in the aggregate which
-     are not themselves derivative works of the Document.
+     legal rights of the compilation's users beyond what the
+     individual works permit.  When the Document is included in an
+     aggregate, this License does not apply to the other works in the
+     aggregate which are not themselves derivative works of the
+     Document.
 
      If the Cover Text requirement of section 3 is applicable to these
-     copies of the Document, then if the Document is less than one half
-     of the entire aggregate, the Document's Cover Texts may be placed
-     on covers that bracket the Document within the aggregate, or the
-     electronic equivalent of covers if the Document is in electronic
-     form.  Otherwise they must appear on printed covers that bracket
-     the whole aggregate.
+     copies of the Document, then if the Document is less than one
+     half of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that bracket the Document within the aggregate,
+     or the electronic equivalent of covers if the Document is in
+     electronic form.  Otherwise they must appear on printed covers
+     that bracket the whole aggregate.
 
   8. TRANSLATION
 
      Translation is considered a kind of modification, so you may
-     distribute translations of the Document under the terms of section
-     4.  Replacing Invariant Sections with translations requires special
-     permission from their copyright holders, but you may include
-     translations of some or all Invariant Sections in addition to the
-     original versions of these Invariant Sections.  You may include a
-     translation of this License, and all the license notices in the
-     Document, and any Warranty Disclaimers, provided that you also
-     include the original English version of this License and the
-     original versions of those notices and disclaimers.  In case of a
-     disagreement between the translation and the original version of
-     this License or a notice or disclaimer, the original version will
-     prevail.
+     distribute translations of the Document under the terms of
+     section 4.  Replacing Invariant Sections with translations
+     requires special permission from their copyright holders, but you
+     may include translations of some or all Invariant Sections in
+     addition to the original versions of these Invariant Sections.
+     You may include a translation of this License, and all the
+     license notices in the Document, and any Warranty Disclaimers,
+     provided that you also include the original English version of
+     this License and the original versions of those notices and
+     disclaimers.  In case of a disagreement between the translation
+     and the original version of this License or a notice or
+     disclaimer, the original version will prevail.
 
      If a section in the Document is Entitled "Acknowledgements",
      "Dedications", or "History", the requirement (section 4) to
-     Preserve its Title (section 1) will typically require changing the
-     actual title.
+     Preserve its Title (section 1) will typically require changing
+     the actual title.
 
   9. TERMINATION
 
@@ -1110,30 +1122,30 @@ Appendix C GNU Free Documentation License
 
      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
+     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.
+     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, receipt of a copy of some or all of the
-     same material does not give you any rights to use it.
+     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, receipt of a copy of some or all of
+     the same material does not give you any rights to use it.
 
   10. FUTURE REVISIONS OF THIS LICENSE
 
      The Free Software Foundation may publish new, revised versions of
      the GNU Free Documentation 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.  See
+     versions will be similar in spirit to the present version, but
+     may differ in detail to address new problems or concerns.  See
      <http://www.gnu.org/copyleft/>.
 
      Each version of the License is given a distinguishing version
@@ -1141,32 +1153,33 @@ Appendix C GNU Free Documentation License
      version of this License "or any later version" applies to it, you
      have the option of following the terms and conditions either of
      that specified version or of any later version that has been
-     published (not as a draft) by the Free Software Foundation.  If the
-     Document does not specify a version number of this License, you may
-     choose any version ever published (not as a draft) by the Free
-     Software Foundation.  If the Document specifies that a proxy can
-     decide which future versions of this License can be used, that
-     proxy's public statement of acceptance of a version permanently
-     authorizes you to choose that version for the Document.
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.  If the Document specifies that a proxy
+     can decide which future versions of this License can be used,
+     that proxy's public statement of acceptance of a version
+     permanently authorizes you to choose that version for the
+     Document.
 
   11. RELICENSING
 
-     "Massive Multiauthor Collaboration Site" (or "MMC Site") means any
-     World Wide Web server that publishes copyrightable works and also
-     provides prominent facilities for anybody to edit those works.  A
-     public wiki that anybody can edit is an example of such a server.
-     A "Massive Multiauthor Collaboration" (or "MMC") contained in the
-     site means any set of copyrightable works thus published on the MMC
-     site.
+     "Massive Multiauthor Collaboration Site" (or "MMC Site") means
+     any World Wide Web server that publishes copyrightable works and
+     also provides prominent facilities for anybody to edit those
+     works.  A public wiki that anybody can edit is an example of such
+     a server.  A "Massive Multiauthor Collaboration" (or "MMC")
+     contained in the site means any set of copyrightable works thus
+     published on the MMC site.
 
      "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
-     license published by Creative Commons Corporation, a not-for-profit
-     corporation with a principal place of business in San Francisco,
-     California, as well as future copyleft versions of that license
-     published by that same organization.
+     license published by Creative Commons Corporation, a
+     not-for-profit corporation with a principal place of business in
+     San Francisco, California, as well as future copyleft versions of
+     that license published by that same organization.
 
-     "Incorporate" means to publish or republish a Document, in whole or
-     in part, as part of another Document.
+     "Incorporate" means to publish or republish a Document, in whole
+     or in part, as part of another Document.
 
      An MMC is "eligible for relicensing" if it is licensed under this
      License, and if all works that were first published under this
@@ -1183,8 +1196,8 @@ ADDENDUM: How to use this License for your documents
 ====================================================
 
 To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and license
-notices just after the title page:
+the License in the document and put the following copyright and
+license notices just after the title page:
 
        Copyright (C)  YEAR  YOUR NAME.
        Permission is granted to copy, distribute and/or modify this document
@@ -1206,25 +1219,25 @@ combination of the three, merge those two alternatives to suit the
 situation.
 
    If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of free
-software license, such as the GNU General Public License, to permit
-their use in free software.
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
 
 
 
 Tag Table:
-Node: Top845
-Node: Overview1837
-Node: Disclaimer2684
-Node: Installation3180
-Node: How to Use3637
-Node: JavaScript Detection7143
-Node: Free Licenses Detection8430
-Node: Setting Your JavaScript Free8901
-Node: LibreJS Development Notes19613
-Node: Installation Requirements22895
-Node: LibreJS Internals23605
-Node: GNU Free Documentation License24255
+Node: Top850
+Node: Overview1842
+Node: Disclaimer2689
+Node: Installation3185
+Node: How to Use3642
+Node: JavaScript Detection7147
+Node: Free Licenses Detection8434
+Node: Setting Your JavaScript Free8904
+Node: LibreJS Development Notes19617
+Node: Installation Requirements22881
+Node: LibreJS Internals23591
+Node: GNU Free Documentation License24241
 
 End Tag Table
 
diff --git a/docs/librejs.texi b/docs/librejs.texi
index 83f2403..ba9f7c0 100644
--- a/docs/librejs.texi
+++ b/docs/librejs.texi
@@ -283,7 +283,7 @@ code, try to find a free alternative.
 
 @item
 If you're using a third-party service such as an analytics service,
-replace it with a free alternative like Piwik.
+replace it with a free alternative like Matomo.
 
 @item
 If you can't find free JavaScript that has already been developed,
diff --git a/docs/version.texi b/docs/version.texi
index 24c46c7..d7c4130 100644
--- a/docs/version.texi
+++ b/docs/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 18 April 2022
+@set UPDATED 28 April 2022
 @set UPDATED-MONTH April 2022
 @set EDITION 3
 @set VERSION 7.20