398 files changed, 19491 insertions, 414 deletions
diff --git a/doc/chm/VeraCrypt User Guide.chm b/doc/chm/VeraCrypt User Guide.chm
index 495ae97e..8c2dd43d 100644
--- a/doc/chm/VeraCrypt User Guide.chm
+++ b/doc/chm/VeraCrypt User Guide.chm
diff --git a/doc/chm/VeraCrypt.hhc b/doc/chm/VeraCrypt.hhc
index 500f906b..57e101b2 100644
--- a/doc/chm/VeraCrypt.hhc
+++ b/doc/chm/VeraCrypt.hhc
@@ -79,76 +79,88 @@
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Hidden Operating System">
 			<param name="Local" value="VeraCrypt Hidden Operating System.html">
 			</OBJECT>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Main Program Window">
 		<param name="Local" value="Main Program Window.html">
 		</OBJECT>
 	<UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Program Menu">
 			<param name="Local" value="Program Menu.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Mounting Volumes">
 			<param name="Local" value="Mounting VeraCrypt Volumes.html">
 			</OBJECT>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Normal Dismount vs Force Dismount ">
+		<param name="Local" value="Normal Dismount vs Force Dismount.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Avoid Third-Party File Extensions">
+		<param name="Local" value="Avoid Third-Party File Extensions.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Parallelization">
 		<param name="Local" value="Parallelization.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Pipelining">
 		<param name="Local" value="Pipelining.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Hardware acceleration">
 		<param name="Local" value="Hardware Acceleration.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Hot keys">
 		<param name="Local" value="Hot Keys.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Keyfiles">
 		<param name="Local" value="Keyfiles in VeraCrypt.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Security Tokens &amp; Smart Cards">
 		<param name="Local" value="Security Tokens & Smart Cards.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Portable Mode">
 		<param name="Local" value="Portable Mode.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="TrueCrypt Support">
 		<param name="Local" value="TrueCrypt Support.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Converting TrueCrypt Volumes &amp; Partitions">
 		<param name="Local" value="Converting TrueCrypt volumes and partitions.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Conversion Guide for Versions 1.26 and Later">
+		<param name="Local" value="Conversion_Guide_VeraCrypt_1.26_and_Later.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Default Mount Parameters">
 		<param name="Local" value="Default Mount Parameters.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Language Packs">
 		<param name="Local" value="Language Packs.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Encryption Algorithms">
 		<param name="Local" value="Encryption Algorithms.html">
 		</OBJECT>
 	<UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="AES">
 			<param name="Local" value="AES.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Camellia">
 			<param name="Local" value="Camellia.html">
 			</OBJECT>
@@ -158,42 +170,42 @@
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Serpent">
 			<param name="Local" value="Serpent.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Twofish">
 			<param name="Local" value="Twofish.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Cascades of ciphers">
 			<param name="Local" value="Cascades.html">
 			</OBJECT>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Hash Algorithms">
 		<param name="Local" value="Hash Algorithms.html">
 		</OBJECT>
 	<UL>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="RIPEMD-160">
-			<param name="Local" value="RIPEMD-160.html">
+			<param name="Name" value="BLAKE2s-256">
+			<param name="Local" value="BLAKE2s-256.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="SHA-256">
 			<param name="Local" value="SHA-256.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="SHA-512">
 			<param name="Local" value="SHA-512.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Whirlpool">
 			<param name="Local" value="Whirlpool.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Streebog">
 			<param name="Local" value="Streebog.html">
 			</OBJECT>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Supported Operating Systems">
@@ -218,40 +230,48 @@
 			</OBJECT>
 		<UL>
 			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="Paging File">
 				<param name="Local" value="Paging File.html">
 				</OBJECT>
 			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="Memory Dump Files">
 				<param name="Local" value="Memory Dump Files.html">
 				</OBJECT>
 			<LI> <OBJECT type="text/sitemap">
 				<param name="Name" value="Hibernation File">
 				<param name="Local" value="Hibernation File.html">
 				</OBJECT>
 		</UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Unencrypted Data in RAM">
 			<param name="Local" value="Unencrypted Data in RAM.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="VeraCrypt RAM Encryption">
+			<param name="Local" value="VeraCrypt RAM Encryption.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="VeraCrypt Memory Protection">
+			<param name="Local" value="VeraCrypt Memory Protection.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Physical Security">
 			<param name="Local" value="Physical Security.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Malware">
 			<param name="Local" value="Malware.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Multi-User Environment">
 			<param name="Local" value="Multi-User Environment.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Authenticity and Integrity">
 			<param name="Local" value="Authenticity and Integrity.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Choosing Passwords and Keyfiles">
 			<param name="Local" value="Choosing Passwords and Keyfiles.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
@@ -373,40 +393,54 @@
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Keyfiles">
 			<param name="Local" value="Keyfiles.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="PIM">
 			<param name="Local" value="Personal Iterations Multiplier (PIM).html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="VeraCrypt Volume Format Specification">
 			<param name="Local" value="VeraCrypt Volume Format Specification.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Compliance with Standards and Specifications">
 			<param name="Local" value="Standard Compliance.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Source Code">
 			<param name="Local" value="Source Code.html">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Building VeraCrypt From Source">
+			<param name="Local" value="CompilingGuidelines.html">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Windows Build Guide">
+				<param name="Local" value="CompilingGuidelineWin.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Linux Build Guide">
+				<param name="Local" value="CompilingGuidelineLinux.html">
+				</OBJECT>
+		</UL>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Contact">
 		<param name="Local" value="Contact.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Legal Information">
 		<param name="Local" value="Legal Information.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Version History">
 		<param name="Local" value="Release Notes.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Acknowledgements">
 		<param name="Local" value="Acknowledgements.html">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="References">
 		<param name="Local" value="References.html">
diff --git a/doc/chm/VeraCrypt.hhp b/doc/chm/VeraCrypt.hhp
index a6aca8ad..e6ff2430 100644
--- a/doc/chm/VeraCrypt.hhp
+++ b/doc/chm/VeraCrypt.hhp
@@ -1,174 +1,191 @@
 [OPTIONS]
 Compatibility=1.1 or later
 Compiled file=VeraCrypt User Guide.chm
 Contents file=VeraCrypt.hhc
 Default topic=Documentation.html
 Display compile progress=No
 Full-text search=Yes
 Index file=VeraCrypt.hhk
 Language=0x409 English (United States)
 Title=VeraCrypt User Guide
 
 [FILES]
 Acknowledgements.html
 Additional Security Requirements and Precautions.html
 AES.html
 arrow_right.gif
 Authenticity and Integrity.html
 Authors.html
+Avoid Third-Party File Extensions.html
 bank_30x30.png
+BC_Logo_30x30.png
+BCH_Logo_30x30.png
 Beginner's Tutorial.html
 Beginner's Tutorial_Image_001.jpg
 Beginner's Tutorial_Image_002.jpg
 Beginner's Tutorial_Image_003.jpg
 Beginner's Tutorial_Image_004.jpg
 Beginner's Tutorial_Image_005.jpg
 Beginner's Tutorial_Image_007.jpg
 Beginner's Tutorial_Image_008.jpg
 Beginner's Tutorial_Image_009.jpg
 Beginner's Tutorial_Image_010.jpg
 Beginner's Tutorial_Image_011.jpg
 Beginner's Tutorial_Image_012.jpg
 Beginner's Tutorial_Image_013.jpg
 Beginner's Tutorial_Image_014.jpg
 Beginner's Tutorial_Image_015.jpg
 Beginner's Tutorial_Image_016.jpg
 Beginner's Tutorial_Image_017.jpg
 Beginner's Tutorial_Image_018.jpg
 Beginner's Tutorial_Image_019.jpg
 Beginner's Tutorial_Image_020.jpg
 Beginner's Tutorial_Image_021.jpg
 Beginner's Tutorial_Image_022.jpg
 Beginner's Tutorial_Image_023.gif
 Beginner's Tutorial_Image_024.gif
 Beginner's Tutorial_Image_034.png
+BLAKE2s-256.html
 Camellia.html
 Cascades.html
 Changing Passwords and Keyfiles.html
 Choosing Passwords and Keyfiles.html
 Command Line Usage.html
+CompilingGuidelineLinux.html
+CompilingGuidelines.html
+CompilingGuidelineWin.html
 Contact.html
 Contributed Resources.html
+Conversion_Guide_VeraCrypt_1.26_and_Later.html
 Converting TrueCrypt volumes and partitions.html
 Converting TrueCrypt volumes and partitions_truecrypt_convertion.jpg
 Creating New Volumes.html
 Data Leaks.html
 Default Mount Parameters.html
 Default Mount Parameters_VeraCrypt_password_using_default_parameters.png
 Defragmenting.html
 Digital Signatures.html
 Disclaimers.html
 Documentation.html
 Donation.html
+Donation_donate.gif
 Donation_donate_CHF.gif
 Donation_donate_Dollars.gif
 Donation_donate_Euros.gif
 Donation_donate_GBP.gif
+Donation_donate_PLN.gif
 Donation_donate_YEN.gif
-Donation_VeraCrypt_Bitcoin.png
+Donation_VeraCrypt_Bitcoin_small.png
+Donation_VeraCrypt_BitcoinCash.png
+Donation_VeraCrypt_Litecoin.png
+Donation_VeraCrypt_Monero.png
 Encryption Algorithms.html
 Encryption Scheme.html
 FAQ.html
 Favorite Volumes.html
 flattr-badge-large.png
 gf2_mul.gif
 Hardware Acceleration.html
 Hash Algorithms.html
 Header Key Derivation.html
 Hibernation File.html
 Hidden Operating System.html
 Hidden Volume.html
 Home_facebook_veracrypt.png
 Home_reddit.png
-Home_tibitDonateButton.png
 Home_utilities-file-archiver-3.png
 Home_VeraCrypt_Default_Mount_Parameters.png
 Home_VeraCrypt_menu_Default_Mount_Parameters.png
 Hot Keys.html
 How to Back Up Securely.html
 Incompatibilities.html
 Introduction.html
 Issues and Limitations.html
 Journaling File Systems.html
 Keyfiles in VeraCrypt.html
 Keyfiles in VeraCrypt_Image_040.gif
 Keyfiles.html
 Kuznyechik.html
 Language Packs.html
 Legal Information.html
+liberapay_donate.svg
+LTC_Logo_30x30.png
 Main Program Window.html
 Malware.html
 Memory Dump Files.html
 Miscellaneous.html
 Modes of Operation.html
+Monero_Logo_30x30.png
 Mounting VeraCrypt Volumes.html
 Multi-User Environment.html
 Notation.html
 Paging File.html
 Parallelization.html
+paypal_30x30.png
 Personal Iterations Multiplier (PIM).html
 Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step1.png
 Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step2.png
 Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step1.png
 Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step2.png
 Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step1.png
 Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step2.png
 Physical Security.html
 Pipelining.html
 Plausible Deniability.html
 Portable Mode.html
 Preface.html
 Program Menu.html
 Protection of Hidden Volumes.html
 Protection of Hidden Volumes_Image_027.jpg
 Protection of Hidden Volumes_Image_028.jpg
 Protection of Hidden Volumes_Image_029.jpg
 Protection of Hidden Volumes_Image_030.jpg
 Protection of Hidden Volumes_Image_031.jpg
 Random Number Generator.html
 Reallocated Sectors.html
 References.html
 Release Notes.html
 Removable Medium Volume.html
 Removing Encryption.html
-RIPEMD-160.html
 Security Model.html
 Security Requirements and Precautions.html
 Security Requirements for Hidden Volumes.html
 Security Tokens & Smart Cards.html
 Serpent.html
 SHA-256.html
 SHA-512.html
 Sharing over Network.html
 Source Code.html
 Standard Compliance.html
 Streebog.html
 styles.css
 Supported Operating Systems.html
 Supported Systems for System Encryption.html
 System Encryption.html
 System Favorite Volumes.html
 Technical Details.html
 Trim Operation.html
 Troubleshooting.html
 TrueCrypt Support.html
 TrueCrypt Support_truecrypt_mode_gui.jpg
 twitter_veracrypt.PNG
 Twofish.html
 Unencrypted Data in RAM.html
 Uninstalling VeraCrypt.html
 Using VeraCrypt Without Administrator Privileges.html
 VeraCrypt Background Task.html
 VeraCrypt Hidden Operating System.html
 VeraCrypt License.html
+VeraCrypt Memory Protection.html
+VeraCrypt RAM Encryption.html
 VeraCrypt Rescue Disk.html
 VeraCrypt System Files.html
 VeraCrypt Volume Format Specification.html
 VeraCrypt Volume.html
 VeraCrypt128x128.png
 Volume Clones.html
 Wear-Leveling.html
 Whirlpool.html
 
 [INFOTYPES]
 
diff --git a/doc/chm/create_chm.bat b/doc/chm/create_chm.bat
index 762371fb..ffc53ebe 100644
--- a/doc/chm/create_chm.bat
+++ b/doc/chm/create_chm.bat
@@ -1,13 +1,11 @@
 PATH=%PATH%;C:\Program Files (x86)\HTML Help Workshop
 
 set CHMBUILDPATH=%~dp0
 cd %CHMBUILDPATH%
 
-copy ..\html\* .
+xcopy /E ..\html\* .
 
 hhc VeraCrypt.hhp
 
-del /F /Q *.html *.css *.jpg *.gif *.png
-
-
-
+del /F /Q *.html *.css *.jpg *.gif *.png *.svg
+rmdir /s /Q CompilingGuidelineWin ru
diff --git a/doc/html/AES.html b/doc/html/AES.html
index 38a56a30..3481a189 100644
--- a/doc/html/AES.html
+++ b/doc/html/AES.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="AES.html">AES</a>
diff --git a/doc/html/Acknowledgements.html b/doc/html/Acknowledgements.html
index 54f5d7da..b6687393 100644
--- a/doc/html/Acknowledgements.html
+++ b/doc/html/Acknowledgements.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Acknowledgements.html">Acknowledgements</a>
 </p></div>
 <div class="wikidoc">
diff --git a/doc/html/Additional Security Requirements and Precautions.html b/doc/html/Additional Security Requirements and Precautions.html
index c7b5f067..a0fc6035 100644
--- a/doc/html/Additional Security Requirements and Precautions.html
+++ b/doc/html/Additional Security Requirements and Precautions.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Additional%20Security%20Requirements%20and%20Precautions.html">Additional Security Requirements and Precautions</a>
diff --git a/doc/html/Authenticity and Integrity.html b/doc/html/Authenticity and Integrity.html
index b7075beb..8b8b276a 100644
--- a/doc/html/Authenticity and Integrity.html
+++ b/doc/html/Authenticity and Integrity.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Authenticity%20and%20Integrity.html">Authenticity and Integrity</a>
diff --git a/doc/html/Authors.html b/doc/html/Authors.html
index 79b5063b..835e99eb 100644
--- a/doc/html/Authors.html
+++ b/doc/html/Authors.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Volume.html">VeraCrypt Volume</a>
 </p></div>
 
diff --git a/doc/html/Avoid Third-Party File Extensions.html b/doc/html/Avoid Third-Party File Extensions.html
new file mode 100644
index 00000000..b339e780
--- /dev/null
+++ b/doc/html/Avoid Third-Party File Extensions.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Avoid%20Third-Party%20File%20Extensions.html">Avoid Third-Party File Extensions</a>
+</p></div>
+
+<div class="wikidoc">
+	<h1>Understanding the Risks of Using Third-Party File Extensions with VeraCrypt</h1>
+	<div>
+	  <p>While VeraCrypt provides robust encryption capabilities to secure your data, using third-party file extensions for File Containers or Keyfiles could risk making the encrypted data inaccessible.<br />
+	  This guide provides an in-depth explanation of the associated risks, and it outlines recommendations for best practices to mitigate these risks.</p>
+	</div>
+	
+	<h2>Risks Associated with File Containers</h2>
+	<div>
+	  <p>Using a third-party file extension for File Containers exposes you to several risks:</p>
+	  <ul>
+		<li>Overwritten Metadata: Third-party applications may update their metadata, which could overwrite crucial parts of the File Container.</li>
+		<li>Unintentional Changes: Accidentally launching a File Container with a third-party application could modify its metadata without your consent.</li>
+		<li>Container Corruption: These actions could render the container unreadable or unusable.</li>
+		<li>Data Loss: The data within the container might be permanently lost if the container becomes corrupted.</li>
+	  </ul>
+	</div>
+	
+	<h2>Risks Associated with Keyfiles</h2>
+	<div>
+	  <p>Similar risks are associated with Keyfiles:</p>
+	  <ul>
+		<li>Keyfile Corruption: Inadvertently modifying a Keyfile with a third-party application can make it unusable for decryption.</li>
+		<li>Overwritten Data: Third-party applications may overwrite the portion of the Keyfile that VeraCrypt uses for decryption.</li>
+		<li>Unintentional Changes: Accidental changes can make it impossible to mount the volume unless you have an unaltered backup of the Keyfile.</li>
+	  </ul>
+	</div>
+	
+	<h2>Examples of Extensions to Avoid</h2>
+	<div>
+	  <p>Avoid using the following types of third-party file extensions:</p>
+	  <ul>
+		<li>Media Files: Picture, audio, and video files are subject to metadata changes by their respective software.</li>
+		<li>Archive Files: Zip files can be easily modified, which could disrupt the encrypted volume.</li>
+		<li>Executable Files: Software updates can modify these files, making them unreliable as File Containers or Keyfiles.</li>
+		<li>Document Files: Office and PDF files can be automatically updated by productivity software, making them risky to use.</li>
+	  </ul>
+	</div>
+	
+	<h2>Recommendations</h2>
+	<div>
+	  <p>For secure usage, consider the following best practices:</p>
+	  <ul>
+		<li>Use neutral file extensions for File Containers and Keyfiles to minimize the risk of automatic file association.</li>
+		<li>Keep secure backups of your File Containers and Keyfiles in locations isolated from network access.</li>
+		<li>Disable auto-open settings for the specific file extensions you use for VeraCrypt File Containers and Keyfiles.</li>
+		<li>Always double-check file associations and be cautious when using a new device or third-party application.</li>
+	  </ul>
+	</div>
+	
+<div class="ClearBoth"></div></body></html>
diff --git a/doc/html/BCH_Logo_30x30.png b/doc/html/BCH_Logo_30x30.png
new file mode 100644
index 00000000..00c71cb9
--- /dev/null
+++ b/doc/html/BCH_Logo_30x30.png
diff --git a/doc/html/BC_Logo_30x30.png b/doc/html/BC_Logo_30x30.png
new file mode 100644
index 00000000..a53a6d93
--- /dev/null
+++ b/doc/html/BC_Logo_30x30.png
diff --git a/doc/html/RIPEMD-160.html b/doc/html/BLAKE2s-256.html
index 663b073d..097b714f 100644
--- a/doc/html/RIPEMD-160.html
+++ b/doc/html/BLAKE2s-256.html
@@ -1,45 +1,51 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hash%20Algorithms.html">Hash Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
-<a href="RIPEMD-160.html">RIPEMD-160</a>
+<a href="BLAKE2s-256.html">BLAKE2s-256</a>
 </p></div>
 
 <div class="wikidoc">
-<h1>RIPEMD-160</h1>
+<h1>BLAKE2s-256</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-RIPEMD-160, published in 1996, is a hash algorithm designed by Hans Dobbertin, Antoon Bosselaers, and Bart Preneel in an open academic community. The size of the output of RIPEMD-160 is 160 bits. RIPEMD-160 is a strengthened version of the RIPEMD hash algorithm
- that was developed in the framework of the European Union's project RIPE (<em style="text-align:left">RACE Integrity Primitives Evaluation</em>), 1988-1992. RIPEMD-160 was adopted by the International Organization for Standardization (ISO) and the IEC in the
- ISO/IEC 10118-3:2004 international standard [21].</div>
+<p>
+BLAKE2 is a cryptographic hash function based on BLAKE, created by Jean-Philippe Aumasson, Samuel Neves, Zooko Wilcox-O'Hearn, and Christian Winnerlein. It was announced on December 21, 2012. The design goal was to replace the widely used, but broken, MD5 and SHA-1 algorithms in applications requiring high performance in software. BLAKE2 provides better security than SHA-2 and similar to that of SHA-3 (e.g. immunity to length extension, indifferentiability from a random oracle, etc...).<br/>
+BLAKE2 removes addition of constants to message words from BLAKE round function, changes two rotation constants, simplifies padding, adds parameter block that is XOR'ed with initialization vectors, and reduces the number of rounds from 16 to 12 for BLAKE2b (successor of BLAKE-512), and from 14 to 10 for BLAKE2s (successor of BLAKE-256).<br/>
+BLAKE2b and BLAKE2s are specified in RFC 7693.
+</p>
+<p>
+VeraCrypt uses only BLAKE2s with its maximum output size of 32-bytes (256 bits).
+</p>
+</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <a href="SHA-256.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></div>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Beginner's Tutorial.html b/doc/html/Beginner's Tutorial.html
index 454f1ed1..c39ee596 100644
--- a/doc/html/Beginner's Tutorial.html
+++ b/doc/html/Beginner's Tutorial.html
@@ -1,207 +1,207 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Beginner's%20Tutorial.html">Beginner's Tutorial</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Beginner's Tutorial</h1>
 <h2>How to Create and Use a VeraCrypt Container</h2>
 <p>This chapter contains step-by-step instructions on how to create, mount, and use a VeraCrypt volume. We strongly recommend that you also read the other sections of this manual, as they contain important information.</p>
 <h4>STEP 1:</h4>
 <p>If you have not done so, download and install VeraCrypt. Then launch VeraCrypt by double-clicking the file VeraCrypt.exe or by clicking the VeraCrypt shortcut in your Windows Start menu.</p>
 <h4>STEP 2:</h4>
-<p><img src="Beginner's Tutorial_Image_001.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_001.jpg" alt=""><br>
 <br>
 The main VeraCrypt window should appear. Click <strong>Create Volume </strong>(marked with a red rectangle for clarity).</p>
 <h4>STEP 3:</h4>
-<p><img src="Beginner's Tutorial_Image_002.jpg" alt="" width="616" height="410"><br>
+<p><img src="Beginner's Tutorial_Image_002.jpg" alt=""><br>
 <br>
 The VeraCrypt Volume Creation Wizard window should appear.<br>
 <br>
 In this step you need to choose where you wish the VeraCrypt volume to be created. A VeraCrypt volume can reside in a file, which is also called container, in a partition or drive. In this tutorial, we will choose the first option and create a VeraCrypt volume
  within a file.<br>
 <br>
 As the option is selected by default, you can just click <strong>Next</strong>.</p>
 <p>Note: In the following steps, the screenshots will show only the right-hand part of the Wizard window.</p>
 <h4>STEP 4:</h4>
-<p><img src="Beginner's Tutorial_Image_003.jpg" alt="" width="371" height="333"><br>
+<p><img src="Beginner's Tutorial_Image_003.jpg" alt=""><br>
 <br>
 In this step you need to choose whether to create a standard or hidden VeraCrypt volume. In this tutorial, we will choose the former option and create a standard VeraCrypt volume.<br>
 <br>
 As the option is selected by default, you can just click <strong>Next</strong>.</p>
 <h4>STEP 5:</h4>
-<p><img src="Beginner's Tutorial_Image_004.jpg" alt="" width="363" height="336"><br>
+<p><img src="Beginner's Tutorial_Image_004.jpg" alt=""><br>
 <br>
 In this step you have to specify where you wish the VeraCrypt volume (file container) to be created. Note that a VeraCrypt container is just like any normal file. It can be, for example, moved or deleted as any normal file. It also needs a filename, which you
  will choose in the next step.<br>
 <br>
 Click <strong>Select File</strong>.<br>
 <br>
 The standard Windows file selector should appear (while the window of the VeraCrypt Volume Creation Wizard remains open in the background).</p>
 <h4>STEP 6:</h4>
-<p><img src="Beginner's Tutorial_Image_005.jpg" alt="" width="720" height="452"><br>
+<p><img src="Beginner's Tutorial_Image_005.jpg" alt=""><br>
 <br>
 In this tutorial, we will create our VeraCrypt volume in the folder F<em>:\Data\ </em>
-and the filename of the volume (container) will be <em>My Volume </em>(as can be seen in the screenshot above). You may, of course, choose any other filename and location you like (for example, on a USB memory stick). Note that the file
-<em>My Volume </em>does not exist yet &ndash; VeraCrypt will create it.</p>
+and the filename of the volume (container) will be <em>MyVolume.hc </em>(as can be seen in the screenshot above). You may, of course, choose any other filename and location you like (for example, on a USB memory stick). Note that the file
+<em>MyVolume.hc </em>does not exist yet &ndash; VeraCrypt will create it.</p>
 <p>IMPORTANT: Note that VeraCrypt will <em>not </em>encrypt any existing files (when creating a VeraCrypt file container). If you select an existing file in this step, it will be overwritten and replaced by the newly created volume (so the overwritten file
  will be <em>lost</em>, <em>not </em>encrypted). You will be able to encrypt existing files (later on) by moving them to the VeraCrypt volume that we are creating now.*</p>
 <p>Select the desired path (where you wish the container to be created) in the file selector. Type the desired container file name in the
 <strong>Filename </strong>box.<br>
 <br>
 Click <strong>Save</strong>.<br>
 <br>
 The file selector window should disappear.<br>
 <br>
 In the following steps, we will return to the VeraCrypt Volume Creation Wizard.</p>
 <p>* Note that after you copy existing unencrypted files to a VeraCrypt volume, you should securely erase (wipe) the original unencrypted files. There are software tools that can be used for the purpose of secure erasure (many of them are free).</p>
 <h4>STEP 7:</h4>
-<p><img src="Beginner's Tutorial_Image_007.jpg" alt="" width="360" height="335"><br>
+<p><img src="Beginner's Tutorial_Image_007.jpg" alt=""><br>
 <br>
 In the Volume Creation Wizard window, click <strong>Next</strong>.</p>
 <h4>STEP 8:</h4>
-<p><img src="Beginner's Tutorial_Image_008.jpg" alt="" width="359" height="331"><br>
+<p><img src="Beginner's Tutorial_Image_008.jpg" alt=""><br>
 <br>
 Here you can choose an encryption algorithm and a hash algorithm for the volume. If you are not sure what to select here, you can use the default settings and click
 <strong>Next </strong>(for more information, see chapters <a href="Encryption Algorithms.html">
 <em>Encryption Algorithms</em></a> and <a href="Hash%20Algorithms.html">
 <em>Hash Algorithms</em></a>).</p>
 <h4>STEP 9:</h4>
-<p><img src="Beginner's Tutorial_Image_009.jpg" alt="" width="369" height="332"><br>
+<p><img src="Beginner's Tutorial_Image_009.jpg" alt=""><br>
 <br>
 Here we specify that we wish the size of our VeraCrypt container to be 250 megabyte. You may, of course, specify a different size. After you type the desired size in the input field (marked with a red rectangle), click
 <strong>Next</strong>.</p>
 <h4>STEP 10:</h4>
-<p><img src="Beginner's Tutorial_Image_010.jpg" alt="" width="372" height="368"><br>
+<p><img src="Beginner's Tutorial_Image_010.jpg" alt=""><br>
 <br>
 This is one of the most important steps. Here you have to choose a good volume password. Read carefully the information displayed in the Wizard window about what is considered a good password.<br>
 <br>
 After you choose a good password, type it in the first input field. Then re-type it in the input field below the first one and click
 <strong>Next</strong>.</p>
 <p>Note: The button <strong>Next </strong>will be disabled until passwords in both input fields are the same.</p>
 <h4>STEP 11:</h4>
-<p><img src="Beginner's Tutorial_Image_011.jpg" alt="" width="365" height="368"><br>
+<p><img src="Beginner's Tutorial_Image_011.jpg" alt=""><br>
 <br>
 Move your mouse as randomly as possible within the Volume Creation Wizard window at least until the randomness indicator becomes green. The longer you move the mouse, the better (moving the mouse for at least 30 seconds is recommended). This significantly increases
  the cryptographic strength of the encryption keys (which increases security).<br>
 <br>
 Click <strong>Format</strong>.<br>
 <br>
-Volume creation should begin. VeraCrypt will now create a file called <em>My Volume
+Volume creation should begin. VeraCrypt will now create a file called <em>MyVolume.hc
 </em>in the folder F<em>:\Data\ </em>(as we specified in Step 6). This file will be a VeraCrypt container (it will contain the encrypted VeraCrypt volume). Depending on the size of the volume, the volume creation may take a long time. After it finishes, the
  following dialog box will appear:<br>
 <br>
-<img src="Beginner's Tutorial_Image_012.jpg" alt="" width="398" height="171"><br>
+<img src="Beginner's Tutorial_Image_012.jpg" alt=""><br>
 <br>
 Click <strong>OK </strong>to close the dialog box.</p>
 <h4>STEP 12:</h4>
-<p><img src="Beginner's Tutorial_Image_013.jpg" alt="" width="361" height="333"><br>
+<p><img src="Beginner's Tutorial_Image_013.jpg" alt=""><br>
 <br>
 We have just successfully created a VeraCrypt volume (file container). In the VeraCrypt Volume Creation Wizard window, click
 <strong>Exit</strong>.<br>
 <br>
 The Wizard window should disappear.<br>
 <br>
 In the remaining steps, we will mount the volume we just created. We will return to the main VeraCrypt window (which should still be open, but if it is not, repeat Step 1 to launch VeraCrypt and then continue from Step 13.)</p>
 <h4>STEP 13:</h4>
-<p><img src="Beginner's Tutorial_Image_014.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_014.jpg" alt=""><br>
 <br>
 Select a drive letter from the list (marked with a red rectangle). This will be the drive letter to which the VeraCrypt container will be mounted.<br>
 <br>
 Note: In this tutorial, we chose the drive letter M, but you may of course choose any other available drive letter.</p>
 <h4>STEP 14:</h4>
-<p><img src="Beginner's Tutorial_Image_015.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_015.jpg" alt=""><br>
 <br>
 Click <strong>Select File</strong>.<br>
 <br>
 The standard file selector window should appear.</p>
 <h4>STEP 15:</h4>
-<p><img src="Beginner's Tutorial_Image_016.jpg" alt="" width="625" height="453"><br>
+<p><img src="Beginner's Tutorial_Image_016.jpg" alt=""><br>
 <br>
 In the file selector, browse to the container file (which we created in Steps 6-12) and select it. Click
 <strong>Open </strong>(in the file selector window).<br>
 <br>
 The file selector window should disappear.<br>
 <br>
 In the following steps, we will return to the main VeraCrypt window.</p>
 <h4>STEP 16:</h4>
-<p><img src="Beginner's Tutorial_Image_017.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_017.jpg" alt=""><br>
 <br>
 In the main VeraCrypt window, click <strong>Mount</strong>. Password prompt dialog window should appear.</p>
 <h4>STEP 17:</h4>
-<p><img src="Beginner's Tutorial_Image_018.jpg" alt="" width="499" height="205"><br>
+<p><img src="Beginner's Tutorial_Image_018.jpg" alt=""><br>
 <br>
 Type the password (which you specified in Step 10) in the password input field (marked with a red rectangle).</p>
 <h4>STEP 18:</h4>
-<p><img src="Beginner's Tutorial_Image_019.jpg" alt="" width="499" height="205"><br>
+<p><img src="Beginner's Tutorial_Image_019.jpg" alt=""><br>
 <br>
 Select the PRF algorithm that was used during the creation of the volume (SHA-512 is the default PRF used by VeraCrypt). If you don&rsquo;t remember which PRF was used, just leave it set to &ldquo;autodetection&rdquo; but the mounting process will take more
  time. Click <strong>OK</strong> after entering the password.<br>
 <br>
 VeraCrypt will now attempt to mount the volume. If the password is incorrect (for example, if you typed it incorrectly), VeraCrypt will notify you and you will need to repeat the previous step (type the password again and click
 <strong>OK</strong>). If the password is correct, the volume will be mounted.</p>
 <h4>FINAL STEP:</h4>
-<p><img src="Beginner's Tutorial_Image_020.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_020.jpg" alt=""><br>
 <br>
 We have just successfully mounted the container as a virtual disk M:<br>
 <br>
 The virtual disk is entirely encrypted (including file names, allocation tables, free space, etc.) and behaves like a real disk. You can save (or copy, move, etc.) files to this virtual disk and they will be encrypted on the fly as they are being written.<br>
 <br>
 If you open a file stored on a VeraCrypt volume, for example, in media player, the file will be automatically decrypted to RAM (memory) on the fly while it is being read.</p>
 <p>Important: Note that when you open a file stored on a VeraCrypt volume (or when you write/copy a file to/from the VeraCrypt volume) you will not be asked to enter the password again. You need to enter the correct password only when mounting the volume.</p>
 <p>You can open the mounted volume, for example, by selecting it on the list as shown in the screenshot above (blue selection) and then double-clicking on the selected item.</p>
 <p>You can also browse to the mounted volume the way you normally browse to any other types of volumes. For example, by opening the &lsquo;<em>Computer</em>&rsquo; (or &lsquo;<em>My Computer</em>&rsquo;) list and double clicking the corresponding drive letter
  (in this case, it is the letter M).<br>
 <br>
-<img src="Beginner's Tutorial_Image_021.jpg" alt="" width="406" height="264"><br>
+<img src="Beginner's Tutorial_Image_021.jpg" alt=""><br>
 <br>
 You can copy files (or folders) to and from the VeraCrypt volume just as you would copy them to any normal disk (for example, by simple drag-and-drop operations). Files that are being read or copied from the encrypted VeraCrypt volume are automatically decrypted
  on the fly in RAM (memory). Similarly, files that are being written or copied to the VeraCrypt volume are automatically encrypted on the fly in RAM (right before they are written to the disk).<br>
 <br>
 Note that VeraCrypt never saves any decrypted data to a disk &ndash; it only stores them temporarily in RAM (memory). Even when the volume is mounted, data stored in the volume is still encrypted. When you restart Windows or turn off your computer, the volume
  will be dismounted and all files stored on it will be inaccessible (and encrypted). Even when power supply is suddenly interrupted (without proper system shut down), all files stored on the volume will be inaccessible (and encrypted). To make them accessible
  again, you have to mount the volume. To do so, repeat Steps 13-18.</p>
 <p>If you want to close the volume and make files stored on it inaccessible, either restart your operating system or dismount the volume. To do so, follow these steps:<br>
 <br>
-<img src="Beginner's Tutorial_Image_022.jpg" alt="" width="579" height="498"><br>
+<img src="Beginner's Tutorial_Image_022.jpg" alt=""><br>
 <br>
 Select the volume from the list of mounted volumes in the main VeraCrypt window (marked with a red rectangle in the screenshot above) and then click
 <strong>Dismount </strong>(also marked with a red rectangle in the screenshot above). To make files stored on the volume accessible again, you will have to mount the volume. To do so, repeat Steps 13-18.</p>
 <h2>How to Create and Use a VeraCrypt-Encrypted Partition/Device</h2>
 <p>Instead of creating file containers, you can also encrypt physical partitions or drives (i.e., create VeraCrypt device-hosted volumes). To do so, repeat the steps 1-3 but in the step 3 select the second or third option. Then follow the remaining instructions
  in the wizard. When you create a device-hosted VeraCrypt volume within a <em>non-system
 </em>partition/drive, you can mount it by clicking <em>Auto-Mount Devices </em>in the main VeraCrypt window. For information pertaining to encrypted
 <em>system </em>partition/drives, see the chapter <a href="System%20Encryption.html">
 <em>System Encryption</em></a>.</p>
 <p>Important: <em>We strongly recommend that you also read the other chapters of this manual, as they contain important information that has been omitted in this tutorial for simplicity.</em></p>
 </div>
 </body></html>
diff --git a/doc/html/Beginner's Tutorial_Image_001.jpg b/doc/html/Beginner's Tutorial_Image_001.jpg
index cfe13f27..75436f32 100644
--- a/doc/html/Beginner's Tutorial_Image_001.jpg
+++ b/doc/html/Beginner's Tutorial_Image_001.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_002.jpg b/doc/html/Beginner's Tutorial_Image_002.jpg
index efb1fbaa..8d9e4bb9 100644
--- a/doc/html/Beginner's Tutorial_Image_002.jpg
+++ b/doc/html/Beginner's Tutorial_Image_002.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_003.jpg b/doc/html/Beginner's Tutorial_Image_003.jpg
index 456a855e..70d07e41 100644
--- a/doc/html/Beginner's Tutorial_Image_003.jpg
+++ b/doc/html/Beginner's Tutorial_Image_003.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_004.jpg b/doc/html/Beginner's Tutorial_Image_004.jpg
index 9b83e71e..97cc51bc 100644
--- a/doc/html/Beginner's Tutorial_Image_004.jpg
+++ b/doc/html/Beginner's Tutorial_Image_004.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_005.jpg b/doc/html/Beginner's Tutorial_Image_005.jpg
index 57d33d58..5173b522 100644
--- a/doc/html/Beginner's Tutorial_Image_005.jpg
+++ b/doc/html/Beginner's Tutorial_Image_005.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_007.jpg b/doc/html/Beginner's Tutorial_Image_007.jpg
index 2aff5b18..c0db0088 100644
--- a/doc/html/Beginner's Tutorial_Image_007.jpg
+++ b/doc/html/Beginner's Tutorial_Image_007.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_008.jpg b/doc/html/Beginner's Tutorial_Image_008.jpg
index 873a7a10..383aa89e 100644
--- a/doc/html/Beginner's Tutorial_Image_008.jpg
+++ b/doc/html/Beginner's Tutorial_Image_008.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_009.jpg b/doc/html/Beginner's Tutorial_Image_009.jpg
index 7e29bb90..be0a5af1 100644
--- a/doc/html/Beginner's Tutorial_Image_009.jpg
+++ b/doc/html/Beginner's Tutorial_Image_009.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_010.jpg b/doc/html/Beginner's Tutorial_Image_010.jpg
index 693562b4..26c74f10 100644
--- a/doc/html/Beginner's Tutorial_Image_010.jpg
+++ b/doc/html/Beginner's Tutorial_Image_010.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_011.jpg b/doc/html/Beginner's Tutorial_Image_011.jpg
index 4c6f6714..a83da447 100644
--- a/doc/html/Beginner's Tutorial_Image_011.jpg
+++ b/doc/html/Beginner's Tutorial_Image_011.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_012.jpg b/doc/html/Beginner's Tutorial_Image_012.jpg
index b24ad6ae..8a47316a 100644
--- a/doc/html/Beginner's Tutorial_Image_012.jpg
+++ b/doc/html/Beginner's Tutorial_Image_012.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_013.jpg b/doc/html/Beginner's Tutorial_Image_013.jpg
index 4d76add2..3f25370c 100644
--- a/doc/html/Beginner's Tutorial_Image_013.jpg
+++ b/doc/html/Beginner's Tutorial_Image_013.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_014.jpg b/doc/html/Beginner's Tutorial_Image_014.jpg
index 19462cde..76e72161 100644
--- a/doc/html/Beginner's Tutorial_Image_014.jpg
+++ b/doc/html/Beginner's Tutorial_Image_014.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_015.jpg b/doc/html/Beginner's Tutorial_Image_015.jpg
index e257bf42..c509c9a8 100644
--- a/doc/html/Beginner's Tutorial_Image_015.jpg
+++ b/doc/html/Beginner's Tutorial_Image_015.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_016.jpg b/doc/html/Beginner's Tutorial_Image_016.jpg
index 878027d6..7d7f0fcc 100644
--- a/doc/html/Beginner's Tutorial_Image_016.jpg
+++ b/doc/html/Beginner's Tutorial_Image_016.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_017.jpg b/doc/html/Beginner's Tutorial_Image_017.jpg
index 476ffd4b..d9c9457e 100644
--- a/doc/html/Beginner's Tutorial_Image_017.jpg
+++ b/doc/html/Beginner's Tutorial_Image_017.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_018.jpg b/doc/html/Beginner's Tutorial_Image_018.jpg
index b0254408..7dcd93c8 100644
--- a/doc/html/Beginner's Tutorial_Image_018.jpg
+++ b/doc/html/Beginner's Tutorial_Image_018.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_019.jpg b/doc/html/Beginner's Tutorial_Image_019.jpg
index 9e379b25..c29ccd27 100644
--- a/doc/html/Beginner's Tutorial_Image_019.jpg
+++ b/doc/html/Beginner's Tutorial_Image_019.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_020.jpg b/doc/html/Beginner's Tutorial_Image_020.jpg
index 0b1f02b9..4c57f1fb 100644
--- a/doc/html/Beginner's Tutorial_Image_020.jpg
+++ b/doc/html/Beginner's Tutorial_Image_020.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_021.jpg b/doc/html/Beginner's Tutorial_Image_021.jpg
index e241f40e..19158894 100644
--- a/doc/html/Beginner's Tutorial_Image_021.jpg
+++ b/doc/html/Beginner's Tutorial_Image_021.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_022.jpg b/doc/html/Beginner's Tutorial_Image_022.jpg
index 5a36c7e6..1c97a0a0 100644
--- a/doc/html/Beginner's Tutorial_Image_022.jpg
+++ b/doc/html/Beginner's Tutorial_Image_022.jpg
diff --git a/doc/html/Beginner's Tutorial_Image_023.gif b/doc/html/Beginner's Tutorial_Image_023.gif
index 5786a91a..4802c738 100644
--- a/doc/html/Beginner's Tutorial_Image_023.gif
+++ b/doc/html/Beginner's Tutorial_Image_023.gif
diff --git a/doc/html/Camellia.html b/doc/html/Camellia.html
index e35bae17..5614a0e5 100644
--- a/doc/html/Camellia.html
+++ b/doc/html/Camellia.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Camellia.html">Camellia</a>
diff --git a/doc/html/Cascades.html b/doc/html/Cascades.html
index baebdef0..fb88fc76 100644
--- a/doc/html/Cascades.html
+++ b/doc/html/Cascades.html
@@ -1,66 +1,91 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Cascades.html">Cascades of ciphers</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Cascades of ciphers</h1>
 <p>&nbsp;</p>
 <h2>AES-Twofish</h2>
 <p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
 <em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Twofish (256-bit key) in XTS mode and then with AES (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
  header keys are independent too, even though they are derived from a single password &ndash; see
 <a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
 <h2>AES-Twofish-Serpent</h2>
 <p>Three ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
 <em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Serpent (256-bit key) in XTS mode, then with Twofish (256-bit key) in XTS mode, and finally with AES (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption
  keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section
 <a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Camellia-Kuznyechik</h2>
+<p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Kuznyechik (256-bit key) in XTS mode and then with Camellia (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
+ header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Camellia-Serpent</h2>
+<p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Serpent (256-bit key) in XTS mode and then with Camellia (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
+ header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Kuznyechik-AES</h2>
+<p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with AES (256-bit key) in XTS mode and then with Kuznyechik (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
+ header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Kuznyechik-Serpent-Camellia</h2>
+<p>Three ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Camellia (256-bit key) in XTS mode, then with Serpent (256- bit key) in XTS mode, and finally with Kuznyechik (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All
+ encryption keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Kuznyechik-Twofish</h2>
+<p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Twofish (256-bit key) in XTS mode and then with Kuznyechik (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
+ header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
 <h2>Serpent-AES</h2>
 <p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
 <em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with AES (256-bit key) in XTS mode and then with Serpent (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
  header keys are independent too, even though they are derived from a single password &ndash; see the section
 <a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
 <h2>Serpent-Twofish-AES</h2>
 <p>Three ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
 <em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with AES (256-bit key) in XTS mode, then with Twofish (256- bit key) in XTS mode, and finally with Serpent (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All
  encryption keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section
 <a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
 <h2>Twofish-Serpent</h2>
 <p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
 <em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Serpent (256-bit key) in XTS mode and then with Twofish (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note
  that header keys are independent too, even though they are derived from a single password &ndash; see the section
 <a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
 </div>
 </body></html>
diff --git a/doc/html/Changing Passwords and Keyfiles.html b/doc/html/Changing Passwords and Keyfiles.html
index d759a251..2a9a7ed6 100644
--- a/doc/html/Changing Passwords and Keyfiles.html
+++ b/doc/html/Changing Passwords and Keyfiles.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Changing%20Passwords%20and%20Keyfiles.html">Changing Passwords and Keyfiles</a>
diff --git a/doc/html/Choosing Passwords and Keyfiles.html b/doc/html/Choosing Passwords and Keyfiles.html
index 89bf5deb..3797009a 100644
--- a/doc/html/Choosing Passwords and Keyfiles.html
+++ b/doc/html/Choosing Passwords and Keyfiles.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Choosing%20Passwords%20and%20Keyfiles.html">Choosing Passwords and Keyfiles</a>
diff --git a/doc/html/Command Line Usage.html b/doc/html/Command Line Usage.html
index d9318b10..c463b04c 100644
--- a/doc/html/Command Line Usage.html
+++ b/doc/html/Command Line Usage.html
@@ -1,72 +1,72 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Command%20Line%20Usage.html">Command Line Usage</a>
 </p></div>
 
 <div class="wikidoc">
 <div>
 <h1>Command Line Usage</h1>
 <p>Note that this section applies to the Windows version of VeraCrypt. For information on command line usage applying to the
 <strong>Linux and Mac OS X versions</strong>, please run: veracrypt &ndash;h</p>
-<table border="1" cellspacing="0" cellpadding="0">
+<table border="1" cellspacing="0" cellpadding="1">
 <tbody>
 <tr>
 <td><em>/help</em> or <em>/?</em></td>
 <td>Display command line help.</td>
 </tr>
 <tr>
 <td><em>/truecrypt or /tc</em></td>
 <td>Activate TrueCrypt compatibility mode which enables mounting volumes created with TrueCrypt 6.x and 7.x series.</td>
 </tr>
 <tr>
 <td><em>/hash</em></td>
-<td>It must be followed by a parameter indicating the PRF hash algorithm to use when mounting the volume. Possible values for /hash parameter are: sha256, sha-256, sha512, sha-512, whirlpool, ripemd160 and ripemd-160. When /hash is omitted, VeraCrypt will try
+<td>It must be followed by a parameter indicating the PRF hash algorithm to use when mounting the volume. Possible values for /hash parameter are: sha256, sha-256, sha512, sha-512, whirlpool, blake2s and blake2s-256. When /hash is omitted, VeraCrypt will try
  all possible PRF algorithms thus lengthening the mount operation time.</td>
 </tr>
 <tr>
 <td id="volume"><em>/volume</em> or <em>/v</em></td>
 <td>
 <p>It must be followed by a parameter indicating the file and path name of a VeraCrypt volume to mount (do not use when dismounting) or the Volume ID of the disk/partition to mount.<br>
 The syntax of the volume ID is <strong>ID:XXXXXX...XX</strong> where the XX part is a 64 hexadecimal characters string that represent the 32-Bytes ID of the desired volume to mount.<br>
 <br>
 To mount a partition/device-hosted volume, use, for example, /v \Device\Harddisk1\Partition3 (to determine the path to a partition/device, run VeraCrypt and click
 <em>Select Device</em>). You can also mount a partition or dynamic volume using its volume name (for example, /v \\?\Volume{5cceb196-48bf-46ab-ad00-70965512253a}\). To determine the volume name use e.g. mountvol.exe. Also note that device paths are case-sensitive.<br>
 <br>
 You can also specify the Volume ID of the partition/device-hosted volume to mount, for example: /v ID:53B9A8D59CC84264004DA8728FC8F3E2EE6C130145ABD3835695C29FD601EDCA. The Volume ID value can be retrieved using the volume properties dialog.</p>
 </td>
 </tr>
 <tr>
 <td><em>/letter</em> or <em>/l</em></td>
 <td>It must be followed by a parameter indicating the driver letter to mount the volume as. When /l is omitted and when /a is used, the first free drive letter is used.</td>
 </tr>
 <tr>
 <td><em>/explore</em> or <em>/e</em></td>
@@ -90,56 +90,57 @@ You can also specify the Volume ID of the partition/device-hosted volume to moun
 <td>Forces dismount (if the volume to be dismounted contains files being used by the system or an application) and forces mounting in shared mode (i.e., without exclusive access).</td>
 </tr>
 <tr>
 <td><em>/keyfile</em> or <em>/k</em></td>
 <td>It must be followed by a parameter specifying a keyfile or a keyfile search path. For multiple keyfiles, specify e.g.: /k c:\keyfile1.dat /k d:\KeyfileFolder /k c:\kf2 To specify a keyfile stored on a security token or smart card, use the following syntax:
  token://slot/SLOT_NUMBER/file/FILE_NAME</td>
 </tr>
 <tr id="tryemptypass">
 <td><em>/tryemptypass&nbsp;&nbsp; </em></td>
 <td>ONLY when default keyfile configured or when a keyfile is specified in the command line.<br>
 If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: try to mount using an empty password and the keyfile before displaying password prompt.<br>
 if it is followed by <strong>n </strong>or<strong> no</strong>: don't try to mount using an empty password and the keyfile, and display password prompt right away.</td>
 </tr>
 <tr>
 <td><em>/nowaitdlg</em></td>
 <td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: don&rsquo;t display the waiting dialog while performing operations like mounting volumes.<br>
 If it is followed by <strong>n</strong> or <strong>no</strong>: force the display waiting dialog is displayed while performing operations.</td>
 </tr>
 <tr>
 <td><em>/secureDesktop</em></td>
-<td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: display password dialog in a dedicated secure desktop to protect against certain types of attacks.<br>
-If it is followed by <strong>n</strong> or <strong>no</strong>: the password dialog is displayed in the normal desktop.</td>
+<td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: display password dialog and token PIN dialog in a dedicated secure desktop to protect against certain types of attacks.<br>
+If it is followed by <strong>n</strong> or <strong>no</strong>: the password dialog and token PIN dialog are displayed in the normal desktop.</td>
 </tr>
 <tr>
 <td><em>/tokenlib</em></td>
 <td>It must be followed by a parameter indicating the PKCS #11 library to use for security tokens and smart cards. (e.g.: /tokenlib c:\pkcs11lib.dll)</td>
 </tr>
 <tr>
 <td><em>/tokenpin</em></td>
 <td>It must be followed by a parameter indicating the PIN to use in order to authenticate to the security token or smart card (e.g.: /tokenpin 0000). Warning: This method of entering a smart card PIN may be insecure, for example, when an unencrypted command
  prompt history log is being saved to unencrypted disk.</td>
 </tr>
 <tr>
 <td><em>/cache</em> or <em>/c</em></td>
 <td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: enable password cache;
 <br>
+If it is followed by <strong>p </strong>or<strong> pim</strong>: enable both password and PIM cache (e.g., /c p).<br>
 If it is followed by <strong>n </strong>or<strong> no</strong>: disable password cache (e.g., /c n).<br>
 If it is followed by <strong>f </strong>or<strong> favorites</strong>: temporary cache password when mounting multiple favorites&nbsp; (e.g., /c f).<br>
 Note that turning the password cache off will not clear it (use /w to clear the password cache).</td>
 </tr>
 <tr>
 <td><em>/history</em> or <em>/h</em></td>
 <td>If it is followed by <strong>y</strong> or no parameter: enables saving history of mounted volumes; if it is followed by
 <strong>n</strong>: disables saving history of mounted volumes (e.g., /h n).</td>
 </tr>
 <tr>
 <td><em>/wipecache</em> or <em>/w</em></td>
 <td>Wipes any passwords cached in the driver memory.</td>
 </tr>
 <tr>
 <td><em>/password</em> or <em>/p</em></td>
 <td>It must be followed by a parameter indicating the volume password. If the password contains spaces, it must be enclosed in quotation marks (e.g., /p &rdquo;My Password&rdquo;). Use /p &rdquo;&rdquo; to specify an empty password.
 <em>Warning: This method of entering a volume password may be insecure, for example, when an unencrypted command prompt history log is being saved to unencrypted disk.</em></td>
 </tr>
 <tr>
 <td><em>/pim</em></td>
@@ -153,111 +154,172 @@ Note that turning the password cache off will not clear it (use /w to clear the
 <tr>
 <td><em>/silent</em> or <em>/s</em></td>
 <td>If /q is specified, suppresses interaction with the user (prompts, error messages, warnings, etc.). If /q is not specified, this option has no effect.</td>
 </tr>
 <tr>
 <td><em>/mountoption</em> or <em>/m</em></td>
 <td>
 <p>It must be followed by a parameter which can have one of the values indicated below.</p>
 <p><strong>ro</strong> or<strong> readonly</strong>: Mount volume as read-only.</p>
 <p><strong>rm</strong> or <strong>removable</strong>: Mount volume as removable medium (see section
 <a href="Removable%20Medium%20Volume.html">
 <em>Volume Mounted as Removable Medium</em></a>).</p>
 <p><strong>ts</strong> or <strong>timestamp</strong>: Do not preserve container modification timestamp.</p>
 <p><strong>sm</strong> or <strong>system</strong>: Without pre-boot authentication, mount a partition that is within the key scope of system encryption (for example, a partition located on the encrypted system drive of another operating system that is not running).
  Useful e.g. for backup or repair operations. Note: If you supply a password as a parameter of /p, make sure that the password has been typed using the standard US keyboard layout (in contrast, the GUI ensures this automatically). This is required due to the
  fact that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available.</p>
 <p><strong>bk</strong> or <strong>headerbak</strong>: Mount volume using embedded backup header. Note: All volumes created by VeraCrypt contain an embedded backup header (located at the end of the volume).</p>
 <p><strong>recovery</strong>: Do not verify any checksums stored in the volume header. This option should be used only when the volume header is damaged and the volume cannot be mounted even with the mount option headerbak. Example: /m ro</p>
 <p><strong>label=LabelValue</strong>: Use the given string value <strong>LabelValue</strong> as a label of the mounted volume in Windows Explorer. The maximum length for
 <strong>LabelValue&nbsp;</strong> is 32 characters for NTFS volumes and 11 characters for FAT volumes. For example,
-<em>/m label=MyDrive</em> will set the label of the drive in Explorer to <em>MyDrive</em>.<br>
-<br>
-Please note that this switch may be present several times in the command line in order to specify multiple mount options (e.g.: /m rm /m ts)</p>
+<em>/m label=MyDrive</em> will set the label of the drive in Explorer to <em>MyDrive</em>.</p>
+<p><strong>noattach</strong>: Only create virtual device without actually attaching the mounted volume to the selected drive letter.</p>
+<p>Please note that this switch may be present several times in the command line in order to specify multiple mount options (e.g.: /m rm /m ts)</p>
 </td>
 </tr>
+<tr>
+<td><em>/DisableDeviceUpdate</em>&nbsp;</td>
+<td>Disables periodic internel check on devices connected to the system that is used for handling favorites identified with VolumeID and replace it with on-demande checks.</td>
+</tr>
+<tr>
+<td><em>/protectMemory</em>&nbsp;</td>
+<td>Activates a mechanism that protects VeraCrypt process memory from being accessed by other non-admin processes.</td>
+</tr>
+<tr>
+<td><em>/signalExit</em>&nbsp;</td>
+<td>It must be followed by a parameter specifying the name of the signal to send to unblock a waiting <a href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/waitfor" target="_blank">WAITFOR.EXE</a> command when VeraCrypt exists.<br>
+The name of signal must be the same as the one specified to WAITFOR.EXE command (e.g."veracrypt.exe /q /v test.hc /l Z /signal SigName" followed by "waitfor.exe SigName"<br>
+This switch is ignored if /q is not specified</td>
+</tr>
 </tbody>
 </table>
 <h4>VeraCrypt Format.exe (VeraCrypt Volume Creation Wizard):</h4>
 <table border="1" cellspacing="0" cellpadding="0">
 <tbody>
 <tr>
 <td>/create</td>
 <td>Create a container based volume in command line mode. It must be followed by the file name of the container to be created.</td>
 </tr>
 <tr>
 <td>/size</td>
 <td>
 <p>(Only with /create)<br>
 It must be followed by a parameter indicating the size of the container file that will be created. This parameter is a number indicating the size in Bytes. It can have a suffixe 'K', 'M', 'G' or 'T' to indicate that the value is in Kilobytes, Megabytes, Gigabytes
  or Terabytes respectively. For example:</p>
 <ul>
 <li>/size 5000000: the container size will be 5000000 bytes </li><li>/size 25K: the container size will be 25 KiloBytes. </li><li>/size 100M: the container size will be 100 MegaBytes. </li><li>/size 2G: the container size will be 2 GigaBytes. </li><li>/size 1T: the container size will be 1 TeraBytes. </li></ul>
 </td>
 </tr>
 <tr>
 <td>&nbsp;/password</td>
 <td>&nbsp;(Only with /create)<br>
 It must be followed by a parameter indicating the password of the container that will be created.</td>
 </tr>
 <tr>
+<td>&nbsp;/keyfile or /k</td>
+<td>&nbsp;(Only with /create)<br>
+It must be followed by a parameter specifying a keyfile or a keyfile search path. For multiple keyfiles, specify e.g.: /k c:\keyfile1.dat /k d:\KeyfileFolder /k c:\kf2 To specify a keyfile stored on a security token or smart card, use the following syntax:
+ token://slot/SLOT_NUMBER/file/FILE_NAME</td>
+</tr>
+<tr>
+<td><em>/tokenlib</em></td>
+<td>&nbsp;(Only with /create)<br>
+It must be followed by a parameter indicating the PKCS #11 library to use for security tokens and smart cards. (e.g.: /tokenlib c:\pkcs11lib.dll)</td>
+</tr>
+<tr>
+<td><em>/tokenpin</em></td>
+<td>&nbsp;(Only with /create)<br>
+It must be followed by a parameter indicating the PIN to use in order to authenticate to the security token or smart card (e.g.: /tokenpin 0000). Warning: This method of entering a smart card PIN may be insecure, for example, when an unencrypted command
+ prompt history log is being saved to unencrypted disk.</td>
+</tr>
+<tr>
 <td>&nbsp;<em>/hash</em></td>
 <td>(Only with /create)<br>
 It must be followed by a parameter indicating the PRF hash algorithm to use when creating the volume. It has the same syntax as VeraCrypt.exe.</td>
 </tr>
 <tr>
 <td>/encryption</td>
 <td>(Only with /create)<br>
 It must be followed by a parameter indicating the encryption algorithm to use. The default is AES if this switch is not specified. The parameter can have the following values (case insensitive):
 <ul>
-<li>AES </li><li>Serpent </li><li>Twofish </li><li>AES(Twofish) </li><li>AES(Twofish(Serpent)) </li><li>Serpent(AES) </li><li>Serpent(Twofish(AES)) </li><li>Twofish(Serpent) </li></ul>
+<li>AES </li><li>Serpent </li><li>Twofish </li><li>Camellia </li><li>Kuznyechik </li><li>AES(Twofish) </li><li>AES(Twofish(Serpent)) </li><li>Serpent(AES) </li><li>Serpent(Twofish(AES)) </li><li>Twofish(Serpent) </li>
+<li>Camellia(Kuznyechik) </li>
+<li>Kuznyechik(Twofish) </li>
+<li>Camellia(Serpent) </li>
+<li>Kuznyechik(AES) </li>
+<li>Kuznyechik(Serpent(Camellia)) </li>
+</ul>
 </td>
 </tr>
 <tr>
 <td>/filesystem</td>
 <td>(Only with /create)<br>
 It must be followed by a parameter indicating the file system to use for the volume. The parameter can have the following values:
 <ul>
 <li>None: don't use any filesystem </li><li>FAT: format using FAT/FAT32 </li><li>NTFS: format using NTFS. Please note that in this case a UAC prompt will be displayed unless the process is run with full administrative privileges.
-</li></ul>
+</li>
+<li>ExFAT: format using ExFAT. This switch is available starting from Windows Vista SP1 </li>
+<li>ReFS: format using ReFS. This switch is available starting from Windows 10 </li>
+</ul>
 </td>
 </tr>
 <tr>
 <td>/dynamic</td>
 <td>(Only with /create)<br>
 It has no parameters and it indicates that the volume will be created as a dynamic volume.</td>
 </tr>
 <tr>
 <td>/force</td>
 <td>(Only with /create)<br>
 It has no parameters and it indicates that overwrite will be forced without requiring user confirmation.</td>
 </tr>
 <tr>
 <td>/silent</td>
 <td>(Only with /create)<br>
 It has no parameters and it indicates that no message box or dialog will be displayed to the user. If there is any error, the operation will fail silently.</td>
 </tr>
 <tr>
 <td><em>/noisocheck</em> or <em>/n</em></td>
 <td>Do not verify that VeraCrypt Rescue Disks are correctly burned. <strong>WARNING</strong>: Never attempt to use this option to facilitate the reuse of a previously created VeraCrypt Rescue Disk. Note that every time you encrypt a system partition/drive,
  you must create a new VeraCrypt Rescue Disk even if you use the same password. A previously created VeraCrypt Rescue Disk cannot be reused as it was created for a different master key.</td>
 </tr>
+<tr>
+<td>/nosizecheck</td>
+<td>Don't check that the given size of the file container is smaller than the available disk free. This applies to both UI and command line.</td>
+</tr>
+<tr>
+<td>/quick</td>
+<td>Perform quick formatting of volumes instead of full formatting. This applies to both UI and command line.</td>
+</tr>
+<tr>
+<td>/FastCreateFile</td>
+<td>Enables a faster, albeit potentially insecure, method for creating file containers. This option carries security risks as it can embed existing disk content into the file container, possibly exposing sensitive data if an attacker gains access to it. Note that this switch affects all file container creation methods, whether initiated from the command line, using the /create switch, or through the UI wizard.</td>
+</tr>
+<tr>
+<td><em>/protectMemory</em>&nbsp;</td>
+<td>Activates a mechanism that protects VeraCrypt Format process memory from being accessed by other non-admin processes.</td>
+</tr>
+<tr>
+<td><em>/secureDesktop</em></td>
+<td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: display password dialog and token PIN dialog in a dedicated secure desktop to protect against certain types of attacks.<br>
+If it is followed by <strong>n</strong> or <strong>no</strong>: the password dialog and token PIN dialog are displayed in the normal desktop.</td>
+</tr>
 </tbody>
 </table>
 <h4>Syntax</h4>
-<p>VeraCrypt.exe [/tc] [/hash {sha256|sha-256|sha512|sha-512|whirlpool |ripemd160|ripemd-160}][/a [devices|favorites]] [/b] [/c [y|n|f]] [/d [drive letter]] [/e] [/f] [/h [y|n]] [/k keyfile or search path] [tryemptypass [y|n]] [/l drive letter] [/m {bk|rm|recovery|ro|sm|ts}]
+<p>VeraCrypt.exe [/tc] [/hash {sha256|sha-256|sha512|sha-512|whirlpool |blake2s|blake2s-256}][/a [devices|favorites]] [/b] [/c [y|n|f]] [/d [drive letter]] [/e] [/f] [/h [y|n]] [/k keyfile or search path] [tryemptypass [y|n]] [/l drive letter] [/m {bk|rm|recovery|ro|sm|ts|noattach}]
  [/p password] [/pim pimvalue] [/q [background|preferences]] [/s] [/tokenlib path] [/v volume] [/w]</p>
-<p>&quot;VeraCrypt Format.exe&quot; [/n] [/create] [/size number[{K|M|G|T}]] [/p password]&nbsp; [/encryption {AES | Serpent | Twofish | AES(Twofish) | AES(Twofish(Serpent)) | Serpent(AES) | Serpent(Twofish(AES)) | Twofish(Serpent)}] [/hash {sha256|sha-256|sha512|sha-512|whirlpool|ripemd160|ripemd-160}]
- [/filesystem {None|FAT|NTFS}] [/dynamic] [/force] [/silent]</p>
+<p>&quot;VeraCrypt Format.exe&quot; [/n] [/create] [/size number[{K|M|G|T}]] [/p password]&nbsp; [/encryption {AES | Serpent | Twofish | Camellia | Kuznyechik | AES(Twofish) | AES(Twofish(Serpent)) | Serpent(AES) | Serpent(Twofish(AES)) | Twofish(Serpent) | Camellia(Kuznyechik) | Kuznyechik(Twofish) | Camellia(Serpent) | Kuznyechik(AES) | Kuznyechik(Serpent(Camellia))}] [/hash {sha256|sha-256|sha512|sha-512|whirlpool|blake2s|blake2s-256}]
+ [/filesystem {None|FAT|NTFS|ExFAT|ReFS}] [/dynamic] [/force] [/silent] [/noisocheck] [FastCreateFile] [/quick]</p>
 <p>Note that the order in which options are specified does not matter.</p>
 <h4>Examples</h4>
 <p>Mount the volume <em>d:\myvolume</em> as the first free drive letter, using the password prompt (the main program window will not be displayed):</p>
 <p>veracrypt /q /v d:\myvolume</p>
 <p>Dismount a volume mounted as the drive letter <em>X</em> (the main program window will not be displayed):</p>
 <p>veracrypt /q /d x</p>
 <p>Mount a volume called <em>myvolume.tc</em> using the password <em>MyPassword</em>, as the drive letter
 <em>X</em>. VeraCrypt will open an explorer window and beep; mounting will be automatic:</p>
 <p>veracrypt /v myvolume.tc /l x /a /p MyPassword /e /b</p>
 <p>Create a 10 MB file container using the password <em>test</em> and formatted using FAT:</p>
 <p><code>&quot;C:\Program Files\VeraCrypt\VeraCrypt Format.exe&quot; /create c:\Data\test.hc /password test /hash sha512 /encryption serpent /filesystem FAT /size 10M /force</code></p>
 </div>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/CompilingGuidelineLinux.html b/doc/html/CompilingGuidelineLinux.html
new file mode 100644
index 00000000..7b0d1df3
--- /dev/null
+++ b/doc/html/CompilingGuidelineLinux.html
@@ -0,0 +1,314 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<style>
+.textbox {
+  vertical-align: top;
+  height: auto !important;
+  font-family: Helvetica,sans-serif;
+  font-size: 20px;
+  font-weight: bold;
+  margin: 10px;
+  padding: 10px;
+  background-color: white;
+  width: auto;
+  border-radius: 10px;
+}
+
+.texttohide {
+  font-family: Helvetica,sans-serif;
+  font-size: 14px;
+  font-weight: normal;
+}
+
+
+</style>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Technical Details</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelines.html">Building VeraCrypt From Source</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelineLinux.html">Linux Build Guide</a>
+</p></div>
+
+<div class="wikidoc">
+This guide describes how to set up a Linux System to build VeraCrypt from source and how to perform compilation. <br>
+The procedure for a Ubuntu 22.04 LTS system is described here as an example, the procedure for other Linux systems is analogous.
+</div>
+
+<div class="wikidoc">
+<br>
+<br>
+The following components are required for compiling VeraCrypt:
+<ol>
+	<li>GNU Make</li>
+	<li>GNU C/C++ Compiler</li>
+	<li>YASM 1.3.0</li>
+	<li>pkg-config</li>
+	<li>wxWidgets 3.x shared library and header files installed by the system or wxWidgets 3.x library source code </li>
+	<li>FUSE library and header files</li>
+	<li>PCSC-lite library and header files</li>
+</ol>
+</div>
+
+<div class="wikidoc">
+<p>Below are the procedure steps. Clicking on any of the link takes directly to the related step:
+<ul>
+<li><strong><a href="#InstallationOfGNUMake">Installation of GNU Make</a></li></strong>
+<li><strong><a href="#InstallationOfGNUCompiler">Installation of GNU C/C++ Compiler</a></li></strong>
+<li><strong><a href="#InstallationOfYASM">Installation of YASM</a></li></strong>
+<li><strong><a href="#InstallationOfPKGConfig">Installation of pkg-config</a></li></strong>
+<li><strong><a href="#InstallationOfwxWidgets">Installation of wxWidgets 3.2</a></li></strong>
+<li><strong><a href="#InstallationOfFuse">Installation of libfuse</a></li></strong>
+<li><strong><a href="#InstallationOfPCSCLite">Installation of libpcsclite</a></li></strong>
+<li><strong><a href="#DownloadVeraCrypt">Download VeraCrypt</a></li></strong>
+<li><strong><a href="#CompileVeraCrypt">Compile VeraCrypt</a></li></strong>
+</ul>
+</p>
+<p>They can also be performed by running the below list of commands in a terminal or by copying them to a script:<br>
+<code>
+sudo apt update <br>
+sudo apt install -y build-essential yasm pkg-config libwxgtk3.0-gtk3-dev <br>
+sudo apt install -y libfuse-dev git libpcsclite-dev <br>
+git clone https://github.com/veracrypt/VeraCrypt.git <br>
+cd ~/VeraCrypt/src <br>
+make
+</code>
+</p>
+</div>
+
+<div class="wikidoc">
+ <div class="textbox" id="InstallationOfGNUMake">
+  <a href="#InstallationOfGNUMake">Installation of GNU Make</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install build-essential
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfGNUCompiler">
+  <a href="#InstallationOfGNUCompiler">Installation of GNU C/C++ Compiler</a>
+  <div class="texttohide">
+    <p> If the build-essential were already installed in the step before, this step can be skipped.
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install build-essential
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfYASM">
+  <a href="#InstallationOfYASM">Installation of YASM</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install yasm
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfPKGConfig">
+  <a href="#InstallationOfPKGConfig">Installation of pkg-config</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install pkg-config
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfwxWidgets">
+  <a href="#InstallationOfwxWidgets">Installation of wxWidgets 3.2</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>		
+				sudo apt update <br>
+				sudo apt install libwxgtk3.0-gtk3-dev <br>
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfFuse">
+  <a href="#InstallationOfFuse">Installation of libfuse</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install libfuse-dev
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+<div class="textbox" id="InstallationOfPCSCLite">
+	<a href="#InstallationOfPCSCLite">Installation of libpcsclite</a>
+	<div class="texttohide">
+		<p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+					sudo apt update <br>
+					sudo apt install libpcsclite-dev
+				</code>
+			</li>
+		</ol>
+		</p>
+	</div>
+</div>
+ 
+ <div class="textbox" id="DownloadVeraCrypt">
+  <a href="#DownloadVeraCrypt">Download VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install git <br>
+				git clone https://github.com/veracrypt/VeraCrypt.git
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="CompileVeraCrypt">
+  <a href="#CompileVeraCrypt">Compile VeraCrypt</a>
+  <div class="texttohide">
+    <p> Remarks: <br>
+	<ul>
+		<li>
+			By default, a universal executable supporting both graphical and text user interface (through the switch --text) is built. <br>
+			On Linux, a console-only executable, which requires no GUI library, can be built using the 'NOGUI' parameter. <br>
+			For that, you need to dowload wxWidgets sources, extract them to a location of your choice and then run the following commands: <br>
+			<code>
+			make NOGUI=1 WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources wxbuild <br>
+			make NOGUI=1 WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources
+			</code>
+		</li>
+		<li>
+			If you are not using the system wxWidgets library, you will have to download and use wxWidgets sources like the remark above but this time the following commands should be run to build GUI version of VeraCrypt (NOGUI is not specified): <br>
+			<code>
+			make WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources wxbuild <br>
+			make WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources
+			</code>
+		</li>
+	</ul>
+	Steps:
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>		
+				cd ~/VeraCrypt/src <br>
+				make
+				</code>
+			</li>
+			<li>
+				If successful, the VeraCrypt executable should be located in the directory 'Main'.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+</div>
+</body></html>
diff --git a/doc/html/CompilingGuidelineWin.html b/doc/html/CompilingGuidelineWin.html
new file mode 100644
index 00000000..ec08af4f
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin.html
@@ -0,0 +1,1225 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<style>
+.textbox {
+  vertical-align: top;
+  height: auto !important;
+  font-family: Helvetica,sans-serif;
+  font-size: 20px;
+  font-weight: bold;
+  margin: 10px;
+  padding: 10px;
+  background-color: white;
+  width: auto;
+  border-radius: 10px;
+}
+
+.texttohide {
+  font-family: Helvetica,sans-serif;
+  font-size: 14px;
+  font-weight: normal;
+}
+
+
+</style>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Technical Details</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelines.html">Building VeraCrypt From Source</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelineWin.html">Windows Build Guide</a>
+</p></div>
+
+<div class="wikidoc">
+This guide describes how to set up a Windows system that can compile the VeraCrypt. Further it is described how VeraCrypt is going to be compiled. <br>
+The procedure for a Windows 10 system is described here as an example, but the procedure for other Windows systems is analogous.
+</div>
+
+<div class="wikidoc">
+The following components are required for compiling VeraCrypt:
+
+<ol>
+	<li>Microsoft Visual Studio 2010</li>
+	<li>Microsoft Visual Studio 2010 Service Pack 1</li>
+	<li>NASM</li>
+	<li>YASM</li>
+	<li>Visual C++ 1.52</li>
+	<li>Windows SDK 7.1</li>
+	<li>Windows Driver Kit 7.1</li>
+	<li>Windows 8.1 SDK</li>
+	<li>gzip</li>
+	<li>upx</li>
+	<li>7zip</li>
+	<li>Wix3</li>
+	<li>Microsoft Visual Studio 2019</li>
+	<li>Windows 10 SDK</li>
+	<li>Windows Driver Kit 1903</li>
+	<li>Visual Studio build tools</li>
+	
+</ol>
+
+</div>
+
+<div class="wikidoc">
+Below are the procedure steps. Clicking on any of the link takes directly to the related step:
+<ul>
+<li><strong><a href="#InstallationOfMicrosoftVisualStudio2010">Installation of Microsoft Visual Studio 2010</a></li></strong>
+<li><strong><a href="#InstallationOfMicrosoftVisualStudio2010ServicePack1">Installation of Microsoft Visual Studio 2010 Service Pack 1</a></li></strong>
+<li><strong><a href="#InstallationOfNASM">Installation of NASM</a></li></strong>
+<li><strong><a href="#InstallationOfYASM">Installation of YASM</a></li></strong>
+<li><strong><a href="#InstallationOfVisualCPP">Installation of Microsoft Visual C++ 1.52</a></li></strong>
+<li><strong><a href="#InstallationOfWindowsSDK71PP">Installation of the Windows SDK 7.1</a></li></strong>
+<li><strong><a href="#InstallationOfWDK71PP">Installation of the Windows Driver Kit 7.1</a></li></strong>
+<li><strong><a href="#InstallationOfSDK81PP">Installation of the Windows 8.1 SDK</a></li></strong>
+<li><strong><a href="#InstallationOfGzip">Installation of gzip</a></li></strong>
+<li><strong><a href="#InstallationOfUpx">Installation of upx</a></li></strong>
+<li><strong><a href="#InstallationOf7zip">Installation of 7zip</a></li></strong>
+<li><strong><a href="#InstallationOfWix3">Installation of Wix3</a></li></strong>
+<li><strong><a href="#InstallationOfVS2019">Installation of Microsoft Visual Studio 2019</a></li></strong>
+<li><strong><a href="#InstallationOfWDK10">Installation of the Windows Driver Kit 2004</a></li></strong>
+<li><strong><a href="#InstallationOfVisualBuildTools">Installation of the Visual Studio build tools</a></li></strong>
+<li><strong><a href="#DownloadVeraCrypt">Download VeraCrypt Source Files</a></li></strong>
+<li><strong><a href="#CompileWin32X64">Compile the Win32/x64 Versions of VeraCrypt</a></li></strong>
+<li><strong><a href="#CompileARM64">Compile the ARM64 Version of VeraCrypt</a></li></strong>
+<li><strong><a href="#BuildVeraCryptExecutables">Build the VeraCrypt Executables</a></li></strong>
+<li><strong><a href="#ImportCertificates">Import the Certificates</a></li></strong>
+<li><strong><a href="#KnownIssues">Known Issues</a></li></strong>
+</ul>
+</div>
+
+<div class="wikidoc">
+ <div class="textbox" id="InstallationOfMicrosoftVisualStudio2010">
+  <a href="#InstallationOfMicrosoftVisualStudio2010">Installation of Microsoft Visual Studio 2010</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Visit the following Microsoft website and log in with a free Microsoft account: <br>
+				<a href="https://my.visualstudio.com/Downloads?q=Visual%20Studio%202010%20Professional&pgroup=" target="_blank">https://my.visualstudio.com/Downloads?q=Visual%20Studio%202010%20Professional&pgroup=</a>
+			</li>
+			<li>
+				Please download a (trial) version of “Visual Studio Professional 2010” <br>
+				<img src="CompilingGuidelineWin/DownloadVS2010.jpg" width="80%">
+			</li>
+			<li>
+				Mount the downloaded ISO file by doubleclicking it
+			</li>
+			<li>
+				Run the file "autorun.exe" as administrator
+			</li>
+			<li>
+				Install Microsoft Visual Studio 2010 with the default settings
+			</li>
+		</ol>
+		The installation of the Microsoft SQL Server 2008 Express Service Pack 1 (x64) may fail, but it is not required for compiling VeraCrypt.
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfMicrosoftVisualStudio2010ServicePack1">
+  <a href="#InstallationOfMicrosoftVisualStudio2010ServicePack1">Installation of Microsoft Visual Studio 2010 Service Pack 1</a>
+  <div class="texttohide">
+    <p>
+		Note: The content the official installer from Microsoft tries to download is no longer available. Therefore, it is necessary to use an offline installer.
+		<ol>
+			<li>
+				Visit the website of the internet archive and download the iso image of the Microsoft Visual Studio 2010 Service Pack 1:<br>
+				<a href="https://archive.org/details/vs-2010-sp-1dvd-1" target="_blank">https://archive.org/details/vs-2010-sp-1dvd-1</a>
+			</li>
+			<li>
+				Mount the downloaded ISO file by doubleclicking it
+			</li>
+			<li>
+				Run the file "Setup.exe" as administrator
+			</li>
+			<li>
+				Install Microsoft Visual Studio 2010 Service Pack 1 with the default settings
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfNASM">
+  <a href="#InstallationOfNASM">Installation of NASM</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Download “nasm-2.08-installer.exe” at: <br>
+				<a href="https://www.nasm.us/pub/nasm/releasebuilds/2.08/win32/" target="_blank">https://www.nasm.us/pub/nasm/releasebuilds/2.08/win32/</a>
+			</li>
+			<li>
+				Run the file as administrator
+			</li>
+			<li>
+				Install NASM with the default settings
+			</li>
+			<li>
+				Add NASM to the path Variable. This will make the command globally available on the command line. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Open a file explorer
+					</li>
+					<li>
+						Within the left file tree, please make a right click on "This PC" and select "Properties" <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						Within the right menu, please click on "Advanced system settings" <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Please click on "Environment Variables" <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						Within the area of the system variables, please select the "Path" variable and click on "Edit..." <br>
+						<img src="CompilingGuidelineWin/SelectPathVariable.jpg" width="25%">
+					</li>
+					<li>
+						Click on "New" and add the following value: <br>
+						<p style="font-family: 'Courier New', monospace;">C:\Program Files (x86)\nasm</p>
+					</li>
+					<li>
+						Close the windows by clicking on "OK"
+					</li>
+				</ol>
+			</li>
+			<li>
+				To check if the configuration is working correctly, please open a command prompt and watch the output of the following command: <br>
+				<p style="font-family: 'Courier New', monospace;">nasm</p> <br>
+				<img src="CompilingGuidelineWin/NasmCommandLine.jpg" width="50%">
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfYASM">
+  <a href="#InstallationOfYASM">Installation of YASM</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please create the following folder: <br>
+				C:\Program Files\YASM
+			</li>
+			<li>
+				Please download the file "Win64 VS2010 .zip" at: <br>
+				<a href="https://yasm.tortall.net/Download.html" target="_blank">https://yasm.tortall.net/Download.html</a>
+			</li>
+			<li>
+				Your browser might inform you that the file might be a security risk due to the low download rate or the unencrypted connection. Nevertheless, the official website is the most reliable source for this file, so we recommend to allow the download
+			</li>
+			<li>
+				Unzip the zip file and copy the files to “C:\Program Files\YASM”
+			</li>
+			<li>
+				Please download the file "Win64 .exe" at: <br>
+				<a href="https://yasm.tortall.net/Download.html" target="_blank">https://yasm.tortall.net/Download.html</a>
+			</li>
+			<li>
+				Your browser might inform you that the file might be a security risk due to the low download rate or the unencrypted connection. Nevertheless, the official website is the most reliable source for this file, so we recommend to allow the download
+			</li>
+			<li>
+				Rename the file to “yasm.exe” and copy it to “C:\Program Files\YASM”
+			</li>
+			<li>
+				Add YASM to the path Variable and create a new system variable for YASM. This will make the command globally available on the command line. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Open a file explorer
+					</li>
+					<li>
+						Within the left file tree, please make a right click on "This PC" and select "Properties" <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						Within the right menu, please click on "Advanced system settings" <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Please click on "Environment Variables" <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						Within the area of the system variables, please select the "Path" variable and click on "Edit..." <br>
+						<img src="CompilingGuidelineWin/SelectPathVariable.jpg" width="25%">
+					</li>
+					<li>
+						Click on "New" and add the following value: <br>
+						<p style="font-family: 'Courier New', monospace;">C:\Program Files\YASM</p>
+					</li>
+					<li>
+						Close the top window by clicking on "OK"
+					</li>
+					<li>
+						Within the area of the system variables, please click on "New..." <br>
+						<img src="CompilingGuidelineWin/AddNewSystemVar.jpg" width="25%">
+					</li>
+					<li>
+						Fill out the form with the following values: <br>
+						<p style="font-family: 'Courier New', monospace;">Variable name: YASMPATH<br> Variable value: C:\Program Files\YASM</p>
+					</li>
+					<li>
+						Close the windows by clicking on "OK"
+					</li>
+				</ol>
+			</li>
+			<li>
+				To check if the configuration is working correctly, please open a command prompt and watch the output of the following command: <br>
+				<p style="font-family: 'Courier New', monospace;">yasm</p> <br>
+				and <br>
+				<p style="font-family: 'Courier New', monospace;">vsyasm</p> <br>
+				<img src="CompilingGuidelineWin/YasmCommandLine.jpg" width="50%">
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfVisualCPP">
+  <a href="#InstallationOfVisualCPP">Installation of Microsoft Visual C++ 1.52</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Visual C++ 1.52 is available via the paid Microsoft MSDN subscription. If you do not have a subscription, you download the ISO image via the internet archive: <br>
+				<a href="https://archive.org/details/ms-vc152" target="_blank">https://archive.org/details/ms-vc152</a>
+			</li>
+			<li>
+				Create the folder “C:\MSVC15”
+			</li>
+			<li>
+				Mount the ISO file and copy the content of the folder “MSVC” to “C:\MSVC15”
+			</li>
+			<li>
+				Create a system variable for Microsoft Visual C++ 1.52 <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Open a file explorer
+					</li>
+					<li>
+						Within the left file tree, please make a right click on "This PC" and select "Properties" <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						Within the right menu, please click on "Advanced system settings" <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Please click on "Environment Variables" <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						Within the area of the system variables, please click on "New..." <br>
+						<img src="CompilingGuidelineWin/AddNewSystemVar.jpg" width="25%">
+					</li>
+					<li>
+						Fill out the form with the following values: <br>
+						<p style="font-family: 'Courier New', monospace;">Variable name: MSVC16_ROOT<br> Variable value: C:\MSVC15</p>
+					</li>
+					<li>
+						Close the windows by clicking on "OK"
+					</li>
+				</ol>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div> 
+ 
+ <div class="textbox" id="InstallationOfWindowsSDK71PP">
+  <a href="#InstallationOfWindowsSDK71PP">Installation of the Windows SDK 7.1</a>
+  <div class="texttohide">
+    <p>
+		The installer requires .Net Framework 4 (Not a newer one like .Net Framework 4.8!). Since a newer version is already preinstalled with Windows 10, the installer has to be tricked:
+		<ol>
+			<li>
+				Click on the start button and search for: "regedit.msc". Start the first finding.
+			</li>
+			<li>
+				Navigate to "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\NET Framework Setup\NDP\v4\"
+			</li>
+			<li>
+				Change the permissions for the "Client" folder, so you can edit the keys: <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Right click on the subfolder "Client" and select "Permissions..."
+					</li>
+					<li>
+						Click on "Advanced" <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-1.jpg" width="17%">
+					</li>
+					<li>
+						Change the owner to your user and click on "Add" <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-2.jpg" width="35%">
+					</li>
+					<li>
+						Set the principal to your user, select "Full Control" and click on "OK" <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-3.jpg" width="35%">
+					</li>
+					<li>
+						Within the folder "Client" note down the value of the entry "Version"
+					</li>
+					<li>
+						Doubleclick on the entry "Version" and change the value to "4.0.30319" <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-4.jpg" width="30%">
+					</li>
+				</ol>
+			</li>
+			<li>
+				Change the permissions for the "Full" folder, so you can edit the keys: <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Right click on the subfolder "Full" and select "Permissions..."
+					</li>
+					<li>
+						Click on "Advanced" <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-1.jpg" width="17%">
+					</li>
+					<li>
+						Change the owner to your user and click on "Add" <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-2.jpg" width="35%">
+					</li>
+					<li>
+						Set the principal to your user, select "Full Control" and click on "OK" <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-3.jpg" width="35%">
+					</li>
+					<li>
+						Within the folder "Full" note down the value of the entry "Version"
+					</li>
+					<li>
+						Doubleclick on the entry "Version" and change the value to "4.0.30319" <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-4.jpg" width="30%">
+					</li>
+				</ol>
+			</li>
+			<li>
+				Download the Windows SDK 7.1 at: <br>
+				<a href="https://www.microsoft.com/en-us/download/details.aspx?id=8279" target="_blank">https://www.microsoft.com/en-us/download/details.aspx?id=8279</a>
+			</li>
+			<li>
+				Run the downloaded file as administrator and install the application with default settings
+			</li>
+			<li>
+				After the installation, revert the changes done in the registry editor. <br>
+				<b>Note:</b> The owner "TrustedInstaller" can be restored by searching for: "NT Service\TrustedInstaller"
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>  
+ 
+ <div class="textbox" id="InstallationOfWDK71PP">
+  <a href="#InstallationOfWDK71PP">Installation of the Windows Driver Kit 7.1</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please download the ISO of the Windows Diver Kit 7.1 at: <br>
+				<a href="https://www.microsoft.com/en-us/download/details.aspx?id=11800" target="_blank">https://www.microsoft.com/en-us/download/details.aspx?id=11800</a>
+			</li>
+			<li>
+				Mount the downloaded ISO file by doubleclicking it
+			</li>
+			<li>
+				Run the file "KitSetup.exe" as administrator. Within the installation select all features to be installed. <br>
+				<b>Note: </b>It might be that during the installed you are requested to install the .NET Framework 3.5. In this case click on "Download and install this feature".
+			</li>
+			<li>
+				Install the Driver Kit to the default location
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfSDK81PP">
+  <a href="#InstallationOfSDK81PP">Installation of the Windows 8.1 SDK</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please download the ISO of the Windows 8.1 SDK at: <br>
+				<a href="https://developer.microsoft.com/de-de/windows/downloads/sdk-archive/" target="_blank">https://developer.microsoft.com/de-de/windows/downloads/sdk-archive/</a>
+			</li>
+			<li>
+				Run the downloaded file as administrator and install the Windows 8.1 SDK with default settings
+			</li>
+			<li>
+				Create a system variable for the Windows 8.1 SDK <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Open a file explorer
+					</li>
+					<li>
+						Within the left file tree, please make a right click on "This PC" and select "Properties" <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						Within the right menu, please click on "Advanced system settings" <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Please click on "Environment Variables" <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						Within the area of the system variables, please click on "New..." <br>
+						<img src="CompilingGuidelineWin/AddNewSystemVar.jpg" width="25%">
+					</li>
+					<li>
+						Fill out the form with the following values: <br>
+						<p style="font-family: 'Courier New', monospace;">Variable name: WSDK81<br> Variable value: C:\Program Files (x86)\Windows Kits\8.1\</p>
+					</li>
+					<li>
+						Close the windows by clicking on "OK"
+					</li>
+				</ol>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfGzip">
+  <a href="#InstallationOfGzip">Installation of gzip</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please create the following folder: <br>
+				C:\Program Files (x86)\gzip
+			</li>
+			<li>
+				Please download gzip version at: <br>
+				<a href="https://sourceforge.net/projects/gnuwin32/files/gzip/1.3.12-1/gzip-1.3.12-1-bin.zip/download?use-mirror=netix&download=" target="_blank">https://sourceforge.net/projects/gnuwin32/files/gzip/1.3.12-1/gzip-1.3.12-1-bin.zip/download?use-mirror=netix&download=</a>
+			</li>
+			<li>
+				Copy the content of the downloaded zip to “C:\Program Files (x86)\gzip”
+			</li>
+			<li>
+				Add gzip to the path Variable. This will make the command globally available on the command line. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Open a file explorer
+					</li>
+					<li>
+						Within the left file tree, please make a right click on "This PC" and select "Properties" <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						Within the right menu, please click on "Advanced system settings" <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Please click on "Environment Variables" <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						Within the area of the system variables, please select the "Path" variable and click on "Edit..." <br>
+						<img src="CompilingGuidelineWin/SelectPathVariable.jpg" width="25%">
+					</li>
+					<li>
+						Click on "New" and add the following value: <br>
+						<p style="font-family: 'Courier New', monospace;">C:\Program Files (x86)\gzip\bin</p>
+					</li>
+					<li>
+						Close the windows by clicking on "OK"
+					</li>
+				</ol>
+			</li>
+			<li>
+				To check if the configuration is working correctly, please open a command prompt and watch the output of the following command: <br>
+				<p style="font-family: 'Courier New', monospace;">gzip</p> <br>
+				<img src="CompilingGuidelineWin/gzipCommandLine.jpg" width="50%">
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfUpx">
+  <a href="#InstallationOfUpx">Installation of upx</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please create the following folder: <br>
+				C:\Program Files (x86)\upx
+			</li>
+			<li>
+				Please download the latest upx-X-XX-win64.zip version at: <br>
+				<a href="https://github.com/upx/upx/releases/tag/v3.96" target="_blank">https://github.com/upx/upx/releases/tag/v3.96</a>
+			</li>
+			<li>
+				Copy the content of the downloaded zip to “C:\Program Files (x86)\upx”
+			</li>
+			<li>
+				Add gzip to the path Variable. This will make the command globally available on the command line. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Open a file explorer
+					</li>
+					<li>
+						Within the left file tree, please make a right click on "This PC" and select "Properties" <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						Within the right menu, please click on "Advanced system settings" <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Please click on "Environment Variables" <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						Within the area of the system variables, please select the "Path" variable and click on "Edit..." <br>
+						<img src="CompilingGuidelineWin/SelectPathVariable.jpg" width="25%">
+					</li>
+					<li>
+						Click on "New" and add the following value: <br>
+						<p style="font-family: 'Courier New', monospace;">C:\Program Files (x86)\upx</p>
+					</li>
+					<li>
+						Close the windows by clicking on "OK"
+					</li>
+				</ol>
+			</li>
+			<li>
+				To check if the configuration is working correctly, please open a command prompt and watch the output of the following command: <br>
+				<p style="font-family: 'Courier New', monospace;">upx</p> <br>
+				<img src="CompilingGuidelineWin/upxCommandLine.jpg" width="50%">
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOf7zip">
+  <a href="#InstallationOf7zip">Installation of 7zip</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please download the latest version of 7zip at: <br>
+				<a href="https://www.7-zip.de/" target="_blank">https://www.7-zip.de/</a>
+			</li>
+			<li>
+				Run the downloaded file as administrator and install 7zip with default settings
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfWix3">
+  <a href="#InstallationOfWix3">Installation of Wix3</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please download wix311.exe at: <br>
+				<a href="https://github.com/wixtoolset/wix3/releases" target="_blank">https://github.com/wixtoolset/wix3/releases</a>
+			</li>
+			<li>
+				Run the downloaded file as administrator and install WiX Toolset with default settings
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfVS2019">
+  <a href="#InstallationOfVS2019">Installation of Microsoft Visual Studio 2019</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Visit the following Microsoft website and log in with a free Microsoft account: <br>
+				<a href="https://my.visualstudio.com/Downloads?q=visual%20studio%202019%20Professional" target="_blank">https://my.visualstudio.com/Downloads?q=visual%20studio%202019%20Professional</a>
+			</li>
+			<li>
+				Please download the latest (trial) version of “Visual Studio Professional 2019” <br>
+				<img src="CompilingGuidelineWin/DownloadVS2019.jpg" width="80%">
+			</li>
+			<li>
+				Run the downloaded file as administrator and go through the wizard. <br>
+				Select the following Workloads for installation: <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Desktop development with C++
+					</li>
+					<li>
+						.NET desktop development
+					</li>
+				</ol>
+				Select the following individual components for installation:
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						.NET
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								.NET 6.0 Runtime
+							</li>
+							<li>
+								.NET Core 3.1 Runtime (LTS)
+							</li>
+							<li>
+								.NET Framework 4 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.5 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.5.1 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.5.2 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.6 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.6.1 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.7.2 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.8 SDK
+							</li>
+							<li>
+								.NET Framework 4.8 targeting pack
+							</li>
+							<li>
+								.NET SDK
+							</li>
+							<li>
+								ML.NET Model Builder (Preview)
+							</li>
+						</ol>
+					</li>
+					<li>
+						Cloud, database, and server
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								CLR data types for SQL Server
+							</li>
+							<li>
+								Connectivity and publishing tools
+							</li>
+						</ol>
+					</li>
+					<li>
+						Code tools
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								NuGet package manager
+							</li>
+							<li>
+								Text Template Transformation
+							</li>
+						</ol>
+					</li>
+					<li>
+						Compilers, build tools, and runtimes
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								.NET Compiler Platform SDK
+							</li>
+							<li>
+								C# and Visual Basic Roslyn compilers
+							</li>
+							<li>
+								C++ 2019 Redistributable Update
+							</li>
+							<li>
+								C++ CMake tools for Windows
+							</li>
+							<li>
+								C++/CLI support for v142 build tools (Latest)
+							</li>
+							<li>
+								MSBuild
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ ARM64 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ ARM64 Spectre-mitigated libs (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ x64/x86 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ x64/x86 Spectre-mitigated libs (Latest)
+							</li>
+						</ol>
+					</li>
+					<li>
+						Debugging and testing
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								.NET profiling tools
+							</li>
+							<li>
+								C++ AddressSanatizer
+							</li>
+							<li>
+								C++ profiling tools
+							</li>
+							<li>
+								Just-In-Time debugger
+							</li>
+							<li>
+								Test Adapter for Boost.Test
+							</li>
+							<li>
+								Test Adapter for Google Test
+							</li>
+						</ol>
+					</li>
+					<li>
+						Development activities
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								C# and Visual Basic
+							</li>
+							<li>
+								C++ core features
+							</li>
+							<li>
+								F# language support
+							</li>
+							<li>
+								IntelliCode
+							</li>
+							<li>
+								JavaScript and TypeScript language support
+							</li>
+							<li>
+								Live Share
+							</li>
+						</ol>
+					</li>
+					<li>
+						Emulators
+						<ol style="list-style-type: upper-roman;">
+							NONE
+						</ol>
+					</li>
+					<li>
+						Games and Graphics
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								Graphics debugger and GPU profiler for DirectX
+							</li>
+						</ol>
+					</li>
+					<li>
+						SDKs, libraries, and frameworks
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								C++ ATL for latest v142 build tools (ARM64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools (x86 & x64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools with Spectre Mitigations (ARM64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools with Spectre Mitigations (x86 & x64)
+							</li>
+							<li>
+								C++ MFC for latest v142 build tools (ARM64)
+							</li>
+							<li>
+								C++ MFC for latest v142 build tools (x86 & x64)
+							</li>
+							<li>
+								C++ MFC for latest v142 build tools with Spectre Mitigations (ARM64)
+							</li>
+							<li>
+								C++ MFC for latest v142 build tools with Spectre Mitigations (x86 & x64)
+							</li>
+							<li>
+								Entity Framework 6 tools
+							</li>
+							<li>
+								TypeScript 4.3 SDK
+							</li>
+							<li>
+								Windows 10 SDK (10.0.19041.0)
+							</li>
+							<li>
+								Windows Universal C Runtime
+							</li>
+						</ol>
+					</li>
+				</ol>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfWDK10">
+  <a href="#InstallationOfWDK10">Installation of the Windows Driver Kit version 2004</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please download the Windows Driver Kit (WDK) version 2004 at: <br>
+				<a href="https://docs.microsoft.com/en-us/windows-hardware/drivers/other-wdk-downloads" target="_blank">https://docs.microsoft.com/en-us/windows-hardware/drivers/other-wdk-downloads</a>
+			</li>
+			<li>
+				Run the downloaded file as administrator and install the WDK with default settings
+			</li>
+			<li>
+				At the end of the installation you will be asked if you want to "install Windows Driver Kit Visual Studio extension". <br>
+				Please make sure, that this option is selected before closing the dialog.
+			</li>
+			<li>
+				A different setup will start automatically and will detect Visual Studio Professional 2019 as possible target for the extension. <br>
+				Please select it and proceed with the installation.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfVisualBuildTools">
+  <a href="#InstallationOfVisualBuildTools">Installation of the Visual Studio build tools</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Visit the following Microsoft website and log in with a free Microsoft account: <br>
+				<a href="https://my.visualstudio.com/Downloads?q=visual%20studio%202019%20build%20tools" target="_blank">https://my.visualstudio.com/Downloads?q=visual%20studio%202019%20build%20tools</a>
+			</li>
+			<li>
+				Please download the latest version of “Build Tools for Visual Studio 2019” <br>
+				<img src="CompilingGuidelineWin/DownloadVSBuildTools.jpg" width="80%">
+			</li>
+			<li>
+				Run the downloaded file as administrator and go through the wizard. Select the following individual components for installation:
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						.NET
+						<ol style="list-style-type: upper-roman;">
+							NONE
+						</ol>
+					</li>
+					<li>
+						Cloud, database, and server
+						<ol style="list-style-type: upper-roman;">
+							NONE
+						</ol>
+					</li>
+					<li>
+						Code tools
+						<ol style="list-style-type: upper-roman;">
+							NONE
+						</ol>
+					</li>
+					<li>
+						Compilers, build tools, and runtimes
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								C++/CLI support for v142 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ ARM64 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ ARM64 Spectre-mitigated libs (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ x64/x86 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ x64/x86 Spectre-mitigated libs (Latest)
+							</li>
+						</ol>
+					</li>
+					<li>
+						Debugging and testing
+						<ol style="list-style-type: upper-roman;">
+							NONE
+						</ol>
+					</li>
+					<li>
+						Development activities
+						<ol style="list-style-type: upper-roman;">
+							NONE
+						</ol>
+					</li>
+					<li>
+						SDKs, libraries, and frameworks
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								C++ ATL for latest v142 build tools (ARM64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools (x86 & x64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools with Spectre Mitigations (ARM64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools with Spectre Mitigations (x86 & x64)
+							</li>
+						</ol>
+					</li>
+				</ol>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="DownloadVeraCrypt">
+  <a href="#DownloadVeraCrypt">Download VeraCrypt Source Files</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Visit the VeraCrypt Github repository at: <br>
+				<a href="https://github.com/veracrypt/VeraCrypt" target="_blank">https://github.com/veracrypt/VeraCrypt</a>
+			</li>
+			<li>
+				Please click on the green button with the label "Code" and download the code. <br>
+				You can download the repository as zip file, but you may consider to use the git protocol in order to track changes.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="CompileWin32X64">
+  <a href="#CompileWin32X64">Compile the Win32/x64 Versions of VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please open the file "src/VeraCrypt.sln" in Visual Studio <b>2010</b>
+			</li>
+			<li>
+				Please select "All|Win32" as active configuration <br>
+				<img src="CompilingGuidelineWin/VS2010Win32Config.jpg" width="80%">
+			</li>
+			<li>
+				Please click on "Build -> Build Solution" <br>
+				<img src="CompilingGuidelineWin/VS2010BuildSolution.jpg" width="40%">
+			</li>
+			<li>
+				The compiling process should end with warnings, but without errors. Some projects should be skipped.
+			</li>
+			<li>
+				Please select "All|x64" as active configuration <br>
+				<img src="CompilingGuidelineWin/VS2010X64Config.jpg" width="80%">
+			</li>
+			<li>
+				Please click on "Build -> Build Solution" <br>
+				<img src="CompilingGuidelineWin/VS2010BuildSolution.jpg" width="40%">
+			</li>
+			<li>
+				The compiling process should end with warnings, but without errors. Some projects should be skipped. <br>
+				Please close Visual Studio 2010 after the compiling process finished
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="CompileARM64">
+  <a href="#CompileARM64">Compile the ARM64 Version of VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please open the file "src/VeraCrypt_vs2019.sln" in Visual Studio <b>2019</b>
+			</li>
+			<li>
+				Please select "All|ARM64" as active configuration <br>
+				<img src="CompilingGuidelineWin/VS2019ARM64Config.jpg" width="80%">
+			</li>
+			<li>
+				Please click on "Build -> Build Solution" <br>
+				<img src="CompilingGuidelineWin/VS2019BuildSolution.jpg" width="40%">
+			</li>
+			<li>
+				The compiling process should end with warnings, but without errors. One project should be skipped. <br>
+				Please close Visual Studio 2019 after the compiling process finished
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="BuildVeraCryptExecutables">
+  <a href="#BuildVeraCryptExecutables">Build the VeraCrypt Executables</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Please open a command line as administrator
+			</li>
+			<li>
+				Go into the folder "src/Signing/"
+			</li>
+			<li>
+				Run the script "sign_test.bat"
+			</li>
+			<li>
+				You will find the generated exectuables within the folder "src/Release/Setup Files"
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="ImportCertificates">
+  <a href="#ImportCertificates">Import the Certificates</a>
+  <div class="texttohide">
+    <p> With the sign_test.bat script you just signed the VeraCrypt executables. This is necessary, since Windows only accepts drivers, which are trusted by a signed Certificate Authority. <br>
+	Since you did not use the official VeraCrypt signing certificate to sign your code, but a public development version, you have to import and therefore trust the certificates used.
+		<ol>
+			<li>
+				Open the folder "src/Signing"
+			</li>
+			<li>
+				Import the following certificates to your Local Machine Certificate storage, by double clicking them:
+				<ul>
+					<li>GlobalSign_R3Cross.cer</li>
+					<li>GlobalSign_SHA256_EV_CodeSigning_CA.cer</li>
+					<li>TestCertificates/idrix_codeSign.pfx</li>
+					<li>TestCertificates/idrix_Sha256CodeSign.pfx</li>
+					<li>TestCertificates/idrix_SHA256TestRootCA.crt</li>
+					<li>TestCertificates/idrix_TestRootCA.crt</li>
+				</ul>
+				Note: If prompted, the password for .pfx certificates is <b>idrix</b>.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="KnownIssues">
+  <a href="#KnownIssues">Known Issues</a>
+  <div class="texttohide">
+    <p>
+		<ul>
+			<li>
+				<b>This distribution package is damaged</b> <br>
+				<img src="CompilingGuidelineWin/DistributionPackageDamaged.jpg" width="20%"> <br>
+				On Windows 10 or higher you might get the error message above. In order to avoid this, you will need to:<br>
+				<ul>
+					<li>Double-check the installation of the root certificate that issued the test code signing certificate in the "Local Machine Trusted Root Certification Authorities" store.</li>
+					<li>Compute SHA512 fingerprint of the test code signing certificate and update the gpbSha512CodeSignCertFingerprint array in the file "src/Common/Dlgcode.c" accordingly.</li>
+				</ul>
+				Please see <a href="https://sourceforge.net/p/veracrypt/discussion/technical/thread/83d5a2d6e8/#db12" target="_blank">https://sourceforge.net/p/veracrypt/discussion/technical/thread/83d5a2d6e8/#db12</a> for further details.<br>
+				<br>
+				Another approach is to disable the signature verification in the VeraCrypt code. This should be done only for testing purposes and not for production use:
+				<ol>
+					<li>
+						Open the file "src/Common/Dlgcode.c"
+					</li>
+					<li>
+						Look for the function "VerifyModuleSignature"
+					</li>
+					<li>
+						Replace the following lines: <br>
+						Find:<br>
+						<p style="font-family: 'Courier New', monospace;">
+						if (!IsOSAtLeast (WIN_10)) <br>
+						return TRUE;
+						</p> <br>
+						Replace:<br>
+						<p style="font-family: 'Courier New', monospace;">
+						return TRUE;
+						</p>
+					</li>
+					<li>
+						Compile the VeraCrypt code again
+					</li>
+				</ol>
+			</li>
+			<li>
+				<b>Driver Installation Failure during VeraCrypt Setup from Custom Builds</b> <br>
+				<img src="CompilingGuidelineWin/CertVerifyFails.jpg" width="20%"> <br>
+				Windows validates the signature for every driver which is going to be installed.<br>
+				For security reasons, Windows allows only drivers signed by Microsoft to load.<br>
+				So, when using a custom build:<br>
+				<ul>
+					<li>If you have not modified the VeraCrypt driver source code, you can use the Microsoft-signed drivers included in the VeraCrypt source code (under "src\Release\Setup Files").</li>
+					<li>If you have made modifications, <strong>you will need to boot Windows into "Test Mode"</strong>. This mode allows Windows to load drivers that aren't signed by Microsoft. However, even in "Test Mode", there are certain requirements for signatures, and failures can still occur due to reasons discussed below.</li>
+				</ul>
+				Potential Causes for Installation Failure under "Test Mode":
+				<ol>
+					<li>
+						<b>The certificate used for signing is not trusted by Windows</b><br>
+						You can verify if you are affected by checking the properties of the executable:
+						<ol>
+							<li>
+								Make a right click on the VeraCrypt Setup executable: "src/Release/Setup Files/VeraCrypt Setup 1.XX.exe"
+							</li>
+							<li>
+								Click on properties
+							</li>
+							<li>	
+								Go to the top menu "Digital Signatures". Her you will find two signatures in the Signature list
+							</li>
+								Check both by double clicking on it. If the headline says "The certificate in the signature cannot be verified", the corresponding signing certificate was not imported correctly.<br>
+								Click on "View Certificate" and then on "Install Certificate..." to import the certificate to Local Machine certificate storage. For the Root certificates, you may need to choose "Place all certificates in the following store", and select the "Trusted Root Certification Authorities" store.<br>
+								<img src="CompilingGuidelineWin/CertificateCannotBeVerified.jpg" width="40%"> <br>
+							<li>
+						</ol>
+					</li>
+					<li>
+						<b>The driver was modified after the signing process.</b> <br>
+						In this case, please use the script "src/Signing/sign_test.bat" to sign your code again with the test certificates
+					</li>
+				</ol>
+			</li>
+		</ul>
+	</p>
+  </div>
+ </div>
+ 
+</div>
+</body></html>
diff --git a/doc/html/CompilingGuidelineWin/AddNewSystemVar.jpg b/doc/html/CompilingGuidelineWin/AddNewSystemVar.jpg
new file mode 100644
index 00000000..8e4bded1
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/AddNewSystemVar.jpg
diff --git a/doc/html/CompilingGuidelineWin/CertVerifyFails.jpg b/doc/html/CompilingGuidelineWin/CertVerifyFails.jpg
new file mode 100644
index 00000000..c7166ffa
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/CertVerifyFails.jpg
diff --git a/doc/html/CompilingGuidelineWin/CertificateCannotBeVerified.jpg b/doc/html/CompilingGuidelineWin/CertificateCannotBeVerified.jpg
new file mode 100644
index 00000000..f5dc2f21
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/CertificateCannotBeVerified.jpg
diff --git a/doc/html/CompilingGuidelineWin/DistributionPackageDamaged.jpg b/doc/html/CompilingGuidelineWin/DistributionPackageDamaged.jpg
new file mode 100644
index 00000000..e04f07c7
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/DistributionPackageDamaged.jpg
diff --git a/doc/html/CompilingGuidelineWin/DownloadVS2010.jpg b/doc/html/CompilingGuidelineWin/DownloadVS2010.jpg
new file mode 100644
index 00000000..1e4ba165
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/DownloadVS2010.jpg
diff --git a/doc/html/CompilingGuidelineWin/DownloadVS2019.jpg b/doc/html/CompilingGuidelineWin/DownloadVS2019.jpg
new file mode 100644
index 00000000..98428292
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/DownloadVS2019.jpg
diff --git a/doc/html/CompilingGuidelineWin/DownloadVSBuildTools.jpg b/doc/html/CompilingGuidelineWin/DownloadVSBuildTools.jpg
new file mode 100644
index 00000000..37217733
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/DownloadVSBuildTools.jpg
diff --git a/doc/html/CompilingGuidelineWin/NasmCommandLine.jpg b/doc/html/CompilingGuidelineWin/NasmCommandLine.jpg
new file mode 100644
index 00000000..d3a2f2f3
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/NasmCommandLine.jpg
diff --git a/doc/html/CompilingGuidelineWin/RegeditPermissions-1.jpg b/doc/html/CompilingGuidelineWin/RegeditPermissions-1.jpg
new file mode 100644
index 00000000..46fcabbc
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/RegeditPermissions-1.jpg
diff --git a/doc/html/CompilingGuidelineWin/RegeditPermissions-2.jpg b/doc/html/CompilingGuidelineWin/RegeditPermissions-2.jpg
new file mode 100644
index 00000000..5e3432cc
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/RegeditPermissions-2.jpg
diff --git a/doc/html/CompilingGuidelineWin/RegeditPermissions-3.jpg b/doc/html/CompilingGuidelineWin/RegeditPermissions-3.jpg
new file mode 100644
index 00000000..7aa66aa0
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/RegeditPermissions-3.jpg
diff --git a/doc/html/CompilingGuidelineWin/RegeditPermissions-4.jpg b/doc/html/CompilingGuidelineWin/RegeditPermissions-4.jpg
new file mode 100644
index 00000000..aa9f1c7b
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/RegeditPermissions-4.jpg
diff --git a/doc/html/CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg b/doc/html/CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg
new file mode 100644
index 00000000..753840d5
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg
diff --git a/doc/html/CompilingGuidelineWin/SelectEnvironmentVariables.jpg b/doc/html/CompilingGuidelineWin/SelectEnvironmentVariables.jpg
new file mode 100644
index 00000000..709589ba
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/SelectEnvironmentVariables.jpg
diff --git a/doc/html/CompilingGuidelineWin/SelectPathVariable.jpg b/doc/html/CompilingGuidelineWin/SelectPathVariable.jpg
new file mode 100644
index 00000000..ef5aa44d
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/SelectPathVariable.jpg
diff --git a/doc/html/CompilingGuidelineWin/SelectThisPC.jpg b/doc/html/CompilingGuidelineWin/SelectThisPC.jpg
new file mode 100644
index 00000000..439182d7
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/SelectThisPC.jpg
diff --git a/doc/html/CompilingGuidelineWin/VS2010BuildSolution.jpg b/doc/html/CompilingGuidelineWin/VS2010BuildSolution.jpg
new file mode 100644
index 00000000..7870cb51
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/VS2010BuildSolution.jpg
diff --git a/doc/html/CompilingGuidelineWin/VS2010Win32Config.jpg b/doc/html/CompilingGuidelineWin/VS2010Win32Config.jpg
new file mode 100644
index 00000000..f0be29b0
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/VS2010Win32Config.jpg
diff --git a/doc/html/CompilingGuidelineWin/VS2010X64Config.jpg b/doc/html/CompilingGuidelineWin/VS2010X64Config.jpg
new file mode 100644
index 00000000..b8d989a2
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/VS2010X64Config.jpg
diff --git a/doc/html/CompilingGuidelineWin/VS2019ARM64Config.jpg b/doc/html/CompilingGuidelineWin/VS2019ARM64Config.jpg
new file mode 100644
index 00000000..825079da
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/VS2019ARM64Config.jpg
diff --git a/doc/html/CompilingGuidelineWin/VS2019BuildSolution.jpg b/doc/html/CompilingGuidelineWin/VS2019BuildSolution.jpg
new file mode 100644
index 00000000..015ab357
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/VS2019BuildSolution.jpg
diff --git a/doc/html/CompilingGuidelineWin/YasmCommandLine.jpg b/doc/html/CompilingGuidelineWin/YasmCommandLine.jpg
new file mode 100644
index 00000000..9b414160
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/YasmCommandLine.jpg
diff --git a/doc/html/CompilingGuidelineWin/gzipCommandLine.jpg b/doc/html/CompilingGuidelineWin/gzipCommandLine.jpg
new file mode 100644
index 00000000..958f3f6a
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/gzipCommandLine.jpg
diff --git a/doc/html/CompilingGuidelineWin/upxCommandLine.jpg b/doc/html/CompilingGuidelineWin/upxCommandLine.jpg
new file mode 100644
index 00000000..cb0af820
--- /dev/null
+++ b/doc/html/CompilingGuidelineWin/upxCommandLine.jpg
diff --git a/doc/html/CompilingGuidelines.html b/doc/html/CompilingGuidelines.html
new file mode 100644
index 00000000..22d30d34
--- /dev/null
+++ b/doc/html/CompilingGuidelines.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Technical Details</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelines.html">Building VeraCrypt From Source</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Building VeraCrypt From Source</h1>
+<p>In order to build VeraCrypt from the source code, you can follow these step-by-step guidelines:
+<ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="CompilingGuidelineWin.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Windows Build Guide</a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="CompilingGuidelineLinux.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Linux Build Guide</a>
+</li></ul>
+</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Contact.html b/doc/html/Contact.html
index 5e114af9..36d8755a 100644
--- a/doc/html/Contact.html
+++ b/doc/html/Contact.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Contact.html">Contact</a>
 </p></div>
 
diff --git a/doc/html/Contributed Resources.html b/doc/html/Contributed Resources.html
index 97045cac..fda44f9c 100644
--- a/doc/html/Contributed Resources.html
+++ b/doc/html/Contributed Resources.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a class="active" href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div class="wikidoc">
 <p>Here you'll find useful resources contributed by VeraCrypt users.</p>
 <h3>Third party binaries:</h3>
 <ul>
 <li>Linux Ubuntu <strong>PPA</strong> provided by user&nbsp;<a href="https://unit193.net/" target="_blank">&quot;Unit 193&quot;</a> (build done by Launchpad):
 <ul>
 <li><a href="https://launchpad.net/~unit193/&#43;archive/ubuntu/encryption" target="_blank">https://launchpad.net/~unit193/&#43;archive/ubuntu/encryption</a>
diff --git a/doc/html/Conversion_Guide_VeraCrypt_1.26_and_Later.html b/doc/html/Conversion_Guide_VeraCrypt_1.26_and_Later.html
new file mode 100644
index 00000000..493d371c
--- /dev/null
+++ b/doc/html/Conversion_Guide_VeraCrypt_1.26_and_Later.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Conversion Guide for Versions 1.26 and Later</title>
+<meta name="description" content="Guide on how to handle deprecated features and conversion of TrueCrypt volumes in VeraCrypt versions 1.26 and later."/>
+<meta name="keywords" content="VeraCrypt, TrueCrypt, Conversion, Encryption, Security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Conversion_Guide_VeraCrypt_1.26_and_Later.html">Conversion Guide for Versions 1.26 and Later</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Conversion Guide for VeraCrypt 1.26 and Later</h1>
+
+<h2>1. Introduction</h2>
+<p>Version 1.26 and newer of VeraCrypt have introduced significant changes by removing support for certain features. If you encounter issues while mounting volumes, this guide will help you understand and resolve them.</p>
+
+<h2>2. Deprecated Features in VeraCrypt 1.26 and Later</h2>
+<p>The following features have been deprecated:</p>
+<ul>
+<li>TrueCrypt Mode</li>
+<li>HMAC-RIPEMD-160 Hash Algorithm</li>
+<li>GOST89 Encryption Algorithm</li>
+</ul>
+<p>If you experience mounting errors with volumes created in VeraCrypt 1.25.9 or older, use VeraCrypt 1.25.9 to check if these deprecated features are in use. Highlight the volume and click on "Volume Properties" in the GUI to check.</p>
+
+<h2>3. Remediation Procedures Based on Version</h2>
+
+<h3>3.1 Scenario 1: Using VeraCrypt 1.25.9 or Older</h3>
+<p>If you are using or can upgrade to VeraCrypt 1.25.9, follow these steps:</p>
+<ul>
+<li>Convert TrueCrypt Volumes to VeraCrypt Volumes</li>
+<li>Change from Deprecated HMAC-RIPEMD-160 Hash Algorithm</li>
+<li>Recreate VeraCrypt Volume if Using GOST89 Encryption Algorithm</li>
+</ul>
+<p>Download the 1.25.9 version <a href="https://veracrypt.fr/en/Downloads_1.25.9.html">here</a>.</p>
+
+<h3>3.2 Scenario 2: Upgraded to VeraCrypt 1.26 or Newer</h3>
+<p>If you have already upgraded to VeraCrypt 1.26 or newer, follow these steps:</p>
+<ul>
+<li>Convert TrueCrypt Volumes to VeraCrypt Volumes</li>
+<li>Change from Deprecated HMAC-RIPEMD-160 Hash Algorithm</li>
+</ul>
+<p>If you are on Linux or Mac, temporarily downgrade to VeraCrypt 1.25.9. Windows users can use the VCPassChanger tool <a href="https://launchpad.net/veracrypt/trunk/1.25.9/+download/VCPassChanger_%28TrueCrypt_Convertion%29.zip">that can be downloaded from here</a>.</p>
+<ul>
+<li>Recreate VeraCrypt Volume if Using GOST89 Encryption Algorithm</li>
+</ul>
+All OSes temporarily downgrade to 1.25.9 version.
+<h2>4. Conversion and Remediation Procedures</h2>
+
+<h3>4.1 Converting TrueCrypt Volumes to VeraCrypt</h3>
+<p>TrueCrypt file containers and partitions created with TrueCrypt versions 6.x or 7.x can be converted to VeraCrypt using VeraCrypt 1.25.9 or the VCPassChanger tool on Windows. For more details, refer to the <a href="Converting%20TrueCrypt%20volumes%20and%20partitions.html">documentation</a>.</p>
+<p>After conversion, the file extension will remain as <code>.tc</code>. Manually change it to <code>.hc</code> if you want VeraCrypt 1.26 or newer to automatically recognize it.</p>
+
+<h3>4.2 Changing Deprecated HMAC-RIPEMD-160 Hash Algorithm</h3>
+<p>Use the "Set Header Key Derivation Algorithm" feature to change the HMAC-RIPEMD-160 hash algorithm to one supported in VeraCrypt 1.26. Refer to the <a href="Hash%20Algorithms.html">documentation</a> for more details.</p>
+
+<h3>4.3 Recreating VeraCrypt Volume if Using GOST89 Encryption Algorithm</h3>
+<p>If your volume uses the GOST89 encryption algorithm, you will need to copy your data elsewhere and recreate the volume using a supported encryption algorithm. More details are available in the <a href="Encryption%20Algorithms.html">encryption algorithm documentation</a>.</p>
+
+<h2>5. Important Notes</h2>
+<p><strong>Note to users who created volumes with VeraCrypt 1.17 or earlier:</strong></p>
+<blockquote>
+<p>To avoid revealing whether your volumes contain a hidden volume or not, or if you rely on plausible deniability, you must recreate both the outer and hidden volumes, including system encryption and hidden OS. Discard existing volumes created prior to VeraCrypt 1.18a.</p>
+</blockquote>
+
+<p>For more information, visit:</p>
+<ul>
+<li><a href="TrueCrypt%20Support.html">TrueCrypt Support</a></li>
+<li><a href="Converting%20TrueCrypt%20volumes%20and%20partitions.html">Converting TrueCrypt Volumes and Partitions</a></li>
+</ul>
+
+</div>
+
+<div class="ClearBoth"></div>
+</body>
+</html>
diff --git a/doc/html/Converting TrueCrypt volumes and partitions.html b/doc/html/Converting TrueCrypt volumes and partitions.html
index 324c8c53..b5485266 100644
--- a/doc/html/Converting TrueCrypt volumes and partitions.html
+++ b/doc/html/Converting TrueCrypt volumes and partitions.html
@@ -1,43 +1,47 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Converting%20TrueCrypt%20volumes%20and%20partitions.html">Converting TrueCrypt volumes and partitions</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Converting TrueCrypt volumes and partitions</h1>
-<p>Starting from version 1.0f, TrueCrypt volumes and <strong>non-system</strong> partitions can be converted to VeraCrypt format using any of the following actions:</p>
+<p><strong>⚠️ Warning:</strong> <span style="color: red;">After conversion, ensure that the "TrueCrypt Mode" checkbox is not selected during the mount of the converted volume. Since it is no longer a TrueCrypt volume, mounting it with this option will lead to a mount failure.</span></p>
+<p><strong>⚠️ Important Notice:</strong> As of version 1.26, VeraCrypt has removed support for "TrueCrypt Mode." Consequently, the conversion of TrueCrypt volumes and partitions using this method is no longer possible. Please refer to <a href="Conversion_Guide_VeraCrypt_1.26_and_Later.html">this documentation page</a> for guidance on how to proceed with TrueCrypt volumes in VeraCrypt versions 1.26 and later.</p>
+<p>From version 1.0f up to and including version 1.25.9, TrueCrypt volumes and <strong>non-system</strong> partitions created with TrueCrypt versions 6.x and 7.x, starting with version 6.0 released on July 4th 2008, can be converted to VeraCrypt format using any of the following actions:</p>
 <ul>
 <li>Change Volume Password </li><li>Set Header Key Derivation Algorithm </li><li>Add/Remove key files </li><li>Remove all key files </li></ul>
-<p>&ldquo;TrueCrypt Mode&rdquo; must be checked in the dialog as show below:</p>
-<p>&nbsp;<img src="Converting TrueCrypt volumes and partitions_truecrypt_convertion.jpg" alt="" width="511" height="436"></p>
+<p>If the TrueCrypt volume contains a hidden volume, it should also be converted using the same approach, by specifying the hidden volume password and/or keyfiles.</p>
+<p>🚨 After conversion of a file container, the file extension will remain as .tc. Manually change it to .hc if you want VeraCrypt 1.26 or newer to automatically recognize it.</p>
+<p>&ldquo;TrueCrypt Mode&rdquo; must be checked in the dialog as shown below:</p>
+<p>&nbsp;<img src="Converting TrueCrypt volumes and partitions_truecrypt_convertion.jpg" alt=""></p>
 <p><strong>Note: </strong>Converting system partitions encrypted with TrueCrypt is not supported.</p>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Converting TrueCrypt volumes and partitions_truecrypt_convertion.jpg b/doc/html/Converting TrueCrypt volumes and partitions_truecrypt_convertion.jpg
index 12119bfd..8a2d4d58 100644
--- a/doc/html/Converting TrueCrypt volumes and partitions_truecrypt_convertion.jpg
+++ b/doc/html/Converting TrueCrypt volumes and partitions_truecrypt_convertion.jpg
diff --git a/doc/html/Creating New Volumes.html b/doc/html/Creating New Volumes.html
index 9dc7ef69..7fe6144e 100644
--- a/doc/html/Creating New Volumes.html
+++ b/doc/html/Creating New Volumes.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Volume.html">VeraCrypt Volume</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Creating%20New%20Volumes.html">Creating New Volumes</a>
@@ -42,41 +42,41 @@
  from the system (for more information, please see the section <a href="Random%20Number%20Generator.html">
 <em>Random Number Generator</em></a>). The Wizard provides help and information necessary to successfully create a new VeraCrypt volume. However, several items deserve further explanation:</p>
 <h3>Hash Algorithm</h3>
 <p>Allows you to select which hash algorithm VeraCrypt will use. The selected hash algorithm is used by the random number generator (as a pseudorandom mixing function), which generates the master key, secondary key (XTS mode), and salt (for more information,
  please see the section <a href="Random%20Number%20Generator.html">
 <em>Random Number Generator</em></a>). It is also used in deriving the new volume header key and secondary header key (see the section
 <a href="Header%20Key%20Derivation.html">
 <em>Header Key Derivation, Salt, and Iteration Count</em></a>).<br>
 <br>
 For information about the implemented hash algorithms, see the chapter <a href="Hash%20Algorithms.html">
 <em>Hash Algorithms.</em></a><br>
 <br>
 Note that the output of a hash function is <em>never </em>used directly as an encryption key. For more information, please refer to the chapter
 <a href="Technical%20Details.html"><em>Technical Details</em></a>.</p>
 <h3>Encryption Algorithm</h3>
 <p>This allows you to select the encryption algorithm with which your new volume will be encrypted. Note that the encryption algorithm cannot be changed after the volume is created. For more information, please see the chapter
 <a href="Encryption%20Algorithms.html"><em>Encryption Algorithms</em></a>.</p>
 <h3 id="QuickFormat">Quick Format</h3>
 <p>If unchecked, each sector of the new volume will be formatted. This means that the new volume will be
 <em>entirely </em>filled with random data. Quick format is much faster but may be less secure because until the whole volume has been filled with files, it may be possible to tell how much data it contains (if the space was not filled with random data beforehand).
- If you are not sure whether to enable or disable Quick Format, we recommend that you leave this option unchecked. Note that Quick Format can only be enabled when encrypting partitions/devices.</p>
+ If you are not sure whether to enable or disable Quick Format, we recommend that you leave this option unchecked. Note that Quick Format can only be enabled when encrypting partitions/devices, except on Windows where it is also available when creating file containers.</p>
 <p>Important: When encrypting a partition/device within which you intend to create a hidden volume afterwards, leave this option unchecked.</p>
 <h3 id="dynamic">Dynamic</h3>
 <p>Dynamic VeraCrypt container is a pre-allocated NTFS sparse file whose physical size (actual disk space used) grows as new data is added to it. Note that the physical size of the container (actual disk space that the container uses) will not decrease when
  files are deleted on the VeraCrypt volume. The physical size of the container can only
 <em>increase </em>up to the maximum value that is specified by the user during the volume creation process. After the maximum specified size is reached, the physical size of the container will remain constant.<br>
 <br>
 Note that sparse files can only be created in the NTFS file system. If you are creating a container in the FAT file system, the option
 <em>Dynamic </em>will be disabled (&ldquo;grayed out&rdquo;).<br>
 <br>
 Note that the size of a dynamic (sparse-file-hosted) VeraCrypt volume reported by Windows and by VeraCrypt will always be equal to its maximum size (which you specify when creating the volume). To find out current physical size of the container (actual disk
  space it uses), right-click the container file (in a Windows Explorer window, not in VeraCrypt), then select
 <em>Properties </em>and see the Size on disk value.</p>
 <p>WARNING: Performance of dynamic (sparse-file-hosted) VeraCrypt volumes is significantly worse than performance of regular volumes. Dynamic (sparse-file-hosted) VeraCrypt volumes are also less secure, because it is possible to tell which volume sectors are
  unused. Furthermore, if data is written to a dynamic volume when there is not enough free space in its host file system, the encrypted file system may get corrupted.</p>
 <h3>Cluster Size</h3>
 <p>Cluster is an allocation unit. For example, one cluster is allocated on a FAT file system for a one- byte file. When the file grows beyond the cluster boundary, another cluster is allocated. Theoretically, this means that the bigger the cluster size, the
  more disk space is wasted; however, the better the performance. If you do not know which value to use, use the default.</p>
 <h3>VeraCrypt Volumes on CDs and DVDs</h3>
 <p>If you want a VeraCrypt volume to be stored on a CD or a DVD, first create a file-hosted VeraCrypt container on a hard drive and then burn it onto a CD/DVD using any CD/DVD burning software (or, under Windows XP or later, using the CD burning tool provided
  with the operating system). Remember that if you need to mount a VeraCrypt volume that is stored on a read-only medium (such as a CD/DVD) under Windows 2000, you must format the VeraCrypt volume as FAT. The reason is that Windows 2000 cannot mount NTFS file
diff --git a/doc/html/Data Leaks.html b/doc/html/Data Leaks.html
index ee37fd69..e12e07a3 100644
--- a/doc/html/Data Leaks.html
+++ b/doc/html/Data Leaks.html
@@ -1,61 +1,64 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Data%20Leaks.html">Data Leaks</a>
 </p></div>
 
 <div class="wikidoc">
 <h2>Data Leaks</h2>
 <p>When a VeraCrypt volume is mounted, the operating system and third-party applications may write to unencrypted volumes (typically, to the unencrypted system volume) unencrypted information about the data stored in the VeraCrypt volume (e.g. filenames and
- locations of recently accessed files, databases created by file indexing tools, etc.), or the data itself in an unencrypted form (temporary files, etc.), or unencrypted information about the filesystem residing in the VeraCrypt volume. Note that Windows automatically
- records large amounts of potentially sensitive data, such as the names and locations of files you open, applications you run, etc.</p>
+ locations of recently accessed files, databases created by file indexing tools, etc.), or the data itself in an unencrypted form (temporary files, etc.), or unencrypted information about the filesystem residing in the VeraCrypt volume.</p>
+<p>Note that Windows automatically records large amounts of potentially sensitive data, such as the names and locations of files you open, applications you run, etc. For example, Windows uses a set of Registry keys known as “shellbags” to store the name, size, view, icon, and position of a folder when using Explorer.
+Each time you open a folder, this information is updated including the time and date of access. Windows Shellbags may be found in a few locations, depending on operating system version and user profile.
+On a Windows XP system, shellbags may be found under <strong>"HKEY_USERS\{USERID}\Software\Microsoft\Windows\Shell\"</strong> and <strong>"HKEY_USERS\{USERID}\Software\Microsoft\Windows\ShellNoRoam\"</strong>.
+On a Windows 7 system, shellbags may be found under <strong>"HEKY_USERS\{USERID}\Local Settings\Software\Microsoft\Windows\Shell\"</strong>. More information available at <a href="https://www.sans.org/reading-room/whitepapers/forensics/windows-shellbag-forensics-in-depth-34545" target="_blank">https://www.sans.org/reading-room/whitepapers/forensics/windows-shellbag-forensics-in-depth-34545</a>.
 <p>Also, starting from Windows 8, every time a VeraCrypt volume that is formatted using NTFS is mounted, an Event 98 is written for the system Events Log and it will contain the device name (\\device\VeraCryptVolumeXX) of the volume. This event log &quot;feature&quot;
  was introduced in Windows 8 as part of newly introduced NTFS health checks as explained
 <a href="https://blogs.msdn.microsoft.com/b8/2012/05/09/redesigning-chkdsk-and-the-new-ntfs-health-model/" target="_blank">
 here</a>. To avoid this leak, the VeraCrypt volume must be mounted <a href="Removable%20Medium%20Volume.html">
 as a removable medium</a>. Big thanks to Liran Elharar for discovering this leak and its workaround.<br>
 <br>
 In order to prevent data leaks, you must follow these steps (alternative steps may exist):</p>
 <ul>
 <li>If you do <em>not</em> need plausible deniability:
 <ul>
 <li>Encrypt the system partition/drive (for information on how to do so, see the chapter
 <a href="System%20Encryption.html"><em>System Encryption</em></a>) and ensure that only encrypted or read-only filesystems are mounted during each session in which you work with sensitive data.<br>
 <br>
 or, </li><li>If you cannot do the above, download or create a &quot;live CD&quot; version of your operating system (i.e. a &quot;live&quot; system entirely stored on and booted from a CD/DVD) that ensures that any data written to the system volume is written to a RAM disk. When you need
  to work with sensitive data, boot such a live CD/DVD and ensure that only encrypted and/or read-only filesystems are mounted during the session.
 </li></ul>
 </li><li>If you need plausible deniability:
 <ul>
 <li>Create a hidden operating system. VeraCrypt will provide automatic data leak protection. For more information, see the section
 <a href="Hidden%20Operating%20System.html">
diff --git a/doc/html/Default Mount Parameters.html b/doc/html/Default Mount Parameters.html
index 899c4280..a55a0f0a 100644
--- a/doc/html/Default Mount Parameters.html
+++ b/doc/html/Default Mount Parameters.html
@@ -1,51 +1,51 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Default%20Mount%20Parameters.html">Default Mount Parameters</a>
 </p></div>
 
 <div class="wikidoc">
 <h2>Default Mount Parameters</h2>
 <p>Starting from version 1.0f-2, it is possible to specify the PRF algorithm and the TrueCrypt mode that will be selected by default in the password dialog.</p>
 <p>As show below, select the entry &quot;Default Mount Parameters&quot; under the menu &quot;Settings&quot;:</p>
-<p><img src="Home_VeraCrypt_menu_Default_Mount_Parameters.png" alt="Menu Default Mount Parameters" width="241" height="254"></p>
+<p><img src="Home_VeraCrypt_menu_Default_Mount_Parameters.png" alt="Menu Default Mount Parameters"></p>
 <p>&nbsp;</p>
 <p>The following dialog will be displayed:</p>
-<p><img src="Home_VeraCrypt_Default_Mount_Parameters.png" alt="Default Mount Parameters Dialog" width="267" height="144"></p>
+<p><img src="Home_VeraCrypt_Default_Mount_Parameters.png" alt="Default Mount Parameters Dialog"></p>
 <p>Make your modifications and then click OK.</p>
 <p>The chosen values are then written to VeraCrypt main configuration file (Configuration.xml) making them persistent.</p>
 <p>All subsequent password request dialogs will use the default values chosen previously. For example, if in the Default Mount Parameters dialog you check TrueCrypt Mode and you select SHA-512 as a PRF, then subsequent password dialogs will look like:<br>
-<img src="Default Mount Parameters_VeraCrypt_password_using_default_parameters.png" alt="Mount Password Dialog using default values" width="499" height="205"></p>
+<img src="Default Mount Parameters_VeraCrypt_password_using_default_parameters.png" alt="Mount Password Dialog using default values"></p>
 <p>&nbsp;</p>
 <p><strong>Note:</strong> The default mount parameters can be overridden by the&nbsp;<a href="Command%20Line%20Usage.html">Command Line</a> switches
 <strong>/tc</strong> and <strong>/hash</strong> which always take precedence.</p>
 <p>&nbsp;</p>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Default Mount Parameters_VeraCrypt_password_using_default_parameters.png b/doc/html/Default Mount Parameters_VeraCrypt_password_using_default_parameters.png
index 0c349d0b..b8a9dda6 100644
--- a/doc/html/Default Mount Parameters_VeraCrypt_password_using_default_parameters.png
+++ b/doc/html/Default Mount Parameters_VeraCrypt_password_using_default_parameters.png
diff --git a/doc/html/Defragmenting.html b/doc/html/Defragmenting.html
index c7c16534..8ef7a572 100644
--- a/doc/html/Defragmenting.html
+++ b/doc/html/Defragmenting.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Defragmenting.html">Defragmenting</a>
diff --git a/doc/html/Digital Signatures.html b/doc/html/Digital Signatures.html
index 17717b48..1d108cbd 100644
--- a/doc/html/Digital Signatures.html
+++ b/doc/html/Digital Signatures.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Digital%20Signatures.html">Digital Signatures</a>
@@ -60,40 +60,47 @@ Therefore, you should always verify the integrity and authenticity of each VeraC
 <p>PGP signatures have the following advantages, in comparison to X.509 signatures:</p>
 <ul>
 <li>They do not depend on any certificate authority (which might be e.g. infiltrated or controlled by an adversary, or be untrustworthy for other reasons).
 </li></ul>
 <h3>How to Verify X.509 Signatures</h3>
 <p>Please note that X.509 signatures are currently available only for the VeraCrypt self-extracting installation packages for Windows. An X.509 digital signature is embedded in each of those files along with the digital certificate of the VeraCrypt Foundation
  issued by a public certification authority. To verify the integrity and authenticity of a self-extracting installation package for Windows, follow these steps:</p>
 <ol>
 <li>Download the VeraCrypt self-extracting installation package. </li><li>In the Windows Explorer, click the downloaded file (&lsquo;<em>VeraCrypt Setup.exe</em>&rsquo;) with the right mouse button and select &lsquo;<em>Properties</em>&rsquo; from the context menu.
 </li><li>In the <em>Properties</em> dialog window, select the &lsquo;<em>Digital Signatures</em>&rsquo; tab.
 </li><li>On the &lsquo;<em>Digital Signatures</em>&rsquo; tab, in the &lsquo;<em>Signature list</em>&rsquo;, double click the line saying &quot;<em>IDRIX</em>&quot; or
 <em>&quot;IDRIX SARL&quot;</em>. </li><li>The &lsquo;<em>Digital Signature Details</em>&rsquo; dialog window should appear now. If you see the following sentence at the top of the dialog window, then the integrity and authenticity of the package have been successfully verified:<br>
 <br>
 &quot;<em>This digital signature is OK.</em>&quot;<br>
 <br>
 If you do not see the above sentence, the file is very likely corrupted. Note: On some obsolete versions of Windows, some of the necessary certificates are missing, which causes the signature verification to fail.
 </li></ol>
 <h3 id="VerifyPGPSignature">How to Verify PGP Signatures</h3>
 <p>To verify a PGP signature, follow these steps:</p>
 <ol>
-<li>Install any public-key encryption software that supports PGP signatures. For Windows, you can download
-<a href="http://www.gpg4win.org/" target="_blank">Gpg4win</a>. For more information, you can visit
-<a href="https://www.gnupg.org/">https://www.gnupg.org/</a>. </li><li>Create a private key (for information on how to do so, please see the documentation for the public-key encryption software).
-</li><li>Download our PGP public key from <strong>IDRIX</strong> website (<a href="https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key.asc" target="_blank">https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key.asc</a>) or from a trusted public key repository
- (ID=0x54DDD393), and import the downloaded key to your keyring (for information on how to do so, please see the documentation for the public-key encryption software). Please check that its fingerprint is
-<strong>993B7D7E8E413809828F0F29EB559C7C54DDD393</strong>. </li><li>Sign the imported key with your private key to mark it as trusted (for information on how to do so, please see the documentation for the public-key encryption software).<br>
+<li>Install any public-key encryption software that supports PGP signatures. For Windows, you can download <a href="http://www.gpg4win.org/" target="_blank">Gpg4win</a>. For more information, you can visit <a href="https://www.gnupg.org/">https://www.gnupg.org/</a>. </li>
+<li>Create a private key (for information on how to do so, please see the documentation for the public-key encryption software).</li>
+<li>Download our PGP public key from <strong>IDRIX</strong> website (<a href="https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key.asc" target="_blank">https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key.asc</a>) or from a trusted public key repository
+ (ID=0x680D16DE), and import the downloaded key to your keyring (for information on how to do so, please see the documentation for the public-key encryption software). Please check that its fingerprint is
+<strong>5069A233D55A0EEB174A5FC3821ACD02680D16DE</strong>.
+<ul>
+<li>For VeraCrypt version 1.22 and below, the verification must use the PGP public key available at <a href="https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key_2014.asc" target="_blank">https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key_2014.asc</a> or from a trusted public key repository
+ (ID=0x54DDD393), whose fingerprint is <strong>993B7D7E8E413809828F0F29EB559C7C54DDD393</strong>.
+</li>
+</ul>
+</li>
+<li>Sign the imported key with your private key to mark it as trusted (for information on how to do so, please see the documentation for the public-key encryption software).<br>
 <br>
 Note: If you skip this step and attempt to verify any of our PGP signatures, you will receive an error message stating that the signing key is invalid.
-</li><li>Download the digital signature by downloading the <em>PGP Signature</em> of the file you want to verify (on the
-<a href="Downloads.html">Downloads page</a>).
-</li><li>Verify the downloaded signature (for information on how to do so, please see the documentation for the public-key encryption software).
-</li></ol>
+</li>
+<li>Download the digital signature by downloading the <em>PGP Signature</em> of the file you want to verify (on the <a href="https://www.veracrypt.fr/en/Downloads.html">Downloads page</a>).
+</li>
+<li>Verify the downloaded signature (for information on how to do so, please see the documentation for the public-key encryption software).</li>
+</ol>
 <p>Under Linux, these steps can be achieved using the following commands:</p>
 <ul>
-<li>Check that the fingerprint of the public key is <strong>993B7D7E8E413809828F0F29EB559C7C54DDD393</strong>:
-<strong>gpg --with-fingerprint VeraCrypt_PGP_public_key.asc</strong> </li><li>If the fingerprint is the expected one, import the public key: <strong>gpg --import VeraCrypt_PGP_public_key.asc</strong>
-</li><li>Verify the signature of the Linux setup archive (here for version 1.0e): <strong>
-gpg --verify veracrypt-1.0e-setup.tar.bz2.sig veracrypt-1.0e-setup.tar.bz2</strong>
+<li>Check that the fingerprint of the public key is <strong>5069A233D55A0EEB174A5FC3821ACD02680D16DE</strong>:<strong>gpg --import --import-options show-only VeraCrypt_PGP_public_key.asc</strong> (for older gpg versions, type instead:
+<strong>gpg --with-fingerprint VeraCrypt_PGP_public_key.asc</strong>)</li><li>If the fingerprint is the expected one, import the public key: <strong>gpg --import VeraCrypt_PGP_public_key.asc</strong>
+</li><li>Verify the signature of the Linux setup archive (here for version 1.23): <strong>
+gpg --verify veracrypt-1.23-setup.tar.bz2.sig veracrypt-1.23-setup.tar.bz2</strong>
 </li></ul>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Disclaimers.html b/doc/html/Disclaimers.html
index e5085d08..b3a38ddc 100644
--- a/doc/html/Disclaimers.html
+++ b/doc/html/Disclaimers.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Disclaimers.html">Disclaimers</a>
 </p></div>
 
diff --git a/doc/html/Documentation.html b/doc/html/Documentation.html
index 4ea96b44..9f6f6587 100644
--- a/doc/html/Documentation.html
+++ b/doc/html/Documentation.html
@@ -1,147 +1,158 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div class="wikidoc">
 <h1>Table of Contents</h1>
 <p><em style="text-align:left">This documentation is not guaranteed to be error-free and is provided &quot;as is&quot; without warranty of any kind. For more information, see
 <a href="Disclaimers.html">Disclaimers</a>.</em></p>
 <ul>
 <li><a title="Preface" href="Preface.html"><strong>Preface</strong></a>
 </li><li><strong><a href="Introduction.html">Introduction</a></strong>
 </li><li><strong><a href="Beginner%27s%20Tutorial.html">Beginner's Tutorial</a></strong>
-</li><li><strong><strong><a href="VeraCrypt%20Volume.html">VeraCrypt Volume</a></strong></strong>
+</li><li><strong><a href="VeraCrypt%20Volume.html">VeraCrypt Volume</a></strong>
 <ul>
 <li><a href="Creating%20New%20Volumes.html">Creating a New VeraCrypt Volume</a>
 </li><li><a href="Favorite%20Volumes.html">Favorite Volumes</a>
 </li><li><a href="System%20Favorite%20Volumes.html">System Favorite Volumes</a>
 </li></ul>
 </li><li><strong><a href="System%20Encryption.html">System Encryption</a></strong>
 <ul>
 <li><a href="Hidden%20Operating%20System.html">Hidden Operating System</a>
 </li><li><a href="Supported%20Systems%20for%20System%20Encryption.html">Operating Systems Supported for System Encryption</a>
 </li><li><a href="VeraCrypt%20Rescue%20Disk.html">VeraCrypt Rescue Disk</a>
 </li></ul>
 </li><li><strong><a href="Plausible%20Deniability.html">Plausible Deniability</a></strong><br>
 <ul>
 <li><a href="Hidden%20Volume.html">Hidden Volume</a>
 <ul>
 <li><a href="Protection%20of%20Hidden%20Volumes.html">Protection of Hidden Volumes Against Damage</a>
 </li><li><a href="Security%20Requirements%20for%20Hidden%20Volumes.html">Security Requirements and Precautions Pertaining to Hidden Volumes</a>
 </li></ul>
 </li><li><a href="VeraCrypt%20Hidden%20Operating%20System.html">Hidden Operating System</a>
 </li></ul>
 </li><li><strong><a href="Main%20Program%20Window.html">Main Program Window</a></strong>
 <ul>
 <li><a href="Program%20Menu.html">Program Menu</a>
 </li><li><a href="Mounting%20VeraCrypt%20Volumes.html">Mounting Volumes</a>
 </li></ul>
+</li><li><strong><a href="Normal%20Dismount%20vs%20Force%20Dismount.html">Normal Dismount vs Force Dismount</a></strong>
+</li><li><strong><a href="Avoid%20Third-Party%20File%20Extensions.html">Avoid Third-Party File Extensions</a></strong>
 </li><li><strong><a href="Parallelization.html">Parallelization</a></strong>
 </li><li><strong><a href="Pipelining.html">Pipelining</a></strong>
 </li><li><strong><a href="Hardware%20Acceleration.html">Hardware acceleration</a></strong>
 </li><li><strong><a href="Hot%20Keys.html">Hot keys</a></strong>
 </li><li><strong><a href="Keyfiles%20in%20VeraCrypt.html">Keyfiles</a></strong>
 </li><li><strong><a href="Security%20Tokens%20%26%20Smart%20Cards.html">Security Tokens &amp; Smart Cards</a></strong>
+</li><li><strong><a href="EMV%20Smart%20Cards.html">EMV Smart Cards</a></strong>
 </li><li><strong><a href="Portable%20Mode.html">Portable Mode</a></strong>
 </li><li><strong><a href="TrueCrypt%20Support.html">TrueCrypt Support</a></strong>
 </li><li><strong><a href="Converting%20TrueCrypt%20volumes%20and%20partitions.html">Converting TrueCrypt Volumes &amp; Partitions</a></strong>
+</li><li><strong><a href="Conversion_Guide_VeraCrypt_1.26_and_Later.html">Conversion Guide for Versions 1.26 and Later</a></strong>
 </li><li><strong><a href="Default%20Mount%20Parameters.html">Default Mount Parameters</a></strong>
 </li><li><strong><a href="Language%20Packs.html">Language Packs</a></strong>
 </li><li><strong><a href="Encryption%20Algorithms.html">Encryption Algorithms</a></strong>
 <ul>
 <li><a href="AES.html">AES</a> </li><li><a href="Camellia.html">Camellia</a>
 </li><li><a href="Kuznyechik.html">Kuznyechik</a>
 </li><li><a href="Serpent.html">Serpent</a> </li><li><a href="Twofish.html">Twofish</a> </li><li><a href="Cascades.html">Cascades of ciphers</a>
 </li></ul>
 </li><li><strong><a href="Hash%20Algorithms.html">Hash Algorithms</a></strong>
 <ul>
-<li><a href="RIPEMD-160.html">RIPEMD-160</a>
+<li><a href="BLAKE2s-256.html">BLAKE2s-256</a>
 </li><li><a href="SHA-256.html">SHA-256</a> </li><li><a href="SHA-512.html">SHA-512</a> </li><li><a href="Whirlpool.html">Whirlpool</a>
 </li><li><a href="Streebog.html">Streebog</a></li></ul>
 </li><li><strong><a href="Supported%20Operating%20Systems.html">Supported Operating Systems</a></strong>
 </li><li><strong><a href="Command%20Line%20Usage.html">Command Line Usage</a></strong>
 </li><li><strong><a href="Security%20Model.html">Security Model</a></strong>
 </li><li><strong><a href="Security%20Requirements%20and%20Precautions.html">Security Requirements And Precautions<br>
 </a></strong>
 <ul>
 <li><a href="Data%20Leaks.html">Data Leaks</a>
 <ul>
 <li><a href="Paging%20File.html">Paging File</a>
 </li><li><a href="Memory%20Dump%20Files.html">Memory Dump Files</a>
 </li><li><a href="Hibernation%20File.html">Hibernation File</a>
 </li></ul>
 </li><li><a href="Unencrypted%20Data%20in%20RAM.html">Unencrypted Data in RAM</a>
+</li><li><a href="VeraCrypt%20RAM%20Encryption.html">VeraCrypt RAM Encryption</a>
+</li><li><a href="VeraCrypt%20Memory%20Protection.html">VeraCrypt Memory Protection</a>
 </li><li><a href="Physical%20Security.html">Physical Security</a>
 </li><li><a href="Malware.html">Malware</a> </li><li><a href="Multi-User%20Environment.html">Multi-User Environment</a>
 </li><li><a href="Authenticity%20and%20Integrity.html">Authenticity and Integrity</a>
 </li><li><a href="Choosing%20Passwords%20and%20Keyfiles.html">Choosing Passwords and Keyfiles</a>
 </li><li><a href="Changing%20Passwords%20and%20Keyfiles.html">Changing Passwords and Keyfiles</a>
 </li><li><a href="Trim%20Operation.html">Trim Operation</a>
 </li><li><a href="Wear-Leveling.html">Wear-Leveling</a>
 </li><li><a href="Reallocated%20Sectors.html">Reallocated Sectors</a>
 </li><li><a href="Defragmenting.html">Defragmenting</a>
 </li><li><a href="Journaling%20File%20Systems.html">Journaling File Systems</a>
 </li><li><a href="Volume%20Clones.html">Volume Clones</a>
 </li><li><a href="Additional%20Security%20Requirements%20and%20Precautions.html">Additional Security Requirements and Precautions</a>
 </li></ul>
 </li><li><strong><a href="How%20to%20Back%20Up%20Securely.html">How To Back Up Securely</a></strong>
 </li><li><strong><a href="Miscellaneous.html">Miscellaneous</a></strong>
 <ul>
 <li><a href="Using%20VeraCrypt%20Without%20Administrator%20Privileges.html">Using VeraCrypt Without Administrator Privileges</a>
 </li><li><a href="Sharing%20over%20Network.html">Sharing Over Network</a>
 </li><li><a href="VeraCrypt%20Background%20Task.html">VeraCrypt Background Task</a>
 </li><li><a href="Removable%20Medium%20Volume.html">Volume Mounted as Removable Medium</a>
 </li><li><a href="VeraCrypt%20System%20Files.html">VeraCrypt System Files &amp; Application Data</a>
 </li><li><a href="Removing%20Encryption.html">How To Remove Encryption</a>
 </li><li><a href="Uninstalling%20VeraCrypt.html">Uninstalling VeraCrypt</a>
 </li><li><a href="Digital%20Signatures.html">Digital Signatures</a>
 </li></ul>
 </li><li><strong><a href="Troubleshooting.html">Troubleshooting</a></strong>
 </li><li><strong><a href="Incompatibilities.html">Incompatibilities</a></strong>
 </li><li><strong><a href="Issues%20and%20Limitations.html">Known Issues and Limitations</a></strong>
 </li><li><strong><a href="FAQ.html">Frequently Asked Questions</a></strong>
-</li><li><strong><strong><a href="Technical%20Details.html">Technical Details</a></strong></strong>
+</li><li><strong><a href="Technical%20Details.html">Technical Details</a></strong>
 <ul>
 <li><a href="Notation.html">Notation</a>
 </li><li><a href="Encryption%20Scheme.html">Encryption Scheme</a>
 </li><li><a href="Modes%20of%20Operation.html">Modes of Operation</a>
 </li><li><a href="Header%20Key%20Derivation.html">Header Key Derivation, Salt, and Iteration Count</a>
 </li><li><a href="Random%20Number%20Generator.html">Random Number Generator</a>
 </li><li><a href="Keyfiles.html">Keyfiles</a>
 </li><li><a title="PIM" href="Personal%20Iterations%20Multiplier%20(PIM).html">PIM</a>
 </li><li><a href="VeraCrypt%20Volume%20Format%20Specification.html">VeraCrypt Volume Format Specification</a>
 </li><li><a href="Standard%20Compliance.html">Compliance with Standards and Specifications</a>
 </li><li><a href="Source%20Code.html">Source Code</a>
+</li><li><a href="CompilingGuidelines.html">Building VeraCrypt From Source</a>
+<ul>
+<li><a href="CompilingGuidelineWin.html">Windows Build Guide</a>
+</li><li><a href="CompilingGuidelineLinux.html">Linux Build Guide</a>
+</li></ul>
 </li></ul>
 </li><li><strong><a href="Contact.html">Contact</a></strong>
 </li><li><strong><a href="Legal%20Information.html">Legal Information</a></strong>
 </li><li><strong><a href="Release%20Notes.html">Version History</a></strong>
 </li><li><strong><a href="Acknowledgements.html">Acknowledgements</a></strong>
 </li><li><strong><a href="References.html">References</a></strong>
 </li></ul>
 </div>
 
 </body></html>
diff --git a/doc/html/Donation.html b/doc/html/Donation.html
index daa5759a..3abcf14d 100644
--- a/doc/html/Donation.html
+++ b/doc/html/Donation.html
@@ -1,104 +1,122 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a href="Documentation.html">Documentation</a></li>
 	  <li><a class="active" href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div class="wikidoc">
 <h1>Donation to VeraCrypt</h1>
-<p>You can support VeraCrypt development through donations using PayPal, Bitcoins, bank transfers. It is also possible to donate using Flattr and Tibit.</p>
-<table border="1" width="645" style="height:427px">
-<tbody>
-<tr>
-<th>
-<h4>PayPal</h4>
-</th>
-<th>
-<h4>Bitcoins</h4>
-</th>
-<th>
-<h4 style="text-align:center">Others</h4>
-</th>
-</tr>
-<tr>
-<td>
-<table border="1">
+<p>You can support VeraCrypt development through donations using PayPal, bank transfers and cryptocurrencies (<a href="#Bitcoin">Bitcoin</a>, <a href="#BitcoinCash">Bitcoin Cash</a>, <a href="#Ethereum">Ethereum</a>, <a href="#Litecoin">Litecoin</a> and <a href="#Monero">Monero</a>). It is also possible to donate using Liberapay and Flattr.</p>
+
+<hr>
+<h3><img src="paypal_30x30.png" style="vertical-align: middle; margin-right: 5px">PayPal</h3>
+<table>
 <tbody>
 <tr>
-<td><strong>Euro</strong></td>
-<td>
-<h3><a title="Donate to VeraCrypt in Euros" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=H25GJLUDHBMB6" target="_blank"><img src="Donation_donate_Euros.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>US Dollar</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in USD" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=B8PU86SHE2ZVA" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>Pound Sterling</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in GBP" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MFAZACXK9NXT8" target="_blank"><img src="Donation_donate_GBP.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>Canadian Dollar</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in Canadian Dollar" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QAN6T5E5F7F5J" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></h3>
-</td>
+<td align="center"><a title="Donate to VeraCrypt in Euros" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=H25GJLUDHBMB6" target="_blank"><img src="Donation_donate_Euros.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in USD" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=B8PU86SHE2ZVA" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in GBP" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MFAZACXK9NXT8" target="_blank"><img src="Donation_donate_GBP.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Canadian Dollar" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QAN6T5E5F7F5J" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Swiss Francs" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=98RJHVLY5NJ5U" target="_blank"><img src="Donation_donate_CHF.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Japanese Yen" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M9DXZ83WD7S8Y" target="_blank"><img src="Donation_donate_YEN.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Australian Dollar" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=S9L769QS6WAU6" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Polish złoty" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2WDGT7KUJ5GH8" target="_blank"><img src="Donation_donate_PLN.gif" alt="" width="92" height="26"></a></td>
 </tr>
 <tr>
-<td><strong>Swiss Franc</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in Swiss Francs" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=98RJHVLY5NJ5U" target="_blank"><img src="Donation_donate_CHF.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>Japanese Yen</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in Japanese Yen" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M9DXZ83WD7S8Y" target="_blank"><img src="Donation_donate_YEN.gif" alt="" width="92" height="26"></a></h3>
-</td>
+<td align="center">Euro</td>
+<td align="center">US Dollar</td>
+<td align="center">Pound Sterling</td>
+<td align="center">Canadian Dollar</td>
+<td align="center">Swiss Franc</td>
+<td align="center">Japanese Yen</td>
+<td align="center">Australian Dollar</td>
+<td align="center">Polish złoty</td>
 </tr>
 </tbody>
 </table>
-</td>
-<td style="text-align:center; vertical-align:middle">
-<p><img src="Donation_VeraCrypt_Bitcoin.png" alt="VeraCrypt Bitcoin Address" width="250" height="250"></p>
-<p><strong>1NRoPQsm8by5iWyMMmHQy3P5takur3kYgG</strong></p>
-</td>
-<td style="text-align:left; vertical-align:top">
-<p><strong>Tibit:<br>
-<a title="Donate a tib to VeraCrypt" href="https://tib.me/1NRoPQsm8by5iWyMMmHQy3P5takur3kYgG/VeraCrypt/?TIB=https://veracrypt.codeplex.com" target="_blank"><img src="Home_tibitDonateButton.png" alt="Donate using Tibit" width="120" height="40"></a></strong></p>
+
+<p>For other currencies, click on the button below and then select your currency using the drop-down list under the amount.</p>
+<a title="VeraCrypt Donation in any currency" href="https://www.paypal.me/idrix" target="_blank"><img src="Donation_donate.gif" alt="" width="92" height="26"></a>
+
+
+<hr>
+<h3><a href="Donation_Bank.html"><img src="bank_30x30.png" style="margin-right: 5px"></a>Bank Transfer</h3>
+<p>You can use <a href="Donation_Bank.html">IDRIX bank details available here</a> to send your donations using bank transfers.
+
+<hr>
+<h3>Donation Platforms:</h3>
+<ul>
+<li><strong>Liberapay: <a href="https://liberapay.com/VeraCrypt/donate" target="_blank"><img alt="Donate using Liberapay" src="liberapay_donate.svg" style="vertical-align: middle; margin-bottom: 5px"></a></strong></li>
+</ul>
+
+<hr>
+<h3 id="Bitcoin"><img src="BC_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Bitcoin</h3>
+<ul>
+<li><strong>Legacy:</strong>
+<p><img src="Donation_VeraCrypt_Bitcoin_small.png" alt="VeraCrypt Bitcoin Address" width="200" height="200"></p>
+<p><strong>14atYG4FNGwd3F89h1wDAfeRDwYodgRLcf</strong></p>
+</li>
+<li><strong>SegWit:</strong>
+<p><img src="Donation_VC_BTC_Sigwit.png" alt="VeraCrypt BTC SegWit Address" width="200" height="200"></p>
+<p><strong>bc1q28x9udhvjp8jzwmmpsv7ehzw8za60c7g62xauh</strong></p>
+</li>
+</ul>
+
+<hr>
+<h3 id="BitcoinCash"><img src="BCH_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Bitcoin Cash</h3>
+<p><img src="Donation_VeraCrypt_BitcoinCash.png" alt="VeraCrypt Bitcoin Cash Address" width="200" height="200"></p>
+<p><strong>bitcoincash:qp5vrqwln247f7l9p98ucj4cqye0cjcyusc94jlpy9</strong></p>
+
+<hr>
+<h3 id="Ethereum"><img src="Ethereum_Logo_19x30.png" style="vertical-align: middle; margin-right: 5px">Ethereum</h3>
+<p><img src="Donation_VeraCrypt_Ethereum.png" alt="VeraCrypt Ethereum Address" width="200" height="200"></p>
+<p><strong>0x0a7a86a3eB5f533d969500831e8CC681454a8bD2</strong></p>
+
+<hr>
+<h3 id="Litecoin"><img src="LTC_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Litecoin</h3>
+<p><img src="Donation_VeraCrypt_Litecoin.png" alt="VeraCrypt Litecoin Address" width="200" height="200"></p>
+<p><strong>LZkkfkMs4qHmWaP9DAvS1Ep1fAxaf8A2T7</strong></p>
+
+<hr>
+<h3 id="Monero"><img src="Monero_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Monero</h3>
+<p><img src="Donation_VeraCrypt_Monero.png" alt="VeraCrypt Monero Address" width="200" height="200"></p>
+<p><strong>464GGAau9CE5XiER4PSZ6SMbK4wxPCgdm2r36uqnL8NoS6zDjxUYXnyQymbUsK1QipDMY2fsSgDyZ3tMaLfpWvSr2EE8wMw</strong></p>
+
+
+<hr>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
 <p>&nbsp;</p>
-<p><strong>Flattr:</strong><br>
-<a title="Donate using Flattr" href="https://flattr.com/submit/auto?user_id=idrix&url=https://veracrypt.codeplex.com&title=VeraCrypt" target="_blank"><img title="Flattr VeraCrypt" src="flattr-badge-large.png" alt="Flattr VeraCrypt" width="93" height="20" border="0"></a></p>
-</td>
-</tr>
-</tbody>
-</table>
-<p><img src="bank_30x30.png" style="margin-right: 5px"><strong>Donate using bank transfer:</strong>&nbsp;<a href="Contact.html" target="_blank.html">contact us</a> for bank account details (based in France).</p>
 <p>&nbsp;</p>
 <p>&nbsp;</p>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Donation_Bank.html b/doc/html/Donation_Bank.html
new file mode 100644
index 00000000..b7f1f391
--- /dev/null
+++ b/doc/html/Donation_Bank.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a href="Documentation.html">Documentation</a></li>
+	  <li><a class="active" href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div class="wikidoc">
+<h1>Donation to VeraCrypt using bank transfer</h1>
+<p>You can support VeraCrypt development through donations using bank transfers to one of IDRIX bank accounts below, depending on the currency used.<br>
+The supported currencies are <a href="#Euro">Euro<img src="flag-eu-small.png" style="vertical-align: top; margin-left: 5px"></a>, <a href="#USD">US Dollar<img src="flag-us-small.png" style="vertical-align: top; margin-left: 5px"></a>, <a href="#GBP">British Pound<img src="flag-gb-small.png" style="vertical-align: top; margin-left: 5px"></a>, <a href="#AUD">Australian Dollar<img src="flag-au-small.png" style="vertical-align: top; margin-left: 5px"></a> and <a href="#NZD">New Zealand Dollar<img src="flag-nz-small.png" style="vertical-align: top; margin-left: 5px"></a>.<br>
+Please <a href="Contact.html" target="_blank.html">contact us</a> if you need an official invoice for your donation.</p>
+<hr>
+<h3 id="Euro"><img src="flag-eu.png" style="vertical-align: middle; margin-right: 5px">Euro SEPA Bank Details</h3>
+<p>Accepted payment types are SEPA bank transferts or SWIFT in Euro only.</p>
+Account Holder: IDRIX SARL<br>
+IBAN: BE16 9670 3707 4574<br>
+Bank code (SWIFT / BIC): TRWIBEB1XXX<br>
+Address: TransferWise Europe SA, Avenue Marnix 13-17, Brussels 1000, Belgium<br>
+Reference: Open Source Donation<br>
+<hr>
+
+<h3 id="USD"><img src="flag-us.png" style="vertical-align: middle; margin-right: 5px">US Dollar Bank Details</h3>
+<p>From within the US, accepted payment types are ACH and Wire.</p>
+Account Holder: IDRIX SARL<br>
+Account number: 8310085792<br>
+ACH and Wire routing number: 026073150<br>
+Account Type: Checking<br>
+Address: Wise, 30 W. 26th Street, Sixth Floor, New York NY 10010, United States<br>
+Reference: Open Source Donation<br>
+
+<p>From outside the US, accepted payment in SWIFT.</p>
+Account Holder: IDRIX SARL<br>
+Account number: 8310085792<br>
+Routing number: 026073150<br>
+Bank code (SWIFT/BIC): CMFGUS33<br>
+Address: Wise, 30 W. 26th Street, Sixth Floor, New York NY 10010, United States<br>
+Reference: Open Source Donation<br>
+<hr>
+
+<h3 id="GBP"><img src="flag-gb.png" style="vertical-align: middle; margin-right: 5px">British Pound Bank Details</h3>
+<p>Accepted payment types are Faster Payments (FPS), BACS and CHAPS from withing the UK only.</p>
+
+Account Holder: IDRIX SARL<br>
+Account number: 56385007<br>
+UK Sort Code: 23-14-70<br>
+IBAN (to receive GBP from UK only): GB18 TRWI 2314 7056 3850 07<br>
+Address: Wise, 56 Shoreditch High Street, London, E1 6JJ, United Kingdom<br>
+Reference: Open Source Donation<br>
+<hr>
+
+<h3 id="AUD"><img src="flag-au.png" style="vertical-align: middle; margin-right: 5px">Australian Dollar Bank Details</h3>
+<p>Accepted payment types to this account are local AUD bank transfers only.</p>
+Account Holder: IDRIX SARL<br>
+Account number: 711714051<br>
+BSB Code: 802-985<br>
+Address: Wise, 36-38 Gipps Street, Collingwood VIC 3066, Autralia.<br>
+Reference: Open Source Donation<br>
+<hr>
+
+<h3 id="NZD"><img src="flag-nz.png" style="vertical-align: middle; margin-right: 5px">New Zealand Dollar Bank Details</h3>
+<p>Accepted payment types to this account are local NZD bank transfers only.</p>
+Account Holder: IDRIX SARL<br>
+Account number: 02-1291-0218919-000<br>
+Address: Wise, 56 Shoreditch High Street, London, E1 6JJ, United Kingdom<br>
+Reference: Open Source Donation<br>
+<hr>
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Donation_VC_BTC_Sigwit.png b/doc/html/Donation_VC_BTC_Sigwit.png
new file mode 100644
index 00000000..d754760e
--- /dev/null
+++ b/doc/html/Donation_VC_BTC_Sigwit.png
diff --git a/doc/html/Donation_VeraCrypt_Bitcoin.png b/doc/html/Donation_VeraCrypt_Bitcoin.png
deleted file mode 100644
index 4817d925..00000000
--- a/doc/html/Donation_VeraCrypt_Bitcoin.png
+++ /dev/null
diff --git a/doc/html/Donation_VeraCrypt_BitcoinCash.png b/doc/html/Donation_VeraCrypt_BitcoinCash.png
new file mode 100644
index 00000000..c7e22e54
--- /dev/null
+++ b/doc/html/Donation_VeraCrypt_BitcoinCash.png
diff --git a/doc/html/Donation_VeraCrypt_Bitcoin_small.png b/doc/html/Donation_VeraCrypt_Bitcoin_small.png
new file mode 100644
index 00000000..72ceae5c
--- /dev/null
+++ b/doc/html/Donation_VeraCrypt_Bitcoin_small.png
diff --git a/doc/html/Donation_VeraCrypt_Ethereum.png b/doc/html/Donation_VeraCrypt_Ethereum.png
new file mode 100644
index 00000000..fa511247
--- /dev/null
+++ b/doc/html/Donation_VeraCrypt_Ethereum.png
diff --git a/doc/html/Donation_VeraCrypt_Litecoin.png b/doc/html/Donation_VeraCrypt_Litecoin.png
new file mode 100644
index 00000000..6f5d858a
--- /dev/null
+++ b/doc/html/Donation_VeraCrypt_Litecoin.png
diff --git a/doc/html/Donation_VeraCrypt_Monero.png b/doc/html/Donation_VeraCrypt_Monero.png
new file mode 100644
index 00000000..4085a721
--- /dev/null
+++ b/doc/html/Donation_VeraCrypt_Monero.png
diff --git a/doc/html/Donation_donate.gif b/doc/html/Donation_donate.gif
new file mode 100644
index 00000000..43cef691
--- /dev/null
+++ b/doc/html/Donation_donate.gif
diff --git a/doc/html/Donation_donate_PLN.gif b/doc/html/Donation_donate_PLN.gif
new file mode 100644
index 00000000..16ab23e9
--- /dev/null
+++ b/doc/html/Donation_donate_PLN.gif
diff --git a/doc/html/EMV Smart Cards.html b/doc/html/EMV Smart Cards.html
new file mode 100644
index 00000000..d9c8716a
--- /dev/null
+++ b/doc/html/EMV Smart Cards.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <title>
+      VeraCrypt - Free Open source disk encryption with strong security for the
+      Paranoid
+    </title>
+    <meta
+      name="description"
+      content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."
+    />
+    <meta name="keywords" content="encryption, security" />
+    <link href="styles.css" rel="stylesheet" type="text/css" />
+  </head>
+  <body>
+    <div>
+      <a href="Documentation.html"
+        ><img src="VeraCrypt128x128.png" alt="VeraCrypt"
+      /></a>
+    </div>
+
+    <div id="menu">
+      <ul>
+        <li><a href="Home.html">Home</a></li>
+        <li><a href="/code/">Source Code</a></li>
+        <li><a href="Downloads.html">Downloads</a></li>
+        <li><a class="active" href="Documentation.html">Documentation</a></li>
+        <li><a href="Donation.html">Donate</a></li>
+        <li>
+          <a
+            href="https://sourceforge.net/p/veracrypt/discussion/"
+            target="_blank"
+            >Forums</a
+          >
+        </li>
+      </ul>
+    </div>
+
+    <div>
+      <p>
+        <a href="Documentation.html">Documentation</a>
+        <img src="arrow_right.gif" alt=">>" style="margin-top: 5px" />
+        <a href="EMV%20Smart%20Cards.html">EMV Smart Cards</a>
+      </p>
+    </div>
+
+    <div class="wikidoc">
+      <h1>EMV Smart Cards</h1>
+      <div
+        style="
+          text-align: left;
+          margin-top: 19px;
+          margin-bottom: 19px;
+          padding-top: 0px;
+          padding-bottom: 0px;
+        "
+      >
+        <p>
+          Windows and Linux versions of VeraCrypt offer to use EMV compliant
+          smart cards as a feature. Indeed, the use of PKCS#11 compliant smart
+          cards is dedicated to users with more or less cybersecurity skills.
+          However, in some situations, having such a card strongly reduces the
+          plausible deniability of the user.
+        </p>
+        <p>
+          To overcome this problem, the idea is to allow the use of a type of
+          smart card owned by anyone: EMV compliant smart cards. According to
+          the standard of the same name, these cards spread all over the world
+          are used to carry out banking operations. Using internal data of the
+          user's EMV card as keyfiles will strengthen the security of his volume
+          while keeping his denial plausible.
+        </p>
+        <p>
+          For more technical information, please see the section
+          <em style="text-align: left">EMV Smart Cards</em> in the chapter
+          <a
+            href="Keyfiles%20in%20VeraCrypt.html"
+            style="text-align: left; color: #0080c0; text-decoration: none.html"
+          >
+            <em style="text-align: left">Keyfiles</em></a
+          >.
+        </p>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/doc/html/Encryption Algorithms.html b/doc/html/Encryption Algorithms.html
index 0619fd65..2866e332 100644
--- a/doc/html/Encryption Algorithms.html
+++ b/doc/html/Encryption Algorithms.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 </p></div>
 
@@ -137,40 +137,100 @@ XTS</td>
 256; 256</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 128</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 XTS</td>
 </tr>
 <tr style="text-align:left">
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 <a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">AES-Twofish-Serpent</a></td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 &nbsp;</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 256; 256; 256</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 128</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 XTS</td>
 </tr>
 <tr style="text-align:left">
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Camellia-Kuznyechik</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Camellia-Serpent</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-AES</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-Serpent-Camellia</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-Twofish</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 <a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Serpent-AES</a></td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 &nbsp;</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 256; 256</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 128</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 XTS</td>
 </tr>
 <tr style="text-align:left">
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 <a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Serpent-Twofish-AES</a></td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 &nbsp;</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 256; 256; 256</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 128</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
diff --git a/doc/html/Encryption Scheme.html b/doc/html/Encryption Scheme.html
index b77a0aaf..88c586a2 100644
--- a/doc/html/Encryption Scheme.html
+++ b/doc/html/Encryption Scheme.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Scheme.html">Encryption Scheme</a>
@@ -37,53 +37,53 @@
 <div class="wikidoc">
 <h1>Encryption Scheme</h1>
 <p>When mounting a VeraCrypt volume (assume there are no cached passwords/keyfiles) or when performing pre-boot authentication, the following steps are performed:</p>
 <ol>
 <li>The first 512 bytes of the volume (i.e., the standard volume header) are read into RAM, out of which the first 64 bytes are the salt (see
 <a href="VeraCrypt%20Volume%20Format%20Specification.html">
 <em>VeraCrypt Volume Format Specification</em></a>). For system encryption (see the chapter
 <a href="System%20Encryption.html"><em>System Encryption</em></a>), the last 512 bytes of the first logical drive track are read into RAM (the VeraCrypt Boot Loader is stored in the first track of the system drive and/or
  on the VeraCrypt Rescue Disk). </li><li>Bytes 65536&ndash;66047 of the volume are read into RAM (see the section <a href="VeraCrypt%20Volume%20Format%20Specification.html">
 <em>VeraCrypt Volume Format Specification</em></a>). For system encryption, bytes 65536&ndash;66047 of the first partition located behind the active partition* are read (see the section
 <a href="Hidden%20Operating%20System.html">
 Hidden Operating System</a>). If there is a hidden volume within this volume (or within the partition behind the boot partition), we have read its header at this point; otherwise, we have just read random data (whether or not there is a hidden volume within
  it has to be determined by attempting to decrypt this data; for more information see the section
 <a href="Hidden%20Volume.html"><em>Hidden Volume</em></a>).
 </li><li>Now VeraCrypt attempts to decrypt the standard volume header read in (1). All data used and generated in the course of the process of decryption are kept in RAM (VeraCrypt never saves them to disk). The following parameters are unknown&dagger; and have
  to be determined through the process of trial and error (i.e., by testing all possible combinations of the following):
 <ol type="a">
 <li>PRF used by the header key derivation function (as specified in PKCS #5 v2.0; see the section
 <a href="Header%20Key%20Derivation.html">
 <em>Header Key Derivation, Salt, and Iteration Count</em></a>), which can be one of the following:
-<p>HMAC-SHA-512, HMAC-SHA-256, HMAC-RIPEMD-160, HMAC-Whirlpool. If a PRF is explicitly specified by the user, it will be used directly without trying the other possibilities.</p>
+<p>HMAC-SHA-512, HMAC-SHA-256, HMAC-BLAKE2S-256, HMAC-Whirlpool. If a PRF is explicitly specified by the user, it will be used directly without trying the other possibilities.</p>
 <p>A password entered by the user (to which one or more keyfiles may have been applied &ndash; see the section
 <a href="Keyfiles%20in%20VeraCrypt.html">
 <em>Keyfiles</em></a>), a PIM value (if specified) and the salt read in (1) are passed to the header key derivation function, which produces a sequence of values (see the section
 <a href="Header%20Key%20Derivation.html">
 <em>Header Key Derivation, Salt, and Iteration Count</em></a>) from which the header encryption key and secondary header key (XTS mode) are formed. (These keys are used to decrypt the volume header.)</p>
 </li><li>Encryption algorithm: AES-256, Serpent, Twofish, AES-Serpent, AES-Twofish- Serpent, etc.
 </li><li>Mode of operation: only XTS is supported </li><li>Key size(s) </li></ol>
 </li><li>Decryption is considered successful if the first 4 bytes of the decrypted data contain the ASCII string &ldquo;VERA&rdquo;, and if the CRC-32 checksum of the last 256 bytes of the decrypted data (volume header) matches the value located at byte #8 of the
  decrypted data (this value is unknown to an adversary because it is encrypted &ndash; see the section
 <a href="VeraCrypt%20Volume%20Format%20Specification.html">
 <em>VeraCrypt Volume Format Specification</em></a>). If these conditions are not met, the process continues from (3) again, but this time, instead of the data read in (1), the data read in (2) are used (i.e., possible hidden volume header). If the conditions
  are not met again, mounting is terminated (wrong password, corrupted volume, or not a VeraCrypt volume).
 </li><li>Now we know (or assume with very high probability) that we have the correct password, the correct encryption algorithm, mode, key size, and the correct header key derivation algorithm. If we successfully decrypted the data read in (2), we also know that
  we are mounting a hidden volume and its size is retrieved from data read in (2) decrypted in (3).
 </li><li>The encryption routine is reinitialized with the primary master key** and the secondary master key (XTS mode &ndash; see the section
 <a href="Modes%20of%20Operation.html"><em>Modes of Operation</em></a>), which are retrieved from the decrypted volume header (see the section
 <a href="VeraCrypt%20Volume%20Format%20Specification.html">
 <em>VeraCrypt Volume Format Specification</em></a>). These keys can be used to decrypt any sector of the volume, except the volume header area (or the key data area, for system encryption), which has been encrypted using the header keys. The volume is mounted.
 </li></ol>
 <p>See also section <a href="Modes%20of%20Operation.html">
 <em>Modes of Operation</em></a> and section <a href="Header%20Key%20Derivation.html">
 <em>Header Key Derivation, Salt, and Iteration Count</em></a> and also the chapter
 <a href="Security%20Model.html"><em>Security Model</em></a>.</p>
 <p>* If the size of the active partition is less than 256 MB, then the data is read from the
 <em>second</em> partition behind the active one (Windows 7 and later, by default, do not boot from the partition on which they are installed).</p>
 <p>&dagger; These parameters are kept secret <em>not</em> in order to increase the complexity of an attack, but primarily to make VeraCrypt volumes unidentifiable (indistinguishable from random data), which would be difficult to achieve if these parameters
- were stored unencrypted within the volume header. Also note that if a non-cascaded encryption algorithm is used for system encryption, the algorithm
+ were stored unencrypted within the volume header. Also note that in the case of legacy MBR boot mode, if a non-cascaded encryption algorithm is used for system encryption, the algorithm
 <em>is</em> known (it can be determined by analyzing the contents of the unencrypted VeraCrypt Boot Loader stored in the first logical drive track or on the VeraCrypt Rescue Disk).</p>
 <p>** The master keys were generated during the volume creation and cannot be changed later. Volume password change is accomplished by re-encrypting the volume header using a new header key (derived from a new password).</p>
 <p>&nbsp;</p>
 <p><a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Ethereum_Logo_19x30.png b/doc/html/Ethereum_Logo_19x30.png
new file mode 100644
index 00000000..0df3a66a
--- /dev/null
+++ b/doc/html/Ethereum_Logo_19x30.png
diff --git a/doc/html/FAQ.html b/doc/html/FAQ.html
index 8bb3df05..e310f3e8 100644
--- a/doc/html/FAQ.html
+++ b/doc/html/FAQ.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="FAQ.html">Frequently Asked Questions</a>
 </p></div>
 
@@ -48,42 +48,41 @@ Yes. There are generally no conflicts between TrueCrypt and VeraCrypt, thus they
  running the following command in an elevated command prompt (using Run as an administrator) before mounting any volume:
 <strong>mountvol.exe /r</strong>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left">Can I use my TrueCrypt volumes in VeraCrypt?</strong></div>
 Yes. Starting from version 1.0f, VeraCrypt supports mounting TrueCrypt volumes.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left">Can I convert my TrueCrypt volumes to VeraCrypt format?</strong></div>
 Yes. Starting from version 1.0f, VeraCrypt offers the possibility to convert TrueCrypt containers and non-system partitions to VeraCrypt format. This can achieved using the &quot;Change Volume Password&quot; or &quot;Set Header Key Derivation Algorithm&quot; actions. Just check
  the &quot;TrueCrypt Mode&quot;, enter you TrueCrypt password and perform the operation. After that, you volume will have the VeraCrypt format.<br>
 Before doing the conversion, it is advised to backup the volume header using TrueCrypt. You can delete this backup safely once the conversion is done and after checking that the converted volume is mounted properly by VeraCrypt.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left">What's the difference between TrueCrypt and VeraCrypt?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 VeraCrypt adds enhanced security to the algorithms used for system and partitions encryption making it immune to new developments in brute-force attacks.<br>
 It also solves many vulnerabilities and security issues found in TrueCrypt.<br>
 As an example, when the system partition is encrypted, TrueCrypt uses PBKDF2-RIPEMD160 with 1000 iterations whereas in VeraCrypt we use
 <span style="text-decoration:underline">327661</span>. And for standard containers and other partitions, TrueCrypt uses at most 2000 iterations but VeraCrypt uses
-<span style="text-decoration:underline">655331 </span>for RIPEMD160 and <span style="text-decoration:underline">
-500000 </span>iterations for SHA-2 and Whirlpool.<br>
+<span style="text-decoration:underline">500000 </span>iterations.<br>
 This enhanced security adds some delay only to the opening of encrypted partitions without any performance impact to the application use phase. This is acceptable to the legitimate owner but it makes it much harder for an attacker to gain access to the encrypted
  data.</div>
 </div>
 <br id="PasswordLost" style="text-align:left">
 <strong style="text-align:left">I forgot my password &ndash; is there any way ('backdoor') to recover the files from my VeraCrypt volume?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 We have not implemented any 'backdoor' in VeraCrypt (and will never implement any even if asked to do so by a government agency), because it would defeat the purpose of the software. VeraCrypt does not allow decryption of data without knowing the correct password
  or key. We cannot recover your data because we do not know and cannot determine the password you chose or the key you generated using VeraCrypt. The only way to recover your files is to try to &quot;crack&quot; the password or the key, but it could take thousands or
  millions of years (depending on the length and quality of the password or keyfiles, on the software/hardware performance, algorithms, and other factors). Back in 2010, there was news about the
 <a href="http://www.webcitation.org/query?url=g1.globo.com/English/noticia/2010/06/not-even-fbi-can-de-crypt-files-daniel-dantas.html" target="_blank">
 FBI failing to decrypt a TrueCrypt volume after a year of trying</a>. While we can't verify if this is true or just a &quot;psy-op&quot; stunt, in VeraCrypt we have increased the security of the key derivation to a level where any brute-force of the password is virtually
  impossible, provided that all security requirements are respected.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Is there a &quot;Quick Start Guide&quot; or some tutorial for beginners?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes. The first chapter, <strong style="text-align:left"><a href="Beginner%27s%20Tutorial.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">Beginner's Tutorial</a></strong>, in the VeraCrypt
  User Guide contains screenshots and step-by-step instructions on how to create, mount, and use a VeraCrypt volume.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
@@ -117,41 +116,41 @@ This can also be caused by some hardware drivers and other software that access
 <strong style="text-align:left">Can I directly play a video (.avi, .mpg, etc.) stored on a VeraCrypt volume?</strong></div>
 </div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes, VeraCrypt-encrypted volumes are like normal disks. You provide the correct password (and/or keyfile) and mount (open) the VeraCrypt volume. When you double click the icon of the video file, the operating system launches the application associated with
  the file type &ndash; typically a media player. The media player then begins loading a small initial portion of the video file from the VeraCrypt-encrypted volume to RAM (memory) in order to play it. While the portion is being loaded, VeraCrypt is automatically
  decrypting it (in RAM). The decrypted portion of the video (stored in RAM) is then played by the media player. While this portion is being played, the media player begins loading another small portion of the video file from the VeraCrypt-encrypted volume to
  RAM (memory) and the process repeats.<br style="text-align:left">
 <br style="text-align:left">
 The same goes for video recording: Before a chunk of a video file is written to a VeraCrypt volume, VeraCrypt encrypts it in RAM and then writes it to the disk. This process is called on-the-fly encryption/decryption and it works for all file types (not only
  for video files).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Will VeraCrypt be open-source and free forever?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes, it will. We will never create a commercial version of VeraCrypt, as we believe in open-source and free security software.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Is it possible to donate to the VeraCrypt project?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes. You can use the donation buttons at <a href="https://www.veracrypt.fr/en/Donation.html" target="_blank">
-https://www.veracrypt.fr/en/donation/</a>.</div>
+https://www.veracrypt.fr/en/Donation.html</a>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Why is VeraCrypt open-source? What are the advantages?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 As the source code for VeraCrypt is publicly available, independent researchers can verify that the source code does not contain any security flaw or secret 'backdoor'. If the source code were not available, reviewers would need to reverse-engineer the executable
  files. However, analyzing and understanding such reverse-engineered code is so difficult that it is practically
 <em style="text-align:left">impossible</em> to do (especially when the code is as large as the VeraCrypt code).<br style="text-align:left">
 <br style="text-align:left">
 Remark: A similar problem also affects cryptographic hardware (for example, a self-encrypting storage device). It is very difficult to reverse-engineer it to verify that it does not contain any security flaw or secret 'backdoor'.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">VeraCrypt is open-source, but has anybody actually reviewed the source code?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes. An <a href="http://blog.quarkslab.com/security-assessment-of-veracrypt-fixes-and-evolutions-from-truecrypt.html" target="_blank">
 audit</a> has been performed by <a href="https://quarkslab.com/" target="_blank">
 Quarkslab</a>. The technical report can be downloaded from <a href="http://blog.quarkslab.com/resources/2016-10-17-audit-veracrypt/16-08-215-REP-VeraCrypt-sec-assessment.pdf">here</a>. VeraCrypt 1.19 addressed the issues found by this audit.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">As VeraCrypt is open-source software, independent researchers can verify that the source code does not contain any security flaw or secret 'backdoor'. Can they also verify that the official executable files were built from the
  published source code and contain no additional code?</strong></div>
@@ -507,48 +506,40 @@ See the question '<em style="text-align:left"><a href="#changing-filesystem" sty
 Yes, when mounted, VeraCrypt volumes can be formatted as FAT12, FAT16, FAT32, NTFS, or any other file system. VeraCrypt volumes behave as standard disk devices so you can right-click the device icon (for example in the '<em style="text-align:left">Computer</em>'
  or '<em style="text-align:left">My Computer</em>' list) and select '<em style="text-align:left">Format</em>'. The actual volume contents will be lost. However, the whole volume will remain encrypted. If you format a VeraCrypt-encrypted partition when the VeraCrypt
  volume that the partition hosts is not mounted, then the volume will be destroyed, and the partition will not be encrypted anymore (it will be empty).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Is it possible to mount a VeraCrypt container that is stored on a CD or DVD?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes. However, if you need to mount a VeraCrypt volume that is stored on a read-only medium (such as a CD or DVD) under Windows 2000, the file system within the VeraCrypt volume must be FAT (Windows 2000 cannot mount an NTFS file system on read-only media).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Is it possible to change the password for a hidden volume?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes, the password change dialog works both for standard and <a href="Hidden%20Volume.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
 hidden volumes</a>. Just type the password for the hidden volume in the 'Current Password' field of the 'Volume Password Change' dialog.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px; font-size:10px; line-height:12px">
 Remark: VeraCrypt first attempts to decrypt the standard <a href="VeraCrypt%20Volume%20Format%20Specification.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
 volume header</a> and if it fails, it attempts to decrypt the area within the volume where the hidden volume header may be stored (if there is a hidden volume within). In case it is successful, the password change applies to the hidden volume. (Both attempts
  use the password typed in the 'Current Password' field.)</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
-<strong style="text-align:left">When I use HMAC-RIPEMD-160, is the size of the header encryption key only 160 bits?</strong></div>
-<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-No, VeraCrypt never uses an output of a hash function (nor of a HMAC algorithm) directly as an encryption key. See the section
-<a href="Header%20Key%20Derivation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
-Header Key Derivation, Salt, and Iteration Count</a> in the <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
-documentation</a> for more information.</div>
-<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-<br style="text-align:left">
 <strong style="text-align:left">How do I burn a VeraCrypt container larger than 2 GB onto a DVD?</strong><br style="text-align:left">
 <br style="text-align:left">
 The DVD burning software you use should allow you to select the format of the DVD. If it does, select the UDF format (ISO format does not support files larger than 2 GB).</div>
 <div id="disk_defragmenter" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Can I use tools like <em style="text-align:left">
 chkdsk</em>, Disk Defragmenter, etc. on the contents of a mounted VeraCrypt volume?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes, VeraCrypt volumes behave like real physical disk devices, so it is possible to use any filesystem checking/repairing/defragmenting tools on the contents of a mounted VeraCrypt volume.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Does VeraCrypt support 64-bit versions of Windows?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Yes, it does. <span style="text-align:left; font-size:10px; line-height:12px">Note: 64-bit versions of Windows load only drivers that are digitally signed with a digital certificate issued by a certification authority approved for issuing kernel-mode code signing
  certificates. VeraCrypt complies with this requirement (the VeraCrypt driver is <a href="Digital%20Signatures.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 digitally signed</a> with the digital certificate of IDRIX, which was issued by the certification authority Thawte).</span></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <strong style="text-align:left">Can I mount my VeraCrypt volume under Windows, Mac OS X, and Linux?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
@@ -711,24 +702,68 @@ documentation</a>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left">How can I perform a Windows built-in backup on a VeraCrypt volume? The VeraCrypt volume doesn't show up in the list of available backup paths.<br>
 </strong>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Windows built-in backup utility looks only for physical driver, that's why it doesn't display the VeraCrypt volume. Nevertheless, you can still backup on a VeraCrypt volume by using a trick: activate sharing on the VeraCrypt volume through Explorer interface
  (of course, you have to put the correct permission to avoid unauthorized access) and then choose the option &quot;Remote shared folder&quot; (it is not remote of course but Windows needs a network path). There you can type the path of the shared drive (for example \\ServerName\sharename)
  and the backup will be configured correctly.</div>
 </div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left">Is the encryption used by VeraCrypt vulnerable to Quantum attacks?</strong>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 VeraCrypt uses block ciphers (AES, Serpent, Twofish) for its encryption. Quantum attacks against these block ciphers are just a faster brute-force since the best know attack against these algorithms is exhaustive search (related keys attacks are irrelevant
  to our case because all keys are random and independent from each other).<br>
 Since VeraCrypt always uses 256-bit random and independent keys, we are assured of a 128-bit security<br>
 level against quantum algorithms which makes VeraCrypt encryption immune to such attacks.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong>How to make a VeraCrypt volume available for Windows Search indexing?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 In order to be able to index a VeraCrypt volume through Windows Search, the volume must be mounted at boot time (System Favorite) or the Windows Search services must be restart after the volume is mounted. This is needed because Windows Search can only index
  drives that are available when it starts.</div>
+ <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong>I'm encountering an "Operation not permitted" error with VeraCrypt on macOS when trying to mount a file container. How can I resolve this?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+
+<p>This specific error, which appears in the form "Operation not permitted: /var/folders/w6/d2xssyzx.../T/.veracrypt_aux_mnt1/control VeraCrypt::File::Open:232", has been reported by some users. It is the result of macOS not granting the necessary permissions to VeraCrypt. Here are a couple of solutions you can try:</p>
+
+<ul>
+<li>A. Granting Full Disk Access to VeraCrypt:
+<p>
+<ol>
+    <li>Go to <code>Apple Menu</code> > <code>System Settings</code>.</li>
+    <li>Click on the <code>Privacy & Security</code> tab.</li>
+    <li>Scroll down and select <code>Full Disk Access</code>.</li>
+    <li>Click the <code>+</code> button, navigate to your Applications folder, select <code>VeraCrypt</code>, and click <code>Open</code>.</li>
+    <li>Ensure that the checkbox next to VeraCrypt is ticked.</li>
+    <li>Close the System Settings window and try using VeraCrypt again.</li>
+</p>
+</ol>
+</li>
+<li>B. Using the sudo approach to launch VeraCrypt:
+<p>You can launch VeraCrypt from the Terminal using elevated permissions:
+
+<pre>
+sudo /Applications/VeraCrypt.app/Contents/MacOS/VeraCrypt
+</pre>
+
+Running VeraCrypt with sudo often bypasses certain permission-related issues, but it's always a good practice to grant the necessary permissions via the system settings whenever possible.</p>
+</li>
+</ul>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Why does VeraCrypt show an unknown device in its list that doesn't appear as a physical disk in Windows Disk Management or in DiskPart output?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<p>
+Starting from Windows 10 version 1903 and later, Microsoft introduced a feature called <b>Windows Sandbox</b>. This is an isolated environment designed to run untrusted applications safely. As part of this feature, Windows generates a dynamic virtual hard disk (VHDX) which represents a clean Windows installation. This VHDX contains a base system image, user data, and the runtime state, and its size can vary depending on system configurations and usage.	
+</p>
+<p>
+When VeraCrypt enumerates devices on a system, it identifies all available disk devices using device path formats like <b>\Device\HardDiskX\PartitionY</b>. VeraCrypt lists these devices, including virtual ones such as those associated with Windows Sandbox, without making distinctions based on their physical or virtual nature. Therefore, you might observe an unexpected device in VeraCrypt, even if it doesn't appear as a physical disk in tools like diskpart.
+</p>
+<p>
+For more details on the Windows Sandbox feature and its associated virtual hard disk, you can refer to this <a href="https://techcommunity.microsoft.com/t5/windows-os-platform-blog/windows-sandbox/ba-p/301849">official Microsoft article</a>.
+</p>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left">I haven't found any answer to my question in the FAQ &ndash; what should I do?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Please search the VeraCrypt documentation and website.</div>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Favorite Volumes.html b/doc/html/Favorite Volumes.html
index a813f843..2e585914 100644
--- a/doc/html/Favorite Volumes.html
+++ b/doc/html/Favorite Volumes.html
@@ -1,68 +1,71 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Volume.html">VeraCrypt Volume</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Favorite%20Volumes.html">Favorite Volumes</a>
 </p></div>
 
 <div class="wikidoc">
-<h2 style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; font-size:14px; margin-bottom:17px">
+<h2 style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; margin-bottom:17px">
 Favorite Volumes</h2>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <p>Favorite volumes are useful, for example, in any the following cases:</p>
 <ul>
 <li>You have a volume that always needs to be <strong>mounted to a particular drive letter</strong>.
 </li><li>You have a volume that needs to be <strong>automatically mounted when its host device gets connected to the computer
 </strong>(for example, a container located on a USB flash drive or external USB hard drive).
 </li><li>You have a volume that needs to be <strong>automatically mounted when you log on
 </strong>to the operating system. </li><li>You have a volume that always needs to be <strong>mounted as read-only </strong>
 or removable medium. </li></ul>
+<p>
+<strong>Note: </strong>Please refer to <a href="Issues%20and%20Limitations.html">Known Issues and Limitations</a> section for issues that may affect favorite volumes when Windows "Fast Startup" feature is enabled.
+</p>
 <h3>To configure a VeraCrypt volume as a favorite volume, follow these steps:</h3>
 <ol>
 <li>Mount the volume (to the drive letter to which you want it to be mounted every time).
 </li><li>Right-click the mounted volume in the drive list in the main VeraCrypt window and select &lsquo;<em>Add to Favorites</em>&rsquo;.
 </li><li>The Favorite Volumes Organizer window should appear now. In this window, you can set various options for the volume (see below).
 </li><li>Click <em>OK</em>. </li></ol>
 <strong>Favorite volumes can be mounted in several ways: </strong>To mount all favorite volumes, select
 <em>Favorites </em>&gt; <em>Mount Favorite Volumes </em>or press the &lsquo;<em>Mount Favorite Volumes</em>&rsquo; hot key (<em>Settings
 </em>&gt; <em>Hot Keys</em>). To mount only one of the favorite volumes, select it from the list contained in the
 <em>Favorites </em>menu. When you do so, you are asked for its password (and/or keyfiles) (unless it is cached) and if it is correct, the volume is mounted. If it is already mounted, an Explorer window is opened for it.
 <h3>Selected or all favorite volumes can be mounted automatically whenever you log on to Windows</h3>
 <p>To set this up, follow these steps:</p>
 <ol>
 <li>Mount the volume you want to have mounted automatically when you log on (mount it to the drive letter to which you want it to be mounted every time).
 </li><li>Right-click the mounted volume in the drive list in the main VeraCrypt window and select &lsquo;<em>Add to Favorites</em>&rsquo;.
 </li><li>The Favorites Organizer window should appear now. In this window, enable the option &lsquo;<em>Mount selected volume upon logon</em>&rsquo; and click
 <em>OK</em>. </li></ol>
 <p>Then, when you log on to Windows, you will be asked for the volume password (and/or keyfiles) and if it is correct, the volume will be mounted.<br>
 <br>
 Note: VeraCrypt will not prompt you for a password if you have enabled caching of the pre-boot authentication password (<em>Settings
diff --git a/doc/html/Hardware Acceleration.html b/doc/html/Hardware Acceleration.html
index 76afc60c..b344e255 100644
--- a/doc/html/Hardware Acceleration.html
+++ b/doc/html/Hardware Acceleration.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hardware%20Acceleration.html">Hardware Acceleration</a>
 </p></div>
 
diff --git a/doc/html/Hash Algorithms.html b/doc/html/Hash Algorithms.html
index c8f4131b..ea8c19ea 100644
--- a/doc/html/Hash Algorithms.html
+++ b/doc/html/Hash Algorithms.html
@@ -1,58 +1,58 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hash%20Algorithms.html">Hash Algorithms</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Hash Algorithms</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 In the Volume Creation Wizard, in the password change dialog window, and in the Keyfile Generator dialog window, you can select a hash algorithm. A user-selected hash algorithm is used by the VeraCrypt Random Number Generator as a pseudorandom &quot;mixing&quot; function,
  and by the header key derivation function (HMAC based on a hash function, as specified in PKCS #5 v2.0) as a pseudorandom function. When creating a new volume, the Random Number Generator generates the master key, secondary key (XTS mode), and salt. For more
  information, please see the section <a href="Random%20Number%20Generator.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Random Number Generator</a> and section <a href="Header%20Key%20Derivation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Header Key Derivation, Salt, and Iteration Count</a>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 VeraCrypt currently supports the following hash algorithms:</div>
 <ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-<a href="RIPEMD-160.html"><strong style="text-align:left.html">RIPEMD-160</strong></a>
+<a href="BLAKE2s-256.html"><strong style="text-align:left.html">BLAKE2s-256</strong></a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="SHA-256.html"><strong style="text-align:left.html">SHA-256</strong></a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="SHA-512.html"><strong style="text-align:left.html">SHA-512</strong></a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Whirlpool.html"><strong style="text-align:left.html">Whirlpool</strong></a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left"><a href="Streebog.html">Streebog</a></strong>
 </li></ul>
-<p><a href="RIPEMD-160.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
+<p><a href="BLAKE2s-256.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Header Key Derivation.html b/doc/html/Header Key Derivation.html
index b9454cd0..f922d676 100644
--- a/doc/html/Header Key Derivation.html
+++ b/doc/html/Header Key Derivation.html
@@ -1,86 +1,89 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Header%20Key%20Derivation.html">Header Key Derivation, Salt, and Iteration Count</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Header Key Derivation, Salt, and Iteration Count</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Header key is used to encrypt and decrypt the encrypted area of the VeraCrypt volume header (for
 <a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 system encryption</a>, of the keydata area), which contains the master key and other data (see the sections
 <a href="Encryption%20Scheme.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Encryption Scheme</a> and <a href="VeraCrypt%20Volume%20Format%20Specification.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 VeraCrypt Volume Format Specification</a>). In volumes created by VeraCrypt (and for
 <a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 system encryption</a>), the area is encrypted in XTS mode (see the section <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Modes of Operation</a>). The method that VeraCrypt uses to generate the header key and the secondary header key (XTS mode) is PBKDF2, specified in PKCS #5 v2.0; see
 <a href="References.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 [7]</a>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 512-bit salt is used, which means there are 2<sup style="text-align:left; font-size:85%">512</sup> keys for each password. This significantly decreases vulnerability to 'off-line' dictionary/'rainbow table' attacks (pre-computing all the keys for a dictionary
  of passwords is very difficult when a salt is used) [7]. The salt consists of random values generated by the
 <a href="Random%20Number%20Generator.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
-VeraCrypt random number generator</a> during the volume creation process. The header key derivation function is based on HMAC-SHA-512, HMAC-SHA-256, HMAC-RIPEMD-160, or HMAC-Whirlpool (see [8, 9, 20, 22]) &ndash; the user selects which. The length of the derived
- key does not depend on the size of the output of the underlying hash function. For example, a header key for the AES-256 cipher is always 256 bits long even if HMAC-RIPEMD-160 is used (in XTS mode, an additional 256-bit secondary header key is used; hence,
+VeraCrypt random number generator</a> during the volume creation process. The header key derivation function is based on HMAC-SHA-512, HMAC-SHA-256, HMAC-BLAKE2S-256, HMAC-Whirlpool or HMAC-Streebog (see [8, 9, 20, 22]) &ndash; the user selects which. The length of the derived
+ key does not depend on the size of the output of the underlying hash function. For example, a header key for the AES-256 cipher is always 256 bits long even if HMAC-SHA-512 is used (in XTS mode, an additional 256-bit secondary header key is used; hence,
  two 256-bit keys are used for AES-256 in total). For more information, refer to [7]. A large number of iterations of the key derivation function have to be performed to derive a header key, which increases the time necessary to perform an exhaustive search
  for passwords (i.e., brute force attack)&nbsp;[7].</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-<p>Prior to version 1.12, VeraCrypt always used a fixed number of iterations depending on the volume type and the derivation algorithm used:</p>
-<ul>
-<li>For system partition encryption (boot encryption), <strong>200000</strong> iterations are used for the HMAC-SHA-256 derivation function and
-<strong>327661</strong> iterations are used for HMAC-RIPEMD-160. </li><li>For standard containers and other partitions, <strong>655331</strong> iterations are used for HMAC-RIPEMD-160 and
-<strong>500000</strong> iterations are used for HMAC-SHA-512,&nbsp;HMAC-SHA-256 and HMAC-Whirlpool.
-</li></ul>
-<p>Starting from version 1.12, the <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">
+<p>Prior to version 1.12, VeraCrypt always used a fixed number of iterations That depended only on the volume type and the derivation algorithm used.
+Starting from version 1.12, the <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">
 PIM </a>field (<a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">Personal Iterations Multiplier</a>) enables users to have more control over the number of iterations used by the key derivation function.</p>
+<p>
 <p>When a <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">
-PIM </a>value is not specified or if it is equal to zero, VeraCrypt uses the default values expressed above.</p>
+PIM </a>value is not specified or if it is equal to zero, VeraCrypt uses the default values expressed below:<br/>
+<ul>
+<li>For system partition encryption (boot encryption) that uses SHA-256, BLAKE2s-256 or Streebog, <strong>200000</strong> iterations are used.</li>
+<li>For system encryption that uses SHA-512 or Whirlpool, <strong>500000</strong> iterations are used.</li>
+<li>For non-system encryption and file containers, all derivation algorithms will use <strong>500000</strong> iterations.
+</li></ul>
+</p>
 <p>When a <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">
 PIM </a>value is given by the user, the number of iterations of the key derivation function is calculated as follows:</p>
 <ul>
 <li>For system encryption that doesn't use SHA-512 or Whirlpool: Iterations = <strong>PIM x 2048</strong>
-</li><li>For system encryption that uses SHA-512 or Whirlpool, non-system encryption and file containers: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
+</li><li>For system encryption that uses SHA-512 or Whirlpool: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
+</li><li>For non-system encryption and file containers: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
 </li></ul>
 </div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Header keys used by ciphers in a cascade are mutually independent, even though they are derived from a single password (to which keyfiles may have been applied). For example, for the AES-Twofish-Serpent cascade, the header key derivation function is instructed
  to derive a 768-bit encryption key from a given password (and, for XTS mode, in addition, a 768-bit
 <em style="text-align:left">secondary</em> header key from the given password). The generated 768-bit header key is then split into three 256-bit keys (for XTS mode, the
 <em style="text-align:left">secondary</em> header key is split into three 256-bit keys too, so the cascade actually uses six 256-bit keys in total), out of which the first key is used by Serpent, the second key is used by Twofish, and the third by AES (in addition,
  for XTS mode, the first secondary key is used by Serpent, the second secondary key is used by Twofish, and the third secondary key by AES). Hence, even when an adversary has one of the keys, he cannot use it to derive the other keys, as there is no feasible
  method to determine the password from which the key was derived (except for brute force attack mounted on a weak password).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <a href="Random%20Number%20Generator.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></div>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Hibernation File.html b/doc/html/Hibernation File.html
index ac046dc8..cc0888f1 100644
--- a/doc/html/Hibernation File.html
+++ b/doc/html/Hibernation File.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Data%20Leaks.html">Data Leaks</a>
diff --git a/doc/html/Hidden Operating System.html b/doc/html/Hidden Operating System.html
index 9d37abe6..1f636a28 100644
--- a/doc/html/Hidden Operating System.html
+++ b/doc/html/Hidden Operating System.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="System%20Encryption.html">System Encryption</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hidden%20Operating%20System.html">Hidden Operating System</a>
diff --git a/doc/html/Hidden Volume.html b/doc/html/Hidden Volume.html
index 612cca74..56f38e2b 100644
--- a/doc/html/Hidden Volume.html
+++ b/doc/html/Hidden Volume.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Plausible%20Deniability.html">Plausible Deniability</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hidden%20Volume.html">Hidden Volume</a>
diff --git a/doc/html/Home_VeraCrypt_Default_Mount_Parameters.png b/doc/html/Home_VeraCrypt_Default_Mount_Parameters.png
index 8481ef37..fd566f80 100644
--- a/doc/html/Home_VeraCrypt_Default_Mount_Parameters.png
+++ b/doc/html/Home_VeraCrypt_Default_Mount_Parameters.png
diff --git a/doc/html/Home_VeraCrypt_menu_Default_Mount_Parameters.png b/doc/html/Home_VeraCrypt_menu_Default_Mount_Parameters.png
index 2cf2665f..954b484c 100644
--- a/doc/html/Home_VeraCrypt_menu_Default_Mount_Parameters.png
+++ b/doc/html/Home_VeraCrypt_menu_Default_Mount_Parameters.png
diff --git a/doc/html/Home_tibitDonateButton.png b/doc/html/Home_tibitDonateButton.png
deleted file mode 100644
index 6042cab2..00000000
--- a/doc/html/Home_tibitDonateButton.png
+++ /dev/null
diff --git a/doc/html/Hot Keys.html b/doc/html/Hot Keys.html
index af31f469..438d57e8 100644
--- a/doc/html/Hot Keys.html
+++ b/doc/html/Hot Keys.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hot%20Keys.html">Hot Keys</a>
 </p></div>
 
diff --git a/doc/html/How to Back Up Securely.html b/doc/html/How to Back Up Securely.html
index 5f6282d9..ef5f30ce 100644
--- a/doc/html/How to Back Up Securely.html
+++ b/doc/html/How to Back Up Securely.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="How%20to%20Back%20Up%20Securely.html">How to Back Up Securely</a>
 </p></div>
 <div class="wikidoc">
diff --git a/doc/html/Incompatibilities.html b/doc/html/Incompatibilities.html
index 06de7db0..4c9e4bce 100644
--- a/doc/html/Incompatibilities.html
+++ b/doc/html/Incompatibilities.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Incompatibilities.html">Incompatibilities</a>
 </p></div>
 
diff --git a/doc/html/Introduction.html b/doc/html/Introduction.html
index 90783867..1a946be2 100644
--- a/doc/html/Introduction.html
+++ b/doc/html/Introduction.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Introduction.html">Introduction</a>
 </p>
 </div>
diff --git a/doc/html/Issues and Limitations.html b/doc/html/Issues and Limitations.html
index ac9e8e95..eed2e222 100644
--- a/doc/html/Issues and Limitations.html
+++ b/doc/html/Issues and Limitations.html
@@ -1,68 +1,68 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Issues%20and%20Limitations.html">Known Issues and Limitations</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Known Issues &amp; Limitations</h1>
 <h3>Known Issues</h3>
 <ul>
-<li>On Windows, it may happen that two drive letters are assigned to a mounted volume instead of a single one. This is caused by an issue with Windows Mount Manager cache and it can be solve by typing the command &quot;<strong>mountvol.exe /r</strong>&quot; in an elevated
+<li>On Windows, it may happen that two drive letters are assigned to a mounted volume instead of a single one. This is caused by an issue with Windows Mount Manager cache and it can be solved by typing the command &quot;<strong>mountvol.exe /r</strong>&quot; in an elevated
  command prompt (run as an administrator) before mounting any volume. If the issue persists after rebooting, the following procedure can be used to solve it:
 <ul>
 <li>Check the registry key &quot;HKEY_LOCAL_MACHINE\SYSTEM\MountedDevices&quot; using regedit. Scroll down and you'll find entries starting with &quot;\DosDevices\&quot; or &quot;\Global??\&quot; which indicate the drive letters that are taken by the system. Before mounting any volume,
  double click on each one and remove the ones contains the name &quot;VeraCrypt&quot; and &quot;TrueCrypt&quot;.
 <br>
 Also, there are other entries whose name start with &quot;#{&quot; and &quot;\??\Volume{&quot;: double click on each one of them and remove the ones whose data value contains the name &quot;VeraCrypt&quot; and &quot;TrueCrypt&quot;.
 </li></ul>
 </li>
-<li>On some Windows machines, VeraCrypt may hang intermittently when mounting or dismounting a volume. Similar hanging may affect other running applications during veraCrypt mounting or dismounting operations.
+<li>On some Windows machines, VeraCrypt may hang intermittently when mounting or dismounting a volume. Similar hanging may affect other running applications during VeraCrypt mounting or dismounting operations.
 This issue is caused by a conflict between VeraCrypt waiting dialog displayed during mount/dismount operations and other software installed on the machine (e.g. Outpost Firewall Pro).
 In such situations, the issue can be solved by disabling VeraCrypt waiting dialog in the Preferences: use menu "Settings -> Preferences" and check the option "Don't show wait message dialog when performing operations".
 </li>
 </ul>
 <h3 id="limitations">Limitations</h3>
 <ul>
 <li>[<em>Note: This limitation does not apply to users of Windows Vista and later versions of Windows.</em>] On Windows XP/2003, VeraCrypt does not support encrypting an entire system drive that contains extended (logical) partitions. You can encrypt an entire
  system drive provided that it contains only primary partitions. Extended (logical) partitions must not be created on any system drive that is partially or fully encrypted (only primary partitions may be created on it).
 <em>Note</em>: If you need to encrypt an entire drive containing extended partitions, you can encrypt the system partition and, in addition, create partition-hosted VeraCrypt volumes within any non- system partitions on the drive. Alternatively, you may want
  to consider upgrading to Windows Vista or a later version of Windows. </li><li>VeraCrypt currently does not support encrypting a system drive that has been converted to a dynamic disk.
 </li><li>To work around a Windows XP issue, the VeraCrypt boot loader is always automatically configured for the version of the operating system under which it is installed. When the version of the system changes (for example, the VeraCrypt boot loader is installed
  when Windows Vista is running but it is later used to boot Windows XP) you may encounter various known and unknown issues (for example, on some notebooks, Windows XP may fail to display the log-on screen). Note that this affects multi-boot configurations,
  VeraCrypt Rescue Disks, and decoy/hidden operating systems (therefore, if the hidden system is e.g. Windows XP, the decoy system should be Windows XP too).
 </li><li>The ability to mount a partition that is within the key scope of system encryption without pre- boot authentication (for example, a partition located on the encrypted system drive of another operating system that is not running), which can be done e.g.
  by selecting <em>System</em> &gt; <em>Mount Without Pre-Boot Authentication,</em> is limited to primary partitions (extended/logical partitions cannot be mounted this way).
 </li><li>Due to a Windows 2000 issue, VeraCrypt does not support the Windows Mount Manager under Windows 2000. Therefore, some Windows 2000 built-in tools, such as Disk Defragmenter, do not work on VeraCrypt volumes. Furthermore, it is not possible to use the Mount
  Manager services under Windows 2000, e.g., assign a mount point to a VeraCrypt volume (i.e., attach a VeraCrypt volume to a folder).
 </li><li>VeraCrypt does not support pre-boot authentication for operating systems installed within VHD files, except when booted using appropriate virtual-machine software such as Microsoft Virtual PC.
 </li><li>The Windows Volume Shadow Copy Service is currently supported only for partitions within the key scope of system encryption (e.g. a system partition encrypted by VeraCrypt, or a non- system partition located on a system drive encrypted by VeraCrypt, mounted
  when the encrypted operating system is running). Note: For other types of volumes, the Volume Shadow Copy Service is not supported because the documentation for the necessary API is not available.
@@ -75,31 +75,35 @@ In such situations, the issue can be solved by disabling VeraCrypt waiting dialo
 </li><li>System encryption is supported only on drives that are connected locally via an ATA/SCSI interface (note that the term ATA also refers to SATA and eSATA).
 </li><li>When system encryption is used (this also applies to hidden operating systems), VeraCrypt does not support multi-boot configuration changes (for example, changes to the number of operating systems and their locations). Specifically, the configuration must
  remain the same as it was when the VeraCrypt Volume Creation Wizard started to prepare the process of encryption of the system partition/drive (or creation of a hidden operating system).<br>
 <br>
 Note: The only exception is the multi-boot configuration where a running VeraCrypt-encrypted operating system is always located on drive #0, and it is the only operating system located on the drive (or there is one VeraCrypt-encrypted decoy and one VeraCrypt-encrypted
  hidden operating system and no other operating system on the drive), and the drive is connected or disconnected before the computer is turned on (for example, using the power switch on an external eSATA drive enclosure). There may be any additional operating
  systems (encrypted or unencrypted) installed on other drives connected to the computer (when drive #0 is disconnected, drive #1 becomes drive #0, etc.)
 </li><li>When the notebook battery power is low, Windows may omit sending the appropriate messages to running applications when the computer is entering power saving mode. Therefore, VeraCrypt may fail to auto-dismount volumes in such cases.
 </li><li>Preserving of any timestamp of any file (e.g. a container or keyfile) is not guaranteed to be reliably and securely performed (for example, due to filesystem journals, timestamps of file attributes, or the operating system failing to perform it for various
  documented and undocumented reasons). Note: When you write to a file-hosted hidden volume, the timestamp of the container may change. This can be plausibly explained as having been caused by changing the (outer) volume password. Also note that VeraCrypt never
  preserves timestamps of system favorite volumes (regardless of the settings). </li><li>Special software (e.g., a low-level disk editor) that writes data to a disk drive in a way that circumvents drivers in the driver stack of the class &lsquo;DiskDrive&rsquo; (GUID of the class is 4D36E967- E325-11CE-BFC1-08002BE10318) can write unencrypted
  data to a non-system drive hosting a mounted VeraCrypt volume (&lsquo;Partition0&rsquo;) and to encrypted partitions/drives that are within the key scope of active system encryption (VeraCrypt does not encrypt such data written that way). Similarly, software
  that writes data to a disk drive circumventing drivers in the driver stack of the class &lsquo;Storage Volume&rsquo; (GUID of the class is 71A27CDD-812A-11D0-BEC7-08002BE2092F) can write unencrypted data to VeraCrypt partition-hosted volumes (even if they
  are mounted). </li><li>For security reasons, when a hidden operating system is running, VeraCrypt ensures that all local unencrypted filesystems and non-hidden VeraCrypt volumes are read-only. However, this does not apply to filesystems on CD/DVD-like media and on custom, atypical,
  or non-standard devices/media (for example, any devices/media whose class is other than the Windows device class &lsquo;Storage Volume&rsquo; or that do not meet the requirements of this class (GUID of the class is 71A27CDD-812A-11D0-BEC7-08002BE2092F)).
 </li><li>Device-hosted VeraCrypt volumes located on floppy disks are not supported. Note: You can still create file-hosted VeraCrypt volumes on floppy disks.
 </li><li>Windows Server editions don't allow the use of mounted VeraCrypt volumes as a path for server backup. This can solved by activating sharing on the VeraCrypt volume through Explorer interface (of course, you have to put the correct permission to avoid unauthorized
  access) and then choosing the option &quot;Remote shared folder&quot; (it is not remote of course but Windows needs a network path). There, you can type the path of the shared drive (for example \\ServerName\sharename) and the backup will be configured correctly.
 </li><li>Due to Microsoft design flaws in NTFS sparse files handling, you may encounter system errors when writing data to large Dynamic volumes (more than few hundreds GB). To avoid this, the recommended size for a Dynamic volume container file for maximum compatibility
  is 300 GB. The following link gives more details concerning this limitation: <a href="http://www.flexhex.com/docs/articles/sparse-files.phtml#msdn" target="_blank">
-http://www.flexhex.com/docs/articles/sparse-files.phtml#msdn</a> </li><li>Windows 8 introduced a new feature called &quot;<strong>Hybrid boot and shutdown</strong>&quot; to give users the impression that booting is quick. This feature is enabled by default and it has side effects on VeraCrypt volumes usage. It is advised to disable this
+http://www.flexhex.com/docs/articles/sparse-files.phtml#msdn</a> </li>
+<li>In Windows 8 and Windows 10, a feature was introduced with the name &quot;<strong>Hybrid boot and shutdown</strong>&quot; and &quot;<strong>Fast Startup</strong>&quot; and which make Windows boot more quickly. This feature is enabled by default and it has side effects on VeraCrypt volumes usage. It is advised to disable this
  feature (e.g. this <a href="https://www.maketecheasier.com/disable-hybrid-boot-and-shutdown-in-windows-8/" target="_blank">
-link </a>explains how). Some examples of issues:
+link </a>explains how to disable it in Windows 8 and this <a href="https://www.tenforums.com/tutorials/4189-turn-off-fast-startup-windows-10-a.html" target="_blank">link</a> gives equivalent instructions for Windows 10). Some examples of issues:
 <ul>
 <li>after a shutdown and a restart, mounted volume will continue to be mounted without typing the password: this due to the fact the new Windows 8 shutdown is not a real shutdown but a disguised hibernate/sleep.
-</li><li>when using system encryption and when there are System Favorites configured to be mounted at boot time: after shutdown and restart, these system favorites will not be mounted.
-</li></ul>
-</li><li>Windows system Repair/Recovery Disk can't be created when a VeraCrypt volume is mounted as a fixed disk (which is the default). To solve this, either dismount all volumes or mount volumes are removable media.
+</li>
+<li>when using system encryption and when there are System Favorites configured to be mounted at boot time: after shutdown and restart, these system favorites will not be mounted.
+</li>
+</ul>
+</li>
+<li>Windows system Repair/Recovery Disk can't be created when a VeraCrypt volume is mounted as a fixed disk (which is the default). To solve this, either dismount all volumes or mount volumes are removable media.
 </li><li>Further limitations are listed in the section <a href="Security%20Model.html">
 <em>Security Model</em></a>. </li></ul>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Journaling File Systems.html b/doc/html/Journaling File Systems.html
index b04a6e47..0b6a18ce 100644
--- a/doc/html/Journaling File Systems.html
+++ b/doc/html/Journaling File Systems.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Journaling%20File%20Systems.html">Journaling File Systems</a>
diff --git a/doc/html/Keyfiles in VeraCrypt.html b/doc/html/Keyfiles in VeraCrypt.html
index c64773b4..5a07bf48 100644
--- a/doc/html/Keyfiles in VeraCrypt.html
+++ b/doc/html/Keyfiles in VeraCrypt.html
@@ -1,75 +1,74 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Keyfiles%20in%20VeraCrypt.html">Keyfiles</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Keyfiles</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 Keyfile is a file whose content is combined with a password (for information on the method used to combine a keyfile with password, see the section
 <a href="Keyfiles.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Keyfiles</a> in the chapter <a href="Technical%20Details.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Technical Details</a>). Until the correct keyfile is provided, no volume that uses the keyfile can be mounted.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 You do not have to use keyfiles. However, using keyfiles has some advantages:</div>
 <ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 May improve protection against brute force attacks (significant particularly if the volume password is not very strong).
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Allows the use of security tokens and smart cards (see below). </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Allows multiple users to mount a single volume using different user passwords or PINs. Just give each user a security token or smart card containing the same VeraCrypt keyfile and let them choose their personal password or PIN that will protect their security
  token or smart card. </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Allows managing multi-user <em style="text-align:left">shared</em> access (all keyfile holders must present their keyfiles before a volume can be mounted).
 </li></ul>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-Any kind of file (for example, .txt, .exe, mp3**, .avi) can be used as a VeraCrypt keyfile (however, we recommend that you prefer compressed files, such as .mp3, .jpg, .zip, etc).
 <br style="text-align:left">
 <br style="text-align:left">
 Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile; the order does not matter. You can also let VeraCrypt generate a file with random content and use it as a keyfile. To do so, select
 <em style="text-align:left">Tools &gt; Keyfile Generator</em>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Note: Keyfiles are currently not supported for system encryption.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 WARNING: If you lose a keyfile or if any bit of its first 1024 kilobytes changes, it will be impossible to mount volumes that use the keyfile!</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <em style="text-align:left"><strong style="text-align:left">WARNING: If password caching is enabled, the password cache also contains the processed contents of keyfiles used to successfully mount a volume. Then it is possible to remount the volume even if the
  keyfile is not available/accessible.</strong> To prevent this, click '</em>Wipe Cache<em style="text-align:left">' or disable password caching (for more information, please see the subsection
 </em>'Settings -&gt; Preferences'<em style="text-align:left">, item </em>'Cache passwords in driver memory'<em style="text-align:left"> in the section
 </em><a href="Program%20Menu.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Program Menu</a>).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 See also the section <a href="Choosing%20Passwords%20and%20Keyfiles.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Choosing Passwords and Keyfiles</a> in the chapter <a href="Security%20Requirements%20and%20Precautions.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Security Requirements and Precautions</a>.</div>
 <p>&nbsp;</p>
 <h3 style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; font-size:13px; margin-bottom:4px">
 Keyfiles Dialog Window</h3>
@@ -97,40 +96,59 @@ In order to allow VeraCrypt to access a security token or smart card, you need t
  website of the vendor or other third parties.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 If your security token or smart card does not contain any file (data object) that you could use as a VeraCrypt keyfile, you can use VeraCrypt to import any file to the token or smart card (if it is supported by the device). To do so, follow these steps:</div>
 <ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 In the keyfile dialog window, click <em style="text-align:left">Add Token Files</em>.
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 If the token or smart card is protected by a PIN, password, or other means (such as a fingerprint reader), authenticate yourself (for example, by entering the PIN using a hardware PIN pad).
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 The 'Security Token Keyfile' dialog window should appear. In it, click <em style="text-align:left">
 Import Keyfile to Token</em> and then select the file you want to import to the token or smart card.
 </li></ol>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Note that you can import for example 512-bit keyfiles with random content generated by VeraCrypt (see
 <em style="text-align:left">Tools &gt; Keyfile Generator</em> below).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 To close all opened security token sessions, either select <em style="text-align:left">
 Tools</em> &gt; <em style="text-align:left">Close All Security Token Sessions</em> or define and use a hotkey combination (<em style="text-align:left">Settings</em> &gt;
 <em style="text-align:left">Hot Keys &gt; Close All Security Token Sessions</em>).</div>
 <p>&nbsp;</p>
+<h3 id="SmartCard" style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; font-size:13px; margin-bottom:4px">
+EMV Smart Cards</h3>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Windows and Linux versions of VeraCrypt can use directly as keyfiles data extracted from EMV compliant smart cards, supporting Visa, Mastecard or Maestro applications. As with PKCS-11 compliant smart cards, to use such data as VeraCrypt keyfiles, 
+click <em style="text-align:left">Add Token Files</em> (in the keyfile dialog window). The last four digits of the card's Primary Account Number will be displayed, allowing the selection of the card as a keyfile source.
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+The data extracted and concatenated into a single keyfile are as follow : ICC Public Key Certificate, Issuer Public Key Certificate and Card Production Life 
+Cycle (CPLC) data. They are respectively identified by the tags '9F46', '90' and '9F7F' in the card's data management system. These two certificates are specific to an application deployed on the EMV card and used for the Dynamic Data Authentication of the card 
+during banking transactions. CPLC data are specific to the card and not to any of its applications. They contain information on the production process of the smart card. Therefore both certificates and data are unique and static on any EMV compliant smart card.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+According to the ISO/IEC 7816 standard on which the EMV standard is based, communication with an EMV smart card is done through structured commands called APDUs, allowing to extract the data from the smart card. These data are encoded in the BER-TLV format, 
+defined by the ASN.1 standard, and therefore need to be parsed before being concatenated into a keyfile. No PIN is required to access and retrieve data from the card. To cope with the diversity of smart cards readers on the market, librairies compliant with the Microsoft Personal 
+Computer/Smart Card communication standard are used. The Winscard library is used. Natively available on Windows in System32, it then doesn't require any installation on this operating system. However, the libpcsclite1 package has to be installed on Linux.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Since the card is read-only, it is not possible to import or delete data. However, data used as keyfiles can be exported locally in any binary file. During the entire cryptographic process of mounting or creating a volume, the certificates and CPLC data are never stored anywhere 
+other than in the user's machine RAM. Once the process is complete, these RAM memory areas are rigorously erased.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+It important to note that this feature is optional and disabled by default. It can be enabled in the <em style="text-align:left">Security Token Preferences</em> parameters by checking the box provided.</div>
+<p>&nbsp;</p>
 <h3 style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; font-size:13px; margin-bottom:4px">
 Keyfile Search Path</h3>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 By adding a folder in the keyfile dialog window (click <em style="text-align:left">
 Add Path</em>), you specify a <em style="text-align:left">keyfile search path</em>. All files found in the keyfile search path* will be used as keyfiles except files that have the Hidden file attribute set.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left"><em style="text-align:left">Important: Note that folders (and files they contain) and hidden files found in a keyfile search path are ignored.</em></strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Keyfile search paths are especially useful if you, for example, store keyfiles on a USB memory stick that you carry with you. You can set the drive letter of the USB memory stick as a default keyfile search path. To do so, select
 <em style="text-align:left">Settings </em>-&gt; <em style="text-align:left">Default Keyfiles</em>. Then click
 <br style="text-align:left">
 <em style="text-align:left">Add Path</em>, browse to the drive letter assigned to the USB memory stick, and click
 <em style="text-align:left">OK</em>. Now each time you mount a volume (and if the option
 <em style="text-align:left">Use keyfiles</em> is checked in the password dialog window), VeraCrypt will scan the path and use all files that it finds on the USB memory stick as keyfiles.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong style="text-align:left"><em style="text-align:left">WARNING: When you add a folder (as opposed to a file) to the list of keyfiles, only the path is remembered, not the filenames! This means e.g. that if you create a new file in the folder or if you
  copy an additional file to the folder, then all volumes that used keyfiles from the folder will be impossible to mount (until you remove the newly added file from the folder).
 </em></strong></div>
 <p>&nbsp;</p>
 <h3 style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; font-size:13px; margin-bottom:4px">
diff --git a/doc/html/Keyfiles in VeraCrypt_Image_040.gif b/doc/html/Keyfiles in VeraCrypt_Image_040.gif
index 4fc413e0..a1a3e57e 100644
--- a/doc/html/Keyfiles in VeraCrypt_Image_040.gif
+++ b/doc/html/Keyfiles in VeraCrypt_Image_040.gif
diff --git a/doc/html/Keyfiles.html b/doc/html/Keyfiles.html
index 03627dbb..04dd3463 100644
--- a/doc/html/Keyfiles.html
+++ b/doc/html/Keyfiles.html
@@ -1,81 +1,222 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
-<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+    <title>
+      VeraCrypt - Free Open source disk encryption with strong security for the
+      Paranoid
+    </title>
+    <meta
+      name="description"
+      content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."
+    />
     <meta name="keywords" content="encryption, security" />
     <link href="styles.css" rel="stylesheet" type="text/css" />
   </head>
   <body>
-
     <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+      <a href="Documentation.html"
+        ><img src="VeraCrypt128x128.png" alt="VeraCrypt"
+      /></a>
     </div>
 
     <div id="menu">
       <ul>
         <li><a href="Home.html">Home</a></li>
         <li><a href="/code/">Source Code</a></li>
         <li><a href="Downloads.html">Downloads</a></li>
         <li><a class="active" href="Documentation.html">Documentation</a></li>
         <li><a href="Donation.html">Donate</a></li>
-	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+        <li>
+          <a
+            href="https://sourceforge.net/p/veracrypt/discussion/"
+            target="_blank"
+            >Forums</a
+          >
+        </li>
       </ul>
     </div>
 
     <div>
       <p>
         <a href="Documentation.html">Documentation</a>
-<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+        <img src="arrow_right.gif" alt=">>" style="margin-top: 5px" />
         <a href="Technical%20Details.html">Technical Details</a>
-<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+        <img src="arrow_right.gif" alt=">>" style="margin-top: 5px" />
         <a href="Keyfiles.html">Keyfiles</a>
-</p></div>
+      </p>
+    </div>
 
     <div class="wikidoc">
       <h1>Keyfiles</h1>
-<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-<p>VeraCrypt keyfile is a file whose content is combined with a password. The user can use any kind of file as a VeraCrypt keyfile. The user can also generate a keyfile using the built-in keyfile generator, which utilizes the VeraCrypt RNG to generate a file
- with random content (for more information, see the section <a href="Random%20Number%20Generator.html">
-<em>Random Number Generator</em></a>).</p>
-<p>The maximum size of a keyfile is not limited; however, only its first 1,048,576 bytes (1 MB) are processed (all remaining bytes are ignored due to performance issues connected with processing extremely large files). The user can supply one or more keyfiles
- (the number of keyfiles is not limited).</p>
-<p>Keyfiles can be stored on PKCS-11-compliant [23] security tokens and smart cards protected by multiple PIN codes (which can be entered either using a hardware PIN pad or via the VeraCrypt GUI).</p>
-<p>Keyfiles are processed and applied to a password using the following method:</p>
+      <div
+        style="
+          text-align: left;
+          margin-top: 19px;
+          margin-bottom: 19px;
+          padding-top: 0px;
+          padding-bottom: 0px;
+        "
+      >
+        <p>
+          VeraCrypt keyfile is a file whose content is combined with a password.
+          The user can use any kind of file as a VeraCrypt keyfile. The user can
+          also generate a keyfile using the built-in keyfile generator, which
+          utilizes the VeraCrypt RNG to generate a file with random content (for
+          more information, see the section
+          <a href="Random%20Number%20Generator.html">
+            <em>Random Number Generator</em></a
+          >).
+        </p>
+        <p>
+          The maximum size of a keyfile is not limited; however, only its first
+          1,048,576 bytes (1 MiB) are processed (all remaining bytes are ignored
+          due to performance issues connected with processing extremely large
+          files). The user can supply one or more keyfiles (the number of
+          keyfiles is not limited).
+        </p>
+        <p>
+          Keyfiles can be stored on PKCS-11-compliant [23] security tokens and
+          smart cards protected by multiple PIN codes (which can be entered
+          either using a hardware PIN pad or via the VeraCrypt GUI).
+        </p>
+        <p>
+          EMV-compliant smart cards' data can be used as keyfile, see chapter
+          <a
+            href="EMV%20Smart%20Cards.html"
+            style="text-align: left; color: #0080c0; text-decoration: none.html"
+          >
+            <em style="text-align: left">EMV Smart Cards</em></a
+          >.
+        </p>
+        <p>
+          Keyfiles are processed and applied to a password using the following
+          method:
+        </p>
         <ol>
-<li>Let <em>P</em> be a VeraCrypt volume password supplied by user (may be empty)
-</li><li>Let <em>KP</em> be the keyfile pool </li><li>Let <em>kpl</em> be the size of the keyfile pool <em>KP</em>, in bytes (64, i.e., 512 bits);
-<p>kpl must be a multiple of the output size of a hash function H</p>
-</li><li>Let <em>pl</em> be the length of the password <em>P</em>, in bytes (in the current version: 0 &le;
-<em>pl</em> &le; 64) </li><li>if <em>kpl &gt; pl</em>, append (<em>kpl &ndash; pl</em>) zero bytes to the password
-<em>P</em> (thus <em>pl = kpl</em>) </li><li>Fill the keyfile pool <em>KP</em> with <em>kpl</em> zero bytes. </li><li>For each keyfile perform the following steps:
+          <li>
+            Let <em>P</em> be a VeraCrypt volume password supplied by user (may
+            be empty)
+          </li>
+          <li>Let <em>KP</em> be the keyfile pool</li>
+          <li>
+            Let <em>kpl</em> be the size of the keyfile pool <em>KP</em>, in
+            bytes (64, i.e., 512 bits);
+            <p>
+              kpl must be a multiple of the output size of a hash function H
+            </p>
+          </li>
+          <li>
+            Let <em>pl</em> be the length of the password <em>P</em>, in bytes
+            (in the current version: 0 &le; <em>pl</em> &le; 64)
+          </li>
+          <li>
+            if <em>kpl &gt; pl</em>, append (<em>kpl &ndash; pl</em>) zero bytes
+            to the password <em>P</em> (thus <em>pl = kpl</em>)
+          </li>
+          <li>
+            Fill the keyfile pool <em>KP</em> with <em>kpl</em> zero bytes.
+          </li>
+          <li>
+            For each keyfile perform the following steps:
             <ol type="a">
-<li>Set the position of the keyfile pool cursor to the beginning of the pool </li><li>Initialize the hash function <em>H</em> </li><li>Load all bytes of the keyfile one by one, and for each loaded byte perform the following steps:
+              <li>
+                Set the position of the keyfile pool cursor to the beginning of
+                the pool
+              </li>
+              <li>Initialize the hash function <em>H</em></li>
+              <li>
+                Load all bytes of the keyfile one by one, and for each loaded
+                byte perform the following steps:
                 <ol type="i">
-<li>Hash the loaded byte using the hash function <em>H</em> without initializing the hash, to obtain an intermediate hash (state)
-<em>M.</em> Do not finalize the hash (the state is retained for next round). </li><li>Divide the state <em>M</em> into individual bytes.<br>
-For example, if the hash output size is 4 bytes, (<em>T</em><sub>0</sub> || <em>T</em><sub>1</sub> ||
-<em>T</em><sub>2</sub> || <em>T</em><sub>3</sub>) = <em>M</em> </li><li>Write these bytes (obtained in step 7.c.ii) individually to the keyfile pool with the modulo 2<sup>8</sup> addition operation (not by replacing the old values in the pool) at the position of the pool cursor. After a byte is written, the pool cursor position
- is advanced by one byte. When the cursor reaches the end of the pool, its position is set to the beginning of the pool.
-</li></ol>
-</li></ol>
-</li><li>Apply the content of the keyfile pool to the password <em>P</em> using the following method:
+                  <li>
+                    Hash the loaded byte using the hash function
+                    <em>H</em> without initializing the hash, to obtain an
+                    intermediate hash (state) <em>M.</em> Do not finalize the
+                    hash (the state is retained for next round).
+                  </li>
+                  <li>
+                    Divide the state <em>M</em> into individual bytes.<br />
+                    For example, if the hash output size is 4 bytes, (<em>T</em
+                    ><sub>0</sub> || <em>T</em><sub>1</sub> || <em>T</em
+                    ><sub>2</sub> || <em>T</em><sub>3</sub>) = <em>M</em>
+                  </li>
+                  <li>
+                    Write these bytes (obtained in step 7.c.ii) individually to
+                    the keyfile pool with the modulo 2<sup>8</sup> addition
+                    operation (not by replacing the old values in the pool) at
+                    the position of the pool cursor. After a byte is written,
+                    the pool cursor position is advanced by one byte. When the
+                    cursor reaches the end of the pool, its position is set to
+                    the beginning of the pool.
+                  </li>
+                </ol>
+              </li>
+            </ol>
+          </li>
+          <li>
+            Apply the content of the keyfile pool to the password
+            <em>P</em> using the following method:
             <ol type="a">
-<li>Divide the password <em>P</em> into individual bytes <em>B</em><sub>0</sub>...<em>B</em><sub>pl-1</sub>.<br>
-Note that if the password was shorter than the keyfile pool, then the password was padded with zero bytes to the length of the pool in Step 5 (hence, at this point the length of the password is always greater than or equal to the length of the keyfile pool).
-</li><li>Divide the keyfile pool <em>KP</em> into individual bytes <em>G</em><sub>0</sub>...<em>G</em><sub>kpl-1</sub>
-</li><li>For 0 &le; i &lt; kpl perform: Bi = Bi &oplus; Gi </li><li><em>P</em> = <em>B</em><sub>0</sub> || <em>B</em><sub>1</sub> || ... || <em>B</em><sub>pl-2</sub> ||
-<em>B</em><sub>pl-1</sub> </li></ol>
-</li><li>The password <em>P</em> (after the keyfile pool content has been applied to it) is now passed to the header key derivation function PBKDF2 (PKCS #5 v2), which processes it (along with salt and other data) using a cryptographically secure hash algorithm
- selected by the user (e.g., SHA-512). See the section <a href="Header%20Key%20Derivation.html">
-<em>Header Key Derivation, Salt, and Iteration Count</em></a> for more information.
-</li></ol>
-<p>The role of the hash function <em>H</em> is merely to perform diffusion [2]. CRC-32 is used as the hash function
-<em>H</em>. Note that the output of CRC-32 is subsequently processed using a cryptographically secure hash algorithm: The keyfile pool content (in addition to being hashed using CRC-32) is applied to the password, which is then passed to the header key derivation
- function PBKDF2 (PKCS #5 v2), which processes it (along with salt and other data) using a cryptographically secure hash algorithm selected by the user (e.g., SHA-512). The resultant values are used to form the header key and the secondary header key (XTS mode).</p>
+              <li>
+                Divide the password <em>P</em> into individual bytes <em>B</em
+                ><sub>0</sub>...<em>B</em><sub>pl-1</sub>.<br />
+                Note that if the password was shorter than the keyfile pool,
+                then the password was padded with zero bytes to the length of
+                the pool in Step 5 (hence, at this point the length of the
+                password is always greater than or equal to the length of the
+                keyfile pool).
+              </li>
+              <li>
+                Divide the keyfile pool <em>KP</em> into individual bytes
+                <em>G</em><sub>0</sub>...<em>G</em><sub>kpl-1</sub>
+              </li>
+              <li>For 0 &le; i &lt; kpl perform: Bi = Bi &oplus; Gi</li>
+              <li>
+                <em>P</em> = <em>B</em><sub>0</sub> || <em>B</em><sub>1</sub> ||
+                ... || <em>B</em><sub>pl-2</sub> || <em>B</em><sub>pl-1</sub>
+              </li>
+            </ol>
+          </li>
+          <li>
+            The password <em>P</em> (after the keyfile pool content has been
+            applied to it) is now passed to the header key derivation function
+            PBKDF2 (PKCS #5 v2), which processes it (along with salt and other
+            data) using a cryptographically secure hash algorithm selected by
+            the user (e.g., SHA-512). See the section
+            <a href="Header%20Key%20Derivation.html">
+              <em>Header Key Derivation, Salt, and Iteration Count</em></a
+            >
+            for more information.
+          </li>
+        </ol>
+        <p>
+          The role of the hash function <em>H</em> is merely to perform
+          diffusion [2]. CRC-32 is used as the hash function <em>H</em>. Note
+          that the output of CRC-32 is subsequently processed using a
+          cryptographically secure hash algorithm: The keyfile pool content (in
+          addition to being hashed using CRC-32) is applied to the password,
+          which is then passed to the header key derivation function PBKDF2
+          (PKCS #5 v2), which processes it (along with salt and other data)
+          using a cryptographically secure hash algorithm selected by the user
+          (e.g., SHA-512). The resultant values are used to form the header key
+          and the secondary header key (XTS mode).
+        </p>
         <p>&nbsp;</p>
-<p><a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
+        <p>
+          <a
+            href="Personal%20Iterations%20Multiplier%20%28PIM%29.html"
+            style="
+              text-align: left;
+              color: #0080c0;
+              text-decoration: none;
+              font-weight: bold.html;
+            "
+            >Next Section &gt;&gt;</a
+          >
+        </p>
+      </div>
     </div>
-</div><div class="ClearBoth"></div></body></html>
-\ No newline at end of file
+    <div class="ClearBoth"></div>
+  </body>
+</html>
diff --git a/doc/html/Kuznyechik.html b/doc/html/Kuznyechik.html
index e5d5d0cc..7e563cbd 100644
--- a/doc/html/Kuznyechik.html
+++ b/doc/html/Kuznyechik.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Kuznyechik.html">Kuznyechik</a>
diff --git a/doc/html/LTC_Logo_30x30.png b/doc/html/LTC_Logo_30x30.png
new file mode 100644
index 00000000..e707c4f0
--- /dev/null
+++ b/doc/html/LTC_Logo_30x30.png
diff --git a/doc/html/Language Packs.html b/doc/html/Language Packs.html
index 6076a3b2..7bd1af87 100644
--- a/doc/html/Language Packs.html
+++ b/doc/html/Language Packs.html
@@ -1,54 +1,54 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>                      
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>           
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Language%20Packs.html">Language Packs</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Language Packs</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 Language packs contain third-party translations of the VeraCrypt user interface texts. Note that language packs are currently supported only by the Windows version of VeraCrypt.</div>
 <h3>Installation</h3>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Since version 1.0e, all language packs are included in the VeraCrypt Windows installer and they can be found in VeraCrypt installation directory. To select a new language, run VeraCrypt, select
 <em style="text-align:left">Settings </em>-&gt; <em style="text-align:left">Language</em>, then select your language and click
 <em style="text-align:left">OK</em>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 To revert to English, select <em style="text-align:left">Settings</em> -&gt; <em style="text-align:left">
 Language</em>. Then select <em style="text-align:left">English</em> and click <em style="text-align:left">
 OK</em>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-You can still download an archive containing all language packs for the latest version (1.19) from
-<a href="https://launchpad.net/veracrypt/trunk/1.19/+download/VeraCrypt_1.19_Language_Files.zip">
+You can still download an archive containing all language packs for the latest version (1.26.15) from
+<a href="https://launchpad.net/veracrypt/trunk/1.26.15/+download/VeraCrypt_1.26.15_Language_Files.zip">
 the following link</a>.</div>
 </div>
 </body></html>
diff --git a/doc/html/Legal Information.html b/doc/html/Legal Information.html
index 797a4ba3..f2eeb660 100644
--- a/doc/html/Legal Information.html
+++ b/doc/html/Legal Information.html
@@ -1,65 +1,67 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Legal%20Information.html">Legal Information</a>
 </p></div>
 
 <div class="wikidoc">
 <div>
 <h1>Legal Information</h1>
 <h3>License</h3>
 <p>The text of the license under which VeraCrypt is distributed is contained in the file
 <em>License.txt</em> that is included in the VeraCrypt binary and source code distribution packages.</p>
 <p>More information on the license <a href="VeraCrypt%20License.html">
 can be found here</a>.</p>
 <h3>Copyright Information</h3>
 <p>This software as a whole:<br>
 <br>
-Copyright &copy; 2013-2016 IDRIX. All rights reserved.<br>
+Copyright &copy; 2013-2024 IDRIX. All rights reserved.<br>
 <br>
 Portions of this software:</p>
-<p>Copyright &copy; 2013-2016 IDRIX. All rights reserved.<br>
+<p>Copyright &copy; 2013-2024 IDRIX. All rights reserved.<br>
 <br>
 Copyright &copy; 2003-2012 TrueCrypt Developers Association. All rights reserved.</p>
 <p>Copyright &copy; 1998-2000 Paul Le Roux. All rights reserved.<br>
 <br>
 Copyright &copy; 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.</p>
-<p>Copyright &copy; 1995-2017 Jean-loup Gailly and Mark Adler.</p>
+<p>Copyright &copy; 1995-2023 Jean-loup Gailly and Mark Adler.</p>
 <p>Copyright &copy; 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov</p>
-<p>Copyright &copy; 1999-2014 Dieter Baron and Thomas Klausner.</p>
+<p>Copyright &copy; 1999-2023 Dieter Baron and Thomas Klausner.</p>
 <p>Copyright &copy; 2013, Alexey Degtyarev. All rights reserved.</p>
-<p>Copyright &copy; 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.<br>
+<p>Copyright &copy; 1999-2016 Jack Lloyd. All rights reserved.</p>
+<p>Copyright &copy; 2013-2019 Stephan Mueller &lt;smueller@chronox.de&gt;</p>
+<p>Copyright &copy; 1999-2023 Igor Pavlov.</p>
 <br>
 For more information, please see the legal notices attached to parts of the source code.</p>
 <h3>Trademark Information</h3>
 <p>Any trademarks mentioned in this document are the sole property of their respective owners.</p>
 </div>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Main Program Window.html b/doc/html/Main Program Window.html
index 4970fe7c..30ee175b 100644
--- a/doc/html/Main Program Window.html
+++ b/doc/html/Main Program Window.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Main%20Program%20Window.html">Main Program Window</a>
 </p></div>
 
diff --git a/doc/html/Malware.html b/doc/html/Malware.html
index b45d69fc..4e067c4d 100644
--- a/doc/html/Malware.html
+++ b/doc/html/Malware.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Malware.html">Malware</a>
diff --git a/doc/html/Memory Dump Files.html b/doc/html/Memory Dump Files.html
index da4ccdda..bc807754 100644
--- a/doc/html/Memory Dump Files.html
+++ b/doc/html/Memory Dump Files.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Data%20Leaks.html">Data Leaks</a>
diff --git a/doc/html/Miscellaneous.html b/doc/html/Miscellaneous.html
index d83f6c3c..95eb6af8 100644
--- a/doc/html/Miscellaneous.html
+++ b/doc/html/Miscellaneous.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 </p></div>
 
diff --git a/doc/html/Modes of Operation.html b/doc/html/Modes of Operation.html
index 3ea4e8c3..a4dd5b96 100644
--- a/doc/html/Modes of Operation.html
+++ b/doc/html/Modes of Operation.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Modes%20of%20Operation.html">Modes of Operation</a>
diff --git a/doc/html/Monero_Logo_30x30.png b/doc/html/Monero_Logo_30x30.png
new file mode 100644
index 00000000..2c233249
--- /dev/null
+++ b/doc/html/Monero_Logo_30x30.png
diff --git a/doc/html/Mounting VeraCrypt Volumes.html b/doc/html/Mounting VeraCrypt Volumes.html
index 78b5c90e..40124c34 100644
--- a/doc/html/Mounting VeraCrypt Volumes.html
+++ b/doc/html/Mounting VeraCrypt Volumes.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Main%20Program%20Window.html">Main Program Window</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Mounting%20VeraCrypt%20Volumes.html">Mounting Volumes</a>
diff --git a/doc/html/Multi-User Environment.html b/doc/html/Multi-User Environment.html
index 4162b3c1..99456293 100644
--- a/doc/html/Multi-User Environment.html
+++ b/doc/html/Multi-User Environment.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Multi-User%20Environment.html">Multi-User Environment</a>
diff --git a/doc/html/Normal Dismount vs Force Dismount.html b/doc/html/Normal Dismount vs Force Dismount.html
new file mode 100644
index 00000000..4ebd52c8
--- /dev/null
+++ b/doc/html/Normal Dismount vs Force Dismount.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Normal%20Dismount%20vs%20Force%20Dismount.html">Normal Dismount vs Force Dismount</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Normal Dismount vs Force Dismount</h1>
+<p>Understanding the distinction between "Normal Dismount" and "Force Dismount" operation is important due to the potential impact on user data.</p>
+
+<h2>Normal Dismount Process</h2>
+
+<p>During a normal dismount process, VeraCrypt performs the following steps:</p>
+
+<ol>
+    <li>Requests the Windows operating system to lock the volume, prohibiting further I/O operations.</li>
+    <li>Requests Windows to gracefully eject the volume from the system. This step is analogous to user-initiated device ejection via the system tray.</li>
+    <li>Instructs the Windows Mount Manager to unmount the volume.</li>
+    <li>Deletes the link between the drive letter and the volume's virtual device.</li>
+    <li>Deletes the volume's virtual device, which includes erasing the encryption keys from RAM.</li>
+</ol>
+
+<p>In this flow, steps 1 and 2 may fail if there are open files on the volume. Notably, even if all user applications accessing files on the volume are closed, Windows might still keep the files open until the I/O cache is completely flushed.</p>
+
+<h2>Force Dismount Process</h2>
+
+<p>The Force Dismount process is distinct but largely similar to the Normal Dismount. It essentially follows the same steps but disregards any failures that might occur during steps 1 and 2, and carries on with the rest of the procedure. However, if there are files open by the user or if the volume I/O cache has not yet been flushed, this could result in potential data loss. This situation parallels forcibly removing a USB device from your computer while Windows is still indicating its active usage.</p>
+
+<p>Provided all applications using files on the mounted volume have been successfully closed and the I/O cache is fully flushed, neither data loss nor data/filesystem corruption should occur when executing a 'force dismount'. As in a normal dismount, the encryption keys are erased from RAM upon successful completion of a 'Force Dismount'.</p>
+
+<h2>How to Trigger Force Dismount</h2>
+
+<p>There are three approaches to trigger a force dismount in VeraCrypt:</p>
+
+<ol>
+    <li>Through the popup window that appears if a normal dismount attempt is unsuccessful.</li>
+    <li>Via Preferences, by checking the "force auto-dismount" option in the "Auto-Dismount" section.</li>
+    <li>Using the command line, by incorporating the /force or /f switch along with the /d or /dismount switch.</li>
+</ol>
+
+<p>In order to avoid inadvertent data loss or corruption, always ensure to follow suitable precautions when dismounting a VeraCrypt volume. This includes</p>
+<ol>
+    <li>Ensuring all files on the volume are closed before initiating a dismount.</li>
+    <li>Allowing some time after closing all files to ensure Windows has completely flushed the I/O cache.</li>
+	<li>Take note that some antivirus software may keep file handles open on the volume after performing a scan, hindering a successful Normal Dismount. If you experience this issue, you might consider excluding the VeraCrypt volume from your antivirus scans. Alternatively, consult with your antivirus software provider to understand how their product interacts with VeraCrypt volumes and how to ensure it doesn't retain open file handles.</li>
+</ol>
+
+
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Notation.html b/doc/html/Notation.html
index dc3a1b93..a04c0706 100644
--- a/doc/html/Notation.html
+++ b/doc/html/Notation.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Notation.html">Notation</a>
diff --git a/doc/html/Paging File.html b/doc/html/Paging File.html
index b4c550d6..5d5a3316 100644
--- a/doc/html/Paging File.html
+++ b/doc/html/Paging File.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Data%20Leaks.html">Data Leaks</a>
diff --git a/doc/html/Parallelization.html b/doc/html/Parallelization.html
index 9da5d27b..5ab6c81d 100644
--- a/doc/html/Parallelization.html
+++ b/doc/html/Parallelization.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Parallelization.html">Parallelization</a>
 </p></div>
 
diff --git a/doc/html/Personal Iterations Multiplier (PIM).html b/doc/html/Personal Iterations Multiplier (PIM).html
index d2da3b7b..d673d431 100644
--- a/doc/html/Personal Iterations Multiplier (PIM).html
+++ b/doc/html/Personal Iterations Multiplier (PIM).html
@@ -1,118 +1,126 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Personal%20Iterations%20Multiplier%20(PIM).html">PIM</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>PIM</h1>
 <div>
 <p>PIM stands for &quot;Personal Iterations Multiplier&quot;. It is a parameter that was introduced in VeraCrypt 1.12 and whose value controls the number of iterations used by the header key derivation function. This value can be specified through the password dialog
  or in the command line.</p>
-<p>If no PIM value is specified, VeraCrypt will use the default number of iterations used in versions prior to 1.12 (see
-<a href="Header%20Key%20Derivation.html">
-Header Key Derivation</a>).</p>
 <p>When a PIM value is specified, the number of iterations is calculated as follows:</p>
 <ul>
-<li>For system encryption that doesn't use SHA-512 or Whirlpool: Iterations = <strong>PIM x 2048</strong> </li><li>For system encryption that uses SHA-512 or Whirlpool, non-system encryption and file containers: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
+<li>For system encryption that doesn't use SHA-512 or Whirlpool: Iterations = <strong>PIM x 2048</strong>
+</li><li>For system encryption that uses SHA-512 or Whirlpool: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
+</li><li>For non-system encryption and file containers: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
 </li></ul>
+<p>If no PIM value is specified, VeraCrypt will use the default number of iterations used in versions prior to 1.12 (see
+	<a href="Header%20Key%20Derivation.html">
+	Header Key Derivation</a>). This can be summarized as follows:<br/>
+		<ul>
+		<li>For system partition encryption (boot encryption) that uses SHA-256, BLAKE2s-256 or Streebog, <strong>200000</strong> iterations are used which is equivalent to a PIM value of <strong>98</strong>.</li>
+		<li>For system encryption that uses SHA-512 or Whirlpool, <strong>500000</strong> iterations are used which is equivalent to a PIM value of <strong>485</strong>.</li>
+		<li>For non-system encryption and file containers, all derivation algorithms will use <strong>500000</strong> iterations which is equivalent to a PIM value of <strong>485</strong>.</li>
+		</ul>
+</p>
 <p>Prior to version 1.12, the security of a VeraCrypt volume was only based on the password strength because VeraCrypt was using a fixed number of iterations.<br>
 With the introduction of PIM, VeraCrypt has a 2-dimensional security space for volumes based on the couple (Password, PIM). This provides more flexibility for adjusting the desired security level while also controlling the performance of the mount/boot operation.</p>
 <h3>PIM Usage</h3>
 It is not mandatory to specify a PIM.</div>
 <div><br>
 When creating a volume or when changing the password, the user has the possibility to specify a PIM value by checking the &quot;Use PIM&quot; checkbox which in turn will make a PIM field available in the GUI so a PIM value can be entered.</div>
 <div>&nbsp;</div>
 <div>The PIM is treated like a secret value that must be entered by the user each time alongside the password. If the incorrect PIM value is specified, the mount/boot operation will fail.</div>
 <div>&nbsp;</div>
 <div>Using high PIM values leads to better security thanks to the increased number of iterations but it comes with slower mounting/booting times.</div>
 <div>With small PIM values, mounting/booting is quicker but this could decrease security if a weak password is used.</div>
 <div>&nbsp;</div>
 <div>During the creation of a volume or the encryption of the system, VeraCrypt forces the PIM value to be greater than or equal to a certain minimal value when the password is less than 20 characters. This check is done in order to ensure that, for short passwords,
  the security level is at least equal to the default level provided by an empty PIM.</div>
 <div>&nbsp;</div>
 <div>The PIM minimal value for short passwords is <strong>98</strong> for system encryption that doesn't use SHA-512 or Whirlpool and
 <strong>485</strong> for the other cases. For password with 20 characters and more, the PIM minimal value is
 <strong>1</strong>. In all cases, leaving the PIM empty or setting its value to 0 will make VeraCrypt use the default high number of iterations as explained in section
 <a href="Header%20Key%20Derivation.html">
 Header Key Derivation</a>.</div>
 <div><br>
 Motivations behind using a custom PIM value can be:<br>
 <ul>
 <li>Add an extra secret parameter (PIM) that an attacker will have to guess </li><li>Increase security level by using large PIM values to thwart future development of brute force attacks.
 </li><li>Speeding up booting or mounting through the use of a small PIM value (less than 98 for system encryption that doesn't use SHA-512 or Whirlpool and less than 485 for the other cases)
 </li></ul>
 <p>The screenshots below show the step to mount a volume using a PIM equal to 231:</p>
 <table style="margin-left:auto; margin-right:auto">
 <tbody>
 <tr>
-<td><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step1.png" alt="" width="499" height="205"></td>
+<td><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step1.png" alt=""></td>
 </tr>
 <tr>
-<td><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step1.png" alt="" width="499" height="205"></td>
+<td><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step2.png" alt=""></td>
 </tr>
 </tbody>
 </table>
 <p>&nbsp;</p>
 <h3>Changing/clearing the PIM</h3>
 <p>The PIM of a volume or for system encryption can be changed or cleared using the change password functionality. The screenshots below shows an example of changing the PIM from the empty default value to a value equal to 3 (this is possible since the password
  has more than 20 characters). In order to do so, the user must first tick &quot;Use PIM&quot; checkbox in the &quot;New&quot; section to reveal the PIM field.</p>
 <table width="519" style="height:896px; width:519px; margin-left:auto; margin-right:auto">
 <caption><strong>Normal volume case</strong></caption>
 <tbody>
 <tr>
-<td style="text-align:center"><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step1.png" alt="" width="511" height="436"></td>
+<td style="text-align:center"><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step1.png" alt=""></td>
 </tr>
 <tr>
 <td>
-<p><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step2.png" alt="" width="511" height="436"></p>
+<p><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step2.png" alt=""></p>
 </td>
 </tr>
 </tbody>
 </table>
 <h5>&nbsp;</h5>
 <table style="margin-left:auto; margin-right:auto">
 <caption><strong>System encryption case</strong></caption>
 <tbody>
 <tr>
-<td><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step1.png" alt="" width="501" height="426"></td>
+<td><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step1.png" alt=""></td>
 </tr>
 <tr>
-<td><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step2.png" alt="" width="501" height="426"></td>
+<td><img src="Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step2.png" alt=""></td>
 </tr>
 </tbody>
 </table>
 <p>&nbsp;</p>
 <p><a href="VeraCrypt%20Volume%20Format%20Specification.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
 </div>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step1.png b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step1.png
index e9a5f6f5..36fb37de 100644
--- a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step1.png
+++ b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step1.png
diff --git a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step2.png b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step2.png
index b6191005..7dbefd75 100644
--- a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step2.png
+++ b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step2.png
diff --git a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step1.png b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step1.png
index 7df9d2ba..48bd029b 100644
--- a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step1.png
+++ b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step1.png
diff --git a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step2.png b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step2.png
index e1bdebae..63baa98a 100644
--- a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step2.png
+++ b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_System_Step2.png
diff --git a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step1.png b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step1.png
index baf11c3f..f5b57f39 100644
--- a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step1.png
+++ b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step1.png
diff --git a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step2.png b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step2.png
index ba0a5d93..22d1d72b 100644
--- a/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step2.png
+++ b/doc/html/Personal Iterations Multiplier (PIM)_VeraCrypt_UsePIM_Step2.png
diff --git a/doc/html/Physical Security.html b/doc/html/Physical Security.html
index fb788f07..b548af8f 100644
--- a/doc/html/Physical Security.html
+++ b/doc/html/Physical Security.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Physical%20Security.html">Physical Security</a>
diff --git a/doc/html/Pipelining.html b/doc/html/Pipelining.html
index f50655d2..eb1834fe 100644
--- a/doc/html/Pipelining.html
+++ b/doc/html/Pipelining.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Pipelining.html">Pipelining</a>
 </p></div>
 
diff --git a/doc/html/Plausible Deniability.html b/doc/html/Plausible Deniability.html
index 2a14c39d..eee117f7 100644
--- a/doc/html/Plausible Deniability.html
+++ b/doc/html/Plausible Deniability.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Plausible%20Deniability.html">Plausible Deniability</a>
 </p></div>
 
diff --git a/doc/html/Portable Mode.html b/doc/html/Portable Mode.html
index 3ae2d3c8..b26cb35b 100644
--- a/doc/html/Portable Mode.html
+++ b/doc/html/Portable Mode.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Portable%20Mode.html">Portable Mode</a>
 </p></div>
 
diff --git a/doc/html/Preface.html b/doc/html/Preface.html
index 95bfc59b..b571e200 100644
--- a/doc/html/Preface.html
+++ b/doc/html/Preface.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Preface.html">Preface</a>
 </p>
 </div>
diff --git a/doc/html/Program Menu.html b/doc/html/Program Menu.html
index a142755e..c7ea0534 100644
--- a/doc/html/Program Menu.html
+++ b/doc/html/Program Menu.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Main%20Program%20Window.html">Main Program Window</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Program%20Menu.html">Program Menu</a>
@@ -56,41 +56,41 @@ To change a VeraCrypt volume password, click on <em>Select File</em> or <em>Sele
 <br>
 Note: For information on how to change a password used for pre-boot authentication, please see the section
 <em>System -&gt; Change Password</em>.<br>
 <br>
 See also the chapter <a href="Security%20Requirements%20and%20Precautions.html">
 <em>Security Requirements and Precautions</em></a>.</p>
 <div style="margin-left:50px">
 <h4>PKCS-5 PRF</h4>
 <p>In this field you can select the algorithm that will be used in deriving new volume header keys (for more information, see the section
 <a href="Header%20Key%20Derivation.html">
 <em>Header Key Derivation, Salt, and Iteration Count</em></a>) and in generating the new salt (for more information, see the section
 <a href="Random%20Number%20Generator.html">
 <em>Random Number Generator</em></a>).<br>
 <br>
 Note: When VeraCrypt re-encrypts a volume header, the original volume header is first overwritten many times (3, 7, 35 or 256 depending on the user choice) with random data to prevent adversaries from using techniques such as magnetic force microscopy or magnetic
  force scanning tunneling microscopy [17] to recover the overwritten header (however, see also the chapter
 <a href="Security%20Requirements%20and%20Precautions.html">
 <em>Security Requirements and Precautions</em></a>).</p>
 </div>
 <h3>Volumes -&gt; Set Header Key Derivation Algorithm</h3>
-<p>This function allows you to re-encrypt a volume header with a header key derived using a different PRF function (for example, instead of HMAC-RIPEMD-160 you could use HMAC-Whirlpool). Note that the volume header contains the master encryption key with which
+<p>This function allows you to re-encrypt a volume header with a header key derived using a different PRF function (for example, instead of HMAC-BLAKE2S-256 you could use HMAC-Whirlpool). Note that the volume header contains the master encryption key with which
  the volume is encrypted. Therefore, the data stored on the volume will <em>not</em> be lost after you use this function. For more information, see the section
 <a href="Header%20Key%20Derivation.html">
 <em>Header Key Derivation, Salt, and Iteration Count</em></a>.<br>
 <br>
 Note: When VeraCrypt re-encrypts a volume header, the original volume header is first overwritten many times (3, 7, 35 or 256 depending on the user choice) with random data to prevent adversaries from using techniques such as magnetic force microscopy or magnetic
  force scanning tunneling microscopy [17] to recover the overwritten header (however, see also the chapter
 <a href="Security%20Requirements%20and%20Precautions.html">
 <em>Security Requirements and Precautions</em></a>).</p>
 <h3>Volumes -&gt; Add/Remove Keyfiles to/from Volume</h3>
 <h3>Volumes -&gt; Remove All Keyfiles from Volume</h3>
 <p>See the chapter <a href="Keyfiles.html">
 <em>Keyfiles.</em></a></p>
 <h3>Favorites -&gt; Add Mounted Volume to Favorites Favorites -&gt; Organize Favorite Volumes Favorites -&gt; Mount Favorites Volumes</h3>
 <p>See the chapter <a href="Favorite%20Volumes.html">
 <em>Favorite Volumes</em></a>.</p>
 <h3>Favorites -&gt; Add Mounted Volume to System Favorites</h3>
 <h3>Favorites -&gt; Organize System Favorite Volumes</h3>
 <p>See the chapter <a href="System%20Favorite%20Volumes.html">
 <em>System Favorite Volumes</em></a>.</p>
 <h3>System -&gt; Change Password</h3>
@@ -117,74 +117,74 @@ Please note you cannot use this function to mount extended (logical) partitions
 <em>Keyfiles.</em></a></p>
 <h3 id="tools-backup-volume-header">Tools -&gt; Backup Volume Header</h3>
 <h3 id="tools-restore-volume-header">Tools -&gt; Restore Volume Header</h3>
 <p>If the header of a VeraCrypt volume is damaged, the volume is, in most cases, impossible to mount. Therefore, each volume created by VeraCrypt (except system partitions) contains an embedded backup header, located at the end of the volume. For extra safety,
  you can also create external volume header backup files. To do so, click <em>Select Device</em> or
 <em>Select File</em>, select the volume, select <em>Tools</em> -&gt; <em>Backup Volume Header</em>, and then follow the instructions.</p>
 <p>Note: For system encryption, there is no backup header at the end of the volume. For non-system volumes, a shrink operation is done first to ensure that all data are put at the beginning of the volume, leaving all free space at the end so that we have a
  place to put the backup header. For system partitions, we can't perform this needed shrink operation while Windows is running and so the backup header can't be created at the end of the partition. The alternative way in the case of system encryption is the
  use of the <a href="VeraCrypt%20Rescue%20Disk.html">
 Rescue Disk</a>.</p>
 <p>Note: A backup header (embedded or external) is <em>not</em> a copy of the original volume header because it is encrypted with a different header key derived using a different salt (see the section
 <a href="Header%20Key%20Derivation.html">
 <em>Header Key Derivation, Salt, and Iteration Count</em></a>). When the volume password and/or keyfiles are changed, or when the header is restored from the embedded (or an external) header backup, both the volume header and the backup header (embedded in
  the volume) are re-encrypted with header keys derived using newly generated salts (the salt for the volume header is different from the salt for the backup header). Each salt is generated by the VeraCrypt random number generator (see the section
 <a href="Random%20Number%20Generator.html">
 <em>Random Number Generator</em></a>).</p>
 <p>Both types of header backups (embedded and external) can be used to repair a damaged volume header. To do so, click
 <em>Select Device</em> or <em>Select File</em>, select the volume, select <em>Tools</em> -&gt;
 <em>Restore Volume Header</em>, and then follow the instructions.<br>
 <br>
-WARNING: Restoring a volume header also restores the volume password that was valid when the backup was created. Moreover, if keyfile(s) are/is necessary to mount a volume when the backup is created, the same keyfile(s) will be necessary to mount the volume
+WARNING: Restoring a volume header also restores the volume password and PIM that were valid when the backup was created. Moreover, if keyfile(s) are/is necessary to mount a volume when the backup is created, the same keyfile(s) will be necessary to mount the volume
  again after the volume header is restored. For more information, see the section
 <a href="Encryption%20Scheme.html"><em>Encryption Scheme</em></a> in the chapter
 <a href="Technical%20Details.html"><em>Technical Details</em></a>.<br>
 <br>
-After you create a volume header backup, you might need to create a new one only when you change the volume password and/or keyfiles. Otherwise, the volume header remains unmodified so the volume header backup remains up-to-date.</p>
+After you create a volume header backup, you might need to create a new one only when you change the volume password and/or keyfiles, or when you change the PIM value. Otherwise, the volume header remains unmodified so the volume header backup remains up-to-date.</p>
 <p>Note: Apart from salt (which is a sequence of random numbers), external header backup files do not contain any unencrypted information and they cannot be decrypted without knowing the correct password and/or supplying the correct keyfile(s). For more information,
  see the chapter <a href="Technical%20Details.html">
 <em>Technical Details</em></a>.</p>
 <p>When you create an external header backup, both the standard volume header and the area where a hidden volume header can be stored is backed up, even if there is no hidden volume within the volume (to preserve plausible deniability of hidden volumes). If
  there is no hidden volume within the volume, the area reserved for the hidden volume header in the backup file will be filled with random data (to preserve plausible deniability).<br>
 <br>
 When <em>restoring</em> a volume header, you need to choose the type of volume whose header you wish to restore (a standard or hidden volume). Only one volume header can be restored at a time. To restore both headers, you need to use the function twice (<em>Tools</em>
- -&gt; <em>Restore Volume Header</em>). You will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type
+ -&gt; <em>Restore Volume Header</em>). You will need to enter the correct password (and/or to supply the correct keyfiles) and the non-default PIM value, if applicable, that were valid when the volume header backup was created. The password (and/or keyfiles) and PIM will also automatically determine the type
  of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).<br>
 <br>
-Note: If the user fails to supply the correct password (and/or keyfiles) twice in a row when trying to mount a volume, VeraCrypt will automatically try to mount the volume using the embedded backup header (in addition to trying to mount it using the primary
+Note: If the user fails to supply the correct password (and/or keyfiles) and/or the correct non-default PIM value twice in a row when trying to mount a volume, VeraCrypt will automatically try to mount the volume using the embedded backup header (in addition to trying to mount it using the primary
  header) each subsequent time that the user attempts to mount the volume (until he or she clicks
 <em>Cancel</em>). If VeraCrypt fails to decrypt the primary header but it successfully decrypts the embedded backup header at the same time, the volume is mounted and the user is warned that the volume header is damaged (and informed as to how to repair it).</p>
 <h3 id="Settings-Performance">Settings -&gt; Performance and Driver Options</h3>
 <p>Invokes the Performance dialog window, where you can change enable or disable AES Hardware acceleration and thread based parallelization. You can also change the following driver option:</p>
 <h4>Enable extended disk control codes support</h4>
 <p>If enabled, VeraCrypt driver will support returning extended technical information about mounted volumes through IOCTL_STORAGE_QUERY_PROPERTY control code. This control code is always supported by physical drives and it can be required by some applications
  to get technical information about a drive (e.g. the Windows fsutil program uses this control code to get the physical sector size of a drive.).<br>
 Enabling this option brings VeraCrypt volumes behavior much closer to that of physical disks and if it is disabled, applications can easily distinguish between physical disks and VeraCrypt volumes since sending this control code to a VeraCrypt volume will result
  in an error.<br>
 Disable this option if you experience stability issues (like volume access issues or system BSOD) which can be caused by poorly written software and drivers.</p>
 <h3>Settings -&gt; Preferences</h3>
 <p>Invokes the Preferences dialog window, where you can change, among others, the following options:</p>
 <h4>Wipe cached passwords on exit</h4>
-<p>If enabled, passwords (which may also contain processed keyfile contents) cached in driver memory will be cleared when VeraCrypt exits.</p>
+<p>If enabled, passwords (which may also contain processed keyfile contents) and PIM values cached in driver memory will be cleared when VeraCrypt exits.</p>
 <h4>Cache passwords in driver memory</h4>
-<p>When checked, passwords and/or processed keyfile contents for up to last four successfully mounted VeraCrypt volumes are cached. This allows mounting volumes without having to type their passwords (and selecting keyfiles) repeatedly. VeraCrypt never saves
- any password to a disk (however, see the chapter <a href="Security%20Requirements%20and%20Precautions.html">
+<p>When checked, passwords and/or processed keyfile contents for up to last four successfully mounted VeraCrypt volumes are cached. If the 'Include PIM when caching a password' option is enabled in the Preferences, non-default PIM values are cached alongside the passwords. This allows mounting volumes without having to type their passwords (and selecting keyfiles) repeatedly. VeraCrypt never saves
+ any password or PIM values to a disk (however, see the chapter <a href="Security%20Requirements%20and%20Precautions.html">
 <em>Security Requirements and Precautions</em></a>). Password caching can be enabled/disabled in the Preferences (<em>Settings</em> -&gt;
 <em>Preferences</em>) and in the password prompt window. If the system partition/drive is encrypted, caching of the pre-boot authentication password can be enabled or disabled in the system encryption settings (<em>Settings</em> &gt; &lsquo;<em>System Encryption</em>&rsquo;).</p>
 <h4>Temporary Cache password during &quot;Mount Favorite Volumes&quot; operations</h4>
 <p>When this option is unchecked (this is the default), VeraCrypt will display the password prompt window for every favorite volume during the execution of the &quot;Mount Favorite Volumes&quot; operation and each password is erased once the volume is mounted (unless
  password caching is enabled).<br>
 <br>
 If this option is checked and if there are two or more favorite volumes, then during the operation &quot;Mount Favorite Volumes&quot;, VeraCrypt will first try the password of the previous favorite and if it doesn't work, it will display password prompt window. This
  logic applies starting from the second favorite volume onwards. Once all favorite volumes are processed, the password is erased from memory.</p>
 <p>This option is useful when favorite volumes share the same password since the password prompt window will only be displayed once for the first favorite and VeraCrypt will automatically mount all subsequent favorites.</p>
 <p>Please note that since we can't assume that all favorites use the same PRF (hash) nor the same TrueCrypt mode, VeraCrypt uses Autodetection for the PRF of subsequent favorite volumes and it tries both TrueCryptMode values (false, true) which means that the
  total mounting time will be slower compared to the individual mounting of each volume with the manual selection of the correct PRF and the correct TrueCryptMode.</p>
 <h4>Open Explorer window for successfully mounted volume</h4>
 <p>If this option is checked, then after a VeraCrypt volume has been successfully mounted, an Explorer window showing the root directory of the volume (e.g., T:\) will be automatically opened.</p>
 <h4>Use a different taskbar icon when there are mounted volumes</h4>
 <p>If enabled, the appearance of the VeraCrypt taskbar icon (shown within the system tray notification area) is different while a VeraCrypt volume is mounted, except the following:</p>
 <ul>
 <li>Partitions/drives within the key scope of active system encryption (e.g., a system partition encrypted by VeraCrypt, or a non-system partition located on a system drive encrypted by VeraCrypt, mounted when the encrypted operating system is running).
 </li><li>VeraCrypt volumes that are not fully accessible to the user account (e.g. a volume mounted from within another user account).
 </li><li>VeraCrypt volumes that are not displayed in the VeraCrypt application window. For example, system favorite volumes attempted to be dismounted by an instance of VeraCrypt without administrator privileges when the option '<em>Allow only administrators to
  view and dismount system favorite volumes in VeraCrypt</em>' is enabled. </li></ul>
diff --git a/doc/html/Protection of Hidden Volumes.html b/doc/html/Protection of Hidden Volumes.html
index 7d489d56..3e3e5890 100644
--- a/doc/html/Protection of Hidden Volumes.html
+++ b/doc/html/Protection of Hidden Volumes.html
@@ -1,127 +1,127 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Plausible%20Deniability.html">Plausible Deniability</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hidden%20Volume.html">Hidden Volume</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Protection%20of%20Hidden%20Volumes.html">Protection of Hidden Volumes</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Protection of Hidden Volumes Against Damage</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 If you mount a VeraCrypt volume within which there is a <a href="Hidden%20Volume.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 hidden volume</a>, you may <em style="text-align:left">read</em> data stored on the (outer) volume without any risk. However, if you (or the operating system) need to
 <em style="text-align:left">save</em> data to the outer volume, there is a risk that the hidden volume will get damaged (overwritten). To prevent this, you should protect the hidden volume in a way described in this section.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 When mounting an outer volume, type in its password and before clicking <em style="text-align:left">
 OK, </em>click <em style="text-align:left">Mount Options</em>:</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-<img src="Protection of Hidden Volumes_Image_027.jpg" alt="VeraCrypt GUI" width="499" height="205"></div>
+<img src="Protection of Hidden Volumes_Image_027.jpg" alt="VeraCrypt GUI"></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 &nbsp;</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 In the <em style="text-align:left">Mount Options </em>dialog window, enable the option '<em style="text-align:left">Protect hidden volume against damage caused by writing to outer volume</em> '. In the '<em style="text-align:left">Password to hidden volume</em>'
  input field, type the password for the hidden volume. Click <em style="text-align:left">
 OK </em>and, in the main password entry dialog, click <em style="text-align:left">
 OK</em>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-<img src="Protection of Hidden Volumes_Image_028.jpg" alt="Mounting with hidden protection" width="432" height="402"></div>
+<img src="Protection of Hidden Volumes_Image_028.jpg" alt="Mounting with hidden protection"></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <br style="text-align:left">
 Both passwords must be correct; otherwise, the outer volume will not be mounted. When hidden volume protection is enabled, VeraCrypt does
 <em style="text-align:left">not</em> actually mount the hidden volume. It only decrypts its header (in RAM) and retrieves information about the size of the hidden volume (from the decrypted header). Then, the outer volume is mounted and any attempt to save
  data to the area of the hidden volume will be rejected (until the outer volume is dismounted).
 <strong style="text-align:left">Note that VeraCrypt never modifies the filesystem (e.g., information about allocated clusters, amount of free space, etc.) within the outer volume in any way. As soon as the volume is dismounted, the protection is lost. When
  the volume is mounted again, it is not possible to determine whether the volume has used hidden volume protection or not. The hidden volume protection can be activated only by users who supply the correct password (and/or keyfiles) for the hidden volume (each
  time they mount the outer volume). <br style="text-align:left">
 </strong><br style="text-align:left">
 As soon as a write operation to the hidden volume area is denied/prevented (to protect the hidden volume), the entire host volume (both the outer and the hidden volume) becomes write-protected until dismounted (the VeraCrypt driver reports the 'invalid parameter'
  error to the system upon each attempt to write data to the volume). This preserves plausible deniability (otherwise certain kinds of inconsistency within the file system could indicate that this volume has used hidden volume protection). When damage to hidden
  volume is prevented, a warning is displayed (provided that the VeraCrypt Background Task is enabled &ndash; see the chapter
 <a href="VeraCrypt%20Background%20Task.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 VeraCrypt Background Task</a>). Furthermore, the type of the mounted outer volume displayed in the main window changes to '<em style="text-align:left">Outer(!)</em> ':</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-<img src="Protection of Hidden Volumes_Image_029.jpg" alt="VeraCrypt GUI" width="579" height="498"></div>
+<img src="Protection of Hidden Volumes_Image_029.jpg" alt="VeraCrypt GUI"></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <br style="text-align:left">
 Moreover, the field <em style="text-align:left">Hidden Volume Protected </em>in the
 <em style="text-align:left">Volume Properties </em>dialog window says:<br style="text-align:left">
 '<em style="text-align:left">Yes (damage prevented!)</em>'<em style="text-align:left">.</em><br style="text-align:left">
 <br style="text-align:left">
 Note that when damage to hidden volume is prevented, <em style="text-align:left">
 no</em> information about the event is written to the volume. When the outer volume is dismounted and mounted again, the volume properties will
 <em style="text-align:left">not </em>display the string &quot;<em style="text-align:left">damage prevented</em>&quot;.<em style="text-align:left"><br style="text-align:left">
 </em></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 There are several ways to check that a hidden volume is being protected against damage:</div>
 <ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 A confirmation message box saying that hidden volume is being protected is displayed after the outer volume is mounted (if it is not displayed, the hidden volume is not protected!).
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 In the <em style="text-align:left">Volume Properties </em>dialog, the field <em style="text-align:left">
 Hidden Volume Protected </em>says '<em style="text-align:left">Yes</em>': </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 The type of the mounted outer volume is <em style="text-align:left">Outer</em>: </li></ol>
-<p><img src="Protection of Hidden Volumes_Image_030.jpg" alt="VeraCrypt GUI" width="579" height="232"></p>
+<p><img src="Protection of Hidden Volumes_Image_030.jpg" alt="VeraCrypt GUI"></p>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <em style="text-align:left"><br style="text-align:left">
 <strong style="text-align:left">Important: You are the only person who can mount your outer volume with the hidden volume protection enabled (since nobody else knows your hidden volume password). When an adversary asks you to mount an outer volume, you of course
  must </strong></em><strong style="text-align:left">not</strong><em style="text-align:left"><strong style="text-align:left"> mount it with the hidden volume protection enabled. You must mount it as a normal volume (and then VeraCrypt will not show the volume
  type &quot;Outer&quot; but &quot;Normal&quot;). The reason is that, during the time when an outer volume is mounted with the hidden volume protection enabled, the adversary
 </strong></em><strong style="text-align:left">can</strong><em style="text-align:left"><strong style="text-align:left"> find out that a hidden volume exists within the outer volume (he/she will be able to find it out until the volume is dismounted and possibly
  even some time after the computer has been powered off - see <a href="Unencrypted%20Data%20in%20RAM.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Unencrypted Data in RAM</a>).</strong></em> <br style="text-align:left">
 <br style="text-align:left">
 <br style="text-align:left">
 <br style="text-align:left">
 <em style="text-align:left">Warning</em>: Note that the option '<em style="text-align:left">Protect hidden volume against damage caused by writing to outer volume</em>' in the
 <em style="text-align:left">Mount Options </em>dialog window is automatically disabled after a mount attempt is completed, no matter whether it is successful or not (all hidden volumes that are already being protected will, of course, continue to be protected).
  Therefore, you need to check that option <em style="text-align:left">each </em>time you attempt to mount the outer volume (if you wish the hidden volume to be protected):<br style="text-align:left">
 <br style="text-align:left">
-<img src="Protection of Hidden Volumes_Image_031.jpg" alt="VeraCrypt GUI" width="432" height="402"></div>
+<img src="Protection of Hidden Volumes_Image_031.jpg" alt="VeraCrypt GUI"></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 If you want to mount an outer volume and protect a hidden volume within using cached passwords, then follow these steps: Hold down the
 <em style="text-align:left">Control </em>(<em style="text-align:left">Ctrl</em>) key when clicking
 <em style="text-align:left">Mount </em>(or select <em style="text-align:left">Mount with Options
 </em>from the <em style="text-align:left">Volumes </em>menu). This will open the <em style="text-align:left">
 Mount Options </em>dialog. Enable the option '<em style="text-align:left">Protect hidden volume against damage caused by writing to outer volume</em>' and leave the password box empty. Then click
 <em style="text-align:left">OK</em>.</div>
 <p>If you need to mount an outer volume and you know that you will not need to save any data to it, then the most comfortable way of protecting the hidden volume against damage is mounting the outer volume as read-only (see the section
 <a href="Mounting%20VeraCrypt%20Volumes.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Mount Options</a>).</p>
 <p>&nbsp;</p>
 <p><a href="Security%20Requirements%20for%20Hidden%20Volumes.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Protection of Hidden Volumes_Image_027.jpg b/doc/html/Protection of Hidden Volumes_Image_027.jpg
index 69ed2453..c536f392 100644
--- a/doc/html/Protection of Hidden Volumes_Image_027.jpg
+++ b/doc/html/Protection of Hidden Volumes_Image_027.jpg
diff --git a/doc/html/Protection of Hidden Volumes_Image_028.jpg b/doc/html/Protection of Hidden Volumes_Image_028.jpg
index 5a44bb07..f1bc2eac 100644
--- a/doc/html/Protection of Hidden Volumes_Image_028.jpg
+++ b/doc/html/Protection of Hidden Volumes_Image_028.jpg
diff --git a/doc/html/Protection of Hidden Volumes_Image_029.jpg b/doc/html/Protection of Hidden Volumes_Image_029.jpg
index 1185714c..69eebbb6 100644
--- a/doc/html/Protection of Hidden Volumes_Image_029.jpg
+++ b/doc/html/Protection of Hidden Volumes_Image_029.jpg
diff --git a/doc/html/Protection of Hidden Volumes_Image_030.jpg b/doc/html/Protection of Hidden Volumes_Image_030.jpg
index fc35b2e6..2e9a74a8 100644
--- a/doc/html/Protection of Hidden Volumes_Image_030.jpg
+++ b/doc/html/Protection of Hidden Volumes_Image_030.jpg
diff --git a/doc/html/Protection of Hidden Volumes_Image_031.jpg b/doc/html/Protection of Hidden Volumes_Image_031.jpg
index 976a66dc..71993f90 100644
--- a/doc/html/Protection of Hidden Volumes_Image_031.jpg
+++ b/doc/html/Protection of Hidden Volumes_Image_031.jpg
diff --git a/doc/html/Random Number Generator.html b/doc/html/Random Number Generator.html
index cadc1716..8b9d934c 100644
--- a/doc/html/Random Number Generator.html
+++ b/doc/html/Random Number Generator.html
@@ -1,76 +1,76 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Random%20Number%20Generator.html">Random Number Generator</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Random Number Generator</h1>
 <p>The VeraCrypt random number generator (RNG) is used to generate the master encryption key, the secondary key (XTS mode), salt, and keyfiles. It creates a pool of random values in RAM (memory). The pool, which is 320 bytes long, is filled with data from the
  following sources:</p>
 <ul>
 <li>Mouse movements </li><li>Keystrokes </li><li><em>Mac OS X and Linux</em>: Values generated by the built-in RNG (both <em>/dev/random</em> and<em>/dev/urandom</em>)
 </li><li><em>MS Windows only</em>: MS Windows CryptoAPI (collected regularly at 500-ms interval)
 </li><li><em>MS Windows only</em>: Network interface statistics (NETAPI32) </li><li><em>MS Windows only</em>: Various Win32 handles, time variables, and counters (collected regularly at 500-ms interval)
 </li></ul>
 <p>Before a value obtained from any of the above-mentioned sources is written to the pool, it is divided into individual bytes (e.g., a 32-bit number is divided into four bytes). These bytes are then individually written to the pool with the modulo 2<sup>8</sup>
  addition operation (not by replacing the old values in the pool) at the position of the pool cursor. After a byte is written, the pool cursor position is advanced by one byte. When the cursor reaches the end of the pool, its position is set to the beginning
  of the pool. After every 16<sup>th</sup> byte written to the pool, the pool mixing function is automatically applied to the entire pool (see below).</p>
 <h2>Pool Mixing Function</h2>
 <p>The purpose of this function is to perform diffusion [2]. Diffusion spreads the influence of individual &ldquo;raw&rdquo; input bits over as much of the pool state as possible, which also hides statistical relationships. After every 16<sup>th</sup> byte
  written to the pool, this function is applied to the entire pool.</p>
 <p>Description of the pool mixing function:</p>
 <ol>
-<li>Let <em>R</em> be the randomness pool. </li><li>Let <em>H</em> be the hash function selected by the user (SHA-512, RIPEMD-160, or Whirlpool).
+<li>Let <em>R</em> be the randomness pool. </li><li>Let <em>H</em> be the hash function selected by the user (SHA-512, BLAKE2S-256, or Whirlpool).
 </li><li><em>l</em> = byte size of the output of the hash function <em>H</em> (i.e., if
-<em>H</em> is RIPEMD-160, then <em>l</em> = 20; if <em>H</em> is SHA-512, <em>l</em> = 64)
+<em>H</em> is BLAKE2S-256, then <em>l</em> = 20; if <em>H</em> is SHA-512, <em>l</em> = 64)
 </li><li><em>z</em> = byte size of the randomness pool <em>R </em>(320 bytes) </li><li><em>q</em> = <em>z</em> / <em>l</em> &ndash; 1 (e.g., if <em>H</em> is Whirlpool, then
 <em>q</em> = 4) </li><li>Ris divided intol-byte blocksB0...Bq.
 <p>For 0 &le; i &le; q (i.e., for each block B) the following steps are performed:</p>
 <ol type="a">
 <li><em>M = H</em> (<em>B</em>0 || <em>B</em>1 || ... || <em>B</em>q) [i.e., the randomness pool is hashed using the hash function H, which produces a hash M]
 </li><li>Bi = Bi ^ M </li></ol>
 </li><li><em>R = B</em>0 || <em>B</em>1 || ... || <em>B</em>q </li></ol>
 <p>For example, if <em>q</em> = 1, the randomness pool would be mixed as follows:</p>
 <ol>
 <li>(<em>B</em>0 || <em>B</em>1) = <em>R</em> </li><li><em>B</em>0 = <em>B</em>0 ^ <em>H</em>(<em>B</em>0 || <em>B</em>1) </li><li><em>B</em>1 = <em>B</em>1 ^ <em>H</em>(<em>B</em>0 || <em>B</em>1) </li><li><em>R</em> = <em>B</em>0 || <em>B</em>1 </li></ol>
 <h2>Generated Values</h2>
 <p>The content of the RNG pool is never directly exported (even when VeraCrypt instructs the RNG to generate and export a value). Thus, even if the attacker obtains a value generated by the RNG, it is infeasible for him to determine or predict (using the obtained
  value) any other values generated by the RNG during the session (it is infeasible to determine the content of the pool from a value generated by the RNG).</p>
 <p>The RNG ensures this by performing the following steps whenever VeraCrypt instructs it to generate and export a value:</p>
 <ol>
 <li>Data obtained from the sources listed above is added to the pool as described above.
 </li><li>The requested number of bytes is copied from the pool to the output buffer (the copying starts from the position of the pool cursor; when the end of the pool is reached, the copying continues from the beginning of the pool; if the requested number of bytes
  is greater than the size of the pool, no value is generated and an error is returned).
 </li><li>The state of each bit in the pool is inverted (i.e., 0 is changed to 1, and 1 is changed to 0).
 </li><li>Data obtained from some of the sources listed above is added to the pool as described above.
diff --git a/doc/html/Reallocated Sectors.html b/doc/html/Reallocated Sectors.html
index cbaef180..c0099495 100644
--- a/doc/html/Reallocated Sectors.html
+++ b/doc/html/Reallocated Sectors.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Reallocated%20Sectors.html">Reallocated Sectors</a>
diff --git a/doc/html/References.html b/doc/html/References.html
index a31f4327..04e3a588 100644
--- a/doc/html/References.html
+++ b/doc/html/References.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="References.html">References</a>
 </p></div>
 
diff --git a/doc/html/Release Notes.html b/doc/html/Release Notes.html
index f8346953..21317e4a 100644
--- a/doc/html/Release Notes.html
+++ b/doc/html/Release Notes.html
@@ -1,70 +1,758 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Release%20Notes.html">Version History</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Release Notes</h1>
 
-<p><strong style="text-align:left">1.22-BETA3 </strong>(August 2<sup>nd</sup>, 2017):</p>
+<p>
+<strong>Note to users who created volumes with 1.17 version of VeraCrypt or earlier: </strong><br/>
+<span style="color:#ff0000;">To avoid hinting whether your volumes contain a hidden volume or not, or if you depend on plausible deniability when using hidden volumes/OS, then you must recreate both the outer and hidden volumes including system encryption and hidden OS, discarding existing volumes created prior to 1.18a version of VeraCrypt.</span></li>
+</p>
+
+<p><strong style="text-align:left">1.26.15</strong> (September 2<sup>nd</sup>, 2024):</p>
+<ul>
+<li><strong>Windows:</strong>
+<ul>
+	<li>Fix MSI install/uninstall issues:
+		<ul>
+			<li>Fixed error 1603 returned by MSI silent install when REBOOT=ReallySuppress is specified and a reboot is required.</li>
+			<li>Fixed missing documentation and language files from the MSI package.</li>
+			<li>Fixed MSI not installing new documentation and language files when upgrading from an EXE-based installation.</li>
+			<li>Fixed installation folder not being removed after MSI uninstall in some cases.</li>
+		</ul>
+	</li>
+	<li>Fix regression during UEFI system decryption that caused the bootloader to persist.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.26.14</strong> (August 25<sup>th</sup>, 2024):</p>
+<ul>
+<li><strong>All OSes:</strong>
+<ul>
+<li>Update translations and documentation</li>
+<li>Implement language selection settings in non-Windows versions.</li>
+<li>Make codebase compatible with wxWidgets 3.3 in non-Windows versions.</li>
+<li>Implement detection of volumes affected by XTS master key vulnerability and warn user about it.</li>
+<li>Update mount failure error messages to mention removal of TrueCrypt support and old algorithms.</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+	<ul>
+	<li>Better fix for Secure Desktop issues under Windows 11 22H2
+		<ul>
+			<li>IME is now disabled in Secure Desktop because it is known to cause issues</li>
+		</ul>
+	</li>
+	<li>VeraCrypt Expander: Fix expansion of volumes on disks with a sector size different from 512 (by skl0n6)</li>
+	<li>Fix writing wrong EFI System Encryption Advanced Options to registry</li>
+	<li>Don't close Setup when exiting VeraCrypt process through system tray Exit menu</li>
+	<li>Fix failure to format some disks (e.g. VHDX) caused by virtual partition offset not 4K aligned</li>
+	<li>Fallback to absolute positioning when accessing disks if relative positioning fails</li>
+	<li>Update zlib to version 1.3.1</li>
+	</ul>
+</li>
+<li><strong>Linux:</strong>
+	<ul>
+	<li>Focus PIM field when selected (#1239)</li>
+	<li>Fix generic installation script on Konsole in Wayland (#1244)</li>
+	<li>Added the ability to build using wolfCrypt as the cryptographic backend. Disabled by default. (Contributed by wolfSSL, GH PR #1227)</li>
+	<li>Allows GUI to launch in a Wayland-only environment (GH #1264)</li>
+	<li>CLI: Don't initially re-ask PIM if it was already specified (GH #1288)</li>
+	<li>CLI: Fix incorrect max hidden volume size for file containers (GH #1338))</li>
+	<li>Enhance ASLR security of generic installer binaries by adding linked flag for old GCC version (reported by @morton-f on Sourceforge)</li>
+	</ul>
+</li>
+<li><strong>macOS:</strong>
+	<ul>
+	<li>Fix corrupted disk icon in main UI (GH #1218)</li>
+	<li>Fix near zero width PIM input box and simplify wxTextValidator logic (GH #1274)</li>
+	<li>Use correct Disk Utility location when "check filesystem" is ran (GH #1273)</li>
+	<li>Add support for FUSE-T as an alternative to MacFUSE (GH #1055)</li>
+	</ul>
+</li>
+<li><strong>FreeBSD:</strong>
+	<ul>
+	<li>Fix privilege escalation prompts not showing up (GH #1349)</li>
+	<li>Support automatic detection and mounting of ext2/3/4, exFAT, NTFS filesystems (GH #1350)</li>
+	<li>Use correct Disk Utility location when "check filesystem" is ran (GH #1273)</li>
+	</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.26.7</strong> (October 1<sup>st</sup>, 2023):</p>
+<ul>
+<li><strong>All OSes:</strong>
+<ul>
+<li>Security: Ensure that XTS primary key is different from the secondary key when creating volumes
+	<ul>
+		<li>Issue unlikely to happen thanks to random generator properties but this check must be added to prevent attacks</li>
+		<li>Reference: CCSS,NSA comment at page 3: <a href="https://csrc.nist.gov/csrc/media/Projects/crypto-publication-review-project/documents/initial-comments/sp800-38e-initial-public-comments-2021.pdf">https://csrc.nist.gov/csrc/media/Projects/crypto-publication-review-project/documents/initial-comments/sp800-38e-initial-public-comments-2021.pdf</a></li>
+	</ul>
+</li>
+<li>Remove TrueCrypt Mode support. Version 1.25.9 can be used to mount or convert TrueCrypt volumes.</li>
+<li>Complete removal of RIPEMD160 and GOST89 algorithms. Legacy volumes using any of them cannot be mounted by VeraCrypt anymore.</li>
+<li>Add support for BLAKE2s as new PRF algorithm for both system encryption and standard volumes.</li>
+<li>Introducing support for EMV banking smart cards as keyfiles for non-system volumes.
+	<ul>
+		<li>No need for a separate PKCS#11 module configuration.</li>
+		<li>Card PIN isn't required.</li>
+		<li>Generates secure keyfile content from unique, encoded data present on the banking card.</li>
+		<li>Supports all EMV standard-compliant banking cards.</li>
+		<li>Can be enabled in settings (go to Settings->Security Tokens).</li>
+		<li>Developed by a team of students from the <a href="https://www.insa-rennes.fr">Institut national des sciences appliquées de Rennes</a>.</li>
+		<li>More details about the team and the project are available at <a href="https://projets-info.insa-rennes.fr/projets/2022/VeraCrypt/index_en.html">https://projets-info.insa-rennes.fr/projets/2022/VeraCrypt/index_en.html</a>.</li>
+	</ul>
+</li>
+<li>When overwriting an existing file container during volume creation, add its current size to the available free space</li>
+<li>Add Corsican language support. Update several translations. </li>
+<li>Update documentation</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Officially, the minimum supported version is now <strong>Windows 10</strong>. VeraCrypt may still run on Windows 7 and Windows 8/8.1, but no active tests are done on these platforms.</li>
+<li>EFI Bootloader:
+<ul>
+<li>Fix bug in PasswordTimeout value handling that caused it to be limited to 255 seconds.</li>
+<li>Rescue Disk: enhance "Boot Original Windows Loader" by using embedded backup of original Windows loader if it is missing from disk</li>
+<li>Addition of Blake2s and removal of RIPEMD160 & GOST89</li>
+</ul>
+</li>
+<li>Enable memory protection by default. Add option under Performance/Driver Configuration to disable it if needed.
+<ul>
+	<li>Memory protection blocks non-admin processes from reading VeraCrypt memory</li>
+	<li>It may block Screen Readers (Accessibility support) from reading VeraCrypt UI, in which case it can be disabled</li>
+	<li>It can be disabled by setting registry value "VeraCryptEnableMemoryProtection" to 0 under "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\veracrypt"</li>
+</ul>
+</li>
+<li>Add process mitigation policy to prevent VeraCrypt from being injected by other processes</li>
+<li>Minor enhancements to RAM Encryption implementation</li>
+<li>Fix Secure Desktop issues under Windows 11 22H2</li>
+<li>Implement support for mounting partially encrypted system partitions.</li>
+<li>Fix false positive detection of new device insertion when Clear Encryption Keys option is enable (System Encryption case only)</li>
+<li>Better implementation of Fast Create when creating file containers that uses UAC to request required privilege if not already held</li>
+<li>Allow choosing Fast Create in Format Wizard UI when creating file containers</li>
+<li>Fix formatting issues during volume creation on some machines.</li>
+<li>Fix stall issue caused by Quick Format of large file containers</li>
+<li>Add dropdown menu to Mount button to allow mounting without using the cache.</li>
+<li>Possible workaround for logarithmic slowdown for Encrypt-In-Place on large volumes.</li>
+<li>Make Expander first check file existence before proceeding further</li>
+<li>Allow selecting size unit (KB/MB/GB) for generated keyfiles</li>
+<li>Display full list of supported cluster sizes for NTFS, ReFS and exFAT filesystems when creating volumes</li>
+<li>Support drag-n-drop of files and keyfiles in Expander.</li>
+<li>Implement translation of Expander UI</li>
+<li>Replace legacy file/dir selection APIs with modern IFileDialog interface for better Windows 11 compatibility</li>
+<li>Enhancements to dependency dlls safe loading, including delay loading.</li>
+<li>Remove recommendation of keyfiles files extensions and update documentation to mention risks of third-party file extensions.</li>
+<li>Add support for more language in the setup installer</li>
+<li>Update LZMA library to version 23.01</li>
+<li>Update libzip to version 1.10.1 and zlib to version 1.3</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Fix bug in Random generator on Linux when used with Blake2s that was triggering a self test failure.</li>
+<li>Modify Random Generator on Linux to exactly match official documentation and the Windows implementation.</li> 
+<li>Fix compatibility issues with Ubuntu 23.04.</li>
+<li>Fix assert messages displayed when using wxWidgets 3.1.6 and newer.</li>
+<li>Fix issues launching fsck on Linux.</li>
+<li>Fix privilege escalation prompts being ignored.</li>
+<li>Fix wrong size for hidden volume when selecting the option to use all free space.</li>
+<li>Fix failure to create hidden volume on a disk using CLI caused by wrong maximum size detection.</li>
+<li>Fix various issues when running in Text mode:
+<ul>
+<li>Don't allow selecting exFAT/BTRFS filesytem if they are not present or not compatible with the created volume.</li>
+<li>Fix wrong dismount message displayed when mounting a volume.</li>
+<li>Hide PIM during entry and re-ask PIM when user entered a wrong value.</li>
+<li>Fix printing error when checking free space during volume creation in path doesn't exist.</li>
+</ul>
+</li>
+<li>Use wxWidgets 3.2.2.1 for static builds (e.g. console only version)</li>
+<li>Fix compatibility of generic installers with old Linux distros</li>
+<li>Update help message to indicate that when cascading algorithms they must be separated by dash</li>
+<li>Better compatibility with building under Alpine Linux and musl libc</li>
+</ul>
+</li>
+<li><strong>macOS:</strong>
+	<ul>
+	<li>Fix issue of VeraCrypt window becoming unusable in use cases involving multiple monitors and change in resolution.</li>
+	</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.25.9</strong> (February 19<sup>th</sup>, 2022):</p>
+<ul>
+<li><strong>All OSes:</strong>
+<ul>
+<li>Update translations (Chinese, Dutch, French, German, Turkish).</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Make MSI installer compatible with system encryption.</li>
+<li>Set minimum support for MSI installation to Windows 7.</li>
+<li>Fix failure to create Traveler Disk when VeraCrypt is installed using MSI.</li>
+<li>Don't cache the outer volume password when mounting with hidden volume protection if wrong hidden volume password was specified.</li> 
+<li>Reduce the size of EXE installers by almost 50% by using LZMA compression instead of DEFLATE.</li>
+<li>Fix double-clicking mounted drive in VeraCrypt UI not working in some special Windows configurations.</li>
+<li>Add registry key to fix BSOD during shutdown/reboot on some machines when using system encryption.
+<ul>
+<li>Under "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\veracrypt", create a REG_DWORD value named "VeraCryptEraseKeysShutdown".</li>
+<li>Setting this registry value to 0 disables erasing system encryption keys which is the cause of BSOD during shutdown on some machines.</li>
+</ul>
+</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Fix hidden volume settings not correctly displayed when enabling hidden volume protection in mount options window.</li>
+<li>Fix generic Linux installer overwriting /usr/sbin if it is a symlink.</li>
+<li>Fix crash when building with _GLIBCXX_ASSERTIONS defined.</li>
+<li>Enable building from source without AES-NI support.</li>
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Fix hidden volume settings not correctly displayed when enabling hidden volume protection in mount options window.</li>
+</ul>
+</li>
+</ul>
+<p><strong style="text-align:left">1.25.7</strong> (January 7<sup>th</sup>, 2022):</p>
+<ul>
+<li><strong>All OSes:</strong>
+<ul>
+<li>Update translations.</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Restore support of Windows Vista, Windows 7 and Windows 8/8.1.
+<ul>
+<li>Windows 7 support requires that either KB3033929 or KB4474419 is installed.</li>
+<li>Windows Vista support requires that either KB4039648 or KB4474419 is installed.</li>
+</ul>
+</li>
+<li>MSI installation only: Fix double-clicking .hc file container inserting %1 instead of volume name in path field.</li>
+<li>Advanced users: Add registry settings to control driver internal encryption queue to allow tuning performance for SSD disks and having better stability under heavy load.
+<ul>
+<li>Under registry key HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\veracrypt:
+<ul>
+<li>VeraCryptEncryptionFragmentSize (REG_DWORD): size of encryption data fragment in KiB. Default is 256. Maximum is 2048.</li>
+<li>VeraCryptEncryptionIoRequestCount (REG_DWORD): maximum number of parallel I/O requests. Default is 16. Maximum is 8192.</li>
+<li>VeraCryptEncryptionItemCount (REG_DWORD): maximum number of encryption queue items processed in parallel. Default as well as maximum is half of VeraCryptEncryptionIoRequestCount.</li>
+</ul>
+</li>
+<li>The triplet (FragmentSize=512, IoRequestCount=128, ItemCount=64) is an example of parameters that enhance sequential read speed on some SSD NVMe systems.</li>
+<li>Fix truncate text in installer for some languages.</li>
+</ul>
+</li>
+</ul>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Fix resource files inside VeraCrypt application bundle (e.g. HTML documentation, languages XML files) being world-writable. (Reported by Niall O'Reilly)</li>
+</ul>
+</li>
+</ul>
+<p><strong style="text-align:left">1.25.4</strong> (December 3<sup>rd</sup>, 2021):</p>
+<ul>
+<li><strong>All OSes:</strong>
+<ul>
+<li>Speed optimization of Streebog.</li>
+<li>Update translations.</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Add support for Windows on ARM64 (e.g. Microsoft Surface Pro X) but system encryption not yet supported.</li>
+<li>Add MSI installer for silent mode deployment (ACCEPTLICENSE=YES must be set in msiexec command line).
+<ul>
+<li>For now, MSI installer cannot be used if system partition is encrypted with VeraCrypt</li>
+<li>MSI installer requires Windows 10 or newer</li>
+</ul>
+</li>
+<li>Drop support of Windows Vista, Windows 7, Windows 8 and Windows 8.1 because of new requirement for driver code signing.</li>
+<li>Reduce time of mount when PRF auto-detection is selected.</li>
+<li>Fix potential memory corruption in driver caused by integer overflow in IOCTL_STORAGE_MANAGE_DATA_SET_ATTRIBUTES (reported by Ilja van Sprundel).</li>
+<li>Replace insecure wcscpy/wcscat/strcpy runtime functions with secure equivalents.</li>
+<li>Changes to EFI bootloader:
+<ul>
+<li>Fix memory leak in some cases caused by wrong check of pointer for calling MEM_FREE</li>
+<li>Clear bootParams variable that may contain sensitive information when halting the system in case of fatal error</li>
+<li>Add option "KeyboardInputDelay" in DcsProp to control the minimum delay supported between two key strokes</li>
+</ul></li>
+<li>Try to workaround Windows Feature Updates issues with system encryption by fixing of bootloader and SetupConfig.ini when system resumes or when session is opened/unlocked</li>
+<li>Fix failure to load local HTML documentation if application running with administrative privileges</li>
+<li>Fix freeze when password dialog displayed in secure desktop and try to access token keyfiles protected by PIN</li>
+<li>Fix failure to launch keyfile generator in secure desktop mode</li>
+<li>Block Windows from resizing system partition if it is encrypted</li>
+<li>Add keyboard shortcut to "TrueCrypt mode" in the mount dialog.</li>
+
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Native support of Apple Silicon M1.</li>
+<li>Drop official support of Mac OS X 10.7 Lion and Mac OS X 10.8 Mountain Lion.</li>
+<li>Add UI language support using installed XML files. Language is automatically detected using "LANG" environment variable</li>
+<li>Add CLI switch (--size=max) and UI option to give a file container all available free space on the disk where it is created.</li>
+<li>Return error if unknown filesystem value specified in CLI --filesystem switch instead of silently skipping filesystem creation.</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Add UI language support using installed XML files. Language is automatically detected using "LANG" environment variable</li>
+<li>Compatiblity with with pam_tmpdir.</li>
+<li>Display icon in notification area on Ubuntu 18.04 and newer (contibuted by https://unit193.net/).</li>
+<li>Add CLI switch (--size=max) and UI option to give a file container all available free space on the disk where it is created.</li>
+<li>Return error if unknown filesystem value specified in CLI --filesystem switch instead of silently skipping filesystem creation.</li>
+</ul>
+</li>
+<li><strong>FreeBSD:</strong>
+<ul>
+<li>Make system devices work under FreeBSD</li>
+<li>Add CLI switch (--size=max) and UI option to give a file container all available free space on the disk where it is created.</li>
+<li>Return error if unknown filesystem value specified in CLI --filesystem switch instead of silently skipping filesystem creation.</li>
+</ul>
+</li>
+<li><strong>OpenBSD:</strong>
+<ul>
+<li>Add basic support of OpenBSD</li>
+<li>Add CLI switch (--size=max) and UI option to give a file container all available free space on the disk where it is created.</li>
+<li>Return error if unknown filesystem value specified in CLI --filesystem switch instead of silently skipping filesystem creation.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.24-Update8</strong> (November 28<sup>th</sup>, 2020):</p>
+<ul>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Fix compatibility issues with macOS Big Sur, especially on Apple Silicon M1 with macFUSE 4.0.x.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.24-Update7</strong> (August 7<sup>th</sup>, 2020):</p>
 <ul>
+<li><strong>All OSes:</strong>
+<ul>
+<li>Don't allow Hidden volume to have the same password, PIM and keyfiles as Outer volume</li>
+<li>Fix random crash in 32-bit builds when using Streebog.</li>
+<li>Enable FIPS mode in JitterEntropy random generator.</li>
+<li>Update Beginner's Tutorial in documentation to use "MyVolume.hc" instead of "My Volume" for file container name in order to avoid confusion about nature of file nature.</li>
+<li>Minor code cleanup</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Fix wrong results in benchmark of encryption algorithms when RAM encryption is enabled</li>
+<li>Fix issue when RAM encryption used, AES selected and AES-NI not supported by CPU that caused the free space of newly created volumes not filled with random data even if "quick format" is not selected.</li>
+<li>Fix UI for blocking TRIM in system encryption not working in MBR boot mode.</li>
+<li>Support password drag-n-drop from external applications (e.g. KeePass) to password UI fields which is more secure than using clipboard.</li>
+<li>Implements compatibility with Windows 10 Modern Standby and Windows 8.1 Connected Standby power model. This makes detection of entring power saving mode more reliable.</li>
+<li>Avoid displaying waiting dialog when /silent specified for "VeraCrypt Format" during creating of file container using /create switch and a filesystem other than FAT.</li>
+<li>Use native Windows format program to perform formatting of volume since it is more reliable and only fallback to FormatEx function from fmifs.dll in case of issue.</li>
+<li>Don't use API for Processor Groups support if there is only 1 CPU group in the system. This can fix slowness issue observed on some PCs with AMD CPUs.</li>
+<li>Don't allow to encrypt the system drive if it is already encrypted by BitLocker.</li>
+<li>Implement detection of Hibernate and Fast Startup and disable them if RAM encryption is activated.</li>
+<li>Warn about Fast Startup if it is enabled during VeraCrypt installation/upgrade, when starting system encryption or when creating a volume, and propose to disable it.</li>
+<li>Add UI options to control the behavior of automatic bootloader fixing when System Encryption used.</li>
+<li>Don't allow a directory path to be entered for the file container to be created in Format wizard.</li>
+<li>Don't try to use fix for CVE-2019-19501 if Windows Shell has been modified or is not running since there is no reliable way to fix it in such non standard configuation.</li>
+<li>MBR bootloader: fix incorrect compressed data size passed to decompressor in boot sector.</li>
+<li>Add warning message when typed password reaches maximum length during the system encryption wizard.</li>
+<li>Fix wrong error message when UTF-8 encoding of entered password exceeds the maximum supported length.</li>
+<li>Fix crash when using portable 32-bit "VeraCrypt Format.exe" to create hidden volume on a 64-bit machine where VeraCrypt is already installed.</li>
+<li>Update libzip to latest version 1.7.3.</li>
+<li>Update translations.</li>
+</ul>
+</li>
+<li><strong>Linux/MacOSX:</strong>
+<ul>
+<li>Force reading of at least 32 bytes from /dev/random before allowing it to fail gracefully</li>
+<li>Allow choosing a filesystem other than FAT for Outer volume but display warning about risks of such choice. Implement an estimation of maximum possible size of hidden volume in this case.</li>
+<li>Erase sensitive memory explicitly instead of relying on the compiler not optimizing calls to method Memory::Erase.</li>
+<li>Add support for Btrfs filesystem when creating volumes (Linux Only).</li>
+<li>Update wxWidgets for static builds to version 3.0.5.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.24-Update6 </strong>(March 10<sup>th</sup>, 2020):</p>
+<ul>
+<li><strong>Windows:</strong>
+<ul>
+<li>Fix PIM label text truncation in password dialog</li>
+<li>Fix wrong language used in installer if user selects a language other than English and then selects English before clicking OK on language selection dialog.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.24-Update5 </strong>(March 9<sup>th</sup>, 2020):</p>
+<ul>
+<li><strong>Windows:</strong>
+<ul>
+<li>Optimize performance for CPUs that have more than 64 logical processors (contributed by Sachin Keswani from AMD)</li>
+<li>Support specifying keyfiles (both in tokens and in filesystem) when creating file containers using command line (switches /keyfile, /tokenlib and /tokenpin supported in VeraCrypt Format)</li>
+<li>Fix leak of keyfiles path and name after VeraCrypt process exits.</li>
+<li>Add CLI switch /secureDesktop to VeraCrypt Format.</li>
+<li>Update libzip to version 1.6.1</li>
+<li>Minor UI fixes</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.24-Update4 </strong>(January 23<sup>rd</sup>, 2020):</p>
+<ul>
+<li><strong>Windows:</strong>
+<ul>
+<li>Fix regression in Expander and Format when RAM encryption is enable that was causing volume headers to be corrupted.</li>
+<li>Fix failure of Screen Readers (Accessibility support) to read UI by disabling newly introduced memory protection by default and adding a CLI switch (/protectMemory) to enable it when needed.</li>
+<li>Fix side effects related to the fix for CVE-2019-19501 which caused links in UI not to open.</li>
+<li>Add switch /signalExit to support notifying <a href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/waitfor" target="_blank">WAITFOR</a> Windows command when VeraCrypt.exe exits if /q was specified in CLI (cf documentation for usage).</li>
+<li>Don't display mount/dismount examples in help dialog for command line in Format and Expander.</li>
+<li>Documentation and translation updates.</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Fix regression that limited the size available for hidden volumes created on disk or partition.</li>
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Fix regression that limited the size available for hidden volumes created on disk or partition.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.24-Update3 </strong>(December 21<sup>nd</sup>, 2019):</p>
+<ul>
+<li><strong>Linux:</strong>
+<ul>
+<li>Fix console-only build to remove dependency on GTK that is not wanted on headless servers.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.24-Update2 </strong>(December 16<sup>th</sup>, 2019):</p>
+<ul>
+<li><strong>All OSes:</strong>
+<ul>
+<li>clear AES key from stack memory when using non-optimized implementation. Doesn't apply to VeraCrypt official build (Reported and fixed by Hanno Böck)</li>
+<li>Update Jitterentropy RNG Library to version 2.2.0</li>
+<li>Start following IEEE 1541 agreed naming of bytes (KiB, MiB, GiB, TiB, PiB).</li>
+<li>Various documentation enhancements.</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Fix possible local privilege escalation vulnerability during execution of VeraCrypt Expander (CVE-2019-19501)</li>
+<li>MBR bootloader:
+<ul>
+<li>workaround for SSD disks that don't allow write operations in BIOS mode with buffers less than 4096 bytes.</li>
+<li>Don't restore MBR to VeraCrypt value if it is coming from a loader different from us or different from Microsoft one.</li>
+</ul>
+</li>
+<li>EFI bootloader:
+<ul>
+<li>Fix "ActionFailed" not working and add "ActionCancelled" to customize handling of user hitting ESC on password prompt</li>
+<li>Fix F5 showing previous password after failed authentication attempt. Ensure that even wrong password value are cleared from memory.</li>
+</ul>
+</li>
+<li>Fix multi-OS boot compatibility by only setting VeraCrypt as first bootloader of the system if the current first bootloader is Windows one.</li>
+<li>Add new registry flags for SystemFavoritesService to control updating of EFI BIOS boot menu on shutdown.</li>
+<li>Allow system encrypted drive to be mounted in WindowsPE even if changing keyboard layout fails (reported and fixed by Sven Strickroth)</li>
+<li>Enhancements to the mechanism preserving file timestamps, especially for keyfiles.</li>
+<li>Fix RDRAND instruction not detected on AMD CPUs.</li>
+<li>Detect cases where RDRAND is flawed (e.g. AMD Ryzen) to avoid using it if enabled by user.</li>
+<li>Don't write extra 0x00 byte at the end of DcsProp file when modifying it through UI</li>
+<li>Reduce memory usage of IOCTL_DISK_VERIFY handler used in disk verification by Windows.</li>
+<li>Add switch /FastCreateFile for VeraCrypt Format.exe to speedup creation of large file container if quick format is selected.</li>
+<li>Fix the checkbox for skipping verification of Rescue Disk not reflecting the value of /noisocheck switch specified in VeraCrypt Format command line.</li>
+<li>check "TrueCrypt Mode" in password dialog when mounting a file container with .tc extension</li>
+<li>Update XML languages files.</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Fix regression causing admin password to be requested too many times in some cases</li>
+<li>Fix off by one buffer overflow in function Process::Execute (Reported and fixed by Hanno Böck)</li>
+<li>Make sure password gets deleted in case of internal error when mounting volume (Reported and fixed by Hanno Böck)</li>
+<li>Fix passwords using Unicode characters not recognized in text mode.</li>
+<li>Fix failure to run VeraCrypt binary built for console mode on headless machines.</li>
+<li>Add switch to force the use of legacy maximum password length (64 UTF8 bytes)</li>
+<li>Add CLI switch (--use-dummy-sudo-password) to force use of old sudo behavior of sending a dummy password</li>
+<li>During uninstall, output error message to STDERR instead of STDOUT for better compatibility with package managers.</li>
+<li>Make sector size mismatch error when mounting disks more verbose.</li>
+<li>Speedup SHA256 in 64-bit mode by using assembly code.</li>
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Add switch to force the use of legacy maximum password length (64 UTF8 bytes)</li>
+<li>Fix off by one buffer overflow in function Process::Execute (Reported and fixed by Hanno Böck)</li>
+<li>Fix passwords using Unicode characters not recognized in text mode.</li>
+<li>Make sector size mismatch error when mounting disks more verbose.</li>
+<li>Speedup SHA256 in 64-bit mode by using assembly code.</li>
+<li>Link against latest wxWidgets version 3.1.3</li>
+</ul>
+</li>
+</ul>
+
+
+<p><strong style="text-align:left">1.24-Hotfix1 </strong>(October 27<sup>rd</sup>, 2019):</p>
+<ul>
+<li><strong>Windows:</strong>
+<ul>
+<li>Fix 1.24 regression that caused system favorites not to mount at boot if VeraCrypt freshly installed.</li>
+<li>Fix failure to encrypt system if the current Windows username contains a Unicode non-ASCII character.</li>
+<li>Make VeraCrypt Expander able to resume expansion of volumes whose previous expansion was aborted before it finishes.</li>
+<li>Add "Quick Expand" option to VeraCrypt Expander to accelarate the expansion of large file containers.</li>
+<li>Add several robustness checks and validation in case of system encryption to better handle some corner cases.</li>
+<li>Minor UI and documentation changes.</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Workaround gcc 4.4.7 bug under CentOS 6 that caused VeraCrypt built under CentOS 6 to crash when Whirlpool hash is used.</li>
+<li>Fix "incorrect password attempt" written to /var/log/auth.log when mounting volumes.</li>
+<li>Fix dropping file in UI not showing its correct path , specifically under GTK-3.</li>
+<li>Add missing JitterEntropy implementation/</li>
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Fix some devices and partitions not showing in the device selection dialog under OSX 10.13 and newer.</li>
+<li>Fix keyboard tab navigation between password fields in "Volume Password" page of volume creation wizard.</li>
+<li>Add missing JitterEntropy implementation/</li>
+<li>Support APFS filesystem for creation volumes.</li>
+<li>Support Dark Mode.</li>
+</ul>
+</li>
+</ul>
+
+
+<p><strong style="text-align:left">1.24 </strong>(October 6<sup>th</sup>, 2019):</p>
+<ul>
+<li><strong>All OSs:</strong>
+<ul>
+<li>Increase password maximum length to 128 bytes in UTF-8 encoding for non-system volumes.</li>
+<ul>
+<li>Add option to use legacy maximum password length (64) instead of new one for compatibility reasons.</li>
+</ul>
+<li>Use Hardware RNG based on CPU timing jitter "Jitterentropy" by Stephan Mueller as a good alternative to CPU RDRAND (<a href="http://www.chronox.de/jent.html" target="_blank">http://www.chronox.de/jent.html</a>)</li>
+<li>Speed optimization of XTS mode on 64-bit machine using SSE2 (up to 10% faster).</li>
+<li>Fix detection of CPU features AVX2/BMI2. Add detection of RDRAND/RDSEED CPU features. Detect Hygon CPU as AMD one.</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Implement RAM encryption for keys and passwords using ChaCha12 cipher, t1ha non-cryptographic fast hash and ChaCha20 based CSPRNG.</li>
+<ul>
+<li>Available only on 64-bit machines.</li>
+<li>Disabled by default. Can be enabled using option in UI.</li>
+<li>Less than 10% overhead on modern CPUs.</li>
+<li>Side effect: Windows Hibernate is not possible if VeraCrypt System Encryption is also being used.</li>
+</ul>
+<li>Mitigate some memory attacks by making VeraCrypt applications memory inaccessible to non-admin users (based on KeePassXC implementation)</li>
+<li>New security features:</li>
+<ul>
+<li>Erase system encryption keys from memory during shutdown/reboot to help mitigate some cold boot attacks</li>
+<li>Add option when system encryption is used to erase all encryption keys from memory when a new device is connected to the system.</li>
+<li>Add new driver entry point that can be called by applications to erase encryption keys from memory in case of emergency.</li>
+</ul>
+<li>MBR Bootloader: dynamically determine boot loader memory segment instead of hardcoded values (proposed by neos6464)</li>
+<li>MBR Bootloader: workaround for issue affecting creation of hidden OS on some SSD drives.</li>
+<li>Fix issue related to Windows Update breaking VeraCrypt UEFI bootloader.</li>
+<li>Several enhancements and fixes for EFI bootloader:</li>
+<ul>
+<li>Implement timeout mechanism for password input. Set default timeout value to 3 minutes and default timeout action to "shutdown".</li>
+<li>Implement new actions "shutdown" and "reboot" for EFI DcsProp config file.</li>
+<li>Enhance Rescue Disk implementation of restoring VeraCrypt loader.</li>
+<li>Fix ESC on password prompt during Pre-Test not starting Windows.</li>
+<li>Add menu entry in Rescue Disk that enables starting original Windows loader.</li>
+<li>Fix issue that was preventing Streebog hash from being selected manually during Pre-Boot authentication.</li>
+<li>If "VeraCrypt" folder is missing from Rescue Disk, it will boot PC directly from bootloader stored on hard drive</li>
+<ul>
+<li>This makes it easy to create a bootable disk for VeraCrypt from Rescue Disk just by removing/renaming its "VeraCrypt" folder.</li>
+</ul>
+</ul>
+<li>Add option (disabled by default) to use CPU RDRAND or RDSEED as an additional entropy source for our random generator when available.</li>
+<li>Add mount option (both UI and command line) that allows mounting a volume without attaching it to the specified drive letter.</li>
+<li>Update libzip to version 1.5.2</li>
+<li>Do not create uninstall shortcut in startmenu when installing VeraCrypt. (by Sven Strickroth)</li>
+<li>Enable selection of Quick Format for file containers creation. Separate Quick Format and Dynamic Volume options in the wizard UI.</li>
+<li>Fix editor of EFI system encryption configuration file not accepting ENTER key to add new lines.</li>
+<li>Avoid simultaneous calls of favorites mounting, for example if corresponding hotkey is pressed multiple times.</li>
+<li>Ensure that only one thread at a time can create a secure desktop.</li>
+<li>Resize some dialogs in Format and Mount Options to to fix some text truncation issues with non-English languages.</li>
+<li>Fix high CPU usage when using favorites and add switch to disable periodic check on devices to reduce CPU load.</li>
+<li>Minor UI changes.</li>
+<li>Updates and corrections to translations and documentation.</li>
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Add check on size of file container during creation to ensure it's smaller than available free disk space. Add CLI switch --no-size-check to disable this check.</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Make CLI switch --import-token-keyfiles compatible with Non-Interactive mode.</li>
+<li>Add check on size of file container during creation to ensure it's smaller than available free disk space. Add CLI switch --no-size-check to disable this check.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.23-Hotfix-2 </strong>(October 8<sup>th</sup>, 2018):</p>
+<ul>
+<li><strong>Windows:</strong>
+<ul>
+<li>Fix low severity vulnerability inherited from TrueCrypt that allowed reading 3 bytes of kernel stack memory (with a rare possibility of 25 additional bytes).
+<ul>
+<li>Reported by Tim Harrison.</li>
+</ul>
+</li>
+<li>Disable quick format when creating file containers from command line. Add /quick switch to enable it in this case if needed.</li>
+<li>Add /nosizecheck switch to disable checking container size against available free space during its creation.
+<ul>
+<li>This enables to workaround a bug in Microsoft Distributed File System (DFS).</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.23 </strong>(September 12<sup>th</sup>, 2018):</p>
+<ul>
+<li><strong>Windows:</strong>
+<ul>
+<li>VeraCrypt is now compatible with default EFI SecureBoot configuration for system encryption.</li>
+<li>Fix EFI system encryption issues on some machines (e.g. HP, Acer).</li>
+<li>Support EFI system encryption on Windows LTSB.</li>
+<li>Add compatibility of system encryption with Windows 10 upgrade using ReflectDrivers mechanism</li>
+<li>Make EFI Rescue Disk decrypt partition correctly when Windows Repair overwrites first partition sector.</li>
+<li>Add Driver option in the UI to explicitly allow Windows 8.1 and Windows 10 defragmenter to see VeraCrypt encrypted disks.</li>
+<li>Add internal verification of binaries embedded signature to protect against some types to tampering attacks.</li>
+<li>Fix Secure Desktop not working for favorites set to mount at logon on Windows 10 under some circumstances.</li>
+<li>when Secure Desktop is enabled, use it for Mount Options dialog if it is displayed before password dialog.</li>
+<li>when extracting files in Setup or Portable mode, decompress zip files docs.zip and Languages.zip in order to have ready to use configuration.</li>
+<li>Display a balloon tip warning message when text pasted to password field is longer than maximum length and so it will be truncated.</li>
+<li>Implement language selection mechanism at the start of the installer to make easier for international users.</li>
+<li>Add check on size of file container during creation to ensure it's smaller than available free disk space.</li>
+<li>Fix buttons at the bottom not shown when user sets a large system font under Window 7.</li>
+<li>Fix compatibility issues with some disk drivers that don't support IOCTL_DISK_GET_DRIVE_GEOMETRY_EX ioctl.</li>
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Support pasting values to password fields using keyboard (CMD+V and CMD+A now working properly).
+<li>Add CheckBox in mount option dialog to force the use of embedded backup header during mount.</li>
+<li>When performing backup of volume header, automatically try to use embedded backup header if using the main header fails.</li>
+<li>Implement benchmarking UI for Hash and PKCS-5 PRF algorithms.</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Don't allow waiting dialog to be closed before the associated operation is finished. This fix a crash under Lubuntu 16.04.
+<li>Add CheckBox in mount option dialog to force the use of embedded backup header during mount.</li>
+<li>When performing backup of volume header, automatically try to use embedded backup header if using the main header fails.</li>
+<li>Implement benchmarking UI for Hash and PKCS-5 PRF algorithms.</li>
+<li>Remove limitation of hidden volume protection on disk with sector size larger than 512 bytes.</li>
+</ul>
+</li>
+</ul>
+
+
+<p><strong style="text-align:left">1.22 </strong>(March 30<sup>th</sup>, 2018):</p>
+<ul>
+<li><strong>All OSs:</strong>
+<ul>
+<li>SIMD speed optimization for Kuznyechik cipher implementation (up to 2x speedup).</li>
+<li>Add 5 new cascades of cipher algorithms: Camellia-Kuznyechik, Camellia-Serpent, Kuznyechik-AES, Kuznyechik-Serpent-Camellia and Kuznyechik-Twofish.</li>
+</ul>
+</li>
 <li><strong>Windows:</strong>
 <ul>
 <li>MBR Bootloader: Fix failure to boot hidden OS on some machines.</li>
 <li>MBR Bootloader: Reduce CPU usage during password prompt.</li>
+<li>Security enhancement: Add option to block TRIM command for system encryption on SSD drives.</li>
+<li>Implement TRIM support for non-system SSD drives and add option to enable it (TRIM is disabled by default for non-system volumes).</li>
 <li>Better fix for "Parameter Incorrect" issues during EFI system encryption in some machines.</li>
 <li>Driver: remove unnecessary dependency to wcsstr which can cause issues on some machines.</li>
-<li>Driver: Fix "Incorrect Parameter" error when mounting values on some machines.</li>
+<li>Driver: Fix "Incorrect Parameter" error when mounting volumes on some machines.</li>
 <li>Fix failure to mount system favorites during boot on some machines.</li>
+<li>Fix current application losing focus when VeraCrypt is run in command line with /quit /silent switches.</li>
+<li>Fix some cases of external applications freezing during mount/dismount.</li>
+<li>Fix rare cases of secure desktop for password dialog not visible which caused UI to block.</li>
+<li>Update libzip to version 1.5.0 that include fixes for some security issues.</li>
 <li>Extend Secure Desktop feature to smart card PIN entry dialog.</li>
 <li>Fix truncated license text in installer wizard.</li>
+<li>Add portable package that allows extracting binaries without asking for admin privileges.</li>
+<li>Simplify format of language XML files.</li>
+<li>Workaround for cases where password dialog doesn't get keyboard focus if Secure Desktop is not enabled.</li>
+</ul>
+<li><strong>Linux:</strong>
+<ul>
+<li>Fix failure to install GUI version under recent versions of KDE.</li>
+<li>Fix wxWidgets assertion failed when backing up/restoring volume header.</li>
 </ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Fix issue preventing some local help files from opening in the browser.</li>
+</ul>
+</li>
 </ul>
 
 <p><strong style="text-align:left">1.21 </strong>(July 9<sup>th</sup>, 2017):</p>
 <ul>
 <li><strong>All OSs:</strong>
 <ul>
 <li>Fix 1.20 regression crash when running on CPU not supporting extended features.</li>
 </ul>
 </li>
 <li><strong>Windows:</strong>
 <ul>
 <li>Fix 1.20 regression that caused PIM value stored in favorites to be ignored during mount.</li>
 <li>Fix 1.20 regression that causes system favorites not to mount in some cases.</li>
 <li>Fix some cases of "Parameter Incorrect" error during EFI system encryption wizard.</li>
 <li>Install PDF documents related to EFI system encryption configuration for advanced users:
 <ul>
 <li>disk_encryption_v1_2.pdf related to EFI hidden OS and full fisk encryption</li>
 <li>dcs_tpm_owner_02.pdf related to TPM configuration for EFI system encryption.</li>
 </li>
 </ul>
@@ -163,45 +851,46 @@
 <li>Fix keyboard issues in EFI Boot Loader. </li><li>Fix crash on 32-bit machines when creating a volume that uses Streebog as PRF.
 </li><li>Fix false positive detection of Evil-Maid attacks in some cases (e.g. hidden OS creation)
 </li><li>Fix failure to access EFS data on VeraCrypt volumes under Windows 10. </li><li>Fix wrong password error in the process of copying hidden OS. </li><li>Fix issues raised by Quarkslab audit:
 <ul>
 <li>Fix leak of password length in MBR bootloader inherited from TrueCrypt. </li><li>EFI bootloader: Fix various leaks and erase keyboard buffer after password is typed.
 </li><li>Use libzip library for handling zip Rescue Disk file instead of vulnerable XUnzip library.
 </li></ul>
 </li><li>Support EFI system encryption for 32-bit Windows. </li><li>Perform shutdown instead of reboot during Pre-Test of EFI system encryption to detect incompatible motherboards.
 </li><li>Minor GUI and translations fixes. </li></ul>
 </li><li><strong>MacOSX:</strong>
 <ul>
 <li>Remove dependency to MacFUSE compatibility layer in OSXFuse. </li></ul>
 </li></ul>
 <p>&nbsp;</p>
 <p><strong style="text-align:left">1.18a </strong>(August 17<sup>th</sup>, 2016):</p>
 <ul>
 <li><strong>All OSs:</strong>
 <ul>
 <li>Support Japanese encryption standard Camellia, including for Windows system encryption (MBR &amp; EFI).
 </li><li>Support Russian encryption and hash standards Kuznyechik, Magma and Streebog, including for Windows EFI system encryption.
+</li><li>Fix TrueCrypt vulnerability allowing detection of hidden volumes presence (reported by Ivanov Aleksey Mikhailovich, alekc96 [at] mail dot ru)
+<ul><li> <strong style="color:#ff0000;">To avoid hinting whether your volumes contain a hidden volume or not, or if you depend on plausible deniability when using hidden volumes/OS, then you must recreate both the outer and hidden volumes including system encryption and hidden OS, discarding existing volumes created prior to 1.18a version of VeraCrypt.</strong></li></ul>
 </li></ul>
 </li><li><strong>Windows:</strong>
 <ul>
 <li>Support EFI Windows system encryption (limitations: no hidden os, no boot custom message)
-</li><li>Fix TrueCrypt vulnerability allowing detection of hidden volumes presence(reported by Ivanov Aleksey Mikhailovich, alekc96 [at] mail dot ru)
 </li><li>Enhanced protection against dll hijacking attacks. </li><li>Fix boot issues on some machines by increasing required memory by 1 KiB </li><li>Add benchmarking of hash algorithms and PRF with PIM (including for pre-boot).
 </li><li>Move build system to Visual C&#43;&#43; 2010 for better stability. </li><li>Workaround for AES-NI support under Hyper-V on Windows Server 2008 R2. </li><li>Correctly remove driver file veracrypt.sys during uninstall on Windows 64-bit.
 </li><li>Implement passing smart card PIN as command line argument (/tokenpin) when explicitly mounting a volume.
 </li><li>When no drive letter specified, choose A: or B: only when no other free drive letter is available.
 </li><li>Reduce CPU usage caused by the option to disable use of disconnected network drives.
 </li><li>Add new volume ID mechanism to be used to identify disks/partitions instead of their device name.
 </li><li>Add option to avoid PIM prompt in pre-boot authentication by storing PIM value unencrypted in MBR.
 </li><li>Add option and command line switch to hide waiting dialog when performing operations.
 </li><li>Add checkbox in &quot;VeraCrypt Format&quot; wizard GUI to skip Rescue Disk verification during system encryption procedure.
 </li><li>Allow files drag-n-drop when VeraCrypt is running as elevated process. </li><li>Minor GUI and translations fixes. </li></ul>
 </li><li><strong>Linux:</strong>
 <ul>
 <li>Fix mount issue on Fedora 23. </li><li>Fix mount failure when compiling source code using gcc 5.x. </li><li>Adhere to XDG Desktop Specification by using XDG_CONFIG_HOME to determine location of configuration files.
 </li></ul>
 </li><li><strong>MacOSX:</strong>
 <ul>
 <li>Solve compatibility issue with newer versions of OSXFuse. </li></ul>
 </li></ul>
 <p>&nbsp;</p>
 <p><strong style="text-align:left">1.17 </strong>(February 13<sup>th</sup>, 2016):</p>
diff --git a/doc/html/Removable Medium Volume.html b/doc/html/Removable Medium Volume.html
index 811a5c8a..63c59c55 100644
--- a/doc/html/Removable Medium Volume.html
+++ b/doc/html/Removable Medium Volume.html
@@ -1,56 +1,56 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Removable%20Medium%20Volume.html">Removable Medium Volume</a>
 </p></div>
 
 <div class="wikidoc">
 <h2>Volume Mounted as Removable Medium</h2>
 <p>This section applies to VeraCrypt volumes mounted when one of the following options is enabled (as applicable):</p>
 <ul>
-<li><em>Tools</em> &gt; <em>Preferences</em> &gt; <em>Mount volumes as removable media</em>
+<li><em>Settings</em> &gt; <em>Preferences</em> &gt; <em>Mount volumes as removable media</em>
 </li><li><em>Mount Options</em> &gt; <em>Mount volume as removable medium</em> </li><li><em>Favorites</em> &gt; <em>Organize Favorite Volumes</em> &gt; <em>Mount selected volume as removable medium</em>
 </li><li><em>Favorites</em> &gt; <em>Organize System Favorite Volumes</em> &gt; <em>Mount selected volume as removable medium</em>
 </li></ul>
 <p>VeraCrypt Volumes that are mounted as removable media have the following advantages and disadvantages:</p>
 <ul>
 <li>Windows is prevented from automatically creating the &lsquo;<em>Recycled</em>&rsquo; and/or the &lsquo;<em>System Volume Information</em>&rsquo; folders on VeraCrypt volumes (in Windows, these folders are used by the Recycle Bin and System Restore features).
 </li><li>Windows 8 and later is prevented from writing an Event 98 to the Events Log that contains the device name (\\device\VeraCryptVolumeXX) of VeraCrypt volumes formatted using NTFS. This event log &quot;feature&quot; was introduced in Windows 8 as part of newly introduced
  NTFS health checks as <a href="https://blogs.msdn.microsoft.com/b8/2012/05/09/redesigning-chkdsk-and-the-new-ntfs-health-model/" target="_blank">
 explained here</a>. Big thanks to Liran Elharar for discovering this. </li><li>Windows may use caching methods and write delays that are normally used for removable media (for example, USB flash drives). This might slightly decrease the performance but at the same increase the likelihood that it will be possible to dismount the volume
  quickly without having to force the dismount. </li><li>The operating system may tend to keep the number of handles it opens to such a volume to a minimum. Hence, volumes mounted as removable media might require fewer forced dismounts than other volumes.
 </li><li>Under Windows Vista and earlier, the &lsquo;<em>Computer</em>&rsquo; (or &lsquo;<em>My Computer</em>&rsquo;) list does not show the amount of free space on volumes mounted as removable (note that this is a Windows limitation, not a bug in VeraCrypt).
 </li><li>Under desktop editions of Windows Vista or later, sectors of a volume mounted as removable medium may be accessible to all users (including users without administrator privileges; see section
 <a href="Multi-User%20Environment.html">
 <em>Multi-User Environment</em></a>). </li></ul>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Removing Encryption.html b/doc/html/Removing Encryption.html
index 6b5335b7..c2baf5c6 100644
--- a/doc/html/Removing Encryption.html
+++ b/doc/html/Removing Encryption.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Removing%20Encryption.html">Removing Encryption</a>
diff --git a/doc/html/SHA-256.html b/doc/html/SHA-256.html
index 4e5bcc5d..f130b547 100644
--- a/doc/html/SHA-256.html
+++ b/doc/html/SHA-256.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hash%20Algorithms.html">Hash Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="SHA-256.html">SHA-256</a>
diff --git a/doc/html/SHA-512.html b/doc/html/SHA-512.html
index 0b2c9d87..0fc6aae6 100644
--- a/doc/html/SHA-512.html
+++ b/doc/html/SHA-512.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hash%20Algorithms.html">Hash Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="SHA-512.html">SHA-512</a>
diff --git a/doc/html/Security Model.html b/doc/html/Security Model.html
index 9a65dcfe..79e154d2 100644
--- a/doc/html/Security Model.html
+++ b/doc/html/Security Model.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Model.html">Security Model</a>
 </p></div>
 
diff --git a/doc/html/Security Requirements and Precautions.html b/doc/html/Security Requirements and Precautions.html
index 4df99b38..1f2c0c47 100644
--- a/doc/html/Security Requirements and Precautions.html
+++ b/doc/html/Security Requirements and Precautions.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 </p></div>
 
@@ -42,40 +42,42 @@
 </tr>
 </tbody>
 </table>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 The sections in this chapter specify security requirements for using VeraCrypt and give information about things that adversely affect or limit the ability of VeraCrypt to secure data and to provide plausible deniability. Disclaimer: This chapter is not guaranteed
  to contain a list of <em style="text-align:left">all</em> security issues and attacks that might adversely affect or limit the ability of VeraCrypt to secure data and to provide plausible deniability.</div>
 <ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Data%20Leaks.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Data Leaks</a>
 <ul>
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Paging%20File.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Paging File</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Hibernation%20File.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Hibernation File</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Memory%20Dump%20Files.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Memory Dump Files</a>
 </li></ul>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Unencrypted%20Data%20in%20RAM.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Unencrypted Data in RAM</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="VeraCrypt%20Memory%20Protection.html" style="text-align:left; color:#0080c0; text-decoration:none.html">VeraCrypt Memory Protection</a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Physical%20Security.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Physical Security</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Malware.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Malware</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Multi-User%20Environment.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Multi-User Environment</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Authenticity%20and%20Integrity.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Authenticity and Integrity</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Choosing%20Passwords%20and%20Keyfiles.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Choosing Passwords and Keyfiles</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Changing%20Passwords%20and%20Keyfiles.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Changing Passwords and Keyfiles</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Trim%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Trim Operation</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Wear-Leveling.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Wear-Leveling</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Reallocated%20Sectors.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Reallocated Sectors</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Defragmenting.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Defragmenting</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
diff --git a/doc/html/Security Requirements for Hidden Volumes.html b/doc/html/Security Requirements for Hidden Volumes.html
index 09998295..3b5dbdb3 100644
--- a/doc/html/Security Requirements for Hidden Volumes.html
+++ b/doc/html/Security Requirements for Hidden Volumes.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Plausible%20Deniability.html">Plausible Deniability</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hidden%20Volume.html">Hidden Volume</a>
diff --git a/doc/html/Security Tokens & Smart Cards.html b/doc/html/Security Tokens & Smart Cards.html
index b0613251..0acbf41a 100644
--- a/doc/html/Security Tokens & Smart Cards.html
+++ b/doc/html/Security Tokens & Smart Cards.html
@@ -1,41 +1,41 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Tokens%20%26%20Smart%20Cards.html">Security Tokens &amp; Smart Cards</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Security Tokens &amp; Smart Cards</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 VeraCrypt supports security (or cryptographic) tokens and smart cards that can be accessed using the PKCS&nbsp;#11 (2.0 or later) protocol [23]. For more information, please see the section
 <em style="text-align:left">Security Tokens and Smart Cards</em> in the chapter <a href="Keyfiles%20in%20VeraCrypt.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
-<em style="text-align:left">Keyfiles</em></a>.</div>
+<em style="text-align:left">Keyfiles</em></a>.<br><p>Please note that security tokens and smart cards are currently not supported for Pre-Boot authentication of system encryption.</p></div>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Serpent.html b/doc/html/Serpent.html
index 81e7a1e1..4212fd7a 100644
--- a/doc/html/Serpent.html
+++ b/doc/html/Serpent.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Serpent.html">Serpent</a>
diff --git a/doc/html/Sharing over Network.html b/doc/html/Sharing over Network.html
index db204a76..829838b9 100644
--- a/doc/html/Sharing over Network.html
+++ b/doc/html/Sharing over Network.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Sharing%20over%20Network.html">Sharing over Network</a>
diff --git a/doc/html/Source Code.html b/doc/html/Source Code.html
index 2942a934..7b8794a9 100644
--- a/doc/html/Source Code.html
+++ b/doc/html/Source Code.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Source%20Code.html">Source Code</a>
diff --git a/doc/html/Standard Compliance.html b/doc/html/Standard Compliance.html
index 14d40d13..848a5acc 100644
--- a/doc/html/Standard Compliance.html
+++ b/doc/html/Standard Compliance.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Standard%20Compliance.html">Compliance with Standards and Specifications</a>
diff --git a/doc/html/Streebog.html b/doc/html/Streebog.html
index 8c9dca8f..56d0e7c9 100644
--- a/doc/html/Streebog.html
+++ b/doc/html/Streebog.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hash%20Algorithms.html">Hash Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Streebog.html">Streebog</a>
diff --git a/doc/html/Supported Operating Systems.html b/doc/html/Supported Operating Systems.html
index be20c3bf..67612ab2 100644
--- a/doc/html/Supported Operating Systems.html
+++ b/doc/html/Supported Operating Systems.html
@@ -1,63 +1,60 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Supported%20Operating%20Systems.html">Supported Operating Systems</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Supported Operating Systems</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 VeraCrypt currently supports the following operating systems:</div>
 <ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Windows 11 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Windows 10 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows 8 and 8.1 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows 7 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Vista </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows XP </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Server 2012 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Server 2008 R2 (64-bit) </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Server 2008 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Server 2003 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Mac OS X 10.12 Sierra </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Mac OS X 10.11 El Capitan </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Mac OS X 10.10 Yosemite </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Mac OS X 10.9 Mavericks </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Mac OS X 10.8 Mountain Lion </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Mac OS X 10.7 Lion </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Linux x86 (32-bit and 64-bit versions, kernel 2.6 or compatible) </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-FreeBSD x86 (32-bit and 64-bit versions, starting from version 11) </li></ul>
+Windows Server 2016 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Mac OS X 14 Sonoma </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Mac OS X 13 Ventura </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Mac OS X 12 Monterey </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Linux x86, x86-64, ARM64 (Starting from Debian 10, Ubuntu 20.04, CentOS 7, OpenSUSE 15.1)  </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+FreeBSD x86-64 (starting from version 12) </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Raspberry Pi OS (32-bit and 64-bit) </li></ul>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<span style="text-align:left;">Note: <br/>
+VeraCrypt 1.25.9 is the last version that supports Windows XP, Windows Vista, Windows 7, Windows 8, and Windows 8.1.<br/>
+VeraCrypt 1.25.9 is the last version the supports Mac OS X versions from 10.9 Mavericks to 11 Big Sur<br/>
+VeraCrypt 1.24-Update8 is the last version that supports Mac OS X 10.7 Lion and Mac OS X 10.8 Mountain Lion.</span></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <span style="text-align:left; font-size:10px; line-height:12px">Note: The following operating systems (among others) are not supported: Windows RT, Windows 2003 IA-64, Windows 2008 IA-64, Windows XP IA-64, and the Embedded/Tablet versions of Windows.</span></div>
 <p><br style="text-align:left">
 <br style="text-align:left">
 Also see the section <strong style="text-align:left"><a href="Supported%20Systems%20for%20System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Operating Systems Supported for System
  Encryption</a></strong></p>
 </div>
 </body></html>
diff --git a/doc/html/Supported Systems for System Encryption.html b/doc/html/Supported Systems for System Encryption.html
index 45542a74..afadc0ec 100644
--- a/doc/html/Supported Systems for System Encryption.html
+++ b/doc/html/Supported Systems for System Encryption.html
@@ -1,62 +1,56 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="System%20Encryption.html">System Encryption</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Supported%20Systems%20for%20System%20Encryption.html">Supported Systems for System Encryption</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Operating Systems Supported for System Encryption</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 VeraCrypt can currently encrypt the following operating systems:</div>
 <ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows 10 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows 8 and 8.1 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows 7 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Vista (SP1 or later) </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows XP </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Server 2012 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Server 2008 and Windows Server 2008 R2 (64-bit) </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Windows Server 2003 </li></ul>
+Windows 11 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Windows 10 </li></ul>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <span style="text-align:left; font-size:10px; line-height:12px">Note: The following operating systems (among others) are not supported: Windows RT, Windows 2003 IA-64, Windows 2008 IA-64, Windows XP IA-64, and the Embedded/Tablet versions of Windows.
 </span></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Also see the section <a href="Supported%20Operating%20Systems.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Supported Operating Systems</a></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 &nbsp;</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <a href="VeraCrypt%20Rescue%20Disk.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></div>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/System Encryption.html b/doc/html/System Encryption.html
index 676c2e19..c83d72fe 100644
--- a/doc/html/System Encryption.html
+++ b/doc/html/System Encryption.html
@@ -1,72 +1,80 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="System%20Encryption.html">System Encryption</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>System Encryption</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 VeraCrypt can on-the-fly encrypt a system partition or entire system drive, i.e. a partition or drive where Windows is installed and from which it boots.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 System encryption provides the highest level of security and privacy, because all files, including any temporary files that Windows and applications create on the system partition (typically, without your knowledge or consent), hibernation files, swap files,
  etc., are always permanently encrypted (even when power supply is suddenly interrupted). Windows also records large amounts of potentially sensitive data, such as the names and locations of files you open, applications you run, etc. All such log files and
  registry entries are always permanently encrypted as well.</div>
+
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong>Note on SSDs and TRIM:</strong>
+When using system encryption on SSDs, it's important to consider the implications of the TRIM operation, which can potentially reveal information about which sectors on the drive are not in use. For detailed guidance on how TRIM operates with VeraCrypt and how to manage its settings for enhanced security, please refer to the <a href="Trim%20Operation.html">TRIM Operation</a> documentation.
+</div>
+
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 System encryption involves pre-boot authentication, which means that anyone who wants to gain access and use the encrypted system, read and write files stored on the system drive, etc., will need to enter the correct password each time before Windows boots
  (starts). Pre-boot authentication is handled by the VeraCrypt Boot Loader, which resides in the first track of the boot drive and on the
 <a href="VeraCrypt%20Rescue%20Disk.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 VeraCrypt Rescue Disk (see below)</a>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Note that VeraCrypt can encrypt an existing unencrypted system partition/drive in-place while the operating system is running (while the system is being encrypted, you can use your computer as usual without any restrictions). Likewise, a VeraCrypt-encrypted
  system partition/drive can be decrypted in-place while the operating system is running. You can interrupt the process of encryption or decryption anytime, leave the partition/drive partially unencrypted, restart or shut down the computer, and then resume the
  process, which will continue from the point it was stopped.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 The mode of operation used for system encryption is <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 XTS</a> (see the section <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Modes of Operation</a>). For further technical details of system encryption, see the section
 <a href="Encryption%20Scheme.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Encryption Scheme</a> in the chapter <a href="Technical%20Details.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Technical Details</a>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 To encrypt a system partition or entire system drive, select <em style="text-align:left">
 System</em> &gt; <em style="text-align:left">Encrypt System Partition/Drive</em> and then follow the instructions in the wizard. To decrypt a system partition/drive, select
 <em style="text-align:left">System</em> &gt; <em style="text-align:left">Permanently Decrypt System Partition/Drive</em>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Because of BIOS requirement, the pre-boot password is typed using <strong>US keyboard layout.
-</strong>During the system encryption process, VeraCrypt automatically and transparently switches the keyboard to US layout in order to ensure that the password value typed will match the one typed in pre-boot mode. Thus, in order to avoid wrong password errors,
- one must type the password using the same keys as when creating the system encryption.</div>
+</strong>During the system encryption process, VeraCrypt automatically and transparently switches the keyboard to US layout in order to ensure that the password value typed will match the one typed in pre-boot mode. 
+However, pasting the password from the clipboard can override this protective measure. To prevent any issues arising from this discrepancy, VeraCrypt disables the option to paste passwords from the clipboard in the system encryption wizard. 
+Thus, when setting or entering your password, it's crucial to type it manually using the same keys as when creating the system encryption, ensuring consistent access to your encrypted system.</div>
 <p>Note: By default, Windows 7 and later boot from a special small partition. The partition contains files that are required to boot the system. Windows allows only applications that have administrator privileges to write to the partition (when the system is
- running). VeraCrypt encrypts the partition only if you choose to encrypt the whole system drive (as opposed to choosing to encrypt only the partition where Windows is installed).</p>
+ running). In EFI boot mode, which is the default on modern PCs, VeraCrypt can not encrypt this partition since it must remain unencrypted so that the BIOS can load the EFI bootloader from it. This in turn implies that in EFI boot mode, VeraCrypt offers only to encrypt the system partition where Windows is installed (the user can later manually encrypt other data partitions using VeraCrypt).
+ In MBR legacy boot mode, VeraCrypt encrypts the partition only if you choose to encrypt the whole system drive (as opposed to choosing to encrypt only the partition where Windows is installed).</p>
 <p>&nbsp;</p>
 <p><a href="Hidden%20Operating%20System.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
 </div>
 </body></html>
diff --git a/doc/html/System Favorite Volumes.html b/doc/html/System Favorite Volumes.html
index 4344d4ad..491a6698 100644
--- a/doc/html/System Favorite Volumes.html
+++ b/doc/html/System Favorite Volumes.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Volume.html">VeraCrypt Volume</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="System%20Favorite%20Volumes.html">System Favorite Volumes</a>
diff --git a/doc/html/Technical Details.html b/doc/html/Technical Details.html
index a5696e1d..63878e05 100644
--- a/doc/html/Technical Details.html
+++ b/doc/html/Technical Details.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 </p></div>
 
@@ -38,22 +38,31 @@
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Notation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Notation</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Encryption%20Scheme.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Encryption Scheme</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Modes of Operation</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Header%20Key%20Derivation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Header Key Derivation, Salt, and Iteration Count</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Random%20Number%20Generator.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Random Number Generator</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Keyfiles.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Keyfiles</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">PIM</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="VeraCrypt%20Volume%20Format%20Specification.html" style="text-align:left; color:#0080c0; text-decoration:none.html">VeraCrypt Volume Format Specification</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Standard%20Compliance.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Compliance with Standards and Specifications</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="Source%20Code.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Source Code</a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="CompilingGuidelines.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Building VeraCrypt From Source</a>
+<ul>
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="CompilingGuidelineWin.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Windows Build Guide</a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="CompilingGuidelineLinux.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Linux Build Guide</a>
+</li>
+</ul>
 </li></ul>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Trim Operation.html b/doc/html/Trim Operation.html
index fd9137ce..a186f9da 100644
--- a/doc/html/Trim Operation.html
+++ b/doc/html/Trim Operation.html
@@ -1,50 +1,59 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Trim%20Operation.html">Trim Operation</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Trim Operation</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Some storage devices (e.g., some solid-state drives, including USB flash drives) use so-called 'trim' operation to mark drive sectors as free e.g. when a file is deleted. Consequently, such sectors may contain unencrypted zeroes or other undefined data (unencrypted)
- even if they are located within a part of the drive that is encrypted by VeraCrypt. VeraCrypt does not block the trim operation on partitions that are within the key scope of
-<a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
-system encryption</a> (unless a <a href="Hidden%20Operating%20System.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
-hidden operating system</a> is running) and under Linux on all volumes that use the Linux native kernel cryptographic services. In those cases, the adversary will be able to tell which sectors contain free space (and may be able to use this information for
+ even if they are located within a part of the drive that is encrypted by VeraCrypt.<br>
+<br>
+On Windows, VeraCrypt allows users to control the trim operation for both non-system and system volumes:
+<ul>
+<li>For non-system volumes, trim is blocked by default. Users can enable trim through VeraCrypt's interface by navigating to "Settings -> Performance/Driver Configuration" and checking the option "Allow TRIM command for non-system SSD partition/drive."</li>
+<li>For <a href="System%20Encryption.html">system encryption</a>, trim is enabled by default (unless a <a href="Hidden%20Operating%20System.html">hidden operating system</a> is running). Users can disable trim by navigating to "System -> Settings" and checking the option "Block TRIM command on system partition/drive."</li>
+</ul>
+
+Under Linux, VeraCrypt does not block the trim operation on volumes using the native Linux kernel cryptographic services, which is the default setting. To block TRIM on Linux, users should either enable the "do not use kernel cryptographic services" option in VeraCrypt's Preferences (applicable only to volumes mounted afterward) or use the <code>--mount-options=nokernelcrypto</code> switch in the command line when mounting.
+<br>
+<br>
+Under macOS, VeraCrypt does not support the trim operation. Therefore, trim is always blocked on all volumes.
+<br>
+<br>
+In cases where trim operations occur, the adversary will be able to tell which sectors contain free space (and may be able to use this information for
  further analysis and attacks) and <a href="Plausible%20Deniability.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
-plausible deniability</a> may be negatively affected. If you want to avoid those issues, do not use
-<a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
-system encryption</a> on drives that use the trim operation and, under Linux, either configure VeraCrypt not to use the Linux native kernel cryptographic services or make sure VeraCrypt volumes are not located on drives that use the trim operation.</div>
+plausible deniability</a> may be negatively affected. In order to avoid these issues, users should either disable trim in VeraCrypt settings as previously described or make sure VeraCrypt volumes are not located on drives that use the trim operation.</div>
 <p>To find out whether a device uses the trim operation, please refer to documentation supplied with the device or contact the vendor/manufacturer.</p>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/Troubleshooting.html b/doc/html/Troubleshooting.html
index e56390af..3eece663 100644
--- a/doc/html/Troubleshooting.html
+++ b/doc/html/Troubleshooting.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Troubleshooting.html">Troubleshooting</a>
 </p></div>
 
diff --git a/doc/html/TrueCrypt Support.html b/doc/html/TrueCrypt Support.html
index a259773b..af1383c7 100644
--- a/doc/html/TrueCrypt Support.html
+++ b/doc/html/TrueCrypt Support.html
@@ -1,41 +1,44 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="TrueCrypt%20Support.html">TrueCrypt Support</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>TrueCrypt Support</h1>
+<p>
+<strong>Note: <span style="color:#ff0000;">TrueCrypt support was dropped starting from version 1.26</span></strong>
+</p>
 <p>Starting from version 1.0f, VeraCrypt supports loading TrueCrypt volumes and partitions, both normal and hidden. In order to activate this, you have to check &ldquo;TrueCrypt Mode&rdquo; in the password prompt dialog as shown below.</p>
-<p><img src="TrueCrypt Support_truecrypt_mode_gui.jpg" alt="TrueCrypt mode" width="499" height="205"></p>
+<p><img src="TrueCrypt Support_truecrypt_mode_gui.jpg" alt="TrueCrypt mode"></p>
 <p><strong>Note:</strong> Only volumes and partitions created using TrueCrypt versions
 <strong>6.x</strong> and <strong>7.x</strong> are supported.</p>
 </div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/TrueCrypt Support_truecrypt_mode_gui.jpg b/doc/html/TrueCrypt Support_truecrypt_mode_gui.jpg
index 3418e081..65e252d7 100644
--- a/doc/html/TrueCrypt Support_truecrypt_mode_gui.jpg
+++ b/doc/html/TrueCrypt Support_truecrypt_mode_gui.jpg
diff --git a/doc/html/Twofish.html b/doc/html/Twofish.html
index 7d8ce2e8..0d0848d2 100644
--- a/doc/html/Twofish.html
+++ b/doc/html/Twofish.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Twofish.html">Twofish</a>
diff --git a/doc/html/Unencrypted Data in RAM.html b/doc/html/Unencrypted Data in RAM.html
index 8917867a..9c4de777 100644
--- a/doc/html/Unencrypted Data in RAM.html
+++ b/doc/html/Unencrypted Data in RAM.html
@@ -1,70 +1,74 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Unencrypted%20Data%20in%20RAM.html">Unencrypted Data in RAM</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>Unencrypted Data in RAM</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 It is important to note that VeraCrypt is <em style="text-align:left">disk</em> encryption software, which encrypts only disks, not RAM (memory).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Keep in mind that most programs do not clear the memory area (buffers) in which they store unencrypted (portions of) files they load from a VeraCrypt volume. This means that after you exit such a program, unencrypted data it worked with may remain in memory
  (RAM) until the computer is turned off (and, according to some researchers, even for some time after the power is turned off*). Also note that if you open a file stored on a VeraCrypt volume, for example, in a text editor and then force dismount on the VeraCrypt
  volume, then the file will remain unencrypted in the area of memory (RAM) used by (allocated to) the text editor. This also applies to forced auto-dismount.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Inherently, unencrypted master keys have to be stored in RAM too. When a non-system VeraCrypt volume is dismounted, VeraCrypt erases its master keys (stored in RAM). When the computer is cleanly restarted (or cleanly shut down), all non-system VeraCrypt volumes
  are automatically dismounted and, thus, all master keys stored in RAM are erased by the VeraCrypt driver (except master keys for system partitions/drives &mdash; see below). However, when power supply is abruptly interrupted, when the computer is reset (not
  cleanly restarted), or when the system crashes, <strong style="text-align:left">
 VeraCrypt naturally stops running and therefore cannot </strong>erase any keys or any other sensitive data. Furthermore, as Microsoft does not provide any appropriate API for handling hibernation and shutdown, master keys used for system encryption cannot be
  reliably (and are not) erased from RAM when the computer hibernates, is shut down or restarted.**</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Starting from version 1.24, VeraCrypt introduces a mechanism to encrypt master keys and cached passwords in RAM. This RAM encryption mechanism must be activated manually in "Performance/Driver Configuration" dialog. RAM encryption comes with a performance overhead (between 5% and 15% depending on the CPU speed) and it disables Windows hibernate. <br>
+Moreover, VeraCrypt 1.24 and above provide an additional security mechanism when system encryption is used that makes VeraCrypt erase master keys from RAM when a new device is connected to the PC. This additional mechanism can be activated using an option in System Settings dialog.<br/>
+Even though both above mechanisms provides strong protection for masterskeys and cached password, users should still take usual precautions related for the safery of sensitive data in RAM.</div>
 <table style="border-collapse:separate; border-spacing:0px; text-align:left; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif">
 <tbody style="text-align:left">
 <tr style="text-align:left">
 <td style="text-align:left; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; color:#ff0000; padding:15px; border:1px solid #000000">
 To summarize, VeraCrypt <strong style="text-align:left">cannot</strong> and does <strong style="text-align:left">
 not</strong> ensure that RAM contains no sensitive data (e.g. passwords, master keys, or decrypted data). Therefore, after each session in which you work with a VeraCrypt volume or in which an encrypted operating system is running, you must shut down (or, if
  the <a href="Hibernation%20File.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 hibernation file</a> is <a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 encrypted</a>, hibernate) the computer and then leave it powered off for at least several minutes (the longer, the better) before turning it on again. This is required to clear the RAM (also see the section
 <a href="Hibernation%20File.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Hibernation File</a>).</td>
 </tr>
 </tbody>
 </table>
 <p>&nbsp;</p>
 <hr align="left" size="1" width="189" style="text-align:left; height:0px; border-width:0px 1px 1px; border-style:solid; border-color:#000000">
 <p><span style="text-align:left; font-size:10px; line-height:12px">* Allegedly, for 1.5-35 seconds under normal operating temperatures (26-44 &deg;C) and up to several hours when the memory modules are cooled (when the computer is running) to very low temperatures
  (e.g. -50&nbsp;&deg;C). New types of memory modules allegedly exhibit a much shorter decay time (e.g. 1.5-2.5 seconds) than older types (as of 2008).</span><br style="text-align:left">
 <span style="text-align:left; font-size:10px; line-height:12px">** Before a key can be erased from RAM, the corresponding VeraCrypt volume must be dismounted. For non-system volumes, this does not cause any problems. However, as Microsoft currently does not
  provide any appropriate API for handling the final phase of the system shutdown process, paging files located on encrypted system volumes that are dismounted during the system shutdown process may still contain valid swapped-out memory pages (including portions
diff --git a/doc/html/Uninstalling VeraCrypt.html b/doc/html/Uninstalling VeraCrypt.html
index e2ee600e..cf247ab3 100644
--- a/doc/html/Uninstalling VeraCrypt.html
+++ b/doc/html/Uninstalling VeraCrypt.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Uninstalling%20VeraCrypt.html">Uninstalling VeraCrypt</a>
diff --git a/doc/html/Using VeraCrypt Without Administrator Privileges.html b/doc/html/Using VeraCrypt Without Administrator Privileges.html
index c02320e6..742ae0e9 100644
--- a/doc/html/Using VeraCrypt Without Administrator Privileges.html
+++ b/doc/html/Using VeraCrypt Without Administrator Privileges.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Using%20VeraCrypt%20Without%20Administrator%20Privileges.html">Using Without Admin Rights</a>
diff --git a/doc/html/VeraCrypt Background Task.html b/doc/html/VeraCrypt Background Task.html
index 7cacb13f..2ded6d50 100644
--- a/doc/html/VeraCrypt Background Task.html
+++ b/doc/html/VeraCrypt Background Task.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Background%20Task.html">Background Task</a>
diff --git a/doc/html/VeraCrypt Hidden Operating System.html b/doc/html/VeraCrypt Hidden Operating System.html
index 03ba1679..8881b925 100644
--- a/doc/html/VeraCrypt Hidden Operating System.html
+++ b/doc/html/VeraCrypt Hidden Operating System.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Plausible%20Deniability.html">Plausible Deniability</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Hidden%20Operating%20System.html">Hidden Operating System</a>
@@ -79,41 +79,41 @@ Note: When you enter a pre-boot authentication password, the VeraCrypt Boot Load
  volume header cannot be identified, as it appears to consist entirely of random data). If the header is successfully decrypted (for information on how VeraCrypt determines that it was successfully decrypted, see the section
 <a href="Encryption%20Scheme.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Encryption Scheme</a>), the information about the size of the hidden volume is retrieved from the decrypted header (which is still stored in RAM), and the hidden volume is mounted (its size also determines its offset). For further technical details, see the
  section <a href="Encryption%20Scheme.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Encryption Scheme</a> in the chapter <a href="Technical%20Details.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Technical Details</a>.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 When running, the hidden operating system appears to be installed on the same partition as the original operating system (the decoy system). However, in reality, it is installed within the partition behind it (in a hidden volume). All read/write operations
  are transparently redirected from the system partition to the hidden volume. Neither the operating system nor applications will know that data written to and read from the system partition is actually written to and read from the partition behind it (from/to
  a hidden volume). Any such data is encrypted and decrypted on the fly as usual (with an encryption key different from the one that is used for the decoy operating system).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Note that there will also be a third password &mdash; the one for the <a href="Hidden%20Volume.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 <strong style="text-align:left">outer volume</strong></a>. It is not a pre-boot authentication password, but a regular VeraCrypt volume password. It can be safely disclosed to anyone forcing you to reveal the password for the encrypted partition where the hidden
  volume (containing the hidden operating system) resides. Thus, the existence of the hidden volume (and of the hidden operating system) will remain secret. If you are not sure you understand how this is possible, or what an outer volume is, please read the
  section <a href="Hidden%20Volume.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 Hidden Volume</a>. The outer volume should contain some sensitive-looking files that you actually do
 <em style="text-align:left">not</em> want to hide.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 To summarize, there will be three passwords in total. Two of them can be revealed to an attacker (for the decoy system and for the outer volume). The third password, for the hidden system, must remain secret.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-<img src="Beginner's Tutorial_Image_034.png" alt="Example Layout of System Drive Containing Hidden Operating System" width="604" height="225"></div>
+<img src="Beginner's Tutorial_Image_034.png" alt="Example Layout of System Drive Containing Hidden Operating System"></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <em style="text-align:left">Example Layout of System Drive Containing Hidden Operating System</em></div>
 <p>&nbsp;</p>
 <h4 id="CreationProcess" style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; font-size:12px; margin-bottom:1px">
 Process of Creation of Hidden Operating System</h4>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 To start the process of creation of a hidden operating system, select <em style="text-align:left">
 System</em> &gt; <em style="text-align:left">Create Hidden Operating System</em> and then follow the instructions in the wizard.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Initially, the wizard verifies that there is a suitable partition for a hidden operating system on the system drive. Note that before you can create a hidden operating system, you need to create a partition for it on the system drive. It must be the first partition
  behind the system partition and it must be at least 5% larger than the system partition (the system partition is the one where the currently running operating system is installed). However, if the outer volume (not to be confused with the system partition)
  is formatted as NTFS, the partition for the hidden operating system must be at least 110% (2.1 times) larger than the system partition (the reason is that the NTFS file system always stores internal data exactly in the middle of the volume and, therefore,
  the hidden volume, which is to contain a clone of the system partition, can reside only in the second half of the partition).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 In the next steps, the wizard will create two VeraCrypt volumes (<a href="Hidden%20Volume.html" style="text-align:left; color:#0080c0; text-decoration:none.html">outer and hidden</a>) within the first partition behind the
  system partition. The <a href="Hidden%20Volume.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 hidden volume</a> will contain the hidden operating system. The size of the hidden volume is always the same as the size of the system partition. The reason is that the hidden volume will need to contain a clone of the content of the system partition (see below).
  Note that the clone will be encrypted using a different encryption key than the original. Before you start copying some sensitive-looking files to the outer volume, the wizard tells you the maximum recommended size of space that the files should occupy, so
  that there is enough free space on the outer volume for the hidden volume.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
diff --git a/doc/html/VeraCrypt License.html b/doc/html/VeraCrypt License.html
index 6b670e1c..20e024aa 100644
--- a/doc/html/VeraCrypt License.html
+++ b/doc/html/VeraCrypt License.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20License.html">VeraCrypt License</a>
 </p></div>
 
@@ -334,75 +334,107 @@ These actions are prohibited by law if you do not accept this License.<br style=
 ____________________________________________________________<br style="text-align:left">
 <br style="text-align:left">
 Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved.<br style="text-align:left">
 <br style="text-align:left">
 LICENSE TERMS<br style="text-align:left">
 <br style="text-align:left">
 The free distribution and use of this software is allowed (with or without changes) provided that:</p>
 <ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 source code distributions include the above copyright notice, this list of conditions and the following disclaimer;
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 binary distributions include the above copyright notice, this list of conditions and the following disclaimer in their documentation;
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 the name of the copyright holder is not used to endorse products built using this software without specific written permission.
 </li></ol>
 <p>DISCLAIMER<br style="text-align:left">
 <br style="text-align:left">
 This software is provided 'as is' with no explicit or implied warranties in respect of its properties, including, but not limited to, correctness and/or fitness for purpose.<br style="text-align:left">
   ____________________________________________________________<br>
   <br>
-  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler.<br>
+  Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler.<br>
   <br>
   This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages arising from the use of this software.<br>
   <br>
 Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:<br>
 <ol>
   <li>The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</li>
   <li> Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</li>
   <li> This notice may not be removed or altered from any source distribution.</li>
 </ol>
   Jean-loup Gailly        Mark Adler<br>
   jloup@gzip.org          madler@alumni.caltech.edu<br>
 ____________________________________________________________<br>
 <br>
-  Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner<br>
+  Copyright (C) 1999-2023 Dieter Baron and Thomas Klausner<br>
   <br>
   The authors can be contacted at <libzip@nih.at><br>
   <br>
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
   <br>
 <ol>
   <li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</li>
   <li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.</li>
   <li>The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission.</li>
 </ol>
 <br>
 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>
 ____________________________________________________________<br>
 <br>
 Copyright (c) 2013, Alexey Degtyarev. All rights reserved.<br>
 <br>
 ________________________________________________________<br>
 <br>
   Copyright (c) 2016. Disk Cryptography Services for EFI (DCS), Alex Kolotnikov<br>
   <br>
   This program and the accompanying materials are licensed and made available under the terms and conditions of the GNU Lesser General Public License, version 3.0 (LGPL-3.0).<br>
   <br>
   The full text of the license may be found at https://opensource.org/licenses/LGPL-3.0<br>
 ____________________________________________________________<br>
 <br>
   Copyright (c) 1999-2013,2014,2015,2016 Jack Lloyd. <br>
   <br>
   All rights reserved.<br>
   <br>
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
   <br>
 <ol>
   <li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</li>
   <li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.</li>
 </ol>
 <br>
 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>
 ____________________________________________________________<br>
+<br>
+Copyright (c) 2013-2019 Stephan Mueller &lt;smueller@chronox.de&gt;<br>
+<br>
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
+<ol>
+<li>Redistributions of source code must retain the above copyright notice, and the entire permission notice in its entirety, including the disclaimer of warranties.</li>
+<li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.</li>
+<li>The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.</li>
+</ol>
+<p>
+ALTERNATIVELY, this product may be distributed under the terms of the GNU General Public License, in which case the provisions of the GPL2 are required INSTEAD OF the above restrictions. (This clause is necessary due to a potential bad interaction between the GPL and the restrictions contained in a BSD-style copyright.)
+</p>
+<p>
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+____________________________________________________________<br>
+<br>
+Copyright (c) 1999-2023 Igor Pavlov<br>
+<br>
+LZMA SDK is written and placed in the public domain by Igor Pavlov.<br>
+<br>
+Some code in LZMA SDK is based on public domain code from another developers:<br>
+<ol>
+  <li> PPMd var.H (2001): Dmitry Shkarin</li>
+  <li> SHA-256: Wei Dai (Crypto++ library)</li>
+</ol>
+<p>
+  Anyone is free to copy, modify, publish, use, compile, sell, or distribute the <br>
+  original LZMA SDK code, either in source code form or as a compiled binary, for <br>
+  any purpose, commercial or non-commercial, and by any means.
+</p>
+____________________________________________________________<br>
 </div>
 </body></html>
diff --git a/doc/html/VeraCrypt Memory Protection.html b/doc/html/VeraCrypt Memory Protection.html
new file mode 100644
index 00000000..115d5f47
--- /dev/null
+++ b/doc/html/VeraCrypt Memory Protection.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="VeraCrypt%20Memory%20Protection.html">VeraCrypt Memory Protection</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>VeraCrypt Memory Protection Mechanism</h1>
+<h2>Introduction</h2>
+<p>VeraCrypt always strives to enhance user experience while maintaining the highest level of security. The memory protection mechanism is one such security feature. However, understanding the need for accessibility, we have also provided an option to disable this mechanism for certain users. This page provides in-depth information on both.</p>
+<h2>Memory Protection Mechanism: An Overview</h2>
+<p>
+The memory protection mechanism ensures that non-administrator processes are prohibited from accessing the VeraCrypt process memory. This serves two primary purposes:
+<ul>
+	<li>Security Against Malicious Activities: The mechanism prevents non-admin processes from injecting harmful data or code inside the VeraCrypt process.</li>
+	<li>Protection of Sensitive Data: Although VeraCrypt is designed to not leave sensitive data in memory, this feature offers an extra layer of assurance by ensuring other non-admin processes cannot access or extract potentially sensitive information.</li>
+</ul>
+</p>
+<h2>Why Introduce An Option To Disable Memory Protection?</h2>
+<p>
+	Some accessibility tools, like screen readers, require access to a software's process memory to effectively interpret and interact with its user interface (UI). VeraCrypt's memory protection unintentionally hindered the functioning of such tools. To ensure that users relying on accessibility tools can still use VeraCrypt without impediments, we introduced this option.
+</p>
+<h2>How to Enable/Disable the Memory Protection Mechanism?</h2>
+<p>
+	By default, the memory protection mechanism is enabled. However, you can disable through VeraCrypt main UI or during installation.
+	<ol>
+		<li>During installation:
+			<ul>
+				<li>In the setup wizard, you'll encounter the <b>"Disable memory protection for Accessibility tools compatibility"</b> checkbox.</li>
+				<li>Check the box if you want to disable the memory protection. Leave it unchecked to keep using memory protection.</li>
+				<li>Proceed with the rest of the installation.</li>
+			</ul>
+		</li>
+		<li>Post-Installation:
+			<ul>
+				<li>Open VeraCrypt main UI and navigate to the menu Settings -> "Performance/Driver Configuration".</li>
+				<li>Locate and check/uncheck the <b>"Disable memory protection for Accessibility tools compatibility"</b> option as per your needs. You will be notified that an OS reboot is required for the change to take effect.</li>
+				<li>Click <b>OK</b>.</li>
+			</ul>
+		</li>
+		<li>During Upgrade or Repair/Reinstall
+			<ul>
+				<li>In the setup wizard, you'll encounter the <b>"Disable memory protection for Accessibility tools compatibility"</b> checkbox.</li>
+				<li>Check/uncheck the <b>"Disable memory protection for Accessibility tools compatibility"</b> option as per your needs.</li>
+				<li>Proceed with the rest of the upgrade or repair/reinstall.</li>
+				<li>You will be notified that an OS reboot is required if you have changed the memory protection setting.</li>
+			</ul>
+
+		</li>
+	</ol>
+<h2>Risks and Considerations</h2>
+<p>
+While disabling the memory protection mechanism can be essential for some users, it's crucial to understand the risks:
+<ul>
+	<li><b>Potential Exposure:</b> Disabling the mechanism could expose the VeraCrypt process memory to malicious processes.</li>
+	<li><b>Best Practice:</b> If you don't require accessibility tools to use VeraCrypt, it's recommended to leave the memory protection enabled.</li>
+</ul>
+</p>
+<h2>FAQ</h2>
+<p>
+	<b>Q: What is the default setting for the memory protection mechanism?</b><br>
+	<b>A:</b> The memory protection mechanism is enabled by default.
+</p>
+<p>
+	<b>Q: How do I know if the memory protection mechanism is enabled or disabled?</b><br>
+	<b>A:</b> You can check the status of the memory protection mechanism in the VeraCrypt main UI. Navigate to the menu Settings -> "Performance/Driver Configuration". If the <b>"Disable memory protection for Accessibility tools compatibility"</b> option is checked, the memory protection mechanism is disabled. If the option is unchecked, the memory protection mechanism is enabled.
+</p>
+<p>
+	<b>Q: Will disabling memory protection reduce the encryption strength of VeraCrypt?</b><br>
+	<b>A:</b> No, the encryption algorithms and their strength remain the same. Only the protection against potential memory snooping and injection by non-admin processes is affected.
+</p>
+<p>
+	<b>Q: I don't use accessibility tools. Should I disable this feature?</b><br>
+	<b>A:</b> No, it's best to keep the memory protection mechanism enabled for added security.
+</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/VeraCrypt RAM Encryption.html b/doc/html/VeraCrypt RAM Encryption.html
new file mode 100644
index 00000000..5bfb6aa5
--- /dev/null
+++ b/doc/html/VeraCrypt RAM Encryption.html
@@ -0,0 +1,158 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="VeraCrypt%20RAM%20Encryption.html">VeraCrypt RAM Encryption</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>VeraCrypt RAM Encryption Mechanism</h1>
+
+<h2>Introduction</h2>
+
+<p>
+    VeraCrypt RAM Encryption aims to protect disk encryption keys stored in volatile memory against certain types of attacks. The primary objectives of this mechanism are:
+    </p><ul>
+        <li>To protect against cold boot attacks.</li>
+        <li>To add an obfuscation layer to significantly complicate the recovery of encryption master keys from memory dumps, be it live or offline.</li>
+    </ul>
+<p></p>
+
+<h3>Implementation Overview</h3>
+
+<p>Here's a summary of how RAM encryption is achieved:</p>
+<ol>
+    <li>At Windows startup, the VeraCrypt driver allocates a 1MiB memory region. If this fails, we device the size by two until allocation succeeds (minimal size being 8KiB). All these variables are allocated in non-paged Kernel memory space.</li>
+    <li>This memory region is then populated with random bytes generated by a CSPRNG based on ChaCha20.</li>
+    <li>Two random 64-bit integers, <code>HashSeedMask</code> and <code>CipherIVMask</code>, are generated.</li>
+    <li>For every master key of a volume, the RAM encryption algorithm derives a unique key from a combination of the memory region and unique values extracted from the memory to be encrypted. This ensures a distinct key for each encrypted memory region. The use of location-dependent keys and IVs prevents master keys from being easily extracted from memory dumps.</li>
+    <li>The master keys are decrypted for every request, requiring a fast decryption algorithm. For this, ChaCha12 is utilized.</li>
+    <li>Once a volume is mounted, its master keys are immediately encrypted using the described algorithm.</li>
+    <li>For each I/O request for a volume, the master keys are decrypted only for the duration of that request and then securely wiped.</li>
+    <li>Upon volume dismounting, the encrypted master keys are securely removed from memory.</li>
+    <li>At Windows shutdown or reboot, the memory region allocated during startup is securely wiped.</li>
+</ol>
+
+<h3>Protection against Cold Boot Attacks</h3>
+
+<p>
+    The mitigation of cold boot attacks is achieved by utilizing a large memory page for key derivation. This ensures that attackers cannot recover the master key since parts of this large memory area would likely be corrupted and irrecoverable after shutdown. Further details on cold boot attacks and mitigation techniques can be found in the referenced papers:
+</p>
+<ul>
+    <li><a href="https://www.blackhat.com/presentations/bh-usa-08/McGregor/BH_US_08_McGregor_Cold_Boot_Attacks.pdf" target="_blank">Cold Boot Attacks (BlackHat)</a></li>
+    <li><a href="https://www.grc.com/sn/files/RAM_Hijacks.pdf" target="_blank">RAM Hijacks</a></li>
+</ul>
+
+<h3>Incompatibility with Windows Hibernate and Fast Startup</h3>
+<p>
+	RAM Encryption in VeraCrypt is not compatible with the Windows Hibernate and Fast Startup features. Before activating RAM Encryption, these features will be disabled by VeraCrypt to ensure the security and functionality of the encryption mechanism.
+
+</p>
+
+<h3>Algorithm Choices</h3>
+
+<p>
+    The choice of algorithms was based on a balance between security and performance:
+</p>
+<ul>
+    <li><strong>t1ha2:</strong> A non-cryptographic hash function chosen for its impressive speed and ability to achieve GiB/s hashing rates. This is vital since keys are derived from a 1MB memory region for every encryption/decryption request. It also respects the strict avalanche criteria which is crucial for this use case.</li>
+    <li><strong>ChaCha12:</strong> Chosen over ChaCha20 for performance reasons, it offers sufficient encryption strength while maintaining fast encryption/decryption speeds.</li>
+</ul>
+
+<h3>Key Algorithms</h3>
+
+<p>
+    Two core algorithms are fundamental to the RAM encryption process:
+</p>
+
+<h4>1. VcGetEncryptionID</h4>
+
+<p>
+    Computes a unique ID for the RAM buffer set to be encrypted.
+</p>
+<pre>    <code>
+    - Input: pCryptoInfo, a CRYPTO_INFO variable to encrypt/decrypt
+    - Output: A 64-bit integer identifying the pCryptoInfo variable
+    - Steps:
+      - Compute the sum of the virtual memory addresses of the fields ks and ks2 of pCryptoInfo: encID = ((uint64) pCryptoInfo-&gt;ks) + ((uint64) pCryptoInfo-&gt;ks2)
+      - Return the result
+    </code>
+</pre>
+
+<h4>2. VcProtectMemory</h4>
+
+<p>
+    Encrypts the RAM buffer using the unique ID generated by VcGetEncryptionID.
+</p>
+<pre>    <code>
+    - Input:
+      - encID, unique ID for memory to be encrypted
+      - pbData, pointer to the memory to be encrypted
+      - pbKeyDerivationArea, memory area allocated by the driver at startup
+      - HashSeedMask and CipherIVMask, two 64-bit random integers from startup
+    - Output:
+      - None; memory at pbData is encrypted in place
+    - Steps:
+      - Derive hashSeed: hashSeed = (((uint64) pbKeyDerivationArea) + encID) ^ HashSeedMask
+      - Compute 128-bit hash: hash128 = t1h2 (pbKeyDerivationArea,hashSeed). 
+      - Decompose hash128 into two 64-bit integers: hash128 = hash128_1 || hash128_2
+      - Create a 256-bit key for ChaCha12: chachaKey = hash128_1 || hash128_2 || (hash128_1 OR hash128_2) || (hash128_1 + hash128_2)
+      - Encrypt chachaKey by itself using ChaCha12 using hashSeed as an IV: ChaCha256Encrypt (chachaKey, hashSeed, chachaKey)
+      - Derive the 64-bit IV for ChaCha12: chachaIV = (((uint64) pbKeyDerivationArea) + encID) ^ CipherIVMask
+      - Encrypt memory at pbData using ChaCha12: ChaCha256Encrypt (chachaKey, chachaIV, pbData)
+      - Securely erase temporary values
+    </code>
+</pre>
+
+<p>
+    It's important to note that, due to ChaCha12 being a stream cipher, encryption and decryption processes are identical, and the <code>VcProtectMemory</code> function can be used for both.
+</p>
+
+<p>
+    For a deeper understanding and a look into the codebase, one can visit the VeraCrypt repository and explore the mentioned functions in the <code>src/Common/Crypto.c</code> file.
+</p>
+
+<h3>Additional Security Measures</h3>
+
+<p>
+    Starting from version 1.24, VeraCrypt has integrated a mechanism that detects the insertion of new devices into the system when System Encryption is active. If a new device is inserted, master keys are immediately purged from memory, resulting in a Windows BSOD. This protects against attacks using specialized devices to extract memory from running systems. However, for maximum efficiency, this feature should be paired with RAM encryption.<br>
+	To enable this feature, navigate to the menu System -> Settings and check the <b>"Clear encryption keys from memory if a new device is inserted"</b> option.
+</p>
+
+<h3>Technical Limitations with Hibernation and Fast Startup</h3>
+<p>
+The Windows Hibernate and Fast Startup features save the content of RAM to the hard drive. In the context of VeraCrypt's RAM Encryption, supporting these features presents a significant challenge, namely a chicken-egg problem.<br>
+To maintain security, the large memory region used for key derivation in RAM Encryption would have to be stored in an encrypted format, separate from the usual VeraCrypt encryption applied to the current drive. This separate encrypted storage must also be unlockable using the same password as the one used for Pre-Boot Authentication. Moreover, this process must happen early in the boot sequence before filesystem access is available, necessitating the raw storage of encrypted data in specific sectors of a different disk.<br>
+While this is technically feasible, the complexity and user-unfriendliness of such a solution make it impractical for standard deployments. Therefore, enabling RAM Encryption necessitates the disabling of the Windows Hibernate and Fast Startup features.<br>
+</p>
+
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/VeraCrypt Rescue Disk.html b/doc/html/VeraCrypt Rescue Disk.html
index b4ab54d0..07a4a324 100644
--- a/doc/html/VeraCrypt Rescue Disk.html
+++ b/doc/html/VeraCrypt Rescue Disk.html
@@ -1,100 +1,168 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="System%20Encryption.html">System Encryption</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Rescue%20Disk.html">VeraCrypt Rescue Disk</a>
 </p></div>
 
 <div class="wikidoc">
 <h1>VeraCrypt Rescue Disk</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-During the process of preparing the encryption of a system partition/drive, VeraCrypt requires that you create a so-called VeraCrypt Rescue Disk (CD/DVD), which serves the following purposes:</div>
+During the process of preparing the encryption of a system partition/drive, VeraCrypt requires that you create a so-called VeraCrypt Rescue Disk (USB disk in EFI boot mode, CD/DVD in MBR legacy boot mode), which serves the following purposes:</div>
 <ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 If the VeraCrypt Boot Loader screen does not appear after you start your computer (or if Windows does not boot), the
 <strong style="text-align:left">VeraCrypt Boot Loader may be damaged</strong>. The VeraCrypt Rescue Disk allows you restore it and thus to regain access to your encrypted system and data (however, note that you will still have to enter the correct password
- then). In the Rescue Disk screen, select <em style="text-align:left">Repair Options</em> &gt;
-<em style="text-align:left">Restore VeraCrypt Boot Loader</em>. Then press 'Y' to confirm the action, remove the Rescue Disk from your CD/DVD drive and restart your computer.
+ then). For EFI boot mode, select <em style="text-align:left">Restore VeraCrypt loader binaries to system disk</em> in the Rescue Disk screen. For MBR legacy boot mode, select instead <em style="text-align:left">Repair Options</em> &gt;
+<em style="text-align:left">Restore VeraCrypt Boot Loader</em>. Then press 'Y' to confirm the action, remove the Rescue Disk from your USB port or CD/DVD drive and restart your computer.
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 If the <strong style="text-align:left">VeraCrypt Boot Loader is frequently damaged
 </strong>(for example, by inappropriately designed activation software) or if <strong style="text-align:left">
 you do not want the VeraCrypt boot loader </strong><strong style="text-align:left">to reside on the hard drive
 </strong>(for example, if you want to use an alternative boot loader/manager for other operating systems), you can boot directly from the VeraCrypt Rescue Disk (as it contains the VeraCrypt boot loader too) without restoring the boot loader to the hard drive.
- Just insert your Rescue Disk into your CD/DVD drive and then enter your password in the Rescue Disk screen.
+ For EFI boot mode, just insert your Rescue Disk into a USB port, boot your computer on it and then select <em style="text-align:left">Boot VeraCrypt loader from rescue disk</em> on the Rescue Disk screen. For MBR legacy boot mode, you need to insert the Rescue Disk in your CD/DVD drive and then enter your password in the Rescue Disk screen.
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 If you repeatedly enter the correct password but VeraCrypt says that the password is incorrect, it is possible that the
 <strong style="text-align:left">master key or other critical data are damaged</strong>. The VeraCrypt Rescue Disk allows you to restore them and thus to regain access to your encrypted system and data (however, note that you will still have to enter the correct
- password then). In the Rescue Disk screen, select <em style="text-align:left">Repair Options</em> &gt;
-<em style="text-align:left">Restore key data</em>. Then enter your password, press 'Y' to confirm the action, remove the Rescue Disk from your CD/DVD drive, and restart your computer.<br style="text-align:left">
+ password then). For EFI boot mode, select <em style="text-align:left">Restore OS header keys</em> in the Rescue Disk screen. For MBR legacy boot mode, select instead <em style="text-align:left">Repair Options</em> &gt;
+<em style="text-align:left">Restore VeraCrypt Boot Loader</em>. Then enter your password, press 'Y' to confirm the action, remove the Rescue Disk from the USB port or CD/DVD drive, and restart your computer.<br style="text-align:left">
 <br style="text-align:left">
 Note: This feature cannot be used to restore the header of a hidden volume within which a
 <a href="Hidden%20Operating%20System.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 hidden operating system</a> resides (see the section <a href="Hidden%20Operating%20System.html">
 Hidden Operating System</a>). To restore such a volume header, click <em style="text-align:left">
 Select Device</em>, select the partition behind the decoy system partition, click
 <em style="text-align:left">OK</em>, select <em style="text-align:left">Tools</em> &gt;
 <em style="text-align:left">Restore Volume Header</em> and then follow the instructions.<br style="text-align:left">
 <br style="text-align:left">
 WARNING: By restoring key data using a VeraCrypt Rescue Disk, you also restore the password that was valid when the VeraCrypt Rescue Disk was created. Therefore, whenever you change the password, you should destroy your VeraCrypt Rescue Disk and create a new
  one (select <em style="text-align:left">System</em> -&gt; <em style="text-align:left">
 Create Rescue Disk</em>). Otherwise, if an attacker knows your old password (for example, captured by a keystroke logger) and if he then finds your old VeraCrypt Rescue Disk, he could use it to restore the key data (the master key encrypted with the old password)
  and thus decrypt your system partition/drive </li><li id="WindowsDamaged" style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-If <strong style="text-align:left">Windows is damaged and cannot start</strong>, the VeraCrypt Rescue Disk allows you to permanently decrypt the partition/drive before Windows starts. In the Rescue Disk screen, select
-<em style="text-align:left">Repair Options</em> &gt; <em style="text-align:left">
+If <strong style="text-align:left">Windows is damaged and cannot start</strong> after typing the correct password on VeraCrypt password prompt, the VeraCrypt Rescue Disk allows you to permanently decrypt the partition/drive before Windows starts. For EFI boot, select
+<em style="text-align:left">Decrypt OS</em> in the Rescue Disk screen. For MBR legacy boot mode, select instead <em style="text-align:left">Repair Options</em> &gt; <em style="text-align:left">
 Permanently decrypt system partition/drive</em>. Enter the correct password and wait until decryption is complete. Then you can e.g. boot your MS Windows setup CD/DVD to repair your Windows installation. Note that this feature cannot be used to decrypt a hidden
  volume within which a <a href="Hidden%20Operating%20System.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
 hidden operating system</a> resides (see the section <a href="Hidden%20Operating%20System.html">
 Hidden Operating System</a>).<br style="text-align:left">
 <br style="text-align:left">
 Note: Alternatively, if Windows is damaged (cannot start) and you need to repair it (or access files on it), you can avoid decrypting the system partition/drive by following these steps:&nbsp;If you have multiple operating systems installed on your computer,
- boot the one that does not require pre-boot authentication. If you do not have multiple operating systems installed on your computer, you can boot a WinPE or BartPE CD/DVD or you can connect your system drive as a secondary or external drive to another computer
+ boot the one that does not require pre-boot authentication. If you do not have multiple operating systems installed on your computer, you can boot a WinPE or BartPE CD/DVD or a Linux Live CD/DVD/USB. You can also connect your system drive as a secondary or external drive to another computer
  and then boot the operating system installed on the computer. After you boot a system, run VeraCrypt, click Select Device, select the affected system partition, click OK , select System &gt; Mount Without Pre-Boot Authentication, enter your pre-boot-authentication
  password and click OK. The partition will be mounted as a regular VeraCrypt volume (data will be on-the-fly decrypted/encrypted in RAM on access, as usual).
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Your VeraCrypt Rescue Disk contains a <strong style="text-align:left">backup of the original content of the first drive track</strong> (made before the VeraCrypt Boot Loader was written to it) and allows you to restore it if necessary. The first track typically
+In case of MBR legacy boot mode, your VeraCrypt Rescue Disk contains a <strong style="text-align:left">backup of the original content of the first drive track</strong> (made before the VeraCrypt Boot Loader was written to it) and allows you to restore it if necessary. The first track typically
  contains a system loader or boot manager. In the Rescue Disk screen, select Repair Options &gt; Restore original system loader.
 </li></ul>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 &nbsp;</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <em style="text-align:left">Note that even if you lose your VeraCrypt Rescue Disk and an attacker finds it, he or she will
 <strong style="text-align:left">not</strong> be able to decrypt the system partition or drive without the correct password.</em></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-To boot a VeraCrypt Rescue Disk, insert it into your CD/DVD drive and restart your computer. If the VeraCrypt Rescue Disk screen does not appear (or if you do not see the 'Repair Options' item in the 'Keyboard Controls' section of the screen), it is possible
- that your BIOS is configured to attempt to boot from hard drives before CD/DVD drives. If that is the case, restart your computer, press F2 or Delete (as soon as you see a BIOS start-up screen), and wait until a BIOS configuration screen appears. If no BIOS
- configuration screen appears, restart (reset) the computer again and start pressing F2 or Delete repeatedly as soon as you restart (reset) the computer. When a BIOS configuration screen appears, configure your BIOS to boot from the CD/DVD drive first (for
+To boot a VeraCrypt Rescue Disk, insert it into a USB port or your CD/DVD drive depending on its type and restart your computer. If the VeraCrypt Rescue Disk screen does not appear (or in case of MBR legacy boot mode if you do not see the 'Repair Options' item in the 'Keyboard Controls' section of the screen), it is possible
+ that your BIOS is configured to attempt to boot from hard drives before USB drivers and CD/DVD drives. If that is the case, restart your computer, press F2 or Delete (as soon as you see a BIOS start-up screen), and wait until a BIOS configuration screen appears. If no BIOS
+ configuration screen appears, restart (reset) the computer again and start pressing F2 or Delete repeatedly as soon as you restart (reset) the computer. When a BIOS configuration screen appears, configure your BIOS to boot from the USB drive and CD/DVD drive first (for
  information on how to do so, please refer to the documentation for your BIOS/motherboard or contact your computer vendor's technical support team for assistance). Then restart your computer. The VeraCrypt Rescue Disk screen should appear now. Note: In the
- VeraCrypt Rescue Disk screen, you can select 'Repair Options' by pressing F8 on your keyboard.</div>
+ case of MBR legacy boot mode, you can select 'Repair Options' on the VeraCrypt Rescue Disk screen by pressing F8 on your keyboard.</div>
 <p>If your VeraCrypt Rescue Disk is damaged, you can create a new one by selecting
-<em style="text-align:left">System</em> &gt; <em style="text-align:left">Create Rescue Disk</em>. To find out whether your VeraCrypt Rescue Disk is damaged, insert it into your CD/DVD drive and select
+<em style="text-align:left">System</em> &gt; <em style="text-align:left">Create Rescue Disk</em>. To find out whether your VeraCrypt Rescue Disk is damaged, insert it into a USB port (or into your CD/DVD drive in case of MBR legacy boot mode) and select
 <em style="text-align:left">System</em> &gt; <em style="text-align:left">Verify Rescue Disk</em>.</p>
-</div><div class="ClearBoth"></div></body></html>
+</div><div class="ClearBoth"></div>
+
+
+<h2>VeraCrypt Rescue Disk for MBR legacy boot mode on USB Stick</h2>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+It is also possible to create a VeraCrypt Rescue Disk for MBR legacy boot mode on a USB drive, in case your machine does not have a CD/DVD drive. <strong style="text-align:left">Please note that you must ensure that the data on the USB stick is not overwritten! If you lose the USB drive or your data is damaged, you will not be able to recover your system in case of a problem!</strong>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+To create a bootable VeraCrypt Rescue USB drive you have to create a bootable USB drive which bootloader runs up the iso image. Solutions like Unetbootin, which try to copy the data inside the iso image to the usb drive do not work yet. On Windows please follow the steps below:
+</div>
+<ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+	<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+		Download the required files from the official SourceForge repository of VeraCrypt: <a href="https://sourceforge.net/projects/veracrypt/files/Contributions/VeraCryptUsbRescueDisk.zip" style="text-align:left; 		color:#0080c0; text-decoration:none.html">
+		https://sourceforge.net/projects/veracrypt/files/Contributions/VeraCryptUsbRescueDisk.zip</a>
+	</li>
+
+	<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+		Insert a USB drive.
+	</li>
+	<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+		Format the USB drive with FAT16 oder FAT32:
+		<ul style="text-align:left; margin-top:6px; margin-bottom:6px; padding-top:0px; padding-bottom:0px">
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				Launch usb_format.exe as an administrator (right click "Run as Administrator").
+			</li>
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				Select your USB drive in the Device list.
+			</li>
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				Choose FAT as filesystem and check "Quick Format". Click Start.
+			</li>
+		</ul>
+
+	</li>
+	<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+		Create a bootloader which can start up an iso image:
+		<ul style="text-align:left; margin-top:6px; margin-bottom:6px; padding-top:0px; padding-bottom:0px">
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				Launch grubinst_gui.exe.
+			</li>
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				Check "Disk" and then select your USB drive in the list.
+			</li>
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				Click the "Refresh" button in front of "Part List" and then choose "Whole disk (MBR)".
+			</li>
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				Leave all other options unchanged and then click "Install".
+			</li>
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				You should see an console window that reads "The MBR/BS has been successfully installed. Press &ltENTER&gt; to continue ..."
+			</li>
+			<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+				Close the tool.
+			</li>
+		</ul>
+	</li>
+	<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+		Copy the file "grldr" to your USB drive at the root (e.g. if the drive letter is I:, you should have I:\grldr). This file loads Grub4Dos.
+	</li>
+	<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+		Copy the file "menu.lst" to your USB drive at the root (e.g. if the drive letter is I:, you should have I:\menu.lst). This file configures the shown menu and its options.
+	</li>
+	<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+		Copy the rescue disk file "VeraCrypt Rescue Disk.iso" to the USB drive at the root and rename it "veracrypt.iso". Another possibility is to change the link in the "menu.lst" file.
+	</li>
+
+</ul>
+</body></html>
diff --git a/doc/html/VeraCrypt System Files.html b/doc/html/VeraCrypt System Files.html
index c220ae3e..7555e2c9 100644
--- a/doc/html/VeraCrypt System Files.html
+++ b/doc/html/VeraCrypt System Files.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Miscellaneous.html">Miscellaneous</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20System%20Files.html">VeraCrypt System Files</a>
diff --git a/doc/html/VeraCrypt Volume Format Specification.html b/doc/html/VeraCrypt Volume Format Specification.html
index aa10f031..308567e4 100644
--- a/doc/html/VeraCrypt Volume Format Specification.html
+++ b/doc/html/VeraCrypt Volume Format Specification.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Technical%20Details.html">Technical Details</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Volume%20Format%20Specification.html">VeraCrypt Volume Format Specification</a>
diff --git a/doc/html/VeraCrypt Volume.html b/doc/html/VeraCrypt Volume.html
index a33ef25e..8c4666de 100644
--- a/doc/html/VeraCrypt Volume.html
+++ b/doc/html/VeraCrypt Volume.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Volume.html">VeraCrypt Volume</a>
 </p></div>
 
diff --git a/doc/html/Volume Clones.html b/doc/html/Volume Clones.html
index a3eb34e6..6cc91ddf 100644
--- a/doc/html/Volume Clones.html
+++ b/doc/html/Volume Clones.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Volume%20Clones.html">Volume Clones</a>
diff --git a/doc/html/Wear-Leveling.html b/doc/html/Wear-Leveling.html
index 10db9f2b..e35ab4d9 100644
--- a/doc/html/Wear-Leveling.html
+++ b/doc/html/Wear-Leveling.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Wear-Leveling.html">Wear-Leveling</a>
diff --git a/doc/html/Whirlpool.html b/doc/html/Whirlpool.html
index 796c6673..870a0f0b 100644
--- a/doc/html/Whirlpool.html
+++ b/doc/html/Whirlpool.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
 <meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
 <meta name="keywords" content="encryption, security"/>
 <link href="styles.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
 	<ul>
 	  <li><a href="Home.html">Home</a></li>
 	  <li><a href="/code/">Source Code</a></li>
 	  <li><a href="Downloads.html">Downloads</a></li>
 	  <li><a class="active" href="Documentation.html">Documentation</a></li>
 	  <li><a href="Donation.html">Donate</a></li>
 	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
 	</ul>
 </div>
 
 <div>
 <p>
 <a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hash%20Algorithms.html">Hash Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Whirlpool.html">Whirlpool</a>
diff --git a/doc/html/flag-au-small.png b/doc/html/flag-au-small.png
new file mode 100644
index 00000000..9c31d730
--- /dev/null
+++ b/doc/html/flag-au-small.png
diff --git a/doc/html/flag-au.png b/doc/html/flag-au.png
new file mode 100644
index 00000000..86c69125
--- /dev/null
+++ b/doc/html/flag-au.png
diff --git a/doc/html/flag-eu-small.png b/doc/html/flag-eu-small.png
new file mode 100644
index 00000000..2f4f1fa3
--- /dev/null
+++ b/doc/html/flag-eu-small.png
diff --git a/doc/html/flag-eu.png b/doc/html/flag-eu.png
new file mode 100644
index 00000000..31660433
--- /dev/null
+++ b/doc/html/flag-eu.png
diff --git a/doc/html/flag-gb-small.png b/doc/html/flag-gb-small.png
new file mode 100644
index 00000000..22489705
--- /dev/null
+++ b/doc/html/flag-gb-small.png
diff --git a/doc/html/flag-gb.png b/doc/html/flag-gb.png
new file mode 100644
index 00000000..c1aab017
--- /dev/null
+++ b/doc/html/flag-gb.png
diff --git a/doc/html/flag-nz-small.png b/doc/html/flag-nz-small.png
new file mode 100644
index 00000000..80ac648c
--- /dev/null
+++ b/doc/html/flag-nz-small.png
diff --git a/doc/html/flag-nz.png b/doc/html/flag-nz.png
new file mode 100644
index 00000000..df23c2a8
--- /dev/null
+++ b/doc/html/flag-nz.png
diff --git a/doc/html/flag-us-small.png b/doc/html/flag-us-small.png
new file mode 100644
index 00000000..fb00702b
--- /dev/null
+++ b/doc/html/flag-us-small.png
diff --git a/doc/html/flag-us.png b/doc/html/flag-us.png
new file mode 100644
index 00000000..1796531d
--- /dev/null
+++ b/doc/html/flag-us.png
diff --git a/doc/html/liberapay_donate.svg b/doc/html/liberapay_donate.svg
new file mode 100644
index 00000000..007d686c
--- /dev/null
+++ b/doc/html/liberapay_donate.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="83" height="30"><rect id="back" fill="#f6c915" x="1" y=".5" width="82" height="29" rx="4"/><svg viewBox="0 0 80 80" height="16" width="16" x="7" y="7"><g transform="translate(-78.37-208.06)" fill="#1a171b"><path d="m104.28 271.1c-3.571 0-6.373-.466-8.41-1.396-2.037-.93-3.495-2.199-4.375-3.809-.88-1.609-1.308-3.457-1.282-5.544.025-2.086.313-4.311.868-6.675l9.579-40.05 11.69-1.81-10.484 43.44c-.202.905-.314 1.735-.339 2.489-.026.754.113 1.421.415 1.999.302.579.817 1.044 1.546 1.395.729.353 1.747.579 3.055.679l-2.263 9.278"/><path d="m146.52 246.14c0 3.671-.604 7.03-1.811 10.07-1.207 3.043-2.879 5.669-5.01 7.881-2.138 2.213-4.702 3.935-7.693 5.167-2.992 1.231-6.248 1.848-9.767 1.848-1.71 0-3.42-.151-5.129-.453l-3.394 13.651h-11.162l12.52-52.19c2.01-.603 4.311-1.143 6.901-1.622 2.589-.477 5.393-.716 8.41-.716 2.815 0 5.242.428 7.278 1.282 2.037.855 3.708 2.024 5.02 3.507 1.307 1.484 2.274 3.219 2.904 5.205.627 1.987.942 4.11.942 6.373m-27.378 15.461c.854.202 1.91.302 3.167.302 1.961 0 3.746-.364 5.355-1.094 1.609-.728 2.979-1.747 4.111-3.055 1.131-1.307 2.01-2.877 2.64-4.714.628-1.835.943-3.858.943-6.071 0-2.161-.479-3.998-1.433-5.506-.956-1.508-2.615-2.263-4.978-2.263-1.61 0-3.118.151-4.525.453l-5.28 21.948"/></g></svg><text fill="#1a171b" text-anchor="middle" font-family="Helvetica Neue,Helvetica,Arial,sans-serif"
+          font-weight="700" font-size="14" x="50" y="20">Donate</text></svg>
+\ No newline at end of file
diff --git a/doc/html/paypal_30x30.png b/doc/html/paypal_30x30.png
new file mode 100644
index 00000000..eb41398d
--- /dev/null
+++ b/doc/html/paypal_30x30.png
diff --git a/doc/html/ru/AES.html b/doc/html/ru/AES.html
new file mode 100644
index 00000000..4d78e88e
--- /dev/null
+++ b/doc/html/ru/AES.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Encryption%20Algorithms.html">Алгоритмы шифрования</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="AES.html">AES</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Алгоритм шифрования AES</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Advanced Encryption Standard (AES) – это одобренный FIPS (Федеральные стандарты обработки информации) криптографический
+алгоритм (также известен как Rijndael, авторы: Joan Daemen и Vincent Rijmen, опубликован в 1998 году), разрешённый
+к применению федеральными ведомствами и учреждениями США для криптостойкой защиты секретной информации [3].
+VeraCrypt использует AES с 14 раундами и 256-битовым ключом (то есть стандарт AES-256, опубликованный в 2001 году), работающий
+<a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+в режиме XTS</a> (см. раздел <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Режимы работы</a>).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+В июне 2003 года, после того как Агентство национальной безопасности США (NSA, US National Security Agency)
+провело исследование и анализ AES, американский комитет CNSS (Committee on National Security Systems) объявил
+в [1], что реализация и надёжность AES-256 (и AES-192) достаточны для защиты секретной информации вплоть до
+уровня Top Secret («Совершенно секретно»). Это относится ко всем правительственным ведомствам и
+учреждениям США, намеревающимся приобрести или использовать продукты, включающие Advanced Encryption Standard (AES),
+для обеспечения требований информационной безопасности, относящейся к защите национальных систем безопасности
+и/или информации, связанной с госбезопасностью [1].
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<a href="Camellia.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Acknowledgements.html b/doc/html/ru/Acknowledgements.html
new file mode 100644
index 00000000..14e6ce3f
--- /dev/null
+++ b/doc/html/ru/Acknowledgements.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Acknowledgements.html">Благодарности</a>
+</p></div>
+<div class="wikidoc">
+<div>
+<h1>Благодарности</h1>
+<p>Выражаем благодарность следующим людям:</p>
+<p>Разработчикам программы TrueCrypt, проделавшим потрясающую работу в течение 10 лет. Без их напряжённого труда VeraCrypt сегодня не существовало бы.</p>
+<p><i>Paul Le Roux</i> за предоставление его исходного кода E4M; TrueCrypt 1.0 ведёт своё происхождение от E4M, а некоторые части исходного кода E4M и поныне входят в исходный код текущей версии TrueCrypt.</p>
+<p><i>Brian Gladman</i>, автору превосходных подпрограмм AES, Twofish и SHA-512.</p>
+<p><i>Peter Gutmann</i> за его документ о случайных числах и за создание библиотеки cryptlib, послужившей источником части исходного кода генератора случайных чисел.</p>
+<p><i>Wei Dai</i>, автору подпрограмм Serpent и RIPEMD-160.</p>
+<p><i>Tom St Denis</i>, автору LibTomCrypt, включающей компактные подпрограммы SHA-256.</p>
+<p><i>Mark Adler</i> и <i>Jean-loup Gailly</i>, написавшим библиотеку zlib.</p>
+<p>Разработчикам алгоритмов шифрования, хеширования и режима работы:</p>
+<p><i>Horst Feistel, Don Coppersmith, Walt Tuchmann, Lars Knudsen, Ross Anderson, Eli Biham, Bruce Schneier, David Wagner, John Kelsey, Niels Ferguson, Doug Whiting, Chris Hall, Joan Daemen, Vincent Rijmen, Carlisle Adams, Stafford Tavares, Phillip Rogaway, Hans
+ Dobbertin, Antoon Bosselaers, Bart Preneel, Paulo S. L. M. Barreto.</i></p>
+<p><i>Andreas Becker</i> за создание логотипа и значков VeraCrypt.</p>
+<p><i>Xavier de Carn&eacute; de Carnavalet</i>, предложившему оптимизацию скорости для PBKDF2, которая вдвое сократила время монтирования/загрузки.</p>
+<p><i>kerukuro</i> за библиотеку cppcrypto (http://cppcrypto.sourceforge.net/), откуда взята реализация шифра «Кузнечик».</p>
+<p><br>
+<i>Dieter Baron</i> и <i>Thomas Klausner</i>, написавшим библиотеку libzip.</p>
+<p><br>
+<i>Jack Lloyd</i>, написавшему оптимизированную для SIMD реализацию Serpent.</p>
+<p>Всем остальным, благодаря кому стал возможен этот проект, кто нас морально поддерживал, а также тем, кто присылал нам сообщения об ошибках и предложения по улучшению программы.</p>
+<p>Большое вам спасибо!</p>
+<br><br>
+<p>Перевод программы и документации на русский язык выполнил <em>Дмитрий Ерохин</em>.</p>
+</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Additional Security Requirements and Precautions.html b/doc/html/ru/Additional Security Requirements and Precautions.html
new file mode 100644
index 00000000..b64a31f4
--- /dev/null
+++ b/doc/html/ru/Additional Security Requirements and Precautions.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Требования безопасности и меры предосторожности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Additional%20Security%20Requirements%20and%20Precautions.html">Дополнительные требования безопасности и меры предосторожности</a>
+</p></div>
+
+<div class="wikidoc">
+<div>
+<h1>Дополнительные требования безопасности и меры предосторожности</h1>
+<p>Помимо всего, что описано в главе <a href="Security%20Requirements%20and%20Precautions.html"><em>Требования безопасности и меры предосторожности</em></a>,
+вы обязаны помнить и соблюдать требования безопасности, меры предосторожности и ограничения, изложенные в следующих главах и разделах:</p>
+<ul>
+<li><a href="How%20to%20Back%20Up%20Securely.html"><em><strong>О безопасном резервном копировании</strong></em></a>
+</li><li><a href="Issues%20and%20Ограничения.html"><em><strong>Ограничения</strong></em></a>
+</li><li><a href="Security%20Model.html"><em><strong>Модель безопасности</strong></em></a>
+</li><li><a href="Security%20Requirements%20for%20Hidden%20Volumes.html"><em><strong>Требования безопасности и меры предосторожности, касающиеся скрытых томов</strong></em></a>
+</li><li><a href="Plausible%20Deniability.html"><em><strong>Правдоподобное отрицание наличия шифрования</strong></em></a>
+</li></ul>
+<p>См. также: <a href="Digital%20Signatures.html">
+<em>Цифровые подписи</em></a></p>
+</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Authenticity and Integrity.html b/doc/html/ru/Authenticity and Integrity.html
new file mode 100644
index 00000000..9e3f699c
--- /dev/null
+++ b/doc/html/ru/Authenticity and Integrity.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Требования безопасности и меры предосторожности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Authenticity%20and%20Integrity.html">Подлинность и целостность данных</a>
+</p></div>
+
+<div class="wikidoc">
+<div>
+<h1>Подлинность и целостность данных</h1>
+<p>VeraCrypt применяет шифрование для сохранения <em>конфиденциальности</em> шифруемых данных. VeraCrypt
+не сохраняет и не проверяет целостность или подлинность данных, подвергающихся шифрованию и дешифрованию.
+Следовательно, если вы позволите неприятелю изменить зашифрованные с помощью VeraCrypt данные, он сможет
+установить у любого 16-байтового блока данных случайное или предыдущее значение, которое ему удалось
+получить в прошлом. Обратите внимание, что неприятель не может выбрать значение, которое вы получите,
+когда VeraCrypt расшифровывает изменённый блок – значение будет случайным, если только противник не восстановит
+старую версию зашифрованного блока, которую ему удалось получить в прошлом. Ответственность за проверку
+целостности и подлинности данных, зашифрованных или расшифрованных VeraCrypt, лежит только на вас (например,
+это можно сделать с помощью соответствующего стороннего ПО).<br>
+<br>
+См. также: <a href="Physical%20Security.html">
+<em>Физическая безопасность</em></a>, <a href="Security%20Model.html">
+<em>Модель безопасности</em></a></p>
+</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Authors.html b/doc/html/ru/Authors.html
new file mode 100644
index 00000000..765a20a4
--- /dev/null
+++ b/doc/html/ru/Authors.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="VeraCrypt%20Volume.html">Том VeraCrypt</a>
+</p></div>
+
+<div class="wikidoc">
+<h2>Авторы</h2>
+<p>Mounir IDRASSI (<a href="https://www.idrix.fr" target="_blank">IDRIX</a>, <a href="https://fr.linkedin.com/in/idrassi" target="_blank">
+https://fr.linkedin.com/in/idrassi</a>) – создатель и главный разработчик VeraCrypt. Руководит всеми аспектами
+разработки и развёртывания на всех поддерживаемых платформах (Windows, Linux и macOS).</p>
+<p>Алекс Колотников (<a href="https://ru.linkedin.com/in/alex-kolotnikov-6625568b" target="_blank">https://ru.linkedin.com/in/alex-kolotnikov-6625568b</a>) – автор
+EFI-загрузчика VeraCrypt. Отвечает за все аспекты поддержки EFI, а его обширный опыт помогает внедрять новые
+интересные функции в системное Windows-шифрование VeraCrypt.</p>
+<p>&nbsp;</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Avoid Third-Party File Extensions.html b/doc/html/ru/Avoid Third-Party File Extensions.html
new file mode 100644
index 00000000..81f88334
--- /dev/null
+++ b/doc/html/ru/Avoid Third-Party File Extensions.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Avoid%20Third-Party%20File%20Extensions.html">О рисках, связанных со сторонними расширениями файлов</a>
+</p></div>
+
+<div class="wikidoc">
+	<h1>Понимание рисков использования сторонних расширений файлов с VeraCrypt</h1>
+	<div>
+	  <p>Хотя VeraCrypt обеспечивает надёжные возможности шифрования для защиты ваших данных, использование сторонних расширений файлов для файловых контейнеров или ключевых файлов может привести к риску сделать зашифрованные данные недоступными.<br />
+	  В этом руководстве содержится подробное объяснение связанных с этим рисков и излагаются рекомендации, как их снизить.</p>
+	</div>
+	
+	<h2>Риски, связанные с файловыми контейнерами</h2>
+	<div>
+	  <p>Использование стороннего расширения файла для файловых контейнеров подвергает вас нескольким рискам:</p>
+	  <ul>
+		<li>ПЕРЕЗАПИСЬ МЕТАДАННЫХ: Обновление метаданных сторонними приложениями может привести к перезаписи важных частей файлового контейнера.</li>
+		<li>НЕПРЕДНАМЕРЕННЫЕ ИЗМЕНЕНИЯ: Случайный запуск файлового контейнера с помощью стороннего приложения может привести к изменению его метаданных без вашего согласия.</li>
+		<li>ПОВРЕЖДЕНИЕ КОНТЕЙНЕРА: Эти действия могут сделать контейнер нечитаемым или непригодным для использования.</li>
+		<li>ПОТЕРЯ ДАННЫХ: Данные внутри контейнера могут быть безвозвратно потеряны, если контейнер будет повреждён.</li>
+	  </ul>
+	</div>
+	
+	<h2>Риски, связанные с ключевыми файлами</h2>
+	<div>
+	  <p>Аналогичные риски связаны с ключевыми файлами:</p>
+	  <ul>
+		<li>ПОВРЕЖДЕНИЕ КЛЮЧЕВОГО ФАЙЛА: Непреднамеренное изменение ключевого файла с помощью стороннего приложения может сделать его непригодным для расшифровки.</li>
+		<li>ПЕРЕЗАПИСЬ ДАННЫХ: Сторонние приложения могут перезаписать ту часть ключевого файла, которую VeraCrypt использует для расшифровки.</li>
+		<li>НЕПРЕДНАМЕРЕННЫЕ ИЗМЕНЕНИЯ: Случайные изменения могут сделать невозможным монтирование тома, если у вас нет неизменённой резервной копии ключевого файла.</li>
+	  </ul>
+	</div>
+	
+	<h2>Примеры расширений, которых следует избегать</h2>
+	<div>
+	  <p>Избегайте использования следующих типов сторонних расширений файлов:</p>
+	  <ul>
+		<li>МЕДИАФАЙЛЫ: Изображения, аудио- и видеофайлы подвержены изменениям метаданных соответствующим программным обеспечением.</li>
+		<li>АРХИВЫ: Файлы ZIP, RAR, 7z могут быть легко изменены, из-за чего нарушится работа зашифрованного тома.</li>
+		<li>ИСПОЛНЯЕМЫЕ ФАЙЛЫ: Эти файлы могут изменяться в результате обновления программного обеспечения, что делает их ненадёжными в качестве файловых контейнеров или ключевых файлов.</li>
+		<li>ФАЙЛЫ ДОКУМЕНТОВ: Файлы Office и PDF могут автоматически обновляться программным обеспечением, что делает их использование рискованным.</li>
+	  </ul>
+	</div>
+	
+	<h2>Рекомендации</h2>
+	<div>
+	  <p>Для безопасного использования примите к сведению следующие рекомендации:</p>
+	  <ul>
+		<li>Используйте нейтральные расширения файлов для файловых контейнеров и ключевых файлов, чтобы свести к минимуму риск автоматической ассоциации файлов.</li>
+		<li>Храните резервные копии файловых контейнеров и ключевых файлов в защищённых местах, изолированных от доступа по сети.</li>
+		<li>Отключите автоматическое открытие для определённых расширений файлов, которые вы используете для файловых контейнеров VeraCrypt и ключевых файлов.</li>
+		<li>Всегда перепроверяйте ассоциации файлов и будьте осторожны при использовании нового устройства или стороннего приложения.</li>
+	  </ul>
+	</div>
+	
+<div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/BCH_Logo_30x30.png b/doc/html/ru/BCH_Logo_30x30.png
new file mode 100644
index 00000000..00c71cb9
--- /dev/null
+++ b/doc/html/ru/BCH_Logo_30x30.png
diff --git a/doc/html/ru/BC_Logo_30x30.png b/doc/html/ru/BC_Logo_30x30.png
new file mode 100644
index 00000000..a53a6d93
--- /dev/null
+++ b/doc/html/ru/BC_Logo_30x30.png
diff --git a/doc/html/ru/BLAKE2s-256.html b/doc/html/ru/BLAKE2s-256.html
new file mode 100644
index 00000000..583433a0
--- /dev/null
+++ b/doc/html/ru/BLAKE2s-256.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Hash%20Algorithms.html">Алгоритмы хеширования</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="BLAKE2s-256.html">BLAKE2s-256</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>BLAKE2s-256</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<p>
+BLAKE2 – это основанная на BLAKE криптографическая хеш-функция (авторы: Jean-Philippe Aumasson,
+Samuel Neves, Zooko Wilcox-O'Hearn и Christian Winnerlein, опубликована 21 декабря 2012 года).
+Цель разработки состояла в том, чтобы заменить широко используемые, но взломанные алгоритмы
+MD5 и SHA-1 в приложениях, требующих высокой производительности программного обеспечения.
+BLAKE2 обеспечивает лучшую безопасность, чем SHA-2, и похож на SHA-3 (например, невосприимчив
+к увеличению длины, имеет недифференцируемость от случайного оракула и т. д.).<br/>
+BLAKE2 убирает добавление констант к словам сообщения из функции раунда BLAKE, изменяет две
+константы вращения, упрощает заполнение, добавляет блок параметров, который подвергается
+операции XOR с векторами инициализации, и уменьшает количество раундов с 16 до 12 для BLAKE2b
+(преемника BLAKE- 512) и с 14 до 10 для BLAKE2s (преемник BLAKE-256).<br/>
+BLAKE2b и BLAKE2s указаны в документе RFC 7693.
+</p>
+<p>
+VeraCrypt использует только BLAKE2s с максимальным выходным размером 32 байта (256 бит).
+</p>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<a href="SHA-256.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Beginner's Tutorial.html b/doc/html/ru/Beginner's Tutorial.html
new file mode 100644
index 00000000..7c78e766
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial.html
@@ -0,0 +1,244 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Beginner's%20Tutorial.html">Руководство для начинающих пользователей</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Руководство для начинающих пользователей</h1>
+<h2>Как создать и использовать контейнер VeraCrypt</h2>
+<p>В этой главе содержатся пошаговые инструкции о том, как создавать, монтировать и использовать том VeraCrypt.
+Настоятельно рекомендуем вам ознакомиться и с другими разделами данного руководства, так как они содержат важную информацию.</p>
+<h4>ШАГ 1:</h4>
+<p>Если вы этого ещё не сделали, загрузите и установите программу VeraCrypt. Затем запустите её, дважды щёлкнув
+по файлу VeraCrypt.exe или по ярлыку VeraCrypt в меню <i>Пуск</i> в Windows.</p>
+<h4>ШАГ 2:</h4>
+<p><img src="Beginner's Tutorial_Image_001.png" alt=""><br>
+<br>
+Должно появиться главное окно VeraCrypt. Нажмите кнопку <strong>Создать том</strong> (на иллюстрации она выделена красным).</p>
+<h4>ШАГ 3:</h4>
+<p><img src="Beginner's Tutorial_Image_002.png" alt=""><br>
+<br>
+Должно появиться окно мастера создания томов VeraCrypt.<br>
+<br>
+На этом этапе нам нужно выбрать место, где будет создан том VeraCrypt. Том может находиться в файле
+(также именуемом контейнером), в разделе или на диске. В этом примере мы выберем первый вариант и
+создадим том VeraCrypt внутри файла.
+<br>
+<br>
+Поскольку эта опция выбрана по умолчанию, просто нажимаем кнопку <strong>Далее</strong>.</p>
+<h4>ШАГ 4:</h4>
+<p><img src="Beginner's Tutorial_Image_003.png" alt=""><br>
+<br>
+Сейчас нам нужно выбрать, какой том VeraCrypt мы хотим создать – обычный или скрытый. В этом примере мы
+выберем первый вариант и создадим обычный том.<br>
+<br>
+Поскольку эта опция выбрана по умолчанию, просто нажимаем кнопку <strong>Далее</strong>.</p>
+<h4>ШАГ 5:</h4>
+<p><img src="Beginner's Tutorial_Image_004.png" alt=""><br>
+<br>
+На этом этапе требуется указать место создания тома (файла-контейнера) VeraCrypt. Обратите внимание: контейнер
+VeraCrypt ничем не отличается от любого другого обычного файла. Например, его можно перемещать или удалять
+как любой другой файл. Также ему потребуется имя файла, которое мы выберем на следующем этапе.<br>
+<br>
+Нажмите кнопку <strong>Выбрать файл</strong>.<br>
+<br>
+Появится стандартное диалоговое окно выбора файлов Windows (при этом окно мастера создания томов останется открытым в фоне).</p>
+<h4>ШАГ 6:</h4>
+<p><img src="Beginner's Tutorial_Image_005.png" alt=""><br>
+<br>
+В этом руководстве мы создадим наш том VeraCrypt в папке F<em>:\Data\ </em>
+и присвоим тому (файлу-контейнеру) имя <em>MyVolume.hc</em> (как показано на иллюстрации выше). Разумеется,
+вы можете выбрать любое другое имя и расположение файла (например, поместив его на USB-флешку). Обратите внимание,
+что файла <em>MyVolume.hc</em> пока не существует &ndash; VeraCrypt его создаст.</p>
+<p>ВАЖНО: Имейте в виду, что VeraCrypt <em>не будет</em> шифровать никакие имеющиеся файлы (при создании
+файла-контейнера VeraCrypt). Если на данном этапе выбрать какой-либо уже существующий файл, он будет
+перезаписан и заменён новым созданным томом (то есть перезаписанный файл будет <em>уничтожен</em>, а <em>не</em>
+зашифрован). Зашифровать имеющиеся файлы вы сможете позднее, переместив их в том VeraCrypt, который мы сейчас создаём.*</p>
+<p>Выберите в файловом окне желаемый путь (место, где вы хотите создать контейнер). В поле
+<strong>Имя файла</strong> введите имя, которое вы хотите дать файлу-контейнеру.<br>
+<br>
+Нажмите кнопку <strong>Сохранить</strong>.<br>
+<br>
+Окно выбора файлов должно исчезнуть.<br>
+<br>
+На следующих этапах мы вернёмся в окно мастера создания томов  VeraCrypt.</p>
+<p>* Обратите внимание, что после того, как вы скопируете существующие незашифрованные файлы на том VeraCrypt,
+вы должны надёжно удалить (затереть) исходные незашифрованные файлы. Для надёжного стирания существуют
+специальные программы (многие из которых бесплатны).</p>
+<h4>ШАГ 7:</h4>
+<p><img src="Beginner's Tutorial_Image_007.png" alt=""><br>
+<br>
+В окне мастера создания томов нажмите <strong>Далее</strong>.</p>
+<h4>ШАГ 8:</h4>
+<p><img src="Beginner's Tutorial_Image_008.png" alt=""><br>
+<br>
+Здесь можно выбрать для тома алгоритмы шифрования и хеширования. Если вы не знаете, что лучше выбрать,
+просто оставьте предложенные значения и нажмите
+<strong>Далее</strong> (см. подробности в главах <a href="Алгоритмы шифрования.html">
+<em>Алгоритмы шифрования</em></a> и <a href="Hash%20Algorithms.html">
+<em>Алгоритмы хеширования</em></a>).</p>
+<h4>ШАГ 9:</h4>
+<p><img src="Beginner's Tutorial_Image_009.png" alt=""><br>
+<br>
+Здесь мы укажем, что хотим создать контейнер VeraCrypt размером 250 мегабайт. Разумеется, вы можете
+указать любой другой размер. После того, как вы введёте размер в поле ввода (оно выделено красным),
+нажмите кнопку <strong>Далее</strong>.</p>
+<h4>ШАГ 10:</h4>
+<p><img src="Beginner's Tutorial_Image_010.png" alt=""><br>
+<br>
+Мы подошли к одному из самых важных этапов: нам нужно выбрать для тома хороший пароль. Какой пароль
+следует считать хорошим, написано в этом окне мастера. Внимательно прочитайте данную информацию.<br>
+<br>
+После того, как вы определитесь с хорошим паролем, введите его в первое поле ввода. Затем введите тот же
+самый пароль в расположенное ниже второе поле ввода и нажмите кнопку <strong>Далее</strong>.</p>
+<p>Примечание: кнопка <strong>Далее</strong> будет недоступна до тех пор, пока в полях ввода не будут
+введены одинаковые пароли.</p>
+<h4>ШАГ 11:</h4>
+<p><img src="Beginner's Tutorial_Image_011.png" alt=""><br>
+<br>
+Произвольно перемещайте мышь в окне мастера создания томов в течение хотя бы 30 секунд. Чем дольше вы
+будете перемещать мышь, тем лучше – этим вы значительно повысите криптостойкость ключей шифрования
+(что увеличит их надёжность).<br>
+<br>
+Нажмите кнопку <strong>Разметить</strong>.<br>
+<br>
+Сейчас должно начаться создание тома. VeraCrypt создаст файл с именем <em>MyVolume.hc</em>
+ в папке <em>F:\Data\</em> (как мы указали в шаге 6). Этот файл станет контейнером VeraCrypt (то есть он
+ будет содержать зашифрованный том VeraCrypt). В зависимости от размера тома, создание тома может
+ длиться довольно долго. По окончании появится следующее окно:<br>
+<br>
+<img src="Beginner's Tutorial_Image_012.png" alt=""><br>
+<br>
+Нажмите <strong>OK</strong>, чтобы закрыть это окно.</p>
+<h4>ШАГ 12:</h4>
+<p><img src="Beginner's Tutorial_Image_013.png" alt=""><br>
+<br>
+Итак, только что мы успешно создали том VeraCrypt (файловый контейнер). Нажмите кнопку
+<strong>Выход</strong> в окне мастера создания томов VeraCrypt.<br>
+<br>
+Окно мастера должно исчезнуть.<br>
+<br>
+На следующих этапах мы смонтируем том, который только что создали. Сейчас мы должны были вернуться
+в главное окно VeraCrypt (которое должно быть всё ещё открыто, в противном случае выполните заново шаг 1,
+чтобы запустить VeraCrypt, а затем перейдите к шагу 13).</p>
+<h4>ШАГ 13:</h4>
+<p><img src="Beginner's Tutorial_Image_014.png" alt=""><br>
+<br>
+Выберите в списке букву диска (на иллюстрации она помечена красным). Она станет буквой диска
+со смонтированным контейнером VeraCrypt.<br>
+<br>
+Примечание: в нашем примере мы выбрали букву диска M, но вы, разумеется, можете выбрать любую другую доступную букву.</p>
+<h4>ШАГ 14:</h4>
+<p><img src="Beginner's Tutorial_Image_015.png" alt=""><br>
+<br>
+Нажмите кнопку <strong>Выбрать файл</strong>.<br>
+<br>
+Появится обычное окно выбора файлов.</p>
+<h4>ШАГ 15:</h4>
+<p><img src="Beginner's Tutorial_Image_016.png" alt=""><br>
+<br>
+В окне выбора файлов найдите и укажите файловый контейнер (который мы создали на шагах 6-12). Нажмите кнопку
+<strong>Открыть</strong> (в окне выбора файлов).<br>
+<br>
+Окно выбора файлов должно исчезнуть.<br>
+<br>
+На следующих этапах мы вернёмся в главное окно VeraCrypt.</p>
+<h4>ШАГ 16:</h4>
+<p><img src="Beginner's Tutorial_Image_017.png" alt=""><br>
+<br>
+В главном окне VeraCrypt нажмите кнопку <strong>Смонтировать</strong>. Появится окно ввода пароля.</p>
+<h4>ШАГ 17:</h4>
+<p><img src="Beginner's Tutorial_Image_018.png" alt=""><br>
+<br>
+Укажите пароль (который мы задали на шаге 10) в поле ввода (на иллюстрации оно отмечено красным).</p>
+<h4>ШАГ 18:</h4>
+<p><img src="Beginner's Tutorial_Image_019.png" alt=""><br>
+<br>
+Выберите алгоритм PRF, который был использован при создании тома (по умолчанию VeraCrypt использует
+PRF-алгоритм SHA-512). Если вы не помните, какой PRF использовался, просто оставьте здесь автоопределение,
+но монтирование в этом случае займёт большее время. После ввода пароля нажмите <strong>OK</strong>.<br>
+<br>
+Сейчас VeraCrypt попытается смонтировать наш том. Если пароль указан неправильно (например, вы ошиблись
+при вводе), VeraCrypt известит вас об этом, и потребуется повторить предыдущий этап (снова ввести пароль и
+нажать <strong>OK</strong>). Если пароль правильный, том будет смонтирован.</p>
+<h4>ШАГ 19 (ЗАКЛЮЧИТЕЛЬНЫЙ):</h4>
+<p><img src="Beginner's Tutorial_Image_020.png" alt=""><br>
+<br>
+Итак, мы только что успешно смонтировали контейнер как виртуальный диск M:.<br>
+<br>
+Этот виртуальный диск полностью зашифрован (в том числе зашифрованы имена файлов, таблицы распределения,
+свободное место и т. д.) и ведёт себя как настоящий диск. Вы можете сохранять (или копировать, перемещать
+и т. д.) файлы на этом виртуальном диске – они будут шифроваться на лету в момент записи.<br>
+<br>
+Если вы откроете файл, хранящийся в томе VeraCrypt, например, в медиапроигрывателе, этот файл будет
+автоматически расшифровываться в памяти (в ОЗУ) непосредственно в момент считывания, то есть на лету.</p>
+<p><i>ВАЖНО: Обратите внимание, что когда вы открываете файл, хранящийся в томе VeraCrypt (или когда
+сохраняете/копируете файл в томе VeraCrypt), повторно пароль не запрашивается. Правильный пароль нужно
+указать только один раз – при монтировании тома.</i></p>
+<p>Открыть смонтированный том можно, например, двойным щелчком по элементу, выделенному на иллюстрации синим цветом.</p>
+<p>Просматривать содержимое смонтированного тома можно точно так же, как содержимое любого другого диска.
+Например, открыть <em>Компьютер</em> (или <em>Мой компьютер</em>) и дважды щёлкнуть по соответствующей
+букве диска (в нашем случае это буква M).<br>
+<br>
+<img src="Beginner's Tutorial_Image_021.png" alt=""><br>
+<br>
+Вы можете копировать файлы (или папки) в/из том(а) VeraCrypt, как если бы вы копировали их в любой другой
+обычный диск (например, с помощью перетаскивания). Файлы, считываемые или копируемые из зашифрованного
+тома VeraCrypt, автоматически на лету расшифровываются в ОЗУ (в памяти). Аналогично, файлы, записываемые
+или копируемые в том VeraCrypt, автоматически зашифровываются на лету в ОЗУ (непосредственно перед их записью на диск).<br>
+<br>
+Обратите внимание, что VeraCrypt никогда не сохраняет на диске данные в незашифрованном виде – незашифрованные
+данные хранятся лишь временно в ОЗУ (памяти). Даже при смонтированном томе данные в этом томе остаются
+зашифрованными. При перезагрузке Windows или выключении компьютера том будет размонтирован, а все находящиеся
+в нём файлы станут недоступными (и зашифрованными). Даже в случае случайного перебоя электропитания (то есть
+при некорректном завершении работы системы) все хранящиеся в томе файлы будут недоступными (и зашифрованными).
+Чтобы снова получить к ним доступ, потребуется смонтировать том. Как это сделать, описано в шагах 13-18.</p>
+<p>Если вам нужно закрыть том, сделав его содержимое недоступным, можно либо перезагрузить операционную систему,
+либо размонтировать том. Для этого сделайте следующее:<br>
+<br>
+<img src="Beginner's Tutorial_Image_022.png" alt=""><br>
+<br>
+Выберите нужный том из списка смонтированных томов в главном окне VeraCrypt (на иллюстрации он отмечен красным)
+и нажмите кнопку <strong>Размонтировать</strong> (на иллюстрации она также отмечена красным). Чтобы снова
+получить доступ к хранящимся в томе файлам, потребуется смонтировать том. Как это сделать, описано в шагах 13-18.</p>
+<h2>Как создать и использовать раздел/устройство, зашифрованное VeraCrypt</h2>
+<p>Вместо создания файлов-контейнеров вы можете воспользоваться шифрованием физических разделов или дисков
+(то есть создавать тома VeraCrypt на основе устройств). Чтобы это сделать, повторите шаги 1-3, но на шаге 3
+выберите второй или третий параметр и следуйте инструкциям мастера.
+При создании тома VeraCrypt на основе устройства внутри <em>несистемного</em> раздела/диска, монтирование
+этого тома выполняется кнопкой <em>Автомонтирование</em> в главном окне VeraCrypt. Информацию о зашифрованных
+<em>системных</em> разделах/дисках см. в главе <a href="System%20Encryption.html">
+<em>Шифрование системы</em></a>.</p>
+<p>ВАЖНО: <em>Настоятельно рекомендуем ознакомиться с другими главами этого руководства – они содержат важную
+информацию, которая здесь опущена, чтобы проще было объяснить азы.</em></p>
+</div>
+</body></html>
diff --git a/doc/html/ru/Beginner's Tutorial_Image_001.png b/doc/html/ru/Beginner's Tutorial_Image_001.png
new file mode 100644
index 00000000..f0232d7c
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_001.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_002.png b/doc/html/ru/Beginner's Tutorial_Image_002.png
new file mode 100644
index 00000000..bfabc461
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_002.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_003.png b/doc/html/ru/Beginner's Tutorial_Image_003.png
new file mode 100644
index 00000000..d82f4346
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_003.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_004.png b/doc/html/ru/Beginner's Tutorial_Image_004.png
new file mode 100644
index 00000000..cd6b4688
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_004.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_005.png b/doc/html/ru/Beginner's Tutorial_Image_005.png
new file mode 100644
index 00000000..c003f4df
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_005.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_007.png b/doc/html/ru/Beginner's Tutorial_Image_007.png
new file mode 100644
index 00000000..8d6fa1b4
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_007.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_008.png b/doc/html/ru/Beginner's Tutorial_Image_008.png
new file mode 100644
index 00000000..5637f034
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_008.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_009.png b/doc/html/ru/Beginner's Tutorial_Image_009.png
new file mode 100644
index 00000000..c9ec72e2
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_009.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_010.png b/doc/html/ru/Beginner's Tutorial_Image_010.png
new file mode 100644
index 00000000..4c0d0df0
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_010.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_011.png b/doc/html/ru/Beginner's Tutorial_Image_011.png
new file mode 100644
index 00000000..3e5c1f08
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_011.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_012.png b/doc/html/ru/Beginner's Tutorial_Image_012.png
new file mode 100644
index 00000000..af05afe8
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_012.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_013.png b/doc/html/ru/Beginner's Tutorial_Image_013.png
new file mode 100644
index 00000000..0ddb537f
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_013.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_014.png b/doc/html/ru/Beginner's Tutorial_Image_014.png
new file mode 100644
index 00000000..4492b513
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_014.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_015.png b/doc/html/ru/Beginner's Tutorial_Image_015.png
new file mode 100644
index 00000000..f9297a36
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_015.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_016.png b/doc/html/ru/Beginner's Tutorial_Image_016.png
new file mode 100644
index 00000000..3648ac45
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_016.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_017.png b/doc/html/ru/Beginner's Tutorial_Image_017.png
new file mode 100644
index 00000000..017dc9ed
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_017.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_018.png b/doc/html/ru/Beginner's Tutorial_Image_018.png
new file mode 100644
index 00000000..8061c181
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_018.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_019.png b/doc/html/ru/Beginner's Tutorial_Image_019.png
new file mode 100644
index 00000000..018858d3
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_019.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_020.png b/doc/html/ru/Beginner's Tutorial_Image_020.png
new file mode 100644
index 00000000..99c94c6c
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_020.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_021.png b/doc/html/ru/Beginner's Tutorial_Image_021.png
new file mode 100644
index 00000000..6aff7099
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_021.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_022.png b/doc/html/ru/Beginner's Tutorial_Image_022.png
new file mode 100644
index 00000000..aa651266
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_022.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_023.png b/doc/html/ru/Beginner's Tutorial_Image_023.png
new file mode 100644
index 00000000..3f2e37c2
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_023.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_024.png b/doc/html/ru/Beginner's Tutorial_Image_024.png
new file mode 100644
index 00000000..121a7581
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_024.png
diff --git a/doc/html/ru/Beginner's Tutorial_Image_034.png b/doc/html/ru/Beginner's Tutorial_Image_034.png
new file mode 100644
index 00000000..49c524d2
--- /dev/null
+++ b/doc/html/ru/Beginner's Tutorial_Image_034.png
diff --git a/doc/html/ru/Camellia.html b/doc/html/ru/Camellia.html
new file mode 100644
index 00000000..7bc84b6e
--- /dev/null
+++ b/doc/html/ru/Camellia.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Encryption%20Algorithms.html">Алгоритмы шифрования</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Camellia.html">Camellia</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Алгоритм шифрования Camellia</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Совместная разработка Mitsubishi Electric и NTT of Japan. Camellia это шифр с блоками размером 128 бит, впервые
+опубликованный в 2000 году. Одобрен к использованию ISO/IEC, проектом NESSIE Евросоюза и японским проектом CRYPTREC.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+В VeraCrypt используется шифр Camellia с 24 раундами и 256-битовым ключом, работающий в <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+режиме XTS</a> (см. раздел <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Режимы работы</a>).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<a href="Kuznyechik.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Cascades.html b/doc/html/ru/Cascades.html
new file mode 100644
index 00000000..d46a7723
--- /dev/null
+++ b/doc/html/ru/Cascades.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Encryption%20Algorithms.html">Алгоритмы шифрования</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Cascades.html">Каскады шифров</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Каскады шифров</h1>
+<p>&nbsp;</p>
+<h2>AES-Twofish</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Twofish (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом AES (с ключом размером 256 бит) также в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга
+ (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>AES-Twofish-Serpent</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] три шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS, затем алгоритмом Twofish (с ключом размером 256 бит) в режиме XTS, и, наконец, алгоритмом AES (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ.
+ Все ключи шифрования не зависят друг от друга (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>Camellia-Kuznyechik</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Kuznyechik (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом Camellia (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга
+ (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>Camellia-Serpent</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом Camellia (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга
+ (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>Kuznyechik-AES</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом AES (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом Kuznyechik (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга
+ (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>Kuznyechik-Serpent-Camellia</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] три шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Camellia (с ключом размером 256 бит) в режиме XTS, затем алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS, и, наконец, алгоритмом Kuznyechik (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ.
+ Все ключи шифрования не зависят друг от друга (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>Kuznyechik-Twofish</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Twofish (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом Kuznyechik (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга
+ (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>Serpent-AES</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом AES (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга
+ (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>Serpent-Twofish-AES</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] три шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом AES (с ключом размером 256 бит) в режиме XTS, затем алгоритмом Twofish (с ключом размером 256 бит) в режиме XTS, и, наконец, алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ.
+ Все ключи шифрования не зависят друг от друга (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+<h2>Twofish-Serpent</h2>
+<p>Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом Twofish (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга
+ (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
+<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
+</div>
+</body></html>
diff --git a/doc/html/ru/Changing Passwords and Keyfiles.html b/doc/html/ru/Changing Passwords and Keyfiles.html
new file mode 100644
index 00000000..fcbd62bc
--- /dev/null
+++ b/doc/html/ru/Changing Passwords and Keyfiles.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Требования безопасности и меры предосторожности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Changing%20Passwords%20and%20Keyfiles.html">Изменение паролей и ключевых файлов</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Изменение паролей и ключевых файлов</h1>
+<p>Обратите внимание, что в заголовке тома (который зашифрован с помощью ключа заголовка, сформированного из пароля/ключевого файла) содержится мастер-ключ (не путайте с паролем), посредством которого зашифрован том.
+ Если у злоумышленника есть возможность сделать копию вашего тома до того, как изменили пароль и/или ключевые файлы, он может использовать свою копию или фрагмент (старый заголовок) тома VeraCrypt, чтобы смонтировать ваш том, используя скомпрометированный пароль и/или скомпрометированные ключевые файлы, которые требовались для монтирования тома
+ до изменения пароля и/или ключевых файлов.<br>
+<br>
+Если вы не уверены, знает ли злоумышленник ваш пароль (или обладает вашими ключевыми файлами), и что у него нет копии вашего тома, когда вам потребовалось изменить его пароль и/или ключевые файлы, то настоятельно рекомендуется создать новый том VeraCrypt и переместить в него файлы
+ из старого тома (у нового тома будет другой мастер-ключ).<br>
+<br>
+Также учтите, что если злоумышленник знает ваш пароль (или обладает вашими ключевыми файлами) и у него есть доступ к вашему тому, он может получить и сохранить его мастер-ключ. Сделав это, он сможет расшифровать ваш том, даже если вы затем изменили пароль и/или ключевые файлы
+ (потому что мастер-ключ не меняется при смене пароля тома и/или ключевых файлов). В этом случае создайте новый том VeraCrypt и переместите в него все файлы из старого тома.<br>
+<br>
+Следующие разделы этой главы содержат дополнительную информацию о возможных проблемах безопасности, связанных со сменой паролей и/или ключевых файлов:</p>
+<ul>
+<li><a href="Security%20Requirements%20and%20Precautions.html"><em>Требования безопасности и меры предосторожности</em></a>
+</li><li><a href="Journaling%20File%20Systems.html"><em>Журналируемые файловые системы</em></a>
+</li><li><a href="Дефрагментация.html"><em>Дефрагментация</em></a>
+</li><li><a href="Reallocated%20Sectors.html"><em>Перераспределённые сектора</em></a>
+</li></ul>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Choosing Passwords and Keyfiles.html b/doc/html/ru/Choosing Passwords and Keyfiles.html
new file mode 100644
index 00000000..ae9080d7
--- /dev/null
+++ b/doc/html/ru/Choosing Passwords and Keyfiles.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Требования безопасности и меры предосторожности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Choosing%20Passwords%20and%20Keyfiles.html">Выбор паролей и ключевых файлов</a>
+</p></div>
+
+<div class="wikidoc">
+<div>
+<h1>Выбор паролей и ключевых файлов</h1>
+<p>Выбрать хороший пароль – это очень важно! Ни в коем случае не используйте пароль из одного слова, которое
+можно найти в каком-нибудь словаре (или сочетание из таких слов). В пароле не должно быть никаких имён, дней рождения,
+номеров телефонов и учётных записей (аккаунтов) и любых других элементов, которые можно угадать. Хороший пароль
+это случайная комбинация из букв в верхнем и нижнем регистрах, цифр и специальных символов, таких как @ ^ = $ * &#43;
+и др. Настоятельно рекомендуется выбирать пароль, состоящий не менее чем из 20 символов (чем длиннее, тем лучше),
+так как короткие пароли несложно взломать методом перебора (brute-force).<br>
+<br>
+Чтобы сделать атаки перебором невозможными, размер ключевого файла должен быть не менее 30 байт. Если для тома
+используется несколько ключевых файлов, хотя бы один из них должен иметь размер 30 байт или больше. Обратите
+внимание, что 30-байтовое ограничение предполагает большой объём энтропии в ключевом файле. Если первые 1024 килобайта
+файла содержат лишь небольшой объём энтропии, такой файл нельзя использовать как ключевой (вне зависимости от
+размера файла). Если вы не понимаете, что такое энтропия, рекомендуем доверить VeraCrypt создание файла со
+случайным содержимым и использовать этот файл как ключевой (выберите <em>Сервис &gt; Генератор ключевых файлов</em>).</p>
+<p>При создании тома, шифровании системного раздела/диска или изменении паролей/ключевых файлов нельзя позволять
+никому другому выбирать или изменять пароли/ключевые файлы до тех пор, пока не будет создан том или изменены
+пароль/ключевые файлы. Например, нельзя использовать никакие генераторы паролей (будь то приложения в Интернете
+или программы у вас в компьютере), если вы не уверены в их высоком качестве и в том, что они не подконтрольны
+неприятелю, а в качестве ключевых файлов нельзя использовать файлы, загруженные из Интернета, или которые
+доступны другим пользователям данного компьютера (неважно, администраторы они или нет).</p>
+</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Command Line Usage.html b/doc/html/ru/Command Line Usage.html
new file mode 100644
index 00000000..c3fc1efe
--- /dev/null
+++ b/doc/html/ru/Command Line Usage.html
@@ -0,0 +1,325 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Command%20Line%20Usage.html">Использование в режиме командной строки</a>
+</p></div>
+
+<div class="wikidoc">
+<div>
+<h1>Использование в режиме командной строки</h1>
+<p>Информация в этом разделе относится к версии VeraCrypt для Windows. Чтобы получить сведения об использовании в режиме командной строки
+<strong>версий для Linux и Mac OS X</strong>, выполните следующую команду: <code>veracrypt -h</code></p>
+<table border="1" cellspacing="0" cellpadding="1">
+<tbody>
+<tr>
+<td>&nbsp;<em>/help</em> или <em>/?</em></td>
+<td>Показать справку по использованию в командной строке.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/truecrypt</em> или <em>/tc</em></td>
+<td>Активировать режим совместимости с TrueCrypt, который позволяет монтировать тома, созданные в TrueCrypt версий 6.x и 7.x.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/hash</em></td>
+<td>После этого ключа указывается хеш-алгоритм PRF, используемый при монтировании тома. Возможные значения ключа /hash: <code>sha256, sha-256, sha512, sha-512, whirlpool, blake2s</code> и <code>blake2s-256</code>. Если ключ <code>/hash</code> не указан, VeraCrypt будет пробовать
+ все доступные PRF-алгоритмы, тем самым увеличивая время монтирования.</td>
+</tr>
+<tr>
+<td id="volume">&nbsp;<em>/volume</em> или <em>/v</em></td>
+<td>
+<p>После этого ключа указывается полное имя (с путём) файла с томом VeraCrypt для монтирования (не используйте при размонтировании) или идентификатор тома (Volume ID) диска/раздела для монтирования.<br>
+Синтаксис идентификатора тома следующий: <code>ID:XXXXXX...XX</code>, где часть с XX это строка из 64 шестнадцатеричных символов, которая представляет собой 32-байтовый идентификатор тома для монтирования.<br>
+<br>
+Чтобы смонтировать том на основе раздела/устройства, используйте, например, параметры <code>/v \Device\Harddisk1\Partition3</code> (узнать путь к разделу/устройству можно, запустив VeraCrypt и нажав кнопку
+<em>Выбрать устройство</em>). Монтировать раздел или динамический том также можно используя его имя тома (например, <code>/v \\?\Volume{5cceb196-48bf-46ab-ad00-70965512253a}\</code>). Узнать имя тома можно, например, с помощью mountvol.exe. Также помните, что в путях устройств учитывается регистр букв.<br>
+<br>
+Для монтирования также можно указывать идентификатор монтируемого тома (Volume ID) на основе раздела/устройства, например: <code>/v ID:53B9A8D59CC84264004DA8728FC8F3E2EE6C130145ABD3835695C29FD601EDCA</code>. Значение идентификатора тома можно получить с помощью диалогового окна свойств тома.</p>
+</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/letter</em> или <em>/l</em></td>
+<td>После этого ключа указывается буква диска, присваиваемая монтируемому тому. Если ключ <code>/l</code> не указан и используется ключ <code>/a</code>, тогда тому присваивается первая незанятая буква диска.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/explore</em> или <em>/e</em></td>
+<td>Открыть окно Проводника после монтирования тома.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/beep</em> или <em>/b</em></td>
+<td>Звуковой сигнал после успешного монтирования или размонтирования.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/auto</em> или <em>/a</em></td>
+<td>Если этот ключ указан без параметров, то выполняется автоматическое монтирование тома. Если указан параметр <code>devices</code> (например, <code>/a devices</code>), то выполняется автомонтирование всех доступных в данный момент томов VeraCrypt на основе устройств/разделов. Если указан параметр <code>favorites</code>, то выполняется автомонтирование
+ избранных томов. Обратите внимание, что ключ <code>/auto</code> подразумевается, если указаны ключи <code>/quit</code> и <code>/volume</code>. Если требуется подавить вывод на экран окна программы, используйте ключ <code>/quit</code>.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/dismount</em> или <em>/d</em></td>
+<td>Размонтировать том с указанной буквой диска (пример: <code>/d x</code>). Если буква диска не указана, то будут размонтированы все смонтированные на данный момент тома VeraCrypt.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/force</em> или <em>/f</em></td>
+<td>Принудительно размонтировать (если размонтируемый том содержит файлы, используемые системой или какой-либо программой) и принудительно смонтировать в совместно используемом (shared) режиме (то есть без эксклюзивного доступа).</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/keyfile</em> или <em>/k</em></td>
+<td>После этого ключа указывается ключевой файл или путь поиска ключевых файлов. Если ключевых файлов несколько, то они указываются, например, так: <code>/k c:\keyfile1.dat /k d:\KeyfileFolder /k c:\kf2</code>. Чтобы указать ключевой файл, находящийся на токене безопасности или смарт-карте, используйте следующий синтаксис:
+<code>token://slot/SLOT_NUMBER/file/FILE_NAME</code></td>
+</tr>
+<tr id="tryemptypass">
+<td>&nbsp;<em>/tryemptypass&nbsp;&nbsp; </em></td>
+<td>Этот ключ применяется, <em>только</em> если сконфигурирован ключевой файл по умолчанию или ключевой файл указан в командной строке.<br>
+Если после этого ключа указан параметр <strong>y</strong> или <strong>yes</strong>, либо параметр не указан: попытаться смонтировать, используя пустой пароль и ключевой файл, прежде чем показать запрос пароля.<br>
+Если после этого ключа указан параметр <strong>n</strong> или <strong>no</strong>: не пытаться смонтировать, используя пустой пароль и ключевой файл, и сразу показать запрос пароля.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/nowaitdlg</em></td>
+<td>Если после этого ключа указан параметр <strong>y</strong> или <strong>yes</strong>, либо параметр не указан: не показывать окно ожидания при выполнении таких операций, как, например, монтирование томов.<br>
+Если после этого ключа указан параметр <strong>n</strong> или <strong>no</strong>: принудительно показывать окно ожидания при выполнении операций.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/secureDesktop</em></td>
+<td>Если после этого ключа указан параметр <strong>y</strong> или <strong>yes</strong>, либо параметр не указан: показывать окно пароля и окно пин-кода токена на выделенном безопасном рабочем столе для защиты от определённых типов атак.<br>
+Если после этого ключа указан параметр <strong>n</strong> или <strong>no</strong>: окно пароля и окно PIN-кода токена отображаются на обычном рабочем столе.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/tokenlib</em></td>
+<td>После этого ключа указывается библиотека PKCS #11 для токенов безопасности и смарт-карт (пример: <code>/tokenlib c:\pkcs11lib.dll</code>).</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/tokenpin</em></td>
+<td>После этого ключа указывается пин-код для аутентификации с помощью токена безопасности или смарт-карты (пример: <code>/tokenpin 0000</code>).
+ ВНИМАНИЕ: Этот метод ввода пин-кода смарт-карты может быть небезопасным, например, когда незашифрованный журнал истории командной строки сохраняется на незашифрованном диске.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/cache</em> или <em>/c</em></td>
+<td>Если после этого ключа указан параметр <strong>y</strong> или <strong>yes</strong>, либо параметр не указан: включить кэш паролей.
+<br>
+Если после этого ключа указан параметр <strong>p</strong> или <strong>pim</strong>: включить кэш паролей и PIM (пример: <code>/c p</code>).<br>
+Если после этого ключа указан параметр <strong>n</strong> или <strong>no</strong>: отключить кэш паролей (пример: <code>/c n</code>).<br>
+Если после этого ключа указан параметр <strong>f</strong> или <strong>favorites</strong>: временно кэшировать пароль при монтировании нескольких избранных томов (пример: <code>/c f</code>).<br>
+Обратите внимание, что отключение кэша паролей не очищает его (чтобы очистить кэш паролей, используйте ключ <code>/w</code>).</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/history</em> или <em>/h</em></td>
+<td>Если после этого ключа указан параметр <strong>y</strong> или параметр не указан: включить сохранение истории смонтированных томов.<br>
+Если после этого ключа указан параметр <strong>n</strong>: отключить сохранение истории смонтированных томов (пример: <code>/h n</code>).</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/wipecache</em> или <em>/w</em></td>
+<td>Удалить все пароли, кэшированные (сохранённые) в памяти драйвера.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/password</em> или <em>/p</em></td>
+<td>После этого ключа указывается пароль тома. Если в пароле есть пробелы, его необходимо заключить в двойные кавычки (пример: <code>/p &rdquo;My Password&rdquo;</code>). Чтобы указать пустой пароль, используйте ключ <code>/p &rdquo;&rdquo;</code>.
+<em>ВНИМАНИЕ: Такой метод ввода пароля может быть небезопасен, например, если на незашифрованном диске записывается незашифрованная история операций в командной строке.</em></td>
+</tr>
+<tr>
+<td>&nbsp;<em>/pim</em></td>
+<td>После этого ключа указывается положительное целое число, определяющее PIM (Персональный множитель итераций) для использования с этим томом.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/quit</em> или <em>/q</em></td>
+<td>Автоматически выполнить запрошенные действия и выйти (без отображения главного окна VeraCrypt). Если в качестве параметра указано <code>preferences</code> (пример: <code>/q preferences</code>), то будут загружены/сохранены настройки программы, и они переопределят параметры, указанные в командной строке.
+Ключ <code>/q background</code> запускает VeraCrypt в фоновом режиме (значок в области уведомлений), если только это не запрещено в настройках.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/silent</em> или <em>/s</em></td>
+<td>При указании вместе с ключом <code>/q</code> подавляет взаимодействие с пользователем (запросы, сообщения об ошибках, предупреждения и т. д.). Если ключ <code>/q</code> не указан, этот параметр никакого действия не оказывает.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/mountoption</em> или <em>/m</em></td>
+<td>
+<p>После этого ключа указывается один из перечисленных ниже параметров.</p>
+<p><strong>ro</strong> или <strong>readonly</strong>: смонтировать том как доступный только для чтения.</p>
+<p><strong>rm</strong> или <strong>removable</strong>: смонтировать том как сменный носитель (см. раздел
+<a href="Removable%20Medium%20Volume.html">
+<em>Том, смонтированный как сменный носитель</em></a>).</p>
+<p><strong>ts</strong> или <strong>timestamp</strong>: не сохранять дату и время изменения контейнера.</p>
+<p><strong>sm</strong> или <strong>system</strong>: смонтировать без предзагрузочной аутентификации раздел, входящий в область действия шифрования системы (например, раздел на зашифрованном системном диске с другой операционной системой, которая в данный момент не выполняется).
+ Полезно, например, для операций резервного копирования или починки. Примечание: если вы указываете пароль как параметр ключа /p, убедитесь, что пароль набран с использованием стандартной американской раскладки клавиатуры (при использовании графического интерфейса программы это делается автоматически). Это необходимо потому,
+ что пароль требуется вводить на этапе до загрузки операционной системы (до запуска Windows), когда раскладки клавиатуры, отличные от американской, ещё недоступны.</p>
+<p><strong>bk</strong> или <strong>headerbak</strong>: смонтировать том, используя встроенную резервную копию заголовка. Примечание: встроенная резервная копия заголовка содержится во всех томах, созданных VeraCrypt (эта копия располагается в конце тома).</p>
+<p><strong>recovery</strong>: не проверять контрольные суммы, хранящиеся в заголовке тома. Этот параметр следует использовать только при повреждении заголовка тома и когда такой том невозможно смонтировать даже с параметром headerbak. Пример: /m ro</p>
+<p><strong>label=LabelValue</strong>: использовать указанную строку <strong>LabelValue</strong> как метку смонтированного тома в Проводнике Windows. Максимальная длина
+<strong>LabelValue&nbsp;</strong> – 32 символа для томов NTFS и 11 символов для томов FAT. Например,
+<code>/m label=MyDrive</code> установит для диска в Проводнике метку тома <em>MyDrive</em>.</p>
+<p><strong>noattach</strong>: создать только виртуальное устройство без фактического присоединения смонтированного тома к выбранной букве диска.</p>
+<p>Обратите внимание, что этот ключ может присутствовать в командной строке несколько раз, чтобы указать несколько вариантов монтирования (пример: /m rm /m ts)</p>
+</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/DisableDeviceUpdate</em>&nbsp;</td>
+<td>Отключить периодическую внутреннюю проверку устройств, подключённых к системе, которая используется для обработки избранного, идентифицированного с помощью идентификаторов томов (Volume ID), и заменить её проверками по требованию.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/protectMemory</em>&nbsp;</td>
+<td>Активировать механизм защиты памяти процесса VeraCrypt от доступа со стороны других процессов без прав администратора.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/signalExit</em>&nbsp;</td>
+<td>После этого ключа должен следовать параметр, определяющий имя отправляемого сигнала для разблокирования ожидания команды <a href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/waitfor" target="_blank">WAITFOR.EXE</a> при завершении работы VeraCrypt.<br>
+Имя сигнала должно совпадать с указанным в команде WAITFOR.EXE (пример: <code>veracrypt.exe /q /v test.hc /l Z /signal SigName</code> с последующим <code>waitfor.exe SigName</code><br>
+Если <code>/q</code> не указан, этот ключ игнорируется.</td>
+</tr>
+</tbody>
+</table>
+<h4>VeraCrypt Format.exe (Мастер создания томов VeraCrypt):</h4>
+<table border="1" cellspacing="0" cellpadding="0">
+<tbody>
+<tr>
+<td>&nbsp;<em>/create</em></td>
+<td>Создать том на основе файла-контейнера в режиме командной строки. За этим ключом должно следовать имя файла создаваемого контейнера.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/size</em></td>
+<td>
+<p>(Только с ключом /create)<br>
+После этого ключа указывается размер создаваемого файла-контейнера. Если указано просто число без суффикса, то оно обозначает размер в байтах. Если после числа добавить суффикс "K", "M", "G" или "T", то это будет означать размер, соответственно, в килобайтах, мегабайтах, гигабайтах или терабайтах.
+Примеры:</p>
+<ul>
+<li><code>/size 5000000</code>: размер контейнера – 5 000 000 байт</li><li><code>/size 25K</code>: размер контейнера – 25 килобайт</li><li><code>/size 100M</code>: размер контейнера – 100 мегабайт </li><li><code>/size 2G</code>: размер контейнера – 2 гигабайта</li><li><code>/size 1T</code>: размер контейнера – 1 терабайт</li></ul>
+</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/password</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+После этого ключа указывается пароль к создаваемому тому.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/keyfile</em> или <em>/k</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+После этого ключа указывается ключевой файл или путь поиска ключевых файлов к создаваемому тому. Чтобы использовать несколько ключевых файлов, укажите, например, такие параметры: <code>/k c:\keyfile1.dat /k d:\KeyfileFolder /k c:\kf2</code>. Чтобы указать ключевой файл, расположенный на токене безопасности или смарт-карте, используйте следующий синтаксис:
+<code>token://slot/SLOT_NUMBER/file/FILE_NAME</code></td>
+</tr>
+<tr>
+<td>&nbsp;<em>/tokenlib</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+После этого ключа указывается библиотека PKCS #11 для использования с токенами безопасности и смарт-картами (пример: <code>/tokenlib c:\pkcs11lib.dll</code>).</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/tokenpin</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+После этого ключа указывается пин-код для аутентификации с помощью токена безопасности или смарт-карты (пример: <code>/tokenpin 0000</code>). ВНИМАНИЕ: Этот метод
+ввода пин-кода смарт-карты может быть небезопасным, например, когда незашифрованный журнал истории командной строки сохраняется на незашифрованном диске.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/hash</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+После этого ключа указывается хеш-алгоритм PRF, используемый при создании тома. Синтаксис такой же, как у VeraCrypt.exe.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/encryption</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+После этого ключа указывается используемый алгоритм шифрования. По умолчанию это AES, если данный ключ не указан. Возможны следующие значения (регистр букв не учитывается):
+<ul>
+<li><code>AES </li><li>Serpent </li><li>Twofish </li><li>Camellia </li><li>Kuznyechik </li><li>AES(Twofish) </li><li>AES(Twofish(Serpent)) </li><li>Serpent(AES) </li><li>Serpent(Twofish(AES)) </li><li>Twofish(Serpent) </li>
+<li>Camellia(Kuznyechik) </li>
+<li>Kuznyechik(Twofish) </li>
+<li>Camellia(Serpent) </li>
+<li>Kuznyechik(AES) </li>
+<li>Kuznyechik(Serpent(Camellia))</code></li>
+</ul>
+</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/filesystem</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+После этого ключа указывается файловая система для использования в томе. Возможны следующие значения:
+<ul>
+<li>Значение не указано: не использовать никакую файловую систему</li><li>FAT: форматировать в FAT/FAT32 </li><li>NTFS: форматировать в NTFS (в этом случае появится окно с запросом UAC, если только процесс не выполняется с полными правами администратора)
+</li>
+<li>ExFAT: форматировать в ExFAT (этот ключ доступен начиная с Windows Vista SP1)</li>
+<li>ReFS: форматировать в ReFS (этот ключ доступен начиная с Windows 10)</li>
+</ul>
+</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/dynamic</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+Создать динамический том.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/force</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+Принудительная перезапись без запроса.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/silent</em></td>
+<td>(Только с ключом <code>/create</code>)<br>
+Не показывать окна с сообщениями. Если произойдёт какая-либо ошибка, операция завершится без сообщений.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/noisocheck</em> или <em>/n</em></td>
+<td>Не проверять правильность записи на носители дисков восстановления VeraCrypt (Rescue Disk). <strong>ВНИМАНИЕ</strong>: Никогда не пытайтесь применять этот ключ, чтобы облегчить повторное использование ранее созданного Диска восстановления VeraCrypt. Помните, что при каждом шифровании системного раздела/диска
+ нужно создавать новый Диск восстановления VeraCrypt, даже если используете тот же пароль. Ранее созданный Диск восстановления нельзя использовать повторно, так как он был создан для другого мастер-ключа.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/nosizecheck</em></td>
+<td>Не проверять Не проверять, что заданный размер файлового контейнера меньше, чем доступно на места на диске. Это относится как к пользовательскому интерфейсу, так и к командной строке.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/quick</em></td>
+<td>Выполнять быстрое форматирование томов вместо полного форматирования. Это относится как к пользовательскому интерфейсу, так и к командной строке.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/FastCreateFile</em></td>
+<td>Использовать более быстрый, хотя и потенциально небезопасный метод создания файловых контейнеров. Эта опция сопряжена с риском для безопасности, поскольку способна встроить существующее содержимое диска в файловый контейнер, что может привести к раскрытию конфиденциальных данных, если злоумышленник получит к нему доступ. Обратите внимание, что этот ключ влияет на все методы создания файловых контейнеров, независимо от того, запущены ли они из командной строки с параметром <em>/create</em> или с помощью мастера из интерфейса пользователя.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/protectMemory</em>&nbsp;</td>
+<td>Активировать механизм защиты памяти процесса VeraCrypt Format от доступа со стороны других процессов без прав администратора.</td>
+</tr>
+<tr>
+<td>&nbsp;<em>/secureDesktop</em></td>
+<td>Если после этого ключа указан параметр <strong>y</strong> или <strong>yes</strong>, либо параметр не указан: показывать окно пароля и окно PIN-кода токена на выделенном безопасном рабочем столе для защиты от определённых типов атак.<br>
+Если после этого ключа указан параметр <strong>n</strong> или <strong>no</strong>: окно пароля и окно PIN-кода токена отображаются на обычном рабочем столе.</td>
+</tr>
+</tbody>
+</table>
+<h4>Синтаксис</h4>
+<p><code>VeraCrypt.exe [/tc] [/hash {sha256|sha-256|sha512|sha-512|whirlpool |blake2s|blake2s-256}][/a [devices|favorites]] [/b] [/c [y|n|f]] [/d [буква диска]] [/e] [/f] [/h [y|n]] [/k ключевой файл или путь поиска] [tryemptypass [y|n]] [/l буква диска] [/m {bk|rm|recovery|ro|sm|ts|noattach}]
+ [/p пароль] [/pim значение pim] [/q [background|preferences]] [/s] [/tokenlib путь] [/v том] [/w]</code></p>
+<p><code>&quot;VeraCrypt Format.exe&quot; [/n] [/create] [/size число[{K|M|G|T}]] [/p пароль]&nbsp; [/encryption {AES | Serpent | Twofish | Camellia | Kuznyechik | AES(Twofish) | AES(Twofish(Serpent)) | Serpent(AES) | Serpent(Twofish(AES)) | Twofish(Serpent) | Camellia(Kuznyechik) | Kuznyechik(Twofish) | Camellia(Serpent) | Kuznyechik(AES) | Kuznyechik(Serpent(Camellia))}] [/hash {sha256|sha-256|sha512|sha-512|whirlpool|blake2s|blake2s-256}]
+ [/filesystem {пусто|FAT|NTFS|ExFAT|ReFS}] [/dynamic] [/force] [/silent] [/noisocheck] [FastCreateFile] [/quick]</code></p>
+<p>Порядок, в котором указаны параметры, не имеет значения.</p>
+<h4>Примеры</h4>
+<p>Смонтировать том <em>d:\myvolume</em> на первую свободную букву диска, используя запрос пароля (основное окно программы не отображается):</p>
+<p><code>veracrypt /q /v d:\myvolume</code></p>
+<p>Размонтировать том, смонтированный как диск <em>X</em> (основное окно программы не отображается):</p>
+<p><code>veracrypt /q /d x</code></p>
+<p>Смонтировать том с именем <em>myvolume.tc</em>, используя пароль <em>MyPassword</em>, как диск
+<em>X</em>. VeraCrypt откроет окно Проводника и подаст звуковой сигнал; монтирование будет автоматическим:</p>
+<p><code>veracrypt /v myvolume.tc /l x /a /p MyPassword /e /b</code></p>
+<p>Создать файловый контейнер размером 10 МБ, используя пароль <em>test</em>, шифрование Serpent, хеш SHA-512, и отформатировав том в FAT:</p>
+<p><code>&quot;C:\Program Files\VeraCrypt\VeraCrypt Format.exe&quot; /create c:\Data\test.hc /password test /hash sha512 /encryption serpent /filesystem FAT /size 10M /force</code></p>
+</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/CompilingGuidelineLinux.html b/doc/html/ru/CompilingGuidelineLinux.html
new file mode 100644
index 00000000..20d9579c
--- /dev/null
+++ b/doc/html/ru/CompilingGuidelineLinux.html
@@ -0,0 +1,314 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<style>
+.textbox {
+  vertical-align: top;
+  height: auto !important;
+  font-family: Helvetica,sans-serif;
+  font-size: 20px;
+  font-weight: bold;
+  margin: 10px;
+  padding: 10px;
+  background-color: white;
+  width: auto;
+  border-radius: 10px;
+}
+
+.texttohide {
+  font-family: Helvetica,sans-serif;
+  font-size: 14px;
+  font-weight: normal;
+}
+
+
+</style>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Технические подробности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelines.html">Сборка VeraCrypt из исходного кода</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelineLinux.html">Руководство по сборке в Linux</a>
+</p></div>
+
+<div class="wikidoc">
+В этом руководстве описано, как настроить систему Linux для сборки программы VeraCrypt из исходных кодов и как выполнить компиляцию. <br>
+Здесь как пример приведена процедура для Ubuntu 22.04 LTS, процедуры для других версий Linux аналогичны.
+</div>
+
+<div class="wikidoc">
+<br>
+<br>
+Для компиляции VeraCrypt необходимы следующие компоненты:
+<ol>
+	<li>GNU Make</li>
+	<li>GNU C/C++ Compiler</li>
+	<li>YASM 1.3.0</li>
+	<li>pkg-config</li>
+	<li>Общая библиотека wxWidgets 3.x и заголовочные файлы, установленные системой, либо исходный код библиотеки wxWidgets 3.x</li>
+	<li>Библиотека FUSE и заголовочные файлы</li>
+	<li>Библиотека PCSC-lite и заголовочные файлы</li>
+</ol>
+</div>
+
+<div class="wikidoc">
+<p>Ниже приведены шаги процедуры. Нажав на любую ссылку, вы сразу перейдёте к соответствующему шагу:
+<ul>
+<li><strong><a href="#InstallationOfGNUMake">Установка GNU Make</a></li></strong>
+<li><strong><a href="#InstallationOfGNUCompiler">Установка GNU C/C++ Compiler</a></li></strong>
+<li><strong><a href="#InstallationOfYASM">Установка YASM</a></li></strong>
+<li><strong><a href="#InstallationOfPKGConfig">Установка pkg-config</a></li></strong>
+<li><strong><a href="#InstallationOfwxWidgets">Установка wxWidgets 3.2</a></li></strong>
+<li><strong><a href="#InstallationOfFuse">Установка libfuse</a></li></strong>
+<li><strong><a href="#InstallationOfPCSCLite">Установка libpcsclite</a></li></strong>
+<li><strong><a href="#DownloadVeraCrypt">Загрузка VeraCrypt</a></li></strong>
+<li><strong><a href="#CompileVeraCrypt">Компиляция VeraCrypt</a></li></strong>
+</ul>
+</p>
+<p>Их также можно выполнить, запустив приведённый ниже список команд в терминале или скопировав их в скрипт:<br>
+<code>
+sudo apt update <br>
+sudo apt install -y build-essential yasm pkg-config libwxgtk3.0-gtk3-dev <br>
+sudo apt install -y libfuse-dev git libpcsclite-dev <br>
+git clone https://github.com/veracrypt/VeraCrypt.git <br>
+cd ~/VeraCrypt/src <br>
+make
+</code>
+</p>
+</div>
+
+<div class="wikidoc">
+ <div class="textbox" id="InstallationOfGNUMake">
+  <a href="#InstallationOfGNUMake">Установка GNU Make</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install build-essential
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfGNUCompiler">
+  <a href="#InstallationOfGNUCompiler">Установка GNU C/C++ Compiler</a>
+  <div class="texttohide">
+    <p> Если build-essential уже был установлен на предыдущем шаге, этот шаг можно пропустить.
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install build-essential
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfYASM">
+  <a href="#InstallationOfYASM">Установка YASM</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install yasm
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfPKGConfig">
+  <a href="#InstallationOfPKGConfig">Установка pkg-config</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install pkg-config
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfwxWidgets">
+  <a href="#InstallationOfwxWidgets">Установка wxWidgets 3.2</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>		
+				sudo apt update <br>
+				sudo apt install libwxgtk3.0-gtk3-dev <br>
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfFuse">
+  <a href="#InstallationOfFuse">Установка libfuse</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install libfuse-dev
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+<div class="textbox" id="InstallationOfPCSCLite">
+	<a href="#InstallationOfPCSCLite">Установка libpcsclite</a>
+	<div class="texttohide">
+		<p>
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>
+					sudo apt update <br>
+					sudo apt install libpcsclite-dev
+				</code>
+			</li>
+		</ol>
+		</p>
+	</div>
+</div>
+ 
+ <div class="textbox" id="DownloadVeraCrypt">
+  <a href="#DownloadVeraCrypt">Загрузка VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install git <br>
+				git clone https://github.com/veracrypt/VeraCrypt.git
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="CompileVeraCrypt">
+  <a href="#CompileVeraCrypt">Компиляция VeraCrypt</a>
+  <div class="texttohide">
+    <p> Примечания: <br>
+	<ul>
+		<li>
+			По умолчанию создаётся универсальный исполняемый файл, поддерживающий как графический, так и текстовый пользовательский интерфейс (через ключ --text). <br>
+			В Linux исполняемый файл только для консоли, для которого не требуется библиотека графического интерфейса, может быть создан с использованием параметра "NOGUI". <br>
+			Для этого нужно загрузить исходники wxWidgets, извлечь их в любое место по вашему выбору, а затем выполнить следующие команды: <br>
+			<code>
+			make NOGUI=1 WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources wxbuild <br>
+			make NOGUI=1 WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources
+			</code>
+		</li>
+		<li>
+			Если вы не используете системную библиотеку wxWidgets, то придётся загрузить и использовать исходники wxWidgets, как указано выше, но на этот раз необходимо выполнить следующие команды для сборки версии VeraCrypt с графическим интерфейсом (NOGUI не указан): <br>
+			<code>
+			make WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources wxbuild <br>
+			make WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources
+			</code>
+		</li>
+	</ul>
+	Шаги:
+		<ol>
+			<li>
+				Откройте терминал.
+			</li>
+			<li>
+				Выполните следующие команды: <br>
+				<code>		
+				cd ~/VeraCrypt/src <br>
+				make
+				</code>
+			</li>
+			<li>
+				Если всё прошло нормально, исполняемый файл VeraCrypt должен находиться в каталоге "Main".
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+</div>
+</body></html>
diff --git a/doc/html/ru/CompilingGuidelineWin.html b/doc/html/ru/CompilingGuidelineWin.html
new file mode 100644
index 00000000..ef17b265
--- /dev/null
+++ b/doc/html/ru/CompilingGuidelineWin.html
@@ -0,0 +1,1224 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<style>
+.textbox {
+  vertical-align: top;
+  height: auto !important;
+  font-family: Helvetica,sans-serif;
+  font-size: 20px;
+  font-weight: bold;
+  margin: 10px;
+  padding: 10px;
+  background-color: white;
+  width: auto;
+  border-radius: 10px;
+}
+
+.texttohide {
+  font-family: Helvetica,sans-serif;
+  font-size: 14px;
+  font-weight: normal;
+}
+
+
+</style>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Технические подробности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelines.html">Сборка VeraCrypt из исходного кода</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelineWin.html">Руководство по сборке в Windows</a>
+</p></div>
+
+<div class="wikidoc">
+В этом руководстве описано, как настроить систему Windows для компилирования VeraCrypt и как cкомпилировать программу.<br>
+Здесь как пример приведена процедура для Windows 10, процедуры для других версий Windows аналогичны.
+</div>
+
+<div class="wikidoc">
+Для компиляции VeraCrypt необходимы следующие компоненты:
+
+<ol>
+	<li>Microsoft Visual Studio 2010</li>
+	<li>Microsoft Visual Studio 2010 Service Pack 1</li>
+	<li>NASM</li>
+	<li>YASM</li>
+	<li>Visual C++ 1.52</li>
+	<li>Windows SDK 7.1</li>
+	<li>Windows Driver Kit 7.1</li>
+	<li>Windows 8.1 SDK</li>
+	<li>gzip</li>
+	<li>UPX</li>
+	<li>7-Zip</li>
+	<li>WiX3</li>
+	<li>Microsoft Visual Studio 2019</li>
+	<li>Windows 10 SDK</li>
+	<li>Windows Driver Kit 1903</li>
+	<li>Средства сборки Visual Studio</li>
+	
+</ol>
+
+</div>
+
+<div class="wikidoc">
+Ниже приведены шаги процедуры. Нажав на любую ссылку, вы сразу перейдёте к соответствующему шагу:
+<ul>
+<li><strong><a href="#InstallationOfMicrosoftVisualStudio2010">Установка Microsoft Visual Studio 2010</a></li></strong>
+<li><strong><a href="#InstallationOfMicrosoftVisualStudio2010ServicePack1">Установка Microsoft Visual Studio 2010 Service Pack 1</a></li></strong>
+<li><strong><a href="#InstallationOfNASM">Установка NASM</a></li></strong>
+<li><strong><a href="#InstallationOfYASM">Установка YASM</a></li></strong>
+<li><strong><a href="#InstallationOfVisualCPP">Установка Microsoft Visual C++ 1.52</a></li></strong>
+<li><strong><a href="#InstallationOfWindowsSDK71PP">Установка Windows SDK 7.1</a></li></strong>
+<li><strong><a href="#InstallationOfWDK71PP">Установка Windows Driver Kit 7.1</a></li></strong>
+<li><strong><a href="#InstallationOfSDK81PP">Установка Windows 8.1 SDK</a></li></strong>
+<li><strong><a href="#InstallationOfGzip">Установка gzip</a></li></strong>
+<li><strong><a href="#InstallationOfUpx">Установка UPX</a></li></strong>
+<li><strong><a href="#InstallationOf7zip">Установка 7-Zip</a></li></strong>
+<li><strong><a href="#InstallationOfWix3">Установка WiX3</a></li></strong>
+<li><strong><a href="#InstallationOfVS2019">Установка Microsoft Visual Studio 2019</a></li></strong>
+<li><strong><a href="#InstallationOfWDK10">Установка Windows Driver Kit 2004</a></li></strong>
+<li><strong><a href="#InstallationOfVisualBuildTools">Установка средств сборки Visual Studio</a></li></strong>
+<li><strong><a href="#DownloadVeraCrypt">Загрузка исходных файлов VeraCrypt</a></li></strong>
+<li><strong><a href="#CompileWin32X64">Компиляция Win32/x64-версий VeraCrypt</a></li></strong>
+<li><strong><a href="#CompileARM64">Компиляция ARM64-версии VeraCrypt</a></li></strong>
+<li><strong><a href="#BuildVeraCryptExecutables">Сборка исполняемых файлов VeraCrypt</a></li></strong>
+<li><strong><a href="#ImportCertificates">Импорт сертификатов</a></li></strong>
+<li><strong><a href="#KnownIssues">Известные проблемы</a></li></strong>
+</ul>
+</div>
+
+<div class="wikidoc">
+ <div class="textbox" id="InstallationOfMicrosoftVisualStudio2010">
+  <a href="#InstallationOfMicrosoftVisualStudio2010">Установка Microsoft Visual Studio 2010</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Посетите следующий сайт Microsoft и войдите в систему с помощью бесплатной учётной записи Microsoft: <br>
+				<a href="https://my.visualstudio.com/Downloads?q=Visual%20Studio%202010%20Professional&pgroup=" target="_blank">https://my.visualstudio.com/Downloads?q=Visual%20Studio%202010%20Professional&pgroup=</a>
+			</li>
+			<li>
+				Загрузите (пробную) версию "Visual Studio Professional 2010". <br>
+				<img src="CompilingGuidelineWin/DownloadVS2010.jpg" width="80%">
+			</li>
+			<li>
+				Смонтируйте загруженный файл ISO, дважды щёлкнув по нему.
+			</li>
+			<li>
+				Запустите файл "autorun.exe" от имени администратора.
+			</li>
+			<li>
+				Установите Microsoft Visual Studio 2010 с настройками по умолчанию.
+			</li>
+		</ol>
+		Установка Microsoft SQL Server 2008 Express Service Pack 1 (x64) может завершиться ошибкой, но это не требуется для компиляции VeraCrypt.
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfMicrosoftVisualStudio2010ServicePack1">
+  <a href="#InstallationOfMicrosoftVisualStudio2010ServicePack1">Установка Microsoft Visual Studio 2010 Service Pack 1</a>
+  <div class="texttohide">
+    <p>
+		ПРИМЕЧАНИЕ: Содержимое, которое пытается загрузить официальный установщик Microsoft, больше недоступно. Поэтому необходимо использовать автономный установщик.
+		<ol>
+			<li>
+				Посетите сайт интернет-архива и загрузите ISO-образ Microsoft Visual Studio 2010 Service Pack 1:<br>
+				<a href="https://archive.org/details/vs-2010-sp-1dvd-1" target="_blank">https://archive.org/details/vs-2010-sp-1dvd-1</a>
+			</li>
+			<li>
+				Смонтируйте загруженный файл ISO, дважды щёлкнув по нему.
+			</li>
+			<li>
+				Запустите файл "Setup.exe" от имени администратора.
+			</li>
+			<li>
+				Установите Microsoft Visual Studio 2010 Service Pack 1 с настройками по умолчанию.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfNASM">
+  <a href="#InstallationOfNASM">Установка NASM</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Загрузите файл "nasm-2.08-installer.exe" отсюда: <br>
+				<a href="https://www.nasm.us/pub/nasm/releasebuilds/2.08/win32/" target="_blank">https://www.nasm.us/pub/nasm/releasebuilds/2.08/win32/</a>
+			</li>
+			<li>
+				Запустите файл от имени администратора.
+			</li>
+			<li>
+				Установите NASM с настройками по умолчанию.
+			</li>
+			<li>
+				Добавьте путь к папке NASM в системную переменную PATH. Это сделает команду доступной отовсюду при вызове из командной строки. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Откройте Проводник.
+					</li>
+					<li>
+						В левой панели щёлкните правой кнопкой мыши по "Этот компьютер" и выберите "Свойства". <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						В правой части окна щёлкните по "Дополнительные параметры системы". <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Нажмите кнопку "Переменные среды". <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						В поле "Системные переменные" выберите переменную "Path" и нажмите кнопку "Изменить...". <br>
+						<img src="CompilingGuidelineWin/SelectPathVariable.jpg" width="25%">
+					</li>
+					<li>
+						Нажмите кнопку "Создать" и добавьте следующее значение: <br>
+						<p style="font-family: 'Courier New', monospace;">C:\Program Files (x86)\nasm</p>
+					</li>
+					<li>
+						Закройте окна, нажимая кнопки OK.
+					</li>
+				</ol>
+			</li>
+			<li>
+				Чтобы проверить, правильно ли работает конфигурация, откройте командную строку и посмотрите вывод следующей команды: <br>
+				<p style="font-family: 'Courier New', monospace;">nasm</p> <br>
+				<img src="CompilingGuidelineWin/NasmCommandLine.jpg" width="50%">
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfYASM">
+  <a href="#InstallationOfYASM">Установка YASM</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Создайте следующую папку: <br>
+				C:\Program Files\YASM
+			</li>
+			<li>
+				Загрузите файл "Win64 VS2010 .zip" отсюда: <br>
+				<a href="https://yasm.tortall.net/Download.html" target="_blank">https://yasm.tortall.net/Download.html</a>
+			</li>
+			<li>
+				Ваш интернет-браузер может сообщить, что, возможно, файл представляет угрозу безопасности, так как редко скачивается или из-за незашифрованного соединения. Тем не менее официальный сайт – наиболее надёжный источник этого файла, поэтому мы рекомендуем разрешить загрузку.
+			</li>
+			<li>
+				Распакуйте загруженный zip-архив и скопируйте извлечённые файлы в папку "C:\Program Files\YASM".
+			</li>
+			<li>
+				Загрузите файл "Win64 .exe" отсюда: <br>
+				<a href="https://yasm.tortall.net/Download.html" target="_blank">https://yasm.tortall.net/Download.html</a>
+			</li>
+			<li>
+				Ваш интернет-браузер может сообщить, что, возможно, файл представляет угрозу безопасности, так как редко скачивается или из-за незашифрованного соединения. Тем не менее официальный сайт – наиболее надёжный источник этого файла, поэтому мы рекомендуем разрешить загрузку.
+			</li>
+			<li>
+				Переименуйте файл в "yasm.exe" и скопируйте его в папку "C:\Program Files\YASM".
+			</li>
+			<li>
+				Добавьте путь к папке YASM в переменную PATH и создайте новую системную переменную для YASM. Это сделает команду доступной отовсюду при вызове из командной строки. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Откройте Проводник.
+					</li>
+					<li>
+						В левой панели щёлкните правой кнопкой мыши по "Этот компьютер" и выберите "Свойства". <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						В правой части окна щёлкните по "Дополнительные параметры системы". <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Нажмите кнопку "Переменные среды". <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						В поле "Системные переменные" выберите переменную "Path" и нажмите кнопку "Изменить...". <br>
+						<img src="CompilingGuidelineWin/SelectPathVariable.jpg" width="25%">
+					</li>
+					<li>
+						Нажмите кнопку "Создать" и добавьте следующее значение: <br>
+						<p style="font-family: 'Courier New', monospace;">C:\Program Files\YASM</p>
+					</li>
+					<li>
+						Закройте верхнее окно, нажав OK.
+					</li>
+					<li>
+						В поле "Системные переменные" нажмите кнопку "Создать...". <br>
+						<img src="CompilingGuidelineWin/AddNewSystemVar.jpg" width="25%">
+					</li>
+					<li>
+						Заполните форму следующими значениями: <br>
+						<p style="font-family: 'Courier New', monospace;">Имя переменной: YASMPATH<br> Значение переменной: C:\Program Files\YASM</p>
+					</li>
+					<li>
+						Закройте окна, нажимая кнопки OK.
+					</li>
+				</ol>
+			</li>
+			<li>
+				Чтобы проверить, правильно ли работает конфигурация, откройте командную строку и посмотрите вывод следующей команды: <br>
+				<p style="font-family: 'Courier New', monospace;">yasm</p> <br>
+				и <br>
+				<p style="font-family: 'Courier New', monospace;">vsyasm</p> <br>
+				<img src="CompilingGuidelineWin/YasmCommandLine.jpg" width="50%">
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfVisualCPP">
+  <a href="#InstallationOfVisualCPP">Установка Microsoft Visual C++ 1.52</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Пакет Visual C++ 1.52 доступен по платной подписке Microsoft MSDN. Если у вас нет подписки, загрузите образ ISO через интернет-архив: <br>
+				<a href="https://archive.org/details/ms-vc152 target="_blank">https://archive.org/details/ms-vc152</a>
+			</li>
+			<li>
+				Создайте папку "C:\MSVC15".
+			</li>
+			<li>
+				Смонтируйте файл ISO и скопируйте содержимое папки "MSVC" в "C:\MSVC15".
+			</li>
+			<li>
+				Создайте системную переменную для Microsoft Visual C++ 1.52. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Откройте Проводник.
+					</li>
+					<li>
+						В левой панели щёлкните правой кнопкой мыши по "Этот компьютер" и выберите "Свойства". <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						В правой части окна щёлкните по "Дополнительные параметры системы". <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Нажмите кнопку "Переменные среды". <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						В поле "Системные переменные" нажмите кнопку "Создать...". <br>
+						<img src="CompilingGuidelineWin/AddNewSystemVar.jpg" width="25%">
+					</li>
+					<li>
+						Заполните форму следующими значениями: <br>
+						<p style="font-family: 'Courier New', monospace;">Имя переменной: MSVC16_ROOT<br> Значение переменной: C:\MSVC15</p>
+					</li>
+					<li>
+						Закройте окна, нажимая кнопки OK.
+					</li>
+				</ol>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div> 
+ 
+ <div class="textbox" id="InstallationOfWindowsSDK71PP">
+  <a href="#InstallationOfWindowsSDK71PP">Установка Windows SDK 7.1</a>
+  <div class="texttohide">
+    <p>
+		Для установки требуется платформа .NET Framework 4 (более новая, например .NET Framework 4.8, не годится!). Поскольку вместе с Windows 10 уже предустановлена более новая версия, установщик придётся обмануть:
+		<ol>
+			<li>
+				Нажмите кнопку <em>Пуск</em> и найдите "regedit.exe". Запустите первое найденное.
+			</li>
+			<li>
+				Перейдите в ветвь "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\NET Framework Setup\NDP\v4\".
+			</li>
+			<li>
+				Измените разрешения у папки "Client", чтобы можно было редактировать ключи: <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Щёлкните правой кнопкой мыши по подпапке "Client" и выберите "Разрешения...".
+					</li>
+					<li>
+						Нажмите кнопку "Дополнительно". <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-1.jpg" width="17%">
+					</li>
+					<li>
+						Измените владельца на своего пользователя и нажмите "Добавить". <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-2.jpg" width="35%">
+					</li>
+					<li>
+						Укажите субъектом своего пользователя, включите опцию "Полный доступ" и нажмите OK. <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-3.jpg" width="35%">
+					</li>
+					<li>
+						В папке "Client" запишите значение элемента "Version".
+					</li>
+					<li>
+						Дважды щёлкните мышью по элементу "Version" и измените значение на "4.0.30319". <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-4.jpg" width="30%">
+					</li>
+				</ol>
+			</li>
+			<li>
+				Измените разрешения у папки "Full", чтобы можно было редактировать ключи: <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Щёлкните правой кнопкой мыши по подпапке "Full" и выберите "Разрешения...".
+					</li>
+					<li>
+						Нажмите кнопку "Дополнительно". <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-1.jpg" width="17%">
+					</li>
+					<li>
+						Измените владельца на своего пользователя и нажмите "Добавить". <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-2.jpg" width="35%">
+					</li>
+					<li>
+						Укажите субъектом своего пользователя, включите опцию "Полный доступ" и нажмите OK. <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-3.jpg" width="35%">
+					</li>
+					<li>
+						В папке "Full" запишите значение элемента "Version".
+					</li>
+					<li>
+						Дважды щёлкните мышью по элементу "Version" и измените значение на "4.0.30319". <br>
+						<img src="CompilingGuidelineWin/RegeditPermissions-4.jpg" width="30%">
+					</li>
+				</ol>
+			</li>
+			<li>
+				Загрузите Windows SDK 7.1 отсюда: <br>
+				<a href="https://www.microsoft.com/en-us/download/details.aspx?id=8279" target="_blank">https://www.microsoft.com/en-us/download/details.aspx?id=8279</a>
+			</li>
+			<li>
+				Запустите загруженный файл от имени администратора и установите приложение с настройками по умолчанию.
+			</li>
+			<li>
+				После установки отмените изменения, сделанные в редакторе реестра. <br>
+				<b>ПРИМЕЧАНИЕ:</b> Владельца "TrustedInstaller" можно восстановить, выполнив поиск: "NT Service\TrustedInstaller".
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>  
+ 
+ <div class="textbox" id="InstallationOfWDK71PP">
+  <a href="#InstallationOfWDK71PP">Установка Windows Driver Kit 7.1</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Загрузите ISO-файл Windows Diver Kit 7.1 отсюда: <br>
+				<a href="https://www.microsoft.com/en-us/download/details.aspx?id=11800" target="_blank">https://www.microsoft.com/en-us/download/details.aspx?id=11800</a>
+			</li>
+			<li>
+				Смонтируйте загруженный файл ISO, дважды щёлкнув по нему.
+			</li>
+			<li>
+				Запустите файл "KitSetup.exe" от имени администратора. Выберите для установки все компоненты. <br>
+				<b>ПРИМЕЧАНИЕ: </b>Возможно, во время установки вас попросят установить .NET Framework 3.5. В этом случае нажмите "Загрузить и установить".
+			</li>
+			<li>
+				Установите комплект драйверов в папку по умолчанию.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfSDK81PP">
+  <a href="#InstallationOfSDK81PP">Установка Windows 8.1 SDK</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Загрузите ISO-файл Windows 8.1 SDK отсюда: <br>
+				<a href="https://developer.microsoft.com/de-de/windows/downloads/sdk-archive/" target="_blank">https://developer.microsoft.com/de-de/windows/downloads/sdk-archive/</a>
+			</li>
+			<li>
+				Запустите загруженный файл от имени администратора и установите Windows 8.1 SDK с настройками по умолчанию.
+			</li>
+			<li>
+				Создайте системную переменную для Windows 8.1 SDK. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Откройте Проводник.
+					</li>
+					<li>
+						В левой панели щёлкните правой кнопкой мыши по "Этот компьютер" и выберите "Свойства". <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						В правой части окна щёлкните по "Дополнительные параметры системы". <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Нажмите кнопку "Переменные среды". <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						В поле "Системные переменные" нажмите кнопку "Создать...". <br>
+						<img src="CompilingGuidelineWin/AddNewSystemVar.jpg" width="25%">
+					</li>
+					<li>
+						Заполните форму следующими значениями: <br>
+						<p style="font-family: 'Courier New', monospace;">Имя переменной: WSDK81<br> Значение переменной: C:\Program Files (x86)\Windows Kits\8.1\</p>
+					</li>
+					<li>
+						Закройте окна, нажимая кнопки OK.
+					</li>
+				</ol>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfGzip">
+  <a href="#InstallationOfGzip">Установка gzip</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Создайте следующую папку: <br>
+				C:\Program Files (x86)\gzip
+			</li>
+			<li>
+				Загрузите версию gzip отсюда: <br>
+				<a href="https://sourceforge.net/projects/gnuwin32/files/gzip/1.3.12-1/gzip-1.3.12-1-bin.zip/download?use-mirror=netix&download=" target="_blank">https://sourceforge.net/projects/gnuwin32/files/gzip/1.3.12-1/gzip-1.3.12-1-bin.zip/download?use-mirror=netix&download=</a>
+			</li>
+			<li>
+				Скопируйте содержимое загруженного zip-архива в папку "C:\Program Files (x86)\gzip".
+			</li>
+			<li>
+				Добавьте путь к папке с gzip в переменную PATH. Это сделает команду доступной отовсюду при вызове из командной строки. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Откройте Проводник.
+					</li>
+					<li>
+						В левой панели щёлкните правой кнопкой мыши по "Этот компьютер" и выберите "Свойства". <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						В правой части окна щёлкните по "Дополнительные параметры системы". <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Нажмите кнопку "Переменные среды". <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						В поле "Системные переменные" выберите переменную "Path" и нажмите кнопку "Изменить...". <br>
+						<img src="CompilingGuidelineWin/SelectPathVariable.jpg" width="25%">
+					</li>
+					<li>
+						Нажмите кнопку "Создать" и добавьте следующее значение: <br>
+						<p style="font-family: 'Courier New', monospace;">C:\Program Files (x86)\gzip\bin</p>
+					</li>
+					<li>
+						Закройте окна, нажимая кнопки OK.
+					</li>
+				</ol>
+			</li>
+			<li>
+				Чтобы проверить, правильно ли работает конфигурация, откройте командную строку и посмотрите вывод следующей команды: <br>
+				<p style="font-family: 'Courier New', monospace;">gzip</p> <br>
+				<img src="CompilingGuidelineWin/gzipCommandLine.jpg" width="50%">
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfUpx">
+  <a href="#InstallationOfUpx">Установка UPX</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Создайте следующую папку: <br>
+				C:\Program Files (x86)\upx
+			</li>
+			<li>
+				Загрузите новейшую версию файла upx-X.X.X-win64.zip отсюда: <br>
+				<a href="https://github.com/upx/upx/releases/tag/v4.0.2" target="_blank">https://github.com/upx/upx/releases/tag/v4.0.2</a>
+			</li>
+			<li>
+				Скопируйте содержимое загруженного zip-архива в папку "C:\Program Files (x86)\upx".
+			</li>
+			<li>
+				Добавьте путь к папке с gzip в системную переменную PATH. Это сделает команду доступной отовсюду при вызове из командной строки. <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Откройте Проводник.
+					</li>
+					<li>
+						В левой панели щёлкните правой кнопкой мыши по "Этот компьютер" и выберите "Свойства". <br>
+						<img src="CompilingGuidelineWin/SelectThisPC.jpg" width="40%">
+					</li>
+					<li>
+						В правой части окна щёлкните по "Дополнительные параметры системы". <br>
+						<img src="CompilingGuidelineWin/SelectAdvancedSystemSettings.jpg" width="50%">
+					</li>
+					<li>
+						Нажмите кнопку "Переменные среды". <br>
+						<img src="CompilingGuidelineWin/SelectEnvironmentVariables.jpg" width="17%">
+					</li>
+					<li>
+						В поле "Системные переменные" выберите переменную "Path" и нажмите кнопку "Изменить...". <br>
+						<img src="CompilingGuidelineWin/SelectPathVariable.jpg" width="25%">
+					</li>
+					<li>
+						Нажмите кнопку "Создать" и добавьте следующее значение: <br>
+						<p style="font-family: 'Courier New', monospace;">C:\Program Files (x86)\upx</p>
+					</li>
+					<li>
+						Закройте окна, нажимая кнопки OK.
+					</li>
+				</ol>
+			</li>
+			<li>
+				Чтобы проверить, правильно ли работает конфигурация, откройте командную строку и посмотрите вывод следующей команды: <br>
+				<p style="font-family: 'Courier New', monospace;">upx</p> <br>
+				<img src="CompilingGuidelineWin/upxCommandLine.jpg" width="50%">
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOf7zip">
+  <a href="#InstallationOf7zip">Установка 7-Zip</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Загрузите новейшую версию 7-Zip отсюда: <br>
+				<a href="https://www.7-zip.org/" target="_blank">https://www.7-zip.org/</a>
+			</li>
+			<li>
+				Запустите загруженный файл от имени администратора и установите 7-Zip с настройками по умолчанию.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfWix3">
+  <a href="#InstallationOfWix3">Установка WiX3</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Загрузите файл "wix311.exe" отсюда: <br>
+				<a href="https://github.com/wixtoolset/wix3/releases" target="_blank">https://github.com/wixtoolset/wix3/releases</a>
+			</li>
+			<li>
+				Запустите загруженный файл от имени администратора и установите WiX с настройками по умолчанию.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfVS2019">
+  <a href="#InstallationOfVS2019">Установка Microsoft Visual Studio 2019</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Посетите следующий сайт Microsoft и войдите в систему с помощью бесплатной учётной записи Microsoft: <br>
+				<a href="https://my.visualstudio.com/Downloads?q=visual%20studio%202019%20Professional" target="_blank">https://my.visualstudio.com/Downloads?q=visual%20studio%202019%20Professional</a>
+			</li>
+			<li>
+				Загрузите новейшую (пробную) версию "Visual Studio Professional 2019". <br>
+				<img src="CompilingGuidelineWin/DownloadVS2019.jpg" width="80%">
+			</li>
+			<li>
+				Запустите загруженный файл от имени администратора и следуйте указаниям мастера. <br>
+				Выберите следующие Workloads для установки: <br>
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						Desktop development with C++
+					</li>
+					<li>
+						.NET desktop development
+					</li>
+				</ol>
+				Выберите следующие отдельные компоненты для установки:
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						.NET
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								.NET 6.0 Runtime
+							</li>
+							<li>
+								.NET Core 3.1 Runtime (LTS)
+							</li>
+							<li>
+								.NET Framework 4 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.5 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.5.1 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.5.2 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.6 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.6.1 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.7.2 targeting pack
+							</li>
+							<li>
+								.NET Framework 4.8 SDK
+							</li>
+							<li>
+								.NET Framework 4.8 targeting pack
+							</li>
+							<li>
+								.NET SDK
+							</li>
+							<li>
+								ML.NET Model Builder (Preview)
+							</li>
+						</ol>
+					</li>
+					<li>
+						Облако, база данных и сервер
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								CLR data types for SQL Server
+							</li>
+							<li>
+								Connectivity and publishing tools
+							</li>
+						</ol>
+					</li>
+					<li>
+						Инструменты кода
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								NuGet package manager
+							</li>
+							<li>
+								Text Template Transformation
+							</li>
+						</ol>
+					</li>
+					<li>
+						Компиляторы, инструменты сборки и среды выполнения
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								.NET Compiler Platform SDK
+							</li>
+							<li>
+								C# and Visual Basic Roslyn compilers
+							</li>
+							<li>
+								C++ 2019 Redistributable Update
+							</li>
+							<li>
+								C++ CMake tools for Windows
+							</li>
+							<li>
+								C++/CLI support for v142 build tools (Latest)
+							</li>
+							<li>
+								MSBuild
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ ARM64 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ ARM64 Spectre-mitigated libs (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ x64/x86 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ x64/x86 Spectre-mitigated libs (Latest)
+							</li>
+						</ol>
+					</li>
+					<li>
+						Отладка и тестирование
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								.NET profiling tools
+							</li>
+							<li>
+								C++ AddressSanatizer
+							</li>
+							<li>
+								C++ profiling tools
+							</li>
+							<li>
+								Just-In-Time debugger
+							</li>
+							<li>
+								Test Adapter for Boost.Test
+							</li>
+							<li>
+								Test Adapter for Google Test
+							</li>
+						</ol>
+					</li>
+					<li>
+						Средства разработки
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								C# and Visual Basic
+							</li>
+							<li>
+								C++ core features
+							</li>
+							<li>
+								F# language support
+							</li>
+							<li>
+								IntelliCode
+							</li>
+							<li>
+								JavaScript and TypeScript language support
+							</li>
+							<li>
+								Live Share
+							</li>
+						</ol>
+					</li>
+					<li>
+						Эмуляторы
+						<ol style="list-style-type: upper-roman;">
+							НЕТ
+						</ol>
+					</li>
+					<li>
+						Игры и графика
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								Graphics debugger and GPU profiler for DirectX
+							</li>
+						</ol>
+					</li>
+					<li>
+						SDK, библиотеки и фреймворки
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								C++ ATL for latest v142 build tools (ARM64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools (x86 & x64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools with Spectre Mitigations (ARM64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools with Spectre Mitigations (x86 & x64)
+							</li>
+							<li>
+								C++ MFC for latest v142 build tools (ARM64)
+							</li>
+							<li>
+								C++ MFC for latest v142 build tools (x86 & x64)
+							</li>
+							<li>
+								C++ MFC for latest v142 build tools with Spectre Mitigations (ARM64)
+							</li>
+							<li>
+								C++ MFC for latest v142 build tools with Spectre Mitigations (x86 & x64)
+							</li>
+							<li>
+								Entity Framework 6 tools
+							</li>
+							<li>
+								TypeScript 4.3 SDK
+							</li>
+							<li>
+								Windows 10 SDK (10.0.19041.0)
+							</li>
+							<li>
+								Windows Universal C Runtime
+							</li>
+						</ol>
+					</li>
+				</ol>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfWDK10">
+  <a href="#InstallationOfWDK10">Установка Windows Driver Kit 2004</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Загрузите Windows Driver Kit (WDK) 2004 отсюда: <br>
+				<a href="https://docs.microsoft.com/en-us/windows-hardware/drivers/other-wdk-downloads" target="_blank">https://docs.microsoft.com/en-us/windows-hardware/drivers/other-wdk-downloads</a>
+			</li>
+			<li>
+				Запустите загруженный файл от имени администратора и установите WDK с настройками по умолчанию.
+			</li>
+			<li>
+				В конце установки вас спросят, нужно ли установить расширение Windows Driver Kit Visual Studio. <br>
+				Перед закрытием диалогового окна убедитесь, что эта опция включена.
+			</li>
+			<li>
+				Автоматически запустится другая установка и определит пакет Visual Studio Professional 2019 как цель для расширения. <br>
+				Выберите его и продолжите установку.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfVisualBuildTools">
+  <a href="#InstallationOfVisualBuildTools">Установка средств сборки Visual Studio</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Посетите следующий сайт Microsoft и войдите в систему с помощью бесплатной учётной записи Microsoft: <br>
+				<a href="https://my.visualstudio.com/Downloads?q=visual%20studio%202019%20build%20tools" target="_blank">https://my.visualstudio.com/Downloads?q=visual%20studio%202019%20build%20tools</a>
+			</li>
+			<li>
+				Загрузите новейшую версию "Build Tools for Visual Studio 2019". <br>
+				<img src="CompilingGuidelineWin/DownloadVSBuildTools.jpg" width="80%">
+			</li>
+			<li>
+				Запустите загруженный файл от имени администратора и следуйте указаниям мастера. Выберите для установки следующие отдельные компоненты:
+				<ol style="list-style-type: upper-roman;">
+					<li>
+						.NET
+						<ol style="list-style-type: upper-roman;">
+							НЕТ
+						</ol>
+					</li>
+					<li>
+						Облако, база данных и сервер
+						<ol style="list-style-type: upper-roman;">
+							НЕТ
+						</ol>
+					</li>
+					<li>
+						Инструменты кода
+						<ol style="list-style-type: upper-roman;">
+							НЕТ
+						</ol>
+					</li>
+					<li>
+						Компиляторы, инструменты сборки и среды выполнения
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								C++/CLI support for v142 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ ARM64 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ ARM64 Spectre-mitigated libs (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ x64/x86 build tools (Latest)
+							</li>
+							<li>
+								MSVC v142 - VS 2019 C++ x64/x86 Spectre-mitigated libs (Latest)
+							</li>
+						</ol>
+					</li>
+					<li>
+						Отладка и тестирование
+						<ol style="list-style-type: upper-roman;">
+							НЕТ
+						</ol>
+					</li>
+					<li>
+						Средства разработки
+						<ol style="list-style-type: upper-roman;">
+							НЕТ
+						</ol>
+					</li>
+					<li>
+						SDK, библиотеки и фреймворки
+						<ol style="list-style-type: upper-roman;">
+							<li>
+								C++ ATL for latest v142 build tools (ARM64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools (x86 & x64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools with Spectre Mitigations (ARM64)
+							</li>
+							<li>
+								C++ ATL for latest v142 build tools with Spectre Mitigations (x86 & x64)
+							</li>
+						</ol>
+					</li>
+				</ol>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="DownloadVeraCrypt">
+  <a href="#DownloadVeraCrypt">Загрузка исходных файлов VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Посетите репозитарий VeraCrypt на Github: <br>
+				<a href="https://github.com/veracrypt/VeraCrypt" target="_blank">https://github.com/veracrypt/VeraCrypt</a>
+			</li>
+			<li>
+				Нажмите зелёную кнопку с надписью "Code" и скачайте код. <br>
+				Загрузить репозиторий можно в виде zip-архива, но вы, возможно, предпочтёте использовать протокол git для отслеживания изменений.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="CompileWin32X64">
+  <a href="#CompileWin32X64">Компиляция Win32/x64-версий VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте файл "src/VeraCrypt.sln" в Visual Studio <b>2010</b>.
+			</li>
+			<li>
+				Выберите "All|Win32" как активную конфигурацию.<br>
+				<img src="CompilingGuidelineWin/VS2010Win32Config.jpg" width="80%">
+			</li>
+			<li>
+				Нажмите "Build -> Build Solution". <br>
+				<img src="CompilingGuidelineWin/VS2010BuildSolution.jpg" width="40%">
+			</li>
+			<li>
+				Процесс компиляции должен завершиться с предупреждениями, но без ошибок. Некоторые проекты следует пропустить.
+			</li>
+			<li>
+				Выберите "All|x64" как активную конфигурацию. <br>
+				<img src="CompilingGuidelineWin/VS2010X64Config.jpg" width="80%">
+			</li>
+			<li>
+				Нажмите "Build -> Build Solution". <br>
+				<img src="CompilingGuidelineWin/VS2010BuildSolution.jpg" width="40%">
+			</li>
+			<li>
+				Процесс компиляции должен завершиться с предупреждениями, но без ошибок. Некоторые проекты следует пропустить. <br>
+				Закройте Visual Studio 2010 после завершения процесса компиляции.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="CompileARM64">
+  <a href="#CompileARM64">Компиляция ARM64-версии VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте файл "src/VeraCrypt_vs2019.sln" в Visual Studio <b>2019</b>.
+			</li>
+			<li>
+				Выберите "All|ARM64" как активную конфигурацию. <br>
+				<img src="CompilingGuidelineWin/VS2019ARM64Config.jpg" width="80%">
+			</li>
+			<li>
+				Нажмите "Build -> Build Solution". <br>
+				<img src="CompilingGuidelineWin/VS2019BuildSolution.jpg" width="40%">
+			</li>
+			<li>
+				Процесс компиляции должен завершиться с предупреждениями, но без ошибок. Один проект следует пропустить. <br>
+				Закройте Visual Studio 2019 после завершения процесса компиляции.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="BuildVeraCryptExecutables">
+  <a href="#BuildVeraCryptExecutables">Сборка исполняемых файлов VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Откройте командную строку от имени администратора.
+			</li>
+			<li>
+				Перейдите в папку "src/Signing/".
+			</li>
+			<li>
+				Запустите скрипт "sign_test.bat".
+			</li>
+			<li>
+				Сгенерированные исполняемые файлы будут в папке "src/Release/Setup Files".
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="ImportCertificates">
+  <a href="#ImportCertificates">Импорт сертификатов</a>
+  <div class="texttohide">
+    <p> С помощью скрипта sign_test.bat вы только что подписали исполняемые файлы VeraCrypt. Это необходимо, поскольку Windows принимает только те драйверы, которым доверяет подписанный центр сертификации. <br>
+	Поскольку вы использовали не официальный сертификат подписи VeraCrypt для подписи своего кода, а общедоступную версию для разработки, вы должны импортировать и, следовательно, доверять используемым сертификатам.
+		<ol>
+			<li>
+				Откройте папку "src/Signing".
+			</li>
+			<li>
+				Импортируйте следующие сертификаты в хранилище сертификатов локального компьютера, дважды щёлкнув по ним:
+				<ul>
+					<li>GlobalSign_R3Cross.cer</li>
+					<li>GlobalSign_SHA256_EV_CodeSigning_CA.cer</li>
+					<li>TestCertificates/idrix_codeSign.pfx</li>
+					<li>TestCertificates/idrix_Sha256CodeSign.pfx</li>
+					<li>TestCertificates/idrix_SHA256TestRootCA.crt</li>
+					<li>TestCertificates/idrix_TestRootCA.crt</li>
+				</ul>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="KnownIssues">
+  <a href="#KnownIssues">Известные проблемы</a>
+  <div class="texttohide">
+    <p>
+		<ul>
+			<li>
+				<b>Этот дистрибутив повреждён.</b> <br>
+				<img src="CompilingGuidelineWin/DistributionPackageDamaged.jpg" width="20%"> <br>
+				В Windows 10 или более новой версии возможно появление указанного выше сообщения об ошибке. Чтобы этого избежать, необходимо сделать следующее: <br>
+				<ul>
+					<li>Перепроверьте установку корневого сертификата, выдавшего сертификат подписи тестового кода, в хранилище доверенных корневых центров сертификации локальной машины ("Local Machine Trusted Root Certification Authorities").</li>
+					<li>Вычислите отпечаток SHA512 сертификата подписи тестового кода и соответствующим образом обновите массив gpbSha512CodeSignCertFingerprint в файле "src/Common/Dlgcode.c".</li>
+				</ul>
+				См. подробности тут: <a href="https://sourceforge.net/p/veracrypt/discussion/technical/thread/83d5a2d6e8/#db12" target="_blank">https://sourceforge.net/p/veracrypt/discussion/technical/thread/83d5a2d6e8/#db12</a>.<br>
+				<br>
+				Другой подход – отключить проверку подписи в коде VeraCrypt. Это следует делать только в целях тестирования, но не для нормального использования:
+				<ol>
+					<li>
+						Откройте файл "src/Common/Dlgcode.c".
+					</li>
+					<li>
+						Найдите функцию "VerifyModuleSignature".
+					</li>
+					<li>
+						Замените следующие строки: <br>
+						Найти:<br>
+						<p style="font-family: 'Courier New', monospace;">
+						if (!IsOSAtLeast (WIN_10)) <br>
+						return TRUE;
+						</p> <br>
+						Заменить на:<br>
+						<p style="font-family: 'Courier New', monospace;">
+						return TRUE;
+						</p>
+					</li>
+					<li>
+						Снова скомпилируйте код VeraCrypt.
+					</li>
+				</ol>
+			</li>
+			<li>
+				<b>Ошибка сертификата.</b> <br>
+				<img src="CompilingGuidelineWin/CertVerifyFails.jpg" width="20%"> <br>
+				Windows проверяет подпись каждого устанавливаемого драйвера.<br>
+				Из соображений безопасности Windows позволяет загружать только драйверы, подписанные Microsoft.<br>
+				Поэтому при использовании пользовательской сборки:<br>
+				<ul>
+					<li>Если вы не изменяли исходный код драйвера VeraCrypt, то можете использовать подписанные Microsoft драйверы, включённые в исходный код VeraCrypt (в "src\Release\Setup Files").</li>
+					<li>Если вы внесли изменения, то <strong>нужно будет загрузить Windows в "тестовом режиме" ("Test Mode")</strong>. Этот режим позволяет Windows загружать драйверы, не подписанные Microsoft. Однако даже в "тестовом режиме" существуют определённые требования к подписям, и сбои всё равно могут возникать по описанным ниже причинам.</li>
+				</ul>
+				Возможные причины сбоя установки в "тестовом режиме" ("Test Mode"):
+				<ol>
+					<li>
+						<b>Используемый для подписи сертификат не является доверенным для Windows.</b><br>
+						Чтобы проверить, относится ли это к вам, проверьте свойства исполняемого файла:
+						<ol>
+							<li>
+								Щёлкните правой кнопкой мыши по исполняемому файлу VeraCrypt Setup: "src/Release/Setup Files/VeraCrypt Setup 1.XX.exe".
+							</li>
+							<li>
+								Выберите <em>Свойства</em>.
+							</li>
+							<li>	
+								Сверху выберите вкладку "Цифровые подписи". Здесь вы увидите две подписи.
+							</li>
+								Проверьте обе, дважды щёлкая по ним. Если в заголовке написано "Подпись сертификата не может быть проверена", то соответствующий сертификат подписи не был правильно импортирован.<br>
+								Нажмите кнопку "Просмотр сертификата", а затем "Установить сертификат...", чтобы импортировать сертификат в хранилище сертификатов. <br>
+								<img src="CompilingGuidelineWin/CertificateCannotBeVerified.jpg" width="40%"> <br>
+							<li>
+						</ol>
+					</li>
+					<li>
+						<b>Драйвер был изменён после подписания.</b> <br>
+						В этом случае воспользуйтесь скриптом "src/Signing/sign_test.bat", чтобы снова подписать ваш код тестовыми сертификатами.
+					</li>
+				</ol>
+			</li>
+		</ul>
+	</p>
+  </div>
+ </div>
+ 
+</div>
+</body></html>
diff --git a/doc/html/ru/CompilingGuidelines.html b/doc/html/ru/CompilingGuidelines.html
new file mode 100644
index 00000000..caa03855
--- /dev/null
+++ b/doc/html/ru/CompilingGuidelines.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Технические подробности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelines.html">Сборка VeraCrypt из исходного кода</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Сборка VeraCrypt из исходного кода</h1>
+<p>Чтобы собрать VeraCrypt из исходного кода, следуйте этим пошаговым инструкциям:
+<ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="CompilingGuidelineWin.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Руководство по сборке в Windows</a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="CompilingGuidelineLinux.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Руководство по сборке в Linux</a>
+</li></ul>
+</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Contact.html b/doc/html/ru/Contact.html
new file mode 100644
index 00000000..38d20409
--- /dev/null
+++ b/doc/html/ru/Contact.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Contact.html">Связь с авторами</a>
+</p></div>
+
+<div class="wikidoc">
+<h1><strong style="text-align:left">Связь с авторами</strong></h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Вы можете связаться с нами, отправив письмо на адрес <code>veracrypt-contact [собачка] lists [точка] sourceforge [точка] net</code><br>
+Также вы можете использовать адрес <code>veracrypt [собачка] idrix [точка] fr</code>, который связан с ключом PGP команды VeraCrypt.<em style="text-align:left"><br>
+</em></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Для непосредственной связи с IDRIX можно воспользоваться <a href="https://www.idrix.fr/Root/mos/Contact_Us/Itemid,3" target="_blank">
+нашей контактной формой</a>.</div>
+</div>
+<div>
+<p>
+Кроме того, мы есть в соцсетях:<br>
+<a title="VeraCrypt on Twitter" href="https://twitter.com/VeraCrypt_IDRIX" target="_blank"><img src="twitter_veracrypt.PNG" alt="VeraCrypt on Twitter" width="168" height="28"></a>&nbsp;&nbsp;
+<a title="VeraCrypt on Facebook" href="https://www.facebook.com/veracrypt" target="_blank"><img src="Home_facebook_veracrypt.png" alt="VeraCrypt on Facebook" width="61" height="28"></a>&nbsp;&nbsp;
+<a title="VeraCrypt on Reddit" href="https://www.reddit.com/r/VeraCrypt/" target="_blank"><img src="Home_reddit.png" alt="VeraCrypt on Reddit" width="94" height="28"></a>
+</p>
+Свои замечания и предложения по переводу программы и документации на русский язык вы можете отправлять на адрес <code>erodim [собачка] mail [точка] ru</code>
+</div>
+</body></html>
diff --git a/doc/html/ru/Contributed Resources.html b/doc/html/ru/Contributed Resources.html
new file mode 100644
index 00000000..be3da5af
--- /dev/null
+++ b/doc/html/ru/Contributed Resources.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a class="active" href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div class="wikidoc">
+<p>Полезные ресурсы, предоставленные пользователями VeraCrypt.</p>
+<h3>Сторонние бинарные файлы:</h3>
+<ul>
+<li>Linux Ubuntu <strong>PPA</strong>, предоставлено пользователем&nbsp;<a href="https://unit193.net/" target="_blank">&quot;Unit 193&quot;</a> (автор сборки – Launchpad):
+<ul>
+<li><a href="https://launchpad.net/~unit193/&#43;archive/ubuntu/encryption" target="_blank">https://launchpad.net/~unit193/&#43;archive/ubuntu/encryption</a>
+</li></ul>
+</li><li>Linux <strong>Armv7</strong> GUI/консольная 32-разрядная сборка на ChromeBook, выполненная пользователем <a href="https://www.codeplex.com/site/users/view/haggster">
+haggster</a>:
+<ul>
+<li><a href="http://sourceforge.net/projects/veracrypt/files/Contributions/ARM%20Linux/veracrypt-1.0f-1-setup-arm.tar.bz2/download" target="_blank">veracrypt-1.0f-1-setup-arm.tar.bz2</a>
+</li></ul>
+</li></ul>
+<h3>Руководства:</h3>
+<ul>
+<li><a href="http://schneckchen.in/veracrypt-anleitung-zum-daten-verschluesseln/" target="_blank">http://schneckchen.in/veracrypt-anleitung-zum-daten-verschluesseln/</a>:
+<ul>
+<li>Немецкое руководство по VeraCrypt, автор Andreas Heinz. </li></ul>
+</li><li><a href="http://howto.wared.fr/raspberry-pi-arch-linux-arm-installation-veracrypt/" target="_blank">http://howto.wared.fr/raspberry-pi-arch-linux-arm-installation-veracrypt/</a>:
+<ul>
+<li>Французское руководство по сборке VeraCrypt на Raspberry Pi Arch Linux, автор <a href="http://howto.wared.fr/author/wared/" target="_blank">
+Edouard WATTECAMPS</a>. </li></ul>
+</li><li><a href="http://sourceforge.net/projects/veracrypt/files/Contributions/clonezilla_using_veracrypt_ver_1.1.doc/download" target="_blank">clonezilla_using_veracrypt_ver_1.1.doc</a>:
+<ul>
+<li>Руководство по использованию VeraCrypt в CloneZilla для доступа к зашифрованным резервным копиям, автор
+<a href="https://www.codeplex.com/site/users/view/pjc123" target="_blank">pjc123</a>.
+</li></ul>
+</li><li><a href="https://bohdan-danishevsky.blogspot.fr/2016/11/raspberry-pi-raspbian-installing.html" target="_blank">https://bohdan-danishevsky.blogspot.fr/2016/11/raspberry-pi-raspbian-installing.html</a>
+<ul>
+<li>Руководство по установке и использованию официальных бинарных файлов VeraCrypt на Raspberry Pi (Raspbian), автор Bohdan Danishevsky.
+</li></ul>
+</li></ul>
+<h3>Разное:</h3>
+<ul>
+<li><a href="http://sourceforge.net/projects/veracrypt/files/Contributions/vcsteg2.py/download" target="_blank">vcsteg2.py</a>: скрипт на Python, пытающийся скрыть том VeraCrypt внутри видеофайла (стеганография).
+</li></ul>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Conversion_Guide_VeraCrypt_1.26_and_Later.html b/doc/html/ru/Conversion_Guide_VeraCrypt_1.26_and_Later.html
new file mode 100644
index 00000000..319453b2
--- /dev/null
+++ b/doc/html/ru/Conversion_Guide_VeraCrypt_1.26_and_Later.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Руководство по преобразованию томов для версий 1.26 и новее</title>
+<meta name="description" content="Как обращаться с устаревшими функциями и преобразовывать тома TrueCrypt в программе VeraCrypt версии 1.26 и новее."/>
+<meta name="keywords" content="VeraCrypt, TrueCrypt, преобразование, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Conversion_Guide_VeraCrypt_1.26_and_Later.html">Руководство по преобразованию томов для версий 1.26 и новее</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Руководство по преобразованию томов для версий 1.26 и новее</h1>
+
+<h2>1. Введение</h2>
+<p>В VeraCrypt версии 1.26 и новее внесены значительные изменения, в том числе удалена поддержка некоторых функций. Если у вас возникли проблемы с монтированием томов, это руководство поможет вам разобраться и найти решение.</p>
+
+<h2>2. Устаревшие функции в VeraCrypt 1.26 и новее</h2>
+<p>Удалены следующие функции:</p>
+<ul>
+<li>Режим TrueCrypt</li>
+<li>Хеш-алгоритм HMAC-RIPEMD-160</li>
+<li>Алгоритм шифрования GOST89</li>
+</ul>
+<p>Если возникают ошибки при монтировании томов, созданных в VeraCrypt версии 1.25.9 или старее, используйте VeraCrypt 1.25.9, чтобы проверить, используются ли в томах устаревшие функции. Выделите том и нажмите "Свойства тома" в интерфейсе для проверки.</p>
+
+<h2>3. Процедуры устранения проблем в зависимости от версии</h2>
+
+<h3>3.1 Сценарий 1: Использование VeraCrypt 1.25.9 или старее</h3>
+<p>Если вы используете VeraCrypt 1.25.9 или можете обновиться до этой версии, выполните следующие действия:</p>
+<ul>
+<li>Преобразуйте тома TrueCrypt в тома VeraCrypt</li>
+<li>Измените устаревший хеш-алгоритм HMAC-RIPEMD-160 на другой</li>
+<li>Воссоздайте том VeraCrypt заново, если используется алгоритм шифрования GOST89</li>
+</ul>
+<p>Загрузите версию 1.25.9 <a href="https://veracrypt.fr/en/Downloads_1.25.9.html">здесь</a>.</p>
+
+<h3>3.2 Сценарий 2: Использование VeraCrypt версии 1.26 и новее</h3>
+<p>Если вы уже используете VeraCrypt версии 1.26 или новее, выполните следующие действия:</p>
+<ul>
+<li>Преобразуйте тома TrueCrypt в тома VeraCrypt</li>
+<li>Измените устаревший хеш-алгоритм HMAC-RIPEMD-160 на другой</li>
+</ul>
+<p>Если вы используете Linux или macOS, временно понизьте версию VeraCrypt до 1.25.9. Пользователи Windows могут использовать инструмент VCPassChanger, доступный для загрузки <a href="https://launchpad.net/veracrypt/trunk/1.25.9/+download/VCPassChanger_%28TrueCrypt_Convertion%29.zip">здесь</a>.</p>
+<ul>
+<li>Воссоздайте том VeraCrypt заново, если используется алгоритм шифрования GOST89</li>
+</ul>
+<p>Для всех операционных систем временно понизьте версию VeraCrypt до 1.25.9.</p>
+
+<h2>4. Процедуры преобразования и устранения проблем</h2>
+
+<h3>4.1 Преобразование файлов-контейнеров и разделов TrueCrypt в формат VeraCrypt</h3>
+<p>Файлы-контейнеры и разделы TrueCrypt, созданные с помощью TrueCrypt версий 6.x и 7.x, можно преобразовать в формат VeraCrypt с помощью VeraCrypt версии 1.25.9 или инструмента VCPassChanger в Windows. См. дополнительную информацию в <a href="Converting%20TrueCrypt%20volumes%20and%20partitions.html">документации</a>.</p>
+<p>После преобразования расширение файла останется тем же — <code>.tc</code>. Измените его на <code>.hc</code> вручную, если хотите, чтобы файл автоматически распознавался VeraCrypt версии 1.26 и новее.</p>
+
+<h3>4.2 Изменение устаревшего хеш-алгоритма HMAC-RIPEMD-160</h3>
+<p>Используйте функцию "Изменить алгоритм формирования ключа заголовка", чтобы заменить хеш-алгоритм HMAC-RIPEMD-160 на поддерживаемый в VeraCrypt версии 1.26. См. дополнительные сведения в <a href="Hash%20Algorithms.html">документации</a>.</p>
+
+<h3>4.3 Повторное создание тома VeraCrypt, если использован алгоритм шифрования GOST89</h3>
+<p>Если в томе используется шифрование GOST89, скопируйте данные в другое место и заново создайте том, выбрав поддерживаемый алгоритм шифрования. Дополнительные сведения по алгоритмам шифрования см. в <a href="Encryption%20Algorithms.html">документации</a>.</p>
+
+<h2>5. Важные примечания</h2>
+<p><strong>Примечание для пользователей, создавших тома с помощью VeraCrypt версии 1.17 или старее:</strong></p>
+<blockquote>
+<p>Чтобы избежать раскрытия информации о том, содержат ли ваши тома скрытый раздел, или если вы полагаетесь на правдоподобное отрицание, необходимо заново создать как внешний, так и скрытый тома, включая шифрование системы и скрытую ОС. Удалите тома, созданные в VeraCrypt версий до 1.18a.</p>
+</blockquote>
+
+<p>См. дополнительную информацию в разделах:</p>
+<ul>
+<li><a href="TrueCrypt%20Support.html">Поддержка TrueCrypt</a></li>
+<li><a href="Converting%20TrueCrypt%20volumes%20and%20partitions.html">Преобразование томов и разделов TrueCrypt в формат VeraCrypt</a></li>
+</ul>
+
+</div>
+
+<div class="ClearBoth"></div>
+</body>
+</html>
diff --git a/doc/html/ru/Converting TrueCrypt volumes and partitions.html b/doc/html/ru/Converting TrueCrypt volumes and partitions.html
new file mode 100644
index 00000000..d93d6e0c
--- /dev/null
+++ b/doc/html/ru/Converting TrueCrypt volumes and partitions.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Converting%20TrueCrypt%20volumes%20and%20partitions.html">Преобразование томов и разделов TrueCrypt в формат VeraCrypt</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Преобразование томов и разделов TrueCrypt в формат VeraCrypt</h1>
+<p><strong>⚠️ Внимание:</strong> <span style="color: red;">После преобразования убедитесь, что опция "Режим TrueCrypt" не выбрана при монтировании преобразованного тома. Поскольку это больше не том TrueCrypt, его монтирование с этой опцией приведет к сбою монтирования.</span></p>
+<p><strong>⚠️ Важное уведомление:</strong> Начиная с версии 1.26, в VeraCrypt была удалена поддержка "Режима TrueCrypt". Таким образом, конвертация томов и разделов TrueCrypt с использованием этого метода больше невозможна. Пожалуйста, обратитесь к <a href="Conversion_Guide_VeraCrypt_1.26_and_Later.html">этой странице документации</a> для получения инструкций по работе с томами TrueCrypt в версиях VeraCrypt 1.26 и выше.</p>
+<p>Начиная с версии <b>1.0f</b> и до версии <b>1.25.9</b> включительно, в VeraCrypt можно преобразовывать
+тома и <i>несистемные</i> разделы TrueCrypt (созданные версиями 6.x и 7.x, начиная с версии 6.0, выпущенной 4 июля 2008 года) в формат VeraCrypt.
+Для этого выполните с томом или разделом любое из следующих действий:</p>
+<ul>
+<li>Измените пароль тома</li>
+<li>Задайте алгоритм формирования ключа заголовка</li>
+<li>Добавьте или удалите ключевые файлы</li>
+<li>Удалите все ключевые файлы</li></ul>
+<p>Если том TrueCrypt содержит скрытый том, его также следует преобразовать аналогичным образом, указав пароль скрытого тома и/или ключевые файлы.</p>
+<p>🚨 После преобразования файлового контейнера его расширение останется .tc. При необходимости вручную измените его на .hc, чтобы версии VeraCrypt 1.26 или новее автоматически его распознавали.</p>
+<p>При этом должна быть включена опция <i>Режим TrueCrypt</i>, как показано на иллюстрации:</p>
+<p>&nbsp;<img src="Converting TrueCrypt volumes and partitions_truecrypt_convertion.png" alt=""></p>
+<p><strong>Примечание.</strong> Преобразование <i>системных</i> разделов, зашифрованных с помощью TrueCrypt, не поддерживается.</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Converting TrueCrypt volumes and partitions_truecrypt_convertion.png b/doc/html/ru/Converting TrueCrypt volumes and partitions_truecrypt_convertion.png
new file mode 100644
index 00000000..096e680f
--- /dev/null
+++ b/doc/html/ru/Converting TrueCrypt volumes and partitions_truecrypt_convertion.png
diff --git a/doc/html/ru/Creating New Volumes.html b/doc/html/ru/Creating New Volumes.html
new file mode 100644
index 00000000..c1da1430
--- /dev/null
+++ b/doc/html/ru/Creating New Volumes.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="VeraCrypt%20Volume.html">Том VeraCrypt</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Creating%20New%20Volumes.html">Создание новых томов</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Создание нового тома VeraCrypt</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<p>Чтобы создать том VeraCrypt на основе файла или чтобы зашифровать раздел/устройство (для этого требуются права администратора),
+нажмите кнопку <i>Создать том</i> в главном окне программы. Появится окно мастера создания томов VeraCrypt. Сразу за этим
+мастер начнёт сбор данных для генерирования мастер-ключа, вторичного ключа (режим XTS) и соли для нового тома. В сборе данных,
+которые должны носить как можно более случайный характер, участвуют перемещения мыши, нажатия клавиш и другая получаемая из системы
+информация (см. подробности в главе <a href="Random%20Number%20Generator.html"> <em>Генератор случайных чисел</em></a>).
+При создании тома VeraCrypt мастер предоставляет необходимые подсказки и сведения, однако некоторые настройки требуют пояснения.
+</p>
+<h3>Алгоритм хеширования</h3>
+<p>Здесь можно выбрать хеш-алгоритм, который будет применять VeraCrypt. Выбранный алгоритм используется генератором случайных
+чисел (как функция псевдослучайного смешивания) для генерирования мастер-ключа, вторичного ключа (режим XTS) и соли
+(см. раздел <a href="Random%20Number%20Generator.html"><em>Генератор случайных чисел</em></a>). Также он используется в формировании
+(деривации) ключа заголовка тома и вторичного ключа заголовка (см. раздел <a href="Header%20Key%20Derivation.html">
+<em>Формирование ключа заголовка, соль и количество итераций</em></a>).<br>
+<br>
+Сведения о доступных хеш-алгоритмах приведены в главе <a href="Hash%20Algorithms.html">
+<em>Алгоритмы хеширования.</em></a><br>
+<br>
+Обратите внимание: вывод хеш-функции <em>никогда</em> не используется непосредственно как ключ шифрования. Дополнительные сведения
+см. в главе <a href="Technical%20Details.html"><em>Технические подробности</em></a>.
+</p>
+<h3>Алгоритм шифрования</h3>
+<p>Здесь выбирается алгоритм шифрования, который будет применяться в новом томе. Обратите внимание, что выбранный алгоритм шифрования
+после создания тома изменить уже нельзя. Дополнительные сведения см. в главе
+<a href="Encryption%20Algorithms.html"><em>Алгоритмы шифрования</em></a>.
+</p>
+<h3 id="QuickFormat">Быстрое форматирование</h3>
+<p>Если этот параметр выключен, форматированию подвергается каждый сектор нового тома. Это означает, что новый том будет
+<em>целиком</em> заполнен случайными данными. Быстрое форматирование занимает гораздо меньше времени, но оно менее надёжно,
+так как пока весь том не будет заполнен файлами, существует вероятность определить, как много данных он содержит
+(если свободное пространство не было предварительно заполнено случайными данными). Если вы не уверены, нужно ли включать
+или выключать быстрое форматирование, рекомендуем оставить этот параметр выключенным. Обратите внимание, что параметр
+<i>Быстрое форматирование</i> доступен только при шифровании разделов/устройств, за исключением Windows, где он также доступен при создании файловых контейнеров.</p>
+<p><i>ВАЖНО: При шифровании раздела/устройства, внутри которого вы планируете затем создать скрытый том, оставьте этот параметр <u>выключенным</u>.</i>
+</p>
+<h3 id="dynamic">Динамический («растягивающийся») том</h3>
+<p>Динамический контейнер VeraCrypt представляет собой предраспределённый разрежённый (sparse) файл NTFS, чей физический
+размер (реально занимаемое место на диске) увеличивается по мере добавления в контейнер новых данных. Обратите внимание,
+что физический размер контейнера (реально занимаемое контейнером место на диске) <i>не уменьшается</i> при удалении файлов
+из тома VeraCrypt. Физический размер контейнера может только увеличиваться до максимального значения, указанного пользователем
+при создании этого тома. По достижении указанного максимального значения физический размер тома будет оставаться постоянным.<br>
+<br>
+Учтите, что разрежённые файлы можно создавать только в файловой системе NTFS. При создании контейнера в файловой системе FAT,
+параметр <em>Динамический</em> будет недоступен (&ldquo;затенён&rdquo;).<br>
+<br>
+Имейте в виду, что размер динамического (на основе разрежённого файла) тома VeraCrypt, сообщаемый Windows и VeraCrypt, будет
+всегда равен его максимальному размеру (который был указан при создании этого тома). Чтобы узнать текущий физический размер
+контейнера (действительно занимаемое им место на диске), щёлкните правой кнопкой по файлу-контейнеру (в Проводнике Windows,
+не в VeraCrypt), и выберите пункт <em>Свойства</em> – в поле <i>На диске</i> будет указано реальное значение.</p>
+<p>ВНИМАНИЕ: Скорость выполнения операций у динамических (на основе разрежённых файлов) томов VeraCrypt значительно ниже, чем
+у обычных томов. Кроме того, динамические тома VeraCrypt менее безопасны, так как они позволяют определить количество незанятых
+секторов в томе. Более того, если при записи данных на динамический том окажется, что в файловой системе, где находится
+файловый контейнер с данным томом, недостаточно свободного места, это может привести к повреждению зашифрованной файловой системы.</p>
+<h3>Размер кластера</h3>
+<p>Кластер это единица хранения данных. Например, один распределённый кластер в файловой системе FAT – это однобайтовый файл.
+Когда файл увеличивается и превосходит границу кластера, распределяется ещё один кластер. В теории это означает, что чем
+больше размер кластера, тем больше тратится места на диске и тем выше производительность. Если вы не знаете, какой размер
+выбрать, используйте значение, предложенное по умолчанию.</p>
+<h3>Тома VeraCrypt на дисках CD и DVD</h3>
+<p>Если вы хотите сохранить том VeraCrypt на CD или DVD, то сначала создайте на жёстком диске контейнер TrueCrypt на основе
+файла, а затем запишите («прожгите») его на CD/DVD с помощью любой программы для записи CD/DVD (в среде Windows XP и более
+новых версий Windows для этого можно воспользоваться средством записи CD, входящим в комплект поставки этой ОС).
+Имейте в виду, что если вы собираетесь монтировать том VeraCrypt, хранящийся на носителе, допускающем только чтение (например,
+на CD/DVD) в Windows 2000, том VeraCrypt должен быть отформатирован в FAT. Причина этого в том, что Windows 2000 не может
+монтировать файловую систему NTFS на носителях только для чтения (в отличие от Windows XP и более новых версий Windows).</p>
+<h3>Аппаратный/программный RAID, динамические тома Windows</h3>
+<p>VeraCrypt поддерживает аппаратные/программные массивы RAID, а также динамические тома Windows.</p>
+<p><i>Windows Vista и новее:</i> динамические тома отображаются в диалоговом окне <i>Выбрать устройство</i> как
+<code>\Device\HarddiskVolumeN</code>.</p>
+<p><i>Windows XP/2000/2003:</i> если вы намереваетесь отформатировать динамический том Windows как том VeraCrypt, помните,
+что после создания динамического тома Windows (с помощью Windows-средства <i>Управление дисками</i>) нужно перезагрузить
+операционную систему, чтобы том стал доступен/виден в диалоговом окне выбора устройства в мастере создания томов VeraCrypt.
+Также учтите, что в окне <i>Выбрать устройство</i> динамический диск Windows отображается не как одно
+устройство (элемент), а как все тома, из которых состоит динамический том Windows, и вы можете выбрать любой из них, чтобы
+отформатировать весь динамический том Windows.</p>
+<h3>Примечания к созданию томов</h3>
+<p>После нажатия кнопки <i>Разметить</i> в окне мастера создания томов (последний этап), последует небольшая задержка,
+в течение которой система собирает дополнительные случайные данные. Затем для нового тома генерируются мастер-ключ, ключ
+заголовка, вторичный ключ (режим XTS) и соль с показом содержимого мастер-ключа и ключа заголовка.<br>
+<br>
+Для большей безопасности можно отключить вывод на экран частей содержимого пула случайных чисел, мастер-ключа и ключа
+заголовка, сняв отметку в правом верхнем углу соответствующего поля:<br>
+<br>
+<img src="Beginner's Tutorial_Image_023.png" alt="" width="338" height="51"><br>
+<br>
+Примечание: отображаются только первые 128 бит пула/ключей (а не всё содержимое).<br>
+<br>
+Можно создавать тома FAT (будет это FAT12, FAT16 и FAT32 – определяется автоматически по количеству кластеров) или NTFS
+(однако нужно иметь в виду, что тома NTFS могут создавать только пользователи с правами администратора). Смонтированные
+тома VeraCrypt можно в любое время переформатировать в FAT12, FAT16, FAT32 или NTFS. Они ведут себя точно так же, как
+стандартные дисковые устройства, поэтому можно щёлкнуть правой кнопкой мыши по значку смонтированного тома VeraCrypt
+(например, в окне <em>Компьютер</em> или <em>Мой компьютер</em>) и выбрать команду <i>Форматировать</i>.<br>
+<br>
+Более подробные сведения о создании томов VeraCrypt см. в разделе <a href="Hidden%20Volume.html">
+<em>Скрытый том</em></a>.</p>
+<p>&nbsp;</p>
+<p><a href="Favorite%20Volumes.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></p>
+</div>
+</div>
+
+</body></html>
diff --git a/doc/html/ru/Data Leaks.html b/doc/html/ru/Data Leaks.html
new file mode 100644
index 00000000..05db890c
--- /dev/null
+++ b/doc/html/ru/Data Leaks.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Требования безопасности и меры предосторожности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Data%20Leaks.html">Утечки данных</a>
+</p></div>
+
+<div class="wikidoc">
+<h2>Утечки данных</h2>
+<p>Когда смонтирован том VeraCrypt, операционная система и сторонние приложения могут записывать в незашифрованные тома
+(обычно в незашифрованный системный том) незашифрованную информацию о данных, хранящихся в томе VeraCrypt (например,
+имена и пути файлов, к которым недавно было обращение, создаваемые программами индексации базы данных, и т. д.), или
+собственно данные в незашифрованном виде (временные файлы и т. п.), или незашифрованную информацию о находящейся в томе
+VeraCrypt файловой системе.
+</p>
+<p>Обратите внимание, что Windows автоматически ведёт запись больших объёмов таких потенциально секретных данных, как
+имена и пути открываемых вами файлов, запускаемые вами приложения и т. д. Например, Windows при работе с Проводником
+использует набор ключей реестра, называемых “shellbags” (“скорлупа”) для хранения имени, размера, вида, значка и позиции папки.
+При каждом открытии папки эта информация обновляется, включая дату и время доступа. Пакеты Windows Shellbags можно
+найти в нескольких местах, в зависимости от версии операционной системы и профиля пользователя.
+В Windows XP пакеты shellbags находятся в "<strong>HKEY_USERS\{USERID}\Software\Microsoft\Windows\Shell\</strong>" и "<strong>HKEY_USERS\{USERID}\Software\Microsoft\Windows\ShellNoRoam\</strong>".
+В Windows 7 они располагаются в "<strong>HKEY_USERS\{USERID}\Local Settings\Software\Microsoft\Windows\Shell\</strong>".
+Более подробную информацию см. на странице <a href="https://www.sans.org/reading-room/whitepapers/forensics/windows-shellbag-forensics-in-depth-34545" target="_blank">https://www.sans.org/reading-room/whitepapers/forensics/windows-shellbag-forensics-in-depth-34545</a>.
+<p>Кроме того, начиная с Windows 8, при каждом монтировании тома VeraCrypt, отформатированном в NTFS, в журнал системных
+событий записывается Событие 98 (Event 98), содержащее имя устройства (\\device\VeraCryptVolumeXX) тома. Эта
+&quot;особенность&quot; журнала событий была представлена в Windows 8 как часть недавно введённых проверок состояния NTFS,
+см. пояснения <a href="https://blogs.msdn.microsoft.com/b8/2012/05/09/redesigning-chkdsk-and-the-new-ntfs-health-model/" target="_blank">
+здесь</a>. Чтобы избежать этой утечки, необходимо монтировать том VeraCrypt <a href="Removable%20Medium%20Volume.html">
+как сменный носитель</a>. Большое спасибо Liran Elharar, обнаружившему эту утечку и предложившему способ её обхода.<br>
+<br>
+Чтобы предотвратить утечки данных, вы должны проделать следующее (возможны и альтернативные меры):</p>
+<ul>
+<li>Если вам <em>не</em> нужно правдоподобное отрицание наличия шифрования:
+<ul>
+<li>Зашифруйте системный раздел/диск (о том, как это сделать, см. главу
+<a href="System%20Encryption.html"><em>Шифрование системы</em></a>) и убедитесь, что в течение каждого сеанса работы с
+секретными данными смонтированы только зашифрованные файловые системы или системы, доступные только для чтения.<br>
+<br>
+или</li>
+<li>Если вы не можете проделать указанное выше, загрузите или создайте "live CD"-версию своей операционной системы
+(то есть live-систему, целиком расположенную на CD/DVD и оттуда же загружающуюся) – это гарантирует, что любые записываемые
+в системный том данные записываются в RAM-диск (диск в ОЗУ). Когда вам требуется поработать с секретными данными,
+загрузите систему с такого live-CD/DVD и проверьте, что в течение сеанса смонтированы только зашифрованные и/или доступные
+только для чтения файловые системы.
+</li></ul>
+</li><li>Если вам <em>нужно</em> правдоподобное отрицание наличия шифрования:
+<ul>
+<li>Создайте скрытую операционную систему. При этом защита от утечек данных будет обеспечена VeraCrypt автоматически.
+См. подробности в разделе <a href="Hidden%20Operating%20System.html"> <em>Скрытая операционная система</em></a>.<br>
+<br>
+или</li>
+<li>Если вы не можете проделать вышеуказанное, загрузите или создайте "live CD"-версию своей операционной системы
+(то есть live-систему, целиком расположенную на CD/DVD и оттуда же загружающуюся) – это гарантирует, что любые записываемые
+в системный том данные записываются в RAM-диск (диск в ОЗУ). Когда вам требуется поработать с секретными данными,
+загрузите систему с такого live-CD/DVD. Если вы используете скрытые тома, следуйте требованиям безопасности, указанным
+в подразделе <a href="Security%20Requirements%20for%20Hidden%20Volumes.html">
+<em>Требования безопасности и меры предосторожности, касающиеся скрытых томов</em></a>. Если скрытые тома вами не используются,
+проверьте, что в течение сеанса смонтированы только несистемные тома VeraCrypt на основе раздела и/или файловые системы,
+доступные только для чтения.
+</li></ul>
+</li></ul>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Default Mount Parameters.html b/doc/html/ru/Default Mount Parameters.html
new file mode 100644
index 00000000..46c7d2e3
--- /dev/null
+++ b/doc/html/ru/Default Mount Parameters.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Default%20Mount%20Parameters.html">Параметры монтирования по умолчанию</a>
+</p></div>
+
+<div class="wikidoc">
+<h2>Параметры монтирования по умолчанию</h2>
+<p>Начиная с версии 1.0f-2 стало возможным указывать алгоритм PRF и режим TrueCrypt выбранными по умолчанию в окне пароля.</p>
+<p>Как показано ниже, выберите пункт <i>Параметры монтирования по умолчанию</i> в меню <i>Настройки</i>:</p>
+<p><img src="Home_VeraCrypt_menu_Default_Mount_Parameters.png" alt="Menu Default Mount Parameters"></p>
+<p>&nbsp;</p>
+<p>Появится следующее окно:</p>
+<p><img src="Home_VeraCrypt_Default_Mount_Parameters.png" alt="Default Mount Parameters Dialog"></p>
+<p>Внесите нужные вам изменения и нажмите OK.</p>
+<p>Выбранные значения затем будут записаны в основной конфигурационный файл VeraCrypt (Configuration.xml), что сделает их постоянными.</p>
+<p>Во всех последующих диалоговых окнах запроса пароля будут использоваться значения по умолчанию, выбранные ранее.
+Например, если в окне параметров монтирования по умолчанию вы установите флажок <i>Режим TrueCrypt</i> и выберете SHA-512
+в качестве PRF, то последующие окна ввода пароля будут выглядеть следующим образом:<br>
+<img src="Default Mount Parameters_VeraCrypt_password_using_default_parameters.png" alt="Mount Password Dialog using default values"></p>
+<p>&nbsp;</p>
+<p><strong>Примечание.</strong> Параметры монтирования по умолчанию могут быть переопределены в
+&nbsp;<a href="Command%20Line%20Usage.html">командной строке</a> ключами
+<strong>/tc</strong> и <strong>/hash</strong>, которые всегда имеют приоритет.</p>
+<p>&nbsp;</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Default Mount Parameters_VeraCrypt_password_using_default_parameters.png b/doc/html/ru/Default Mount Parameters_VeraCrypt_password_using_default_parameters.png
new file mode 100644
index 00000000..f3f2546a
--- /dev/null
+++ b/doc/html/ru/Default Mount Parameters_VeraCrypt_password_using_default_parameters.png
diff --git a/doc/html/ru/Defragmenting.html b/doc/html/ru/Defragmenting.html
new file mode 100644
index 00000000..36abd76e
--- /dev/null
+++ b/doc/html/ru/Defragmenting.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Требования безопасности и меры предосторожности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Дефрагментация.html">Дефрагментация</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Дефрагментация</h1>
+<p>Когда вы (или операционная система) выполняете дефрагментацию файловой системы, в которой находится контейнер VeraCrypt
+на основе файла, копия этого контейнера (или его фрагмент) может остаться в свободной области хост-тома (в дефрагментированной
+файловой системе). Это может повлечь за собой ряд проблем с безопасностью. Например, если вы затем измените у тома пароль
+и/или ключевые файлы, а неприятель обнаружит старую копию или фрагмент (старый заголовок) тома VeraCrypt, он может с его
+помощью смонтировать том, используя старый скомпрометированный пароль (и/или старые скомпрометированные ключевые файлы,
+действительные для монтирования этого тома до того, как был перешифрован заголовок тома). Избежать этой и других
+проблем с безопасностью (таких, как описано в разделе <a href="Volume%20Clones.html"><em>Клонирование томов</em></a>)
+поможет одно из следующего:</p>
+<ul>
+<li>Используйте тома VeraCrypt на основе раздела/устройства, а не на основе файла.</li>
+<li>После дефрагментации <em>надёжно</em> затирайте свободное место на хост-томе (в дефрагментированной файловой системе).
+В Windows это можно сделать с помощью бесплатной утилиты Microsoft <code>SDelete</code> (<a href="https://technet.microsoft.com/en-us/sysinternals/bb897443.aspx" rel="nofollow">https://technet.microsoft.com/en-us/sysinternals/bb897443.aspx</a>). В Linux для этой цели служит утилита
+<code>shred</code> из пакета GNU coreutils.&nbsp;
+</li><li>Не дефрагментируйте файловые системы, в которых вы храните тома VeraCrypt. </li></ul>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Digital Signatures.html b/doc/html/ru/Digital Signatures.html
new file mode 100644
index 00000000..d40f82b7
--- /dev/null
+++ b/doc/html/ru/Digital Signatures.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Miscellaneous.html">Miscellaneous</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Digital%20Signatures.html">Цифровые подписи</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Цифровые подписи</h1>
+<h3>Зачем нужно проверять цифровые подписи</h3>
+<p>Может так случиться, что установочный пакет VeraCrypt, который вы загружаете с нашего сервера, был создан или модифицирован
+взломщиком. Например, взломщик мог воспользоваться какой-либо уязвимостью в используемом нами серверном ПО и изменить хранящиеся
+на сервере установочные пакеты, либо он мог изменить любые файлы при их пересылке к вам.<br>
+<br>
+По этой причине следует всегда проверять целостность и аутентичность любого установочного пакета VeraCrypt , который вы загружаете или получаете из какого-либо иного источника. Другими словами, следует всегда проверять, что файл создан именно нами и не был модифицирован злоумышленником. Единственный способ это
+сделать – проверить у файла так называемые цифровые подписи.</p>
+<h3>Типы используемых нами цифровых подписей</h3>
+<p>В настоящий момент мы используем цифровые подписи двух типов:</p>
+<ul>
+<li>Подписи <strong>PGP</strong> (доступны для всех пакетов с бинарными файлами и с исходным кодом для всех операционных систем).
+</li><li>Подписи <strong>X.509</strong> (доступны для пакетов с бинарными файлами для Windows).
+</li></ul>
+<h3>Преимущества подписей X.509</h3>
+<p>По сравнению с подписями PGP, подписи X.509 имеют следующие преимущества:</p>
+<ul>
+<li>значительно проще проверить, что ключ, которым подписан файл, действительно наш (а не взломщика);
+</li><li>чтобы поверить подлинность подписи X.509, не требуется загружать и устанавливать никакого дополнительного ПО (см. ниже);
+</li><li>не нужно загружать и импортировать наш открытый ключ (он встроен в подписанный файл);
+</li><li>не нужно загружать отдельный файл с подписью (она встроена в подписанный файл).
+</li></ul>
+<h3>Преимущества подписей PGP</h3>
+<p>По сравнению с подписями X.509, подписи PGP имеют следующее преимущество:</p>
+<ul>
+<li>они не зависят от источника сертификации (который может, например, фильтроваться/контролироваться неприятелем или быть
+ненадёжным по другим причинам).
+</li></ul>
+<h3>Как проверять подписи X.509</h3>
+<p>Обратите внимание, что в настоящий момент подписи X.509 доступны только для самораспаковывающихся установочных пакетов
+VeraCrypt для Windows. Подпись X.509, встроенная в каждый из таких файлов вместе с цифровым сертификатом VeraCrypt Foundation,
+выпущена общественной организацией сертификации. Чтобы проверить целостность и подлинность самораспаковывающегося
+установочного пакета для Windows, сделайте следующее:</p>
+<ol>
+<li>Загрузите (скачайте) самораспаковывающийся установочный пакет VeraCrypt. </li><li>В Проводнике Windows щёлкните правой
+кнопкой мыши по загруженному файлу (&lsquo;<em>VeraCrypt Setup.exe</em>&rsquo;) и выберите в контекстном меню пункт
+<em>Свойства</em>.
+</li><li>В диалоговом окне <em>Свойства</em> перейдите на вкладку <em>Цифровые подписи</em>.
+</li><li>На вкладке <em>Цифровые подписи</em> в поле <em>Список подписей</em> дважды щёлкните по
+строке с надписью &quot;<em>IDRIX</em>&quot; или &quot;<em>IDRIX SARL</em>&quot;.
+</li><li>Появится диалоговое окно <em>Состав цифровой подписи</em>. Если вверху этого окна вы увидите следующую
+фразу, значит целостность и подлинность пакета успешно прошли проверку и подтверждены:<br>
+<br>
+&quot;<em>Эта цифровая подпись действительна.</em>&quot;<br>
+<br>
+Если такой фразы нет, это означает, что файл скорее всего повреждён.<br>
+Примечание. В ряде устаревших версий Windows проверка подписей не работает, так как отсутствуют некоторые необходимые сертификаты.
+</li></ol>
+<h3 id="VerifyPGPSignature">Как проверять подписи PGP</h3>
+<p>Чтобы проверить подпись PGP, проделайте следующее:</p>
+<ol>
+<li>Установите любую программу шифрования с открытым ключом, поддерживающую подписи PGP. Для Windows можно загрузить
+<a href="http://www.gpg4win.org/" target="_blank">Gpg4win</a>. См. подробности на сайте <a href="https://www.gnupg.org/">https://www.gnupg.org/</a>. </li>
+<li>Создайте закрытый (личный) ключ (о том, как это сделать, см. в документации на ПО шифрования с открытым ключом).</li>
+<li>Загрузите наш открытый ключ PGP с сайта <strong>IDRIX</strong> (<a href="https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key.asc" target="_blank">https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key.asc</a>) или из надёжного репозитария (ID=0x680D16DE)
+открытых ключей и импортируйте загруженный ключ в свою связку ключей (keyring). О том, как это сделать, см. в документации
+на ПО шифрования с открытым ключом. Убедитесь, что его отпечаток – <strong>5069A233D55A0EEB174A5FC3821ACD02680D16DE</strong>.
+<ul>
+<li>Для VeraCrypt версии 1.22 и старее проверка должна использовать открытый ключ PGP, доступный по адресу
+<a href="https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key_2014.asc" target="_blank">https://www.idrix.fr/VeraCrypt/VeraCrypt_PGP_public_key_2014.asc</a>
+или из надёжного репозитария открытых ключей (ID=0x54DDD393), чей отпечаток – <strong>993B7D7E8E413809828F0F29EB559C7C54DDD393</strong>.
+</li>
+</ul>
+</li>
+<li>Подпишите импортированный ключ своим личным ключом, чтобы пометить его как надёжный (о том, как это сделать,
+см. в документации на ПО шифрования с открытым ключом).<br>
+<br>
+Примечание: если вы пропустите этот шаг и попытаетесь проверить любую нашу PGP-подпись, то получите сообщение
+об ошибке, гласящее, что цифровая подпись неверна.
+</li>
+<li>Загрузите цифровую подпись, нажав кнопку <em>PGP Signature</em> рядом с файлом, который вы хотите проверить
+(на <a href="https://www.veracrypt.fr/en/Downloads.html">странице загрузок</a>).
+</li>
+<li>Проверьте загруженную подпись (о том, как это сделать, см. в документации на ПО шифрования с открытым ключом).</li>
+</ol>
+<p>В Linux эти шаги могут быть выполнены с помощью следующих команд:</p>
+<ul>
+<li>Проверьте, что отпечаток открытого ключа равен <strong>5069A233D55A0EEB174A5FC3821ACD02680D16DE</strong>: <strong>gpg --import --import-options show-only VeraCrypt_PGP_public_key.asc</strong> (для старых версий gpg вместо этого введите:
+<strong>gpg --with-fingerprint VeraCrypt_PGP_public_key.asc</strong>)</li>
+<li>Если отпечаток такой, как ожидалось, импортируйте открытый ключ: <strong>gpg --import VeraCrypt_PGP_public_key.asc</strong>
+</li>
+<li>Проверьте подпись у установочного архива Linux (в этом примере – для версии 1.23): <strong>
+gpg --verify veracrypt-1.23-setup.tar.bz2.sig veracrypt-1.23-setup.tar.bz2</strong>
+</li></ul>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Disclaimers.html b/doc/html/ru/Disclaimers.html
new file mode 100644
index 00000000..3fc3089c
--- /dev/null
+++ b/doc/html/ru/Disclaimers.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Disclaimers.html">Отказ от обязательств</a>
+</p></div>
+
+<div class="wikidoc">
+<h2>Отказ от гарантий</h2>
+<div align="justify" style="margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+СОДЕРЖИМОЕ ЭТОГО САЙТА (И ЛЮБЫХ СВЯЗАННЫХ САЙТОВ/СЕРВЕРОВ) ПРЕДОСТАВЛЯЕТСЯ КАК ЕСТЬ; БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, ЯВНЫХ,
+ПОДРАЗУМЕВАЕМЫХ ИЛИ УСТАНОВЛЕННЫХ ЗАКОНОМ. СОДЕРЖИМОЕ ЭТОГО САЙТА (И ЛЮБЫХ СВЯЗАННЫХ САЙТОВ) МОЖЕТ БЫТЬ НЕТОЧНЫМ,
+НЕПРАВИЛЬНЫМ, НЕДЕЙСТВИТЕЛЬНЫМ, НЕДОСТОВЕРНЫМ, ЛОЖНЫМ, НЕПОЛНЫМ И/ИЛИ ВВОДЯЩИМ В ЗАБЛУЖДЕНИЕ. ВЕСЬ РИСК В ОТНОШЕНИИ
+КАЧЕСТВА, ПРАВИЛЬНОСТИ, ТОЧНОСТИ ИЛИ ПОЛНОТЫ СОДЕРЖИМОГО ЭТОГО САЙТА (И ЛЮБЫХ СВЯЗАННЫХ САЙТОВ) ЛЕЖИТ НА ВАС. АВТОРЫ,
+ВЛАДЕЛЬЦЫ, ИЗДАТЕЛИ И АДМИНИСТРАТОРЫ ЭТОГО САЙТА (И СВЯЗАННЫХ САЙТОВ/СЕРВЕРОВ), И СООТВЕТСТВУЮЩИЕ ВЛАДЕЛЬЦЫ ИНТЕЛЛЕКТУАЛЬНОЙ
+СОБСТВЕННОСТИ ОТКАЗЫВАЮТСЯ ОТ ЛЮБЫХ ГАРАНТИЙ ЛЮБОГО РОДА.</div>
+<h2>Отказ от ответственности</h2>
+<div align="justify" style="margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+АВТОРЫ, ВЛАДЕЛЬЦЫ, ИЗДАТЕЛИ И АДМИНИСТРАТОРЫ ЭТОГО (И СВЯЗАННЫХ С НИМ САЙТОВ/СЕРВЕРОВ), А ТАКЖЕ СООТВЕТСТВУЮЩИЕ
+ВЛАДЕЛЬЦЫ ИНТЕЛЛЕКТУАЛЬНОЙ СОБСТВЕННОСТИ ОТКАЗЫВАЮТСЯ ОТ ЛЮБОЙ ОТВЕТСТВЕННОСТИ И НИ В КОЕМ СЛУЧАЕ НИ ОДНА ИЗ ЭТИХ
+СТОРОН НЕ НЕСЁТ ОТВЕТСТВЕННОСТИ ПЕРЕД ВАМИ ИЛИ ЛЮБОЙ ДРУГОЙ СТОРОНОЙ ЗА ЛЮБЫЕ УБЫТКИ, ВКЛЮЧАЯ, НО НЕ ОГРАНИЧИВАЯСЬ,
+ЛЮБЫЕ ПРЯМЫЕ, КОСВЕННЫЕ, ОБЩИЕ, ОСОБЫЕ, СЛУЧАЙНЫЕ, ШТРАФНЫЕ, ПРИМЕРНЫЕ ИЛИ КОСВЕННЫЕ УБЫТКИ (ВКЛЮЧАЯ, НО НЕ ОГРАНИЧИВАЯСЬ,
+ЛЮБЫЕ УБЫТКИ, ПОНЕСЁННЫЕ ВАМИ ИЛИ ТРЕТЬИМИ СТОРОНАМИ, ЗАКУПКА УСЛУГ-ЗАМЕНИТЕЛЕЙ ИЛИ ПРЕРЫВАНИЕ БИЗНЕСА), ИЛИ ИНОЕ,
+ВОЗНИКАЮЩЕЕ В РЕЗУЛЬТАТЕ ЛЮБОГО ИСПОЛЬЗОВАНИЯ ЭТОГО САЙТА (ИЛИ СВЯЗАННЫХ С НИМ САЙТОВ/СЕРВЕРОВ) ИЛИ ЕГО СОДЕРЖИМОГО
+ИЛИ ЛЮБОГО СТОРОННЕГО САЙТА, СВЯЗАННОГО КАКИМ-ЛИБО ОБРАЗОМ С ЭТИМ САЙТОМ (ИЛИ СО СВЯЗАННЫМИ САЙТАМИ), ДАЖЕ ЕСЛИ
+ТАКИЕ УБЫТКИ (ИЛИ ВОЗМОЖНОСТЬ ТАКИХ УБЫТКОВ) ЯВЛЯЮТСЯ/БЫЛИ ПРЕДСКАЗУЕМЫ ИЛИ ИЗВЕСТНЫ ЛЮБОМУ АВТОРУ, ВЛАДЕЛЬЦУ,
+ИЗДАТЕЛЮ, АДМИНИСТРАТОРУ ИЛИ ЛЮБОЙ ДРУГОЙ СТОРОНЕ.</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Documentation.html b/doc/html/ru/Documentation.html
new file mode 100644
index 00000000..00fcc0ea
--- /dev/null
+++ b/doc/html/ru/Documentation.html
@@ -0,0 +1,161 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div class="wikidoc">
+<h1>Содержание</h1>
+<p><em style="text-align:left">Эта документация поставляется по принципу &quot;как есть&quot;, без гарантии отсутствия ошибок и любых других гарантий.
+См. подробности в разделе <a href="Disclaimers.html">Отказ от обязательств</a>.</em></p>
+<ul>
+<li><a title="Предисловие" href="Preface.html"><strong>Предисловие</strong></a>
+</li><li><strong><a href="Introduction.html">Введение</a></strong>
+</li><li><strong><a href="Beginner%27s%20Tutorial.html">Руководство для начинающих</a></strong>
+</li><li><strong><a href="VeraCrypt%20Volume.html">Том VeraCrypt</a></strong>
+<ul>
+<li><a href="Creating%20New%20Volumes.html">Создание нового тома VeraCrypt</a>
+</li><li><a href="Favorite%20Volumes.html">Избранные тома</a>
+</li><li><a href="System%20Favorite%20Volumes.html">Системные избранные тома</a>
+</li></ul>
+</li><li><strong><a href="System%20Encryption.html">Шифрование системы</a></strong>
+<ul>
+<li><a href="Hidden%20Operating%20System.html">Скрытая операционная система</a>
+</li><li><a href="Supported%20Systems%20for%20System%20Encryption.html">Операционные системы, поддерживающие системное шифрование</a>
+</li><li><a href="VeraCrypt%20Rescue%20Disk.html">Диск восстановления VeraCrypt (Rescue Disk)</a>
+</li></ul>
+</li><li><strong><a href="Plausible%20Deniability.html">Правдоподобное отрицание наличия шифрования</a></strong><br>
+<ul>
+<li><a href="Hidden%20Volume.html">Скрытый том</a>
+<ul>
+<li><a href="Protection%20of%20Hidden%20Volumes.html">Защита скрытых томов от повреждений</a>
+</li><li><a href="Security%20Requirements%20for%20Hidden%20Volumes.html">Требования безопасности и меры предосторожности, касающиеся скрытых томов</a>
+</li></ul>
+</li><li><a href="VeraCrypt%20Hidden%20Operating%20System.html">Скрытая операционная система</a>
+</li></ul>
+</li><li><strong><a href="Main%20Program%20Window.html">Главное окно программы</a></strong>
+<ul>
+<li><a href="Program%20Menu.html">Меню программы</a>
+</li><li><a href="Mounting%20VeraCrypt%20Volumes.html">Монтирование томов</a>
+</li></ul>
+</li><li><strong><a href="Normal%20Dismount%20vs%20Force%20Dismount.html">Обычное размонтирование против принудительного</a></strong>
+</li><li><strong><a href="Avoid%20Third-Party%20File%20Extensions.html">О рисках, связанных со сторонними расширениями файлов</a></strong>
+</li><li><strong><a href="Parallelization.html">Распараллеливание</a></strong>
+</li><li><strong><a href="Pipelining.html">Конвейеризация</a></strong>
+</li><li><strong><a href="Hardware%20Acceleration.html">Аппаратное ускорение</a></strong>
+</li><li><strong><a href="Hot%20Keys.html">Горячие клавиши</a></strong>
+</li><li><strong><a href="Keyfiles%20in%20VeraCrypt.html">Ключевые файлы</a></strong>
+</li><li><strong><a href="Security%20Tokens%20%26%20Smart%20Cards.html">Токены безопасности и смарт-карты</a></strong>
+</li><li><strong><a href="EMV%20Smart%20Cards.html">Смарт-карты EMV</a></strong>
+</li><li><strong><a href="Portable%20Mode.html">Портативный (переносной) режим</a></strong>
+</li><li><strong><a href="TrueCrypt%20Support.html">Поддержка TrueCrypt</a></strong>
+</li><li><strong><a href="Converting%20TrueCrypt%20volumes%20and%20partitions.html">Преобразование томов и разделов TrueCrypt в формат VeraCrypt</a></strong>
+</li><li><strong><a href="Conversion_Guide_VeraCrypt_1.26_and_Later.html">Руководство по преобразованию томов для версий 1.26 и новее</a></strong>
+</li><li><strong><a href="Default%20Mount%20Parameters.html">Параметры монтирования по умолчанию</a></strong>
+</li><li><strong><a href="Language%20Packs.html">Языковые пакеты</a></strong>
+</li><li><strong><a href="Encryption%20Algorithms.html">Алгоритмы шифрования</a></strong>
+<ul>
+<li><a href="AES.html">AES</a> </li><li><a href="Camellia.html">Camellia</a>
+</li><li><a href="Kuznyechik.html">Kuznyechik</a>
+</li><li><a href="Serpent.html">Serpent</a> </li><li><a href="Twofish.html">Twofish</a> </li><li><a href="Cascades.html">Каскады шифров</a>
+</li></ul>
+</li><li><strong><a href="Hash%20Algorithms.html">Алгоритмы хеширования</a></strong>
+<ul>
+<li><a href="BLAKE2s-256.html">BLAKE2s-256</a></li>
+<li><a href="SHA-256.html">SHA-256</a></li>
+<li><a href="SHA-512.html">SHA-512</a></li>
+<li><a href="Whirlpool.html">Whirlpool</a></li>
+<li><a href="Streebog.html">Streebog</a></li>
+</ul>
+</li><li><strong><a href="Supported%20Operating%20Systems.html">Поддерживаемые операционные системы</a></strong>
+</li><li><strong><a href="Command%20Line%20Usage.html">Использование в командной строке</a></strong>
+</li><li><strong><a href="Security%20Model.html">Модель безопасности</a></strong>
+</li><li><strong><a href="Security%20Requirements%20and%20Precautions.html">Требования безопасности и меры предосторожности<br>
+</a></strong>
+<ul>
+<li><a href="Data%20Leaks.html">Утечки данных</a>
+<ul>
+<li><a href="Paging%20File.html">Файл подкачки</a>
+</li><li><a href="Memory%20Dump%20Files.html">Файлы дампа памяти</a>
+</li><li><a href="Hibernation%20File.html">Файл гибернации</a>
+</li></ul>
+</li><li><a href="Unencrypted%20Data%20in%20RAM.html">Незашифрованные данные в ОЗУ</a>
+</li><li><a href="VeraCrypt%20RAM%20Encryption.html">Шифрование оперативной памяти в VeraCrypt</a>
+</li><li><a href="VeraCrypt%20Memory%20Protection.html">Защита памяти в VeraCrypt</a>
+</li><li><a href="Physical%20Security.html">Физическая безопасность</a>
+</li><li><a href="Malware.html">Вредоносное ПО (malware)</a> </li><li><a href="Multi-User%20Environment.html">Многопользовательская среда</a>
+</li><li><a href="Authenticity%20and%20Integrity.html">Подлинность и целостность данных</a>
+</li><li><a href="Choosing%20Passwords%20and%20Keyfiles.html">Выбор паролей и ключевых файлов</a>
+</li><li><a href="Changing%20Passwords%20and%20Keyfiles.html">Изменение паролей и ключевых файлов</a>
+</li><li><a href="Trim%20Operation.html">Операция Trim</a>
+</li><li><a href="Wear-Leveling.html">Распределение износа (Wear-Leveling)</a>
+</li><li><a href="Reallocated%20Sectors.html">Перераспределённые сектора</a>
+</li><li><a href="Defragmenting.html">Дефрагментация</a>
+</li><li><a href="Journaling%20File%20Systems.html">Журналируемые файловые системы</a>
+</li><li><a href="Volume%20Clones.html">Клонирование томов</a>
+</li><li><a href="Additional%20Security%20Requirements%20and%20Precautions.html">Дополнительные требования безопасности и меры предосторожности</a>
+</li></ul>
+</li><li><strong><a href="How%20to%20Back%20Up%20Securely.html">О безопасном резервном копировании</a></strong>
+</li><li><strong><a href="Miscellaneous.html">Разное</a></strong>
+<ul>
+<li><a href="Using%20VeraCrypt%20Without%20Administrator%20Privileges.html">Использование VeraCrypt без прав администратора</a>
+</li><li><a href="Sharing%20over%20Network.html">Общий доступ по сети</a>
+</li><li><a href="VeraCrypt%20Background%20Task.html">Работа VeraCrypt в фоновом режиме</a>
+</li><li><a href="Removable%20Medium%20Volume.html">Том, смонтированный как сменный носитель</a>
+</li><li><a href="VeraCrypt%20System%20Files.html">Системные файлы VeraCrypt и программные данные</a>
+</li><li><a href="Removing%20Encryption.html">Как удалить шифрование</a>
+</li><li><a href="Uninstalling%20VeraCrypt.html">Удаление VeraCrypt</a>
+</li><li><a href="Digital%20Signatures.html">Цифровые подписи</a>
+</li></ul>
+</li><li><strong><a href="Troubleshooting.html">Устранение затруднений</a></strong>
+</li><li><strong><a href="Incompatibilities.html">Несовместимости</a></strong>
+</li><li><strong><a href="Issues%20and%20Limitations.html">Замеченные проблемы и ограничения</a></strong>
+</li><li><strong><a href="FAQ.html">Вопросы и ответы</a></strong>
+</li><li><strong><a href="Technical%20Details.html">Технические подробности</a></strong>
+<ul>
+<li><a href="Notation.html">Система обозначений</a>
+</li><li><a href="Encryption%20Scheme.html">Схема шифрования</a>
+</li><li><a href="Modes%20of%20Operation.html">Режимы работы</a>
+</li><li><a href="Header%20Key%20Derivation.html">Формирование ключа заголовка, соль и количество итераций</a>
+</li><li><a href="Random%20Number%20Generator.html">Генератор случайных чисел</a>
+</li><li><a href="Keyfiles.html">Ключевые файлы</a>
+</li><li><a title="PIM" href="Personal%20Iterations%20Multiplier%20(PIM).html">PIM (Персональный множитель итераций)</a>
+</li><li><a href="VeraCrypt%20Volume%20Format%20Specification.html">Спецификация формата томов VeraCrypt</a>
+</li><li><a href="Standard%20Compliance.html">Соответствие стандартам и спецификациям</a>
+</li><li><a href="Source%20Code.html">Исходный код программы</a>
+</li><li><a href="CompilingGuidelines.html">Сборка VeraCrypt из исходного кода</a>
+<ul>
+<li><a href="CompilingGuidelineWin.html">Руководство по сборке в Windows</a>
+</li><li><a href="CompilingGuidelineLinux.html">Руководство по сборке в Linux</a>
+</li></ul>
+</li></ul>
+</li><li><strong><a href="Contact.html">Связь с авторами</a></strong>
+</li><li><strong><a href="Legal%20Information.html">Правовая информация</a></strong>
+</li><li><strong><a href="Release%20Notes.html">История версий</a></strong>
+</li><li><strong><a href="Acknowledgements.html">Благодарности</a></strong>
+</li><li><strong><a href="References.html">Ссылки</a></strong>
+</li></ul>
+</div>
+
+</body></html>
diff --git a/doc/html/ru/Donation.html b/doc/html/ru/Donation.html
new file mode 100644
index 00000000..17ca4d9a
--- /dev/null
+++ b/doc/html/ru/Donation.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a href="Documentation.html">Документация</a></li>
+	  <li><a class="active" href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div class="wikidoc">
+<h1>Пожертвование на разработку VeraCrypt</h1>
+<p>Вы можете поддержать развитие VeraCrypt, отправив пожертвование с помощью PayPal, банковского перевода или криптовалюты (<a href="#Bitcoin">Bitcoin</a>, <a href="#BitcoinCash">Bitcoin Cash</a>, <a href="#Ethereum">Ethereum</a>, <a href="#Litecoin">Litecoin</a> и <a href="#Monero">Monero</a>). Также можно отправить пожертвование, используя платформы Liberapay и Flattr.</p>
+
+<hr>
+<h3><img src="paypal_30x30.png" style="vertical-align: middle; margin-right: 5px">PayPal</h3>
+<table>
+<tbody>
+<tr>
+<td align="center"><a title="Donate to VeraCrypt in Euros" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=H25GJLUDHBMB6" target="_blank"><img src="Donation_donate_Euros.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in USD" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=B8PU86SHE2ZVA" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in GBP" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MFAZACXK9NXT8" target="_blank"><img src="Donation_donate_GBP.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Canadian Dollar" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QAN6T5E5F7F5J" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Swiss Francs" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=98RJHVLY5NJ5U" target="_blank"><img src="Donation_donate_CHF.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Japanese Yen" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M9DXZ83WD7S8Y" target="_blank"><img src="Donation_donate_YEN.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Australian Dollar" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=S9L769QS6WAU6" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></td>
+<td align="center"><a title="VeraCrypt Donation in Polish złoty" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2WDGT7KUJ5GH8" target="_blank"><img src="Donation_donate_PLN.gif" alt="" width="92" height="26"></a></td>
+</tr>
+<tr>
+<td align="center">Евро</td>
+<td align="center">Доллар США</td>
+<td align="center">Фунт стерлингов</td>
+<td align="center">Канадский доллар</td>
+<td align="center">Швейцарский франк</td>
+<td align="center">Японская иена</td>
+<td align="center">Австралийский доллар</td>
+<td align="center">Польский злотый</td>
+</tr>
+</tbody>
+</table>
+
+<p>Если вы хотите отправить пожертвование в другой валюте, нажмите кнопку ниже и выберите свою валюту в выпадающем списке под суммой.</p>
+<a title="VeraCrypt Donation in any currency" href="https://www.paypal.me/idrix" target="_blank"><img src="Donation_donate.gif" alt="" width="92" height="26"></a>
+
+
+<hr>
+<h3><a href="Donation_Bank.html"><img src="bank_30x30.png" style="margin-right: 5px"></a>Банковский перевод</h3>
+<p>Чтобы отправить пожертвование через банковский перевод, используйте <a href="Donation_Bank.html">банковские данные IDRIX</a>.
+
+<hr>
+<h3>Платформы для пожертвований:</h3>
+<ul>
+<li><strong>Liberapay: <a href="https://liberapay.com/VeraCrypt/donate" target="_blank"><img alt="Donate using Liberapay" src="liberapay_donate.svg" style="vertical-align: middle; margin-bottom: 5px"></a></strong></li>
+</ul>
+
+<hr>
+<h3 id="Bitcoin"><img src="BC_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Bitcoin</h3>
+<ul>
+<li><strong>Legacy:</strong>
+<p><img src="Donation_VeraCrypt_Bitcoin_small.png" alt="VeraCrypt Bitcoin Address" width="200" height="200"></p>
+<p><strong>14atYG4FNGwd3F89h1wDAfeRDwYodgRLcf</strong></p>
+</li>
+<li><strong>SegWit:</strong>
+<p><img src="Donation_VC_BTC_Sigwit.png" alt="VeraCrypt BTC SegWit Address" width="200" height="200"></p>
+<p><strong>bc1q28x9udhvjp8jzwmmpsv7ehzw8za60c7g62xauh</strong></p>
+</li>
+</ul>
+
+<hr>
+<h3 id="BitcoinCash"><img src="BCH_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Bitcoin Cash</h3>
+<p><img src="Donation_VeraCrypt_BitcoinCash.png" alt="VeraCrypt Bitcoin Cash Address" width="200" height="200"></p>
+<p><strong>bitcoincash:qp5vrqwln247f7l9p98ucj4cqye0cjcyusc94jlpy9</strong></p>
+
+<hr>
+<h3 id="Ethereum"><img src="Ethereum_Logo_19x30.png" style="vertical-align: middle; margin-right: 5px">Ethereum</h3>
+<p><img src="Donation_VeraCrypt_Ethereum.png" alt="VeraCrypt Ethereum Address" width="200" height="200"></p>
+<p><strong>0x0a7a86a3eB5f533d969500831e8CC681454a8bD2</strong></p>
+
+<hr>
+<h3 id="Litecoin"><img src="LTC_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Litecoin</h3>
+<p><img src="Donation_VeraCrypt_Litecoin.png" alt="VeraCrypt Litecoin Address" width="200" height="200"></p>
+<p><strong>LZkkfkMs4qHmWaP9DAvS1Ep1fAxaf8A2T7</strong></p>
+
+<hr>
+<h3 id="Monero"><img src="Monero_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Monero</h3>
+<p><img src="Donation_VeraCrypt_Monero.png" alt="VeraCrypt Monero Address" width="200" height="200"></p>
+<p><strong>464GGAau9CE5XiER4PSZ6SMbK4wxPCgdm2r36uqnL8NoS6zDjxUYXnyQymbUsK1QipDMY2fsSgDyZ3tMaLfpWvSr2EE8wMw</strong></p>
+
+
+<hr>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Donation_Bank.html b/doc/html/ru/Donation_Bank.html
new file mode 100644
index 00000000..24776b50
--- /dev/null
+++ b/doc/html/ru/Donation_Bank.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a href="Documentation.html">Документация</a></li>
+	  <li><a class="active" href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div class="wikidoc">
+<h1>Пожертвование на развитие VeraCrypt с помощью банковского перевода</h1>
+<p>Вы можете поддержать развитие VeraCrypt, отправив пожертвование посредством банковского перевода на один из перечисленных ниже банковских счетов IDRIX, в зависимости от валюты.<br>
+Поддерживаемые валюты: <a href="#Euro">евро<img src="flag-eu-small.png" style="vertical-align: top; margin-left: 5px"></a>, <a href="#USD">доллар США<img src="flag-us-small.png" style="vertical-align: top; margin-left: 5px"></a>, <a href="#GBP">британский фунт<img src="flag-gb-small.png" style="vertical-align: top; margin-left: 5px"></a>, <a href="#AUD">австралийский доллар<img src="flag-au-small.png" style="vertical-align: top; margin-left: 5px"></a> и <a href="#NZD">новозеландский доллар<img src="flag-nz-small.png" style="vertical-align: top; margin-left: 5px"></a>.<br>
+<a href="Contact.html" target="_blank.html">Свяжитесь с нами</a>, если вам нужен официальный счёт для вашего пожертвования.</p>
+<hr>
+<h3 id="Euro"><img src="flag-eu.png" style="vertical-align: middle; margin-right: 5px">Евро SEPA – банковские детали</h3>
+<p>Принимаемые типы платежей: SEPA bank transferts или SWIFT только в евро.</p>
+Владелец счёта: IDRIX SARL<br>
+IBAN: BE16 9670 3707 4574<br>
+Банковский код (SWIFT / BIC): TRWIBEB1XXX<br>
+Адрес: TransferWise Europe SA, Avenue Marnix 13-17, Brussels 1000, Belgium<br>
+Назначение: Open Source Donation<br>
+<hr>
+
+<h3 id="USD"><img src="flag-us.png" style="vertical-align: middle; margin-right: 5px">Доллар США – банковские детали</h3>
+<p>Из США, принимаемые типы платежей: ACH и Wire.</p>
+Владелец счёта: IDRIX SARL<br>
+Номер счёта: 8310085792<br>
+Номер маршрута ACH и Wire: 026073150<br>
+Тип счёта: Checking<br>
+Адрес: Wise, 30 W. 26th Street, Sixth Floor, New York NY, 10010, United States<br>
+Назначение: Open Source Donation<br>
+
+<p>Не из США, принимаемые типы платежей: SWIFT.</p>
+Владелец счёта: IDRIX SARL<br>
+Номер счёта: 8310085792<br>
+Номер маршрута: 026073150<br>
+Банковский код (SWIFT/BIC): CMFGUS33<br>
+Адрес: Wise, 30 W. 26th Street, Sixth Floor, New York NY, 10010, United States<br>
+Назначение: Open Source Donation<br>
+<hr>
+
+<h3 id="GBP"><img src="flag-gb.png" style="vertical-align: middle; margin-right: 5px">Британский фунт стерлингов – банковские детали</h3>
+<p>Принимаемые типы платежей: Faster Payments (FPS), BACS и CHAPS только из Великобритании.</p>
+
+Владелец счёта: IDRIX SARL<br>
+Номер счёта: 56385007<br>
+Код Великобритании: 23-14-70<br>
+IBAN (для получения GBP только из Великобритании): GB18 TRWI 2314 7056 3850 07<br>
+Адрес: Wise, 56 Shoreditch High Street, London, E1 6JJ, United Kingdom<br>
+Назначение: Open Source Donation<br>
+<hr>
+
+<h3 id="AUD"><img src="flag-au.png" style="vertical-align: middle; margin-right: 5px">Австралийский доллар – банковские детали</h3>
+<p>Принимаемые типы платежей: только локальные банковские переводы AUD.</p>
+Владелец счёта: IDRIX SARL<br>
+Номер счёта: 711714051<br>
+Код BSB: 802-985<br>
+Адрес: Wise, 36-38 Gipps Street, Collingwood VIC 3066, Australia.<br>
+Назначение: Open Source Donation<br>
+<hr>
+
+<h3 id="NZD"><img src="flag-nz.png" style="vertical-align: middle; margin-right: 5px">Новозеландский доллар – банковские детали</h3>
+<p>Принимаемые типы платежей: только локальные банковские переводы NZD.</p>
+Владелец счёта: IDRIX SARL<br>
+Номер счёта: 02-1291-0218919-000<br>
+Адрес: Wise, 56 Shoreditch High Street, London, E1 6JJ, United Kingdom<br>
+Назначение: Open Source Donation<br>
+<hr>
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Donation_VC_BTC_Sigwit.png b/doc/html/ru/Donation_VC_BTC_Sigwit.png
new file mode 100644
index 00000000..d754760e
--- /dev/null
+++ b/doc/html/ru/Donation_VC_BTC_Sigwit.png
diff --git a/doc/html/ru/Donation_VeraCrypt_BitcoinCash.png b/doc/html/ru/Donation_VeraCrypt_BitcoinCash.png
new file mode 100644
index 00000000..c7e22e54
--- /dev/null
+++ b/doc/html/ru/Donation_VeraCrypt_BitcoinCash.png
diff --git a/doc/html/ru/Donation_VeraCrypt_Bitcoin_small.png b/doc/html/ru/Donation_VeraCrypt_Bitcoin_small.png
new file mode 100644
index 00000000..72ceae5c
--- /dev/null
+++ b/doc/html/ru/Donation_VeraCrypt_Bitcoin_small.png
diff --git a/doc/html/ru/Donation_VeraCrypt_Ethereum.png b/doc/html/ru/Donation_VeraCrypt_Ethereum.png
new file mode 100644
index 00000000..fa511247
--- /dev/null
+++ b/doc/html/ru/Donation_VeraCrypt_Ethereum.png
diff --git a/doc/html/ru/Donation_VeraCrypt_Litecoin.png b/doc/html/ru/Donation_VeraCrypt_Litecoin.png
new file mode 100644
index 00000000..6f5d858a
--- /dev/null
+++ b/doc/html/ru/Donation_VeraCrypt_Litecoin.png
diff --git a/doc/html/ru/Donation_VeraCrypt_Monero.png b/doc/html/ru/Donation_VeraCrypt_Monero.png
new file mode 100644
index 00000000..4085a721
--- /dev/null
+++ b/doc/html/ru/Donation_VeraCrypt_Monero.png
diff --git a/doc/html/ru/Donation_donate.gif b/doc/html/ru/Donation_donate.gif
new file mode 100644
index 00000000..43cef691
--- /dev/null
+++ b/doc/html/ru/Donation_donate.gif
diff --git a/doc/html/ru/Donation_donate_CHF.gif b/doc/html/ru/Donation_donate_CHF.gif
new file mode 100644
index 00000000..8b1eb5c9
--- /dev/null
+++ b/doc/html/ru/Donation_donate_CHF.gif
diff --git a/doc/html/ru/Donation_donate_Dollars.gif b/doc/html/ru/Donation_donate_Dollars.gif
new file mode 100644
index 00000000..d4b532e7
--- /dev/null
+++ b/doc/html/ru/Donation_donate_Dollars.gif
diff --git a/doc/html/ru/Donation_donate_Euros.gif b/doc/html/ru/Donation_donate_Euros.gif
new file mode 100644
index 00000000..9d7d1c8d
--- /dev/null
+++ b/doc/html/ru/Donation_donate_Euros.gif
diff --git a/doc/html/ru/Donation_donate_GBP.gif b/doc/html/ru/Donation_donate_GBP.gif
new file mode 100644
index 00000000..10463fe1
--- /dev/null
+++ b/doc/html/ru/Donation_donate_GBP.gif
diff --git a/doc/html/ru/Donation_donate_PLN.gif b/doc/html/ru/Donation_donate_PLN.gif
new file mode 100644
index 00000000..16ab23e9
--- /dev/null
+++ b/doc/html/ru/Donation_donate_PLN.gif
diff --git a/doc/html/ru/Donation_donate_YEN.gif b/doc/html/ru/Donation_donate_YEN.gif
new file mode 100644
index 00000000..6684382e
--- /dev/null
+++ b/doc/html/ru/Donation_donate_YEN.gif
diff --git a/doc/html/ru/EMV Smart Cards.html b/doc/html/ru/EMV Smart Cards.html
new file mode 100644
index 00000000..8c9877b4
--- /dev/null
+++ b/doc/html/ru/EMV Smart Cards.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <title>
+      VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом
+    </title>
+    <meta
+      name="description"
+      content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."
+    />
+    <meta name="keywords" content="encryption, security, шифрование, безопасность" />
+    <link href="styles.css" rel="stylesheet" type="text/css" />
+  </head>
+  <body>
+    <div>
+      <a href="Documentation.html"
+        ><img src="VeraCrypt128x128.png" alt="VeraCrypt"
+      /></a>
+    </div>
+
+    <div id="menu">
+      <ul>
+        <li><a href="Home.html">Начало</a></li>
+        <li><a href="/code/">Исходный код</a></li>
+        <li><a href="Downloads.html">Загрузить</a></li>
+        <li><a class="active" href="Documentation.html">Документация</a></li>
+        <li><a href="Donation.html">Поддержать разработку</a></li>
+        <li>
+          <a
+            href="https://sourceforge.net/p/veracrypt/discussion/"
+            target="_blank"
+            >Форум</a
+          >
+        </li>
+      </ul>
+    </div>
+
+    <div>
+      <p>
+        <a href="Documentation.html">Документация</a>
+        <img src="arrow_right.gif" alt=">>" style="margin-top: 5px" />
+        <a href="EMV%20Smart%20Cards.html">Смарт-карты EMV</a>
+      </p>
+    </div>
+
+    <div class="wikidoc">
+      <h1>Смарт-карты EMV</h1>
+      <div
+        style="
+          text-align: left;
+          margin-top: 19px;
+          margin-bottom: 19px;
+          padding-top: 0px;
+          padding-bottom: 0px;
+        "
+      >
+        <p>
+          Версии VeraCrypt для Windows и Linux позволяют использовать смарт-карты,
+          совместимые с EMV, в качестве функции. Использование смарт-карт,
+          совместимых с PKCS#11, предназначено для пользователей с определёнными
+          навыками кибербезопасности. Однако в некоторых ситуациях наличие такой
+          карты сильно снижает правдоподобность отрицания пользователем наличия шифрования.</p>
+        <p>
+          Чтобы решить эту проблему, появилась идея использовать карты, которые есть у каждого,
+          а именно смарт-карты, совместимые с EMV. Согласно одноимённому стандарту,
+          эти карты, распространённые во всем мире, применяются для банковских операций.
+          Использование внутренних данных карты EMV пользователя в качестве ключевых файлов
+          повысит безопасность его тома, сохраняя при этом правдоподобность отрицания наличия
+          шифрования.
+        </p>
+        <p>
+          Более подробную техническую информацию см. в разделе
+          <em style="text-align: left">Смарт-карты EMV</em> в главе
+          <a
+            href="Keyfiles%20in%20VeraCrypt.html"
+            style="text-align: left; color: #0080c0; text-decoration: none.html"
+          >
+            <em style="text-align: left">Ключевые файлы</em></a
+          >.
+        </p>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/doc/html/ru/Encryption Algorithms.html b/doc/html/ru/Encryption Algorithms.html
new file mode 100644
index 00000000..bac3894b
--- /dev/null
+++ b/doc/html/ru/Encryption Algorithms.html
@@ -0,0 +1,270 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Encryption%20Algorithms.html">Алгоритмы шифрования</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Алгоритмы шифрования</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Для шифрования томов VeraCrypt можно использовать следующие алгоритмы:</div>
+<table style="border-collapse:separate; border-spacing:0px; width:608px; text-align:left; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; border-width:0px 0px 1px 1px; border-style:solid; border-color:#ffffff #ffffff #000000 #000000">
+<tbody style="text-align:left">
+<tr style="text-align:left">
+<th style="width:151px; font-weight:normal; text-align:center; vertical-align:middle; color:#000000; border-width:1px 1px 1px 0px; border-style:solid solid solid none; padding:12px 0px; border-color:#000000 #000000 #000000 white">
+Алгоритм</th>
+<th style="width:225px; font-weight:normal; text-align:center; vertical-align:middle; color:#000000; border-width:1px 1px 1px 0px; border-style:solid solid solid none; padding:12px 0px; border-color:#000000 #000000 #000000 white">
+Разработчик(и)</th>
+<th style="width:94px; font-weight:normal; text-align:center; vertical-align:middle; color:#000000; border-width:1px 1px 1px 0px; border-style:solid solid solid none; padding:12px 0px; border-color:#000000 #000000 #000000 white">
+Размер ключа<br>
+(бит)</th>
+<th style="width:68px; font-weight:normal; text-align:center; vertical-align:middle; color:#000000; border-width:1px 1px 1px 0px; border-style:solid solid solid none; padding:12px 0px; border-color:#000000 #000000 #000000 white">
+Размер блока (бит)</th>
+<th style="width:68px; font-weight:normal; text-align:center; vertical-align:middle; color:#000000; border-width:1px 1px 1px 0px; border-style:solid solid solid none; padding:12px 0px; border-color:#000000 #000000 #000000 white">
+<a href="Modes%20of%20Operation.html" style="color:#0080c0; text-decoration:none.html">Режим работы</a></th>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="AES.html" style="color:#0080c0; text-decoration:none.html">AES</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+J. Daemen, V. Rijmen</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Modes%20of%20Operation.html" style="color:#0080c0; text-decoration:none.html">XTS</a></td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Camellia.html">Camellia</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<p align="center" style="margin-left:0cm"><font face="Arial, serif"><font size="2" style="font-size:9pt">Японские Mitsubishi Electric и NTT</font></font></p>
+</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<p align="center" style="margin-left:0cm"><a href="Kuznyechik.html">Kuznyechik</a></p>
+</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<p align="center" style="margin-left:0cm"><font face="Arial, serif"><font size="2" style="font-size:9pt">Национальный стандарт Российской Федерации<br>
+ГОСТ Р 34.12-2015</font></font></p>
+</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Serpent.html" style="color:#0080c0; text-decoration:none.html">Serpent</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+R. Anderson, E. Biham, L. Knudsen</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Twofish.html" style="color:#0080c0; text-decoration:none.html">Twofish</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+B. Schneier, J. Kelsey, D. Whiting,<br>
+D. Wagner, C. Hall, N. Ferguson</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">AES-Twofish</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">AES-Twofish-Serpent</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Camellia-Kuznyechik</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Camellia-Serpent</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-AES</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-Serpent-Camellia</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-Twofish</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Serpent-AES</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Serpent-Twofish-AES</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Twofish-Serpent</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Информацию о режиме XTS см. в разделе <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Режимы работы</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<a href="AES.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Encryption Scheme.html b/doc/html/ru/Encryption Scheme.html
new file mode 100644
index 00000000..2b9634d8
--- /dev/null
+++ b/doc/html/ru/Encryption Scheme.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Технические подробности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Encryption%20Scheme.html">Схема шифрования</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Схема шифрования</h1>
+<p>При монтировании тома VeraCrypt (предполагаем, что нет кэшированных паролей/ключевых файлов) или при предзагрузочной аутентификации выполняются следующие операции:</p>
+<ol>
+<li>Считываются (помещаются) в ОЗУ первые 512 байт тома (то есть заголовок обычного тома), из которых первые 64 байта это соль (см.
+<a href="VeraCrypt%20Volume%20Format%20Specification.html">
+<em>Спецификация формата томов VeraCrypt</em></a>). Для шифрования системы (см. <a href="System%20Encryption.html"><em>Шифрование системы</em></a>)
+в ОЗУ считываются последние 512 байт первой дорожки логического диска (загрузчик VeraCrypt располагается в первой дорожке
+системного диска и/или Диска восстановления VeraCrypt). </li><li>Считываются (помещаются) в ОЗУ байты 65 536&ndash;66 047 тома (см.
+<a href="VeraCrypt%20Volume%20Format%20Specification.html">
+<em>Спецификация формата томов VeraCrypt</em></a>). Для шифрования системы считываются байты 65 536&ndash;66 047 раздела, расположенного сразу за активным разделом* (см.
+<a href="Hidden%20Operating%20System.html">
+Скрытая операционная система</a>). Если внутри этого тома имеется скрытый том (или внутри раздела, следующего за загрузочным разделом),
+то в этой точке мы прочитали его заголовок; в противном случае мы просто прочитали случайные данные (есть скрытый том внутри или его нет,
+определяется только попыткой расшифровать эти данные; подробности см. в разделе
+<a href="Hidden%20Volume.html"><em>Скрытый том</em></a>).
+</li><li>Сейчас VeraCrypt пытается расшифровать заголовок обычного тома, считанный на этапе 1. Все данные, использованные
+и сгенерированные в ходе дешифрования, хранятся в ОЗУ (VeraCrypt никогда не сохраняет их на диске). Указанные ниже параметры
+неизвестны и определяются методом проб и ошибок (то есть проверкой всех возможных комбинаций следующего):
+<ol type="a">
+<li>PRF (псевдослучайная функция), применяемая при формировании (деривации) ключа заголовка (как определено в PKCS #5 v2.0; см.
+<a href="Header%20Key%20Derivation.html">
+<em>Формирование ключа заголовка, соль и количество итераций</em></a>), которая может быть одной из следующих:
+<p>HMAC-SHA-512, HMAC-SHA-256, HMAC-BLAKE2S-256, HMAC-Whirlpool.</p>
+<p>Если PRF указана пользователем явно, используется непосредственно она, без опробования других функций.</p>
+<p>Введённый пользователем пароль (который может сопровождаться одним или несколькими ключевыми файлами – см. раздел
+<a href="Keyfiles%20in%20VeraCrypt.html">
+<em>Ключевые файлы</em></a>), значение PIM (если указано) и соль, считанные на этапе 1, передаются в функцию формирования
+ключа заголовка, которая производит последовательность значений (см. <a href="Header%20Key%20Derivation.html">
+<em>Формирование ключа заголовка, соль и количество итераций</em></a>), из которых формируются ключ шифрования
+заголовка и вторичный ключ заголовка (режим XTS). (Эти ключи используются для дешифрования заголовка тома.)</p>
+</li><li>Алгоритм шифрования: AES-256, Serpent, Twofish, AES-Serpent, AES-Twofish-Serpent и т. д.
+</li><li>Режим работы: поддерживается только XTS</li><li>Размеры ключей</li></ol>
+</li><li>Дешифрование считается успешным, если первые четыре байта расшифрованных данных содержат ASCII-строку &ldquo;VERA&rdquo;
+и если контрольная сумма CRC-32 последних 256 байт расшифрованных данных (заголовок тома) совпадает со значением, находящимся в байте №8
+расшифрованных данных (неприятелю это значение неизвестно, поскольку оно зашифровано – см. раздел
+<a href="VeraCrypt%20Volume%20Format%20Specification.html">
+<em>Спецификация формата томов VeraCrypt</em></a>). Если эти условия не выполнены, процесс продолжается с этапа 3 снова,
+но на этот раз вместо данных, считанных на этапе 1, используются данные, считанные на этапе 2 (то есть возможный заголовок
+скрытого тома). Если условия снова не выполнены, монтирование прекращается (неверный пароль, повреждённый том, не том
+VeraCrypt).
+</li><li>Теперь мы знаем (или предполагаем с очень высокой вероятностью), что у нас правильный пароль, правильный алгоритм
+шифрования, режим, размер ключа и правильный алгоритм формирования ключа заголовка. Если мы успешно расшифровали данные,
+считанные на этапе 2, мы также знаем, что монтируется скрытый том, и знаем его размер, полученный из данных, считанных
+на этапе 2 и расшифрованных на этапе 3.
+</li><li>Подпрограмма шифрования переинициализируется с первичным мастер-ключом** и вторичным мастер-ключом (режим
+XTS &ndash; см. раздел <a href="Modes%20of%20Operation.html"><em>Режимы работы</em></a>), которые получены из расшифрованного заголовка
+тома (см. раздел <a href="VeraCrypt%20Volume%20Format%20Specification.html">
+<em>Спецификация формата томов VeraCrypt</em></a>). Эти ключи могут быть использованы для дешифрования любого сектора тома,
+за исключением области заголовка тома (или, в случае шифрования системы, области ключевых данных), зашифрованного с помощью
+ключей заголовка. Том смонтирован.
+</li></ol>
+<p>См. также разделы <a href="Modes%20of%20Operation.html">
+<em>Режимы работы</em></a> и <a href="Header%20Key%20Derivation.html">
+<em>Формирование ключа заголовка, соль и количество итераций</em></a>, а также главу
+<a href="Security%20Model.html"><em>Модель безопасности</em></a>.</p>
+<p>* Если размер активного раздела меньше 256 МБ, то данные считываются из <em>второго</em> раздела, идущего следом за активным
+(Windows 7 и более поздние версии по умолчанию не загружаются с раздела, на котором они установлены).</p>
+<p>&dagger; Эти параметры держатся в секрете <em>не</em> для того, чтобы усложнить атаку, а в первую очередь для того, чтобы
+сделать тома VeraCrypt не идентифицируемыми (неотличимыми от случайных данных), чего было бы трудно добиться, если бы эти
+параметры хранились в незашифрованном виде в заголовке тома. Также обратите внимание, что в случае устаревшего режима
+загрузки MBR, если для шифрования системы используется некаскадный алгоритм шифрования, алгоритм <em>известен</em>
+(его можно определить, проанализировав содержимое незашифрованного загрузчика VeraCrypt, хранящегося на первой дорожке
+логического диска или на Диске восстановления VeraCrypt).</p>
+<p>** Мастер-ключи генерируются во время создания тома и не могут быть изменены позже. Изменение пароля тома выполняется
+путём повторного шифрования заголовка тома с использованием нового ключа заголовка (сформированным из нового пароля).</p>
+<p>&nbsp;</p>
+<p><a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Ethereum_Logo_19x30.png b/doc/html/ru/Ethereum_Logo_19x30.png
new file mode 100644
index 00000000..0df3a66a
--- /dev/null
+++ b/doc/html/ru/Ethereum_Logo_19x30.png
diff --git a/doc/html/ru/FAQ.html b/doc/html/ru/FAQ.html
new file mode 100644
index 00000000..6e156208
--- /dev/null
+++ b/doc/html/ru/FAQ.html
@@ -0,0 +1,911 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="FAQ.html">Вопросы и ответы</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Вопросы и ответы</h1>
+<div style="text-align:left; margin-bottom:19px; padding-top:0px; padding-bottom:0px; margin-top:0px">
+Последнее обновление: 1 октября 2023 г.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<em style="text-align:left">Мы не обещаем отсутствие ошибок в этом документе, он поставляется &quot;как есть&quot; без всяких гарантий. См. подробности в главе
+<a href="Disclaimers.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Отказ от обязательств</a>.</em></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Могут ли TrueCrypt и VeraCrypt работать на одном компьютере?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Как правило, между программами TrueCrypt и VeraCrypt нет конфликтов, поэтому их можно установить и использовать на одном компьютере.
+Однако в Windows, если они обе используются для монтирования одного и того же тома, при его монтировании могут появиться два диска.
+Это можно решить, выполнив перед монтированием любого тома следующую команду в командной строке с повышенными привилегиями
+(используя запуск от имени администратора):
+<strong>mountvol.exe /r</strong>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Можно ли использовать тома TrueCrypt в VeraCrypt?</strong></div>
+Да. Начиная с версии 1.0f, программа VeraCrypt поддерживает монтирование томов TrueCrypt.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Можно ли преобразовать тома TrueCrypt в формат VeraCrypt?</strong></div>
+Да. Начиная с версии 1.0f, программа VeraCrypt умеет преобразовывать контейнеры и несистемные разделы TrueCrypt в формат VeraCrypt.
+Это можно сделать с помощью команды <i>Изменить пароль тома</i> или <i>Установить алгоритм формирования ключа заголовка</i>. Просто включите
+опцию <i>Режим TrueCrypt</i>, введите пароль TrueCrypt и выполните операцию – после этого том будет преобразован в формат VeraCrypt.<br>
+Перед преобразованием рекомендуется с помощью программы TrueCrypt сделать резервную копию заголовка тома.
+После преобразования и проверки правильности монтирования преобразованного тома в VeraCrypt эту резервную копию можно безопасно удалить .</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Чем VeraCrypt отличается от TrueCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+VeraCrypt добавляет повышенную безопасность к алгоритмам, используемым для шифрования системы и разделов, что делает его
+невосприимчивым к новым разработкам в атаках перебором.<br>
+Кроме того, в VeraCrypt устранено много уязвимостей и проблем безопасности, обнаруженных в TrueCrypt.<br>
+Как пример: когда системный раздел зашифрован, TrueCrypt использует PBKDF2-RIPEMD160 с 1000 итераций, тогда как
+итераций в VeraCrypt – <span style="text-decoration:underline">327 661</span>. А с обычными контейнерами и другими
+разделами TrueCrypt использует максимум 2000 итераций, в то время как VeraCrypt использует
+<span style="text-decoration:underline">500 000</span> итераций.<br>
+Эта повышенная безопасность добавляет некоторую задержку только при открытии зашифрованных разделов, не оказывая
+никакого влияния на производительность на этапе использования приложения. Для законного владельца это приемлемо,
+а вот злоумышленнику получить доступ к зашифрованным данным гораздо труднее.</div>
+</div>
+<br id="PasswordLost" style="text-align:left">
+<strong style="text-align:left">Я не могу вспомнить пароль! Есть ли какой-нибудь способ ("лазейка"), чтобы можно
+было извлечь файлы из моего тома VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Мы не внедряли никаких "лазеек" ("бэкдоров") в VeraCrypt (и никогда не внедрим их, даже если об этом попросит
+орган власти), потому что это противоречило бы самой сути данного ПО. VeraCrypt не позволяет восстанавливать никакие
+зашифрованные данные без знания правильного пароля или ключа. Мы не можем восстановить ваши данные, так как не знаем
+и не можем узнать выбранный вами пароль или сгенерированный с помощью VeraCrypt ключ. Единственный способ восстановить
+ваши файлы – попытаться "взломать" пароль или ключ, но на это могут уйти тысячи или миллионы лет (в зависимости от
+длины и качества пароля или ключевых файлов, быстродействия программной/аппаратной части компьютера, алгоритмов и
+других факторов).
+В 2010 году были новости о том, что
+<a href="http://www.webcitation.org/query?url=g1.globo.com/English/noticia/2010/06/not-even-fbi-can-de-crypt-files-daniel-dantas.html" target="_blank">
+ФБР не удалось расшифровать том TrueCrypt после года попыток</a>. Пока мы не можем проверить, правда ли это или нет,
+но в VeraCrypt мы повысили безопасность формирования ключа до уровня, при котором любой перебор пароля практически
+невозможен при условии соблюдения всех требований безопасности.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Существует ли учебник, как быстро приступить к работе, или какое-то пособие для новичков?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Первая глава, <strong style="text-align:left"><a href="Beginner%27s%20Tutorial.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">Руководство для начинающих</a></strong>, в Руководстве пользователя VeraCrypt содержит снимки экранов и пошаговые инструкции, как
+создавать, монтировать и использовать тома VeraCrypt.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли зашифровать раздел/диск, на котором установлена Windows?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, см. раздел <a href="System%20Encryption.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Шифрование системы</a> в Руководстве пользователя VeraCrypt.</div>
+<div id="BootingHang" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong>Предварительная проверка (пре-тест) шифрования системы завершается неудачно, потому что загрузчик зависает на сообщении
+&quot;booting&quot; ("загрузка") после успешной проверки пароля. Как сделать, чтобы пре-тест прошёл успешно?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Известно два решения этой проблемы (для обоих требуется установочный диск Windows):</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<ol>
+<li>Загрузите компьютер с помощью установочного диска Windows и выберите <i>Восстановить компьютер</i>. Выберите опцию
+<i>Командная строка</i>, а когда она откроется, введите приведённые ниже команды, после чего перезапустите систему:
+<ul>
+<li>BootRec /fixmbr </li><li>BootRec /FixBoot </li></ul>
+</li><li>Удалите зарезервированный системой раздел объёмом 100 МБ в начале диска и сделайте системный раздел рядом с ним активным
+(оба действия выполняются с помощью утилиты diskpart, доступной в опции восстановления установочного диска Windows). Затем запустите
+восстановление при запуске после перезагрузки на установочном диске Windows. См. здесь подробные инструкции:
+<a href="https://www.sevenforums.com/tutorials/71363-system-reserved-partition-delete.html" target="_blank">
+https://www.sevenforums.com/tutorials/71363-system-reserved-partition-delete.html</a>
+</li></ol>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<div id="PreTestFail" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong>Предварительная проверка (пре-тест) шифрования системы завершается неудачно, хотя пароль в загрузчике был введён правильно.
+Как сделать, чтобы пре-тест прошёл успешно?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Это может быть вызвано драйвером TrueCrypt, который очищает память BIOS до того, как VeraCrypt сможет её прочитать.
+В этом случае решает проблему удаление TrueCrypt.<br>
+Это также может быть вызвано некоторыми драйверами оборудования и другим ПО, которые получают доступ к памяти BIOS.
+Универсального решения для этого не существует, пользователи, которые с этим столкнулись, должны идентифицировать
+такое ПО и удалить его из системы.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли воспроизводить видеофайлы (.avi, .mpg и т. д.) прямо с тома VeraCrypt, где они записаны?</strong></div>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, зашифрованные с помощью VeraCrypt тома ведут себя как обычные диски. Вы указываете правильный пароль
+(и/или ключевой файл) и монтируете (открываете) том VeraCrypt. Когда вы дважды щёлкаете по значку видеофайла,
+операционная система запускает ассоциированное с этим типом файлов приложение – обычно это медиапроигрываетель.
+Затем медиапроигрыватель начинает загружать маленькую начальную часть видеофайла из зашифрованного тома VeraCrypt
+в ОЗУ (оперативную память компьютера), чтобы его воспроизвести. Во время загрузки этой части VeraCrypt автоматически
+её расшифровывает (в ОЗУ), после чего расшифрованная часть видео (находящаяся в ОЗУ) воспроизводится
+медиапроигрываетелем. Пока эта часть воспроизводится, медиапроигрыватель начинает загружать другую небольшую часть
+видеофайла из зашифрованного тома VeraCrypt, и процесс повторяется.<br style="text-align:left">
+<br style="text-align:left">
+То же самое происходит, например, при записи видео: прежде чем часть видеофайла будет записана в том VeraCrypt,
+она шифруется TrueCrypt в ОЗУ, и только затем записывается на диск. Такой процесс называется шифрованием/дешифрованием
+«на лету», и он работает для файлов всех типов (не только видео).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Будет ли VeraCrypt всегда бесплатным и с открытым кодом?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, будет. Мы никогда не станем выпускать коммерческие версии VeraCrypt, поскольку уверены, что ПО для
+обеспечения безопасности должно быть с открытым исходным кодом и бесплатным.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Могу ли я оказать финансовое содействие проекту VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Можете использовать для этого кнопки пожертвования на веб-странице <a href="https://www.veracrypt.fr/en/Donation.html" target="_blank">
+https://www.veracrypt.fr/en/Donation.html</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Почему у VeraCrypt открытый исходный код? Каковы преимущества этого?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Поскольку исходный код VeraCrypt доступен всем, у независимых экспертов есть возможность проверить, что
+он не содержит никаких брешей в безопасности или потайных "лазеек". Если бы исходный код был недоступен,
+экспертам пришлось бы прибегать к обратному инжинирингу исполняемых файлов. Однако проанализировать и
+осмыслить такой полученный в результате реинжиниринга код настолько сложно, что это практически <i>невозможно</i>
+(особенно если код столь большой, как у VeraCrypt).
+<br>
+<br>
+Примечание: аналогичная проблема касается и аппаратуры для шифрования (например самошифрующихся запоминающих
+устройств). Выполнить её реинжиниринг и проверить отсутствие брешей в безопасности и потайных "лазеек" крайне сложно.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Исходный код VeraCrypt открыт, но кто-нибудь его на самом деле проверял?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. <a href="http://blog.quarkslab.com/security-assessment-of-veracrypt-fixes-and-evolutions-from-truecrypt.html" target="_blank">
+Аудит</a> проводила компания <a href="https://quarkslab.com/" target="_blank">
+Quarkslab</a>. Технический отчёт можно загрузить <a href="http://blog.quarkslab.com/resources/2016-10-17-audit-veracrypt/16-08-215-REP-VeraCrypt-sec-assessment.pdf">здесь</a>.
+Выявленные в ходе этого аудита проблемы устранены в VeraCrypt 1.19.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Так как VeraCrypt это ПО с открытым исходным кодом, независимые исследователи
+могут проверить, что исходный код не содержит никаких брешей в безопасности и "лазеек". Могут ли они также
+проверить, что официально распространяемые исполняемые файлы собраны из публично доступного исходного кода
+и не содержат никакого дополнительного кода?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, могут. Помимо исследования исходного кода, независимые эксперты могут скомпилировать исходный код и
+сравнить полученные исполняемые файлы с официальными. При этом возможны некоторые расхождения (например,
+метки времени или встроенные цифровые подписи), но эти различия можно проанализировать и убедиться, что
+они несут никакого вредоносного кода.
+</div>
+<div id="UsbFlashDrive" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Как использовать VeraCrypt на USB-флешке? </strong>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Есть три варианта:</div>
+<ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Зашифровать весь флеш-накопитель USB. Однако в этом случае с него не удастся запускать VeraCrypt.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Создать два или более разделов на флеш-накопителе USB. Оставьте первый раздел незашифрованным и зашифруйте другие
+разделы. Таким образом, на первом разделе можно будет хранить VeraCrypt, чтобы запускать его прямо с флешки.<br style="text-align:left">
+Примечание: Windows может получать доступ только к первичному разделу флеш-накопителя USB, тем не менее
+дополнительные разделы остаются доступными через VeraCrypt.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Создать на флеш-накопителе USB файловый контейнер VeraCrypt (о том, как это сделать, см. в главе
+<strong style="text-align:left"><a href="Beginner%27s%20Tutorial.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Руководство для начинающих</a></strong> в
+<a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>). Если оставить на флеш-накопителе достаточно места (выбрав соответствующий
+размер контейнера VeraCrypt), то можно будет также хранить в нём программу VeraCrypt (<i>рядом</i> с контейнером, а
+<em style="text-align:left">не</em> в контейнере) и оттуда же её запускать (cм. также главу
+<a href="Portable%20Mode.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Портативный режим</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>). </li></ol>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Шифрует ли VeraCrypt также имена файлов и папок?
+</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Вся файловая система внутри тома VeraCrypt зашифрована (включая имена файлов, имена папок и содержимое
+каждого файла). Это относится к обоим типам томов VeraCrypt &ndash; к файлам-контейнерам (виртуальным
+дискам VeraCrypt) и к зашифрованным с помощью VeraCrypt разделам/устройствам.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Использует ли VeraCrypt распараллеливание?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Увеличение скорости шифрования/дешифрования прямо пропорционально числу ядер/процессоров в компьютере. См. подробности в главе
+<a href="Parallelization.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Распараллеливание</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Скорость чтения и записи на зашифрованном томе/диске такая же, как на диске без шифрования?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, поскольку VeraCrypt использует конвейеризацию и распараллеливание. См. подробности в главах
+<a href="Pipelining.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Конвейеризация</a> и <a href="Parallelization.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Распараллеливание</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Поддерживает ли VeraCrypt аппаратное ускорение шифрования?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. См. подробности в главе <a href="Hardware%20Acceleration.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Аппаратное ускорение</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли загружать Windows, установленную в скрытом томе VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, можно. См. подробности в разделе <a href="Hidden%20Operating%20System.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Скрытая операционная система</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Смогу ли я смонтировать свой том (контейнер) VeraCrypt на любом компьютере?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, <a href="VeraCrypt%20Volume.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+тома VeraCrypt</a> не зависят от операционной системы. Том VeraCrypt можно смонтировать на любом компьютере,
+на котором способен работать VeraCrypt (см. также вопрос <em style="text-align:left">Можно ли использовать
+VeraCrypt в Windows, если у меня нет прав администратора?</em>).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли извлекать или выключать устройство с «горячим» подключением (например,
+USB-флешку или жёсткий диск с интерфейсом USB), когда на нём находится смонтированный том VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Прежде чем отсоединить или выключить такое устройство, сначала всегда следует в VeraCrypt размонтировать том,
+а затем выполнить операцию <em style="text-align:left">Извлечь</em>, если это доступно (щёлкнув правой кнопкой
+мыши по устройству в списке <em style="text-align:left">Компьютер</em> или <em style="text-align:left">Мой компьютер</em>),
+либо воспользоваться функцией <em style="text-align:left">Безопасное извлечение устройства</em> (она встроена в Windows и
+доступна в области уведомлений на панели задач). Иначе возможна потеря данных.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Что такое «скрытая операционная система»?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. раздел <a href="Hidden%20Operating%20System.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Скрытая операционная система</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Что такое «правдоподобное отрицание наличия шифрования»?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. главу <a href="Plausible%20Deniability.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Правдоподобное отрицание наличия шифрования</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div id="SystemReinstallUpgrade" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Смогу ли я монтировать свой раздел/контейнер VeraCrypt после того, как переустановлю или обновлю операционную систему?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, <a href="VeraCrypt%20Volume.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+тома VeraCrypt</a> не зависят от операционной системы. При этом, однако, нужно убедиться, что программа установки
+вашей операционной системы не выполняет форматирование раздела, где находится том VeraCrypt.<br style="text-align:left">
+<br style="text-align:left">
+Примечание: если системный раздел/диск зашифрован, и вы хотите переустановить или обновить Windows, сначала его нужно расшифровать (выберите
+<em style="text-align:left">Система</em> &gt; <em style="text-align:left">Окончательно расшифровать системный
+раздел/диск</em>). В то же время, запущенную операционную систему можно
+<em style="text-align:left">обновлять</em> (устанавливать обновления безопасности, пакеты обновления и т. п.)
+без всяких проблем, даже если системный раздел/диск зашифрован.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли обновлять VeraCrypt с более старой версии до новой без каких-либо проблем?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Как правило, да. Тем не менее, перед обновлением ознакомьтесь с <a href="Release%20Notes.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+примечаниями</a> ко всем версиям VeraCrypt, выпущенным после вашей. Если имеются известные проблемы или несовместимости, касающиеся обновления вашей версии до более новой, они будут там указаны.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли обновлять VeraCrypt, если зашифрован системный раздел/диск, или нужно сначала его расшифровать?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Как правило, вы можете обновлять программу до самой новой версии без дешифрования системного раздела/диска
+(просто запустите программу установки VeraCrypt – и она автоматически обновит VeraCrypt в вашей системе).
+Тем не менее, перед обновлением ознакомьтесь с
+<a href="Release%20Notes.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+примечаниями</a> ко всем версиям VeraCrypt, выпущенным после вашей. Если имеются известные проблемы или несовместимости, касающиеся обновления вашей версии до более новой, они будут там указаны. Обратите внимание, что данный ответ адресован и пользователям <a href="Hidden%20Operating%20System.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+скрытых операционных систем</a>. Также примите к сведению, что если системный раздел/диск зашифрован, то устанавливать
+более <em style="text-align:left">старую</em> версию VeraCrypt нельзя.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Я использую предзагрузочную аутентификацию. Можно ли сделать, чтобы при включении компьютера не было видно, что я использую VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Чтобы это сделать, загрузите зашифрованную систему, запустите VeraCrypt, выберите <em style="text-align:left">
+Настройки</em> &gt; <em style="text-align:left">Шифрование системы</em>, включите опцию <em style="text-align:left">Пустой экран аутентификации</em>
+и нажмите <em style="text-align:left">OK</em>. После этого загрузчик VeraCrypt при включении компьютера
+не будет выводить на экран никакого текста (даже если введён неправильный пароль). При вводе пароля будет казаться,
+что компьютер &quot;завис&quot;. При этом, однако, важно помнить, что если неприятелю доступно для анализа
+содержимое жёсткого диска, то он сможет обнаружить и наличие загрузчика VeraCrypt.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Я использую предзагрузочную аутентификацию. Можно ли настроить загрузчик VeraCrypt, чтобы
+он выводил на экран только обманное сообщение об ошибке?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Чтобы это сделать, загрузите зашифрованную систему, запустите VeraCrypt, выберите <em style="text-align:left">
+Настройки</em> &gt; <em style="text-align:left">Шифрование системы</em>, включите опцию <em style="text-align:left">Пустой экран аутентификации</em>
+и введите в соответствующем поле обманное сообщение об ошибке (например, можно ввести сообщение
+&quot;<em style="text-align:left">Missing operating system</em>&quot;, которое обычно выводит загрузчик Windows,
+если ему не удаётся обнаружить загрузочный раздел Windows). При этом, однако, важно помнить, что если неприятелю доступно для анализа
+содержимое жёсткого диска, то он сможет обнаружить и наличие загрузчика VeraCrypt.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли настроить VeraCrypt так, чтобы при каждом старте Windows выполнялось
+автоматическое монтирование несистемного тома VeraCrypt, пароль для которого такой же, как для системного
+раздела/диска (т. е. пароль предзагрузочной аутентификации)?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Для этого сделайте следующее:</div>
+<ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Смонтируйте том (на ту букву диска, на которую вы хотите, чтобы он монтировался каждый раз).
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Щёлкните правой кнопкой мыши на томе в списке дисков в главном окне VeraCrypt и выберите
+<em style="text-align:left">Добавить в системные избранные</em>.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+В появившемся окне упорядочивания системных избранных томов включите опцию
+<em style="text-align:left">Монтировать системные избранные тома при старте Windows</em> и нажмите
+<em style="text-align:left">OK</em>. </li></ol>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. подробности в главе <a href="System%20Favorite%20Volumes.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Системные избранные тома</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли автоматически монтировать том при каждом входе в Windows?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Для этого сделайте следующее:</div>
+<ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Смонтируйте том (на ту букву диска, на которую вы хотите, чтобы он монтировался каждый раз).
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Щёлкните правой кнопкой мыши на томе в списке дисков в главном окне VeraCrypt и выберите
+<em style="text-align:left">Добавить в избранные</em>.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+В появившемся окне <a href="Favorite%20Volumes.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Избранные тома</a> включите опцию <em style="text-align:left">Монтировать выбранный том при входе в систему</em>
+и нажмите <em style="text-align:left">OK</em>. </li></ol>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+После этого при каждом входе в Windows вам будет предлагаться указать пароль тома (и/или ключевые файлы),
+и в случае правильного ввода том будет смонтирован.<br style="text-align:left">
+<br style="text-align:left">
+Если тома на основе раздела/устройства, и вам не нужно монтировать их всякий раз только на какие-то конкретные
+буквы дисков, то можно сделать следующее:</div>
+<ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Выберите <em style="text-align:left">Настройки</em> &gt; <em style="text-align:left">
+Параметры.</em> Появится окно <em style="text-align:left">Параметры</em>.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+В группе <em style="text-align:left">Действия при входе в Windows</em>, включите опцию
+<em style="text-align:left">Монтировать все тома на устройствах</em> и нажмите <em style="text-align:left">OK</em>. </li></ol>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Примечание: VeraCrypt не будет спрашивать пароль, если вы включили кэширование пароля
+<a href="System%20Encryption.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+предзагрузочной аутентификации</a> (<em style="text-align:left">Настройки</em> &gt; <em style="text-align:left">Шифрование системы</em>),
+а у томов такой же пароль, как у системного раздела/диска.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли автоматически монтировать том при подключении к компьютеру
+устройства, на котором находится этот том?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Например, если вы храните контейнер VeraCrypt на USB-флешке и хотите, чтобы он автоматически монтировался
+при вставке флешки в порт USB, сделайте следующее:</div>
+<ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Смонтируйте том (на ту букву диска, на которую вы хотите, чтобы он монтировался каждый раз).
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Щёлкните правой кнопкой мыши на томе в списке дисков в главном окне VeraCrypt и выберите
+<em style="text-align:left">Добавить в избранные</em>.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+В появившемся окне <a href="Favorite%20Volumes.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Избранные тома</a> включите опцию <em style="text-align:left">Монтировать выбранный том при подключении устройства, на котором он расположен</em>
+и нажмите <em style="text-align:left">OK</em>. </li></ol>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+После этого при каждой вставке флешки в USB-разъём вам будет предлагаться указать пароль тома (и/или ключевые файлы)
+(если только он уже не был помещён в кэш), и в случае правильного ввода том будет смонтирован.<br style="text-align:left">
+<br style="text-align:left">
+Примечание: VeraCrypt не будет спрашивать пароль, если вы включили кэширование пароля
+<a href="System%20Encryption.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+предзагрузочной аутентификации</a> (<em style="text-align:left">Настройки</em> &gt; <em style="text-align:left">Шифрование системы</em>),
+а у тома такой же пароль, как у системного раздела/диска.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли поместить в кэш (запомнить) пароль предзагрузочной аутентификации,
+чтобы его можно было использовать для монтирования несистемных томов в течение данного сеанса работы?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Выберите <em style="text-align:left">Настройки</em> &gt; <em style="text-align:left">Шифрование системы</em>
+и включите опцию <em style="text-align:left">Кэшировать пароль в памяти драйвера</em>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<a name="notraces" style="text-align:left; color:#0080c0; text-decoration:none"></a><br style="text-align:left">
+<strong style="text-align:left">Я живу в стране, где в отношении её граждан нарушаются основные права человека.
+Существует ли возможность использовать VeraCrypt, не оставляя никаких ‘следов’ в незашифрованной Windows?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Для этого нужно запускать VeraCrypt в <a href="Portable%20Mode.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+переносном (portable) режиме</a> в среде <a href="http://www.nu2.nu/pebuilder/" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+BartPE</a> или аналогичном окружении. BartPE (расшифровывается как &quot;Bart's Preinstalled Environment&quot;),
+в действительности представляет собой операционную систему Windows, подготовленную таким образом, чтобы она
+целиком находилась на CD/DVD и оттуда же загружалась (реестр, временные файлы и т. п. хранятся в ОЗУ – жёсткий
+диск при этом не используется вовсе и даже может отсутствовать). Чтобы преобразовать установочный компакт-диск
+Windows XP в BartPE CD, можно воспользоваться бесплатным конструктором
+<a href="http://www.nu2.nu/pebuilder/" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Bart's PE Builder</a>. Для BartPE даже не требуется никакого особого модуля (плагина) VeraCrypt. Сделайте следующее:</div>
+<ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Создайте BartPE CD и загрузитесь с него. (Внимание: все следующие шаги должны выполняться из среды BartPE.)
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Загрузите самораспаковывающийся пакет VeraCrypt на RAM-диск (который BartPE создаёт автоматически).
+<br style="text-align:left">
+<br style="text-align:left">
+<strong style="text-align:left">Примечание</strong>: если неприятель имеет возможность перехватывать данные,
+которые вы отправляете или получаете через Интернет, и вам нужно, чтобы он не знал, что вы загружали VeraCrypt,
+выполняйте загрузку через
+<a href="https://geti2p.net/en/" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+<strong style="text-align:left">I2P</strong></a>, <a href="http://www.torproject.org/" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+<strong style="text-align:left">Tor</strong></a> или другие аналогичные анонимайзеры работы в сети.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Проверьте цифровые подписи у загруженного файла (см. подробности <a href="Digital%20Signatures.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+здесь</a>). </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Запустите загруженный файл и выберите на второй странице мастера установки <em style="text-align:left">Извлечь</em>
+(вместо <em style="text-align:left">Установить</em>). Извлеките содержимое на RAM-диск.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Запустите файл <em style="text-align:left">VeraCrypt.exe</em> с RAM-диска. </li></ol>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Примечание: в качестве альтернативного варианта можно создать скрытую операционную систему (см. раздел
+<a href="Hidden%20Operating%20System.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Скрытая операционная система</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>). См. также главу <a href="Plausible%20Deniability.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Правдоподобное отрицание наличия шифрования</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли шифровать системный раздел/диск, если у меня нет клавиатуры со стандартной раскладкой США?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, VeraCrypt поддерживает все раскладки клавиатуры. Из-за требований BIOS пароль для предварительной загрузки
+вводится с использованием американской раскладки клавиатуры. Во время процесса шифрования системы VeraCrypt
+автоматически и прозрачно переключает клавиатуру на американскую раскладку, чтобы гарантировать, что введённый
+пароль будет соответствовать паролю, введённому в режиме предварительной загрузки. Таким образом, чтобы избежать
+ошибок в пароле, необходимо ввести пароль, используя те же клавиши, что и при создании зашифрованной системы.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли сохранять данные в разделе с обманной системой, не рискуя повредить раздел со скрытой системой?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Вы можете спокойно записывать данные в раздел с обманной системой безо всякого риска повредить скрытый том
+(потому что обманная система <em style="text-align:left">не</em> установлена в том же разделе, где установлена
+скрытая система. См. подробности в главе
+<a href="Hidden%20Operating%20System.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Скрытая операционная система</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли использовать VeraCrypt в Windows, если у меня нет прав администратора?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. главу <a href="Using%20VeraCrypt%20Without%20Administrator%20Privileges.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">Использование VeraCrypt без прав администратора</a>
+ в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Сохраняет ли VeraCrypt пароли на диске?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Нет.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Как VeraCrypt проверяет, что введённый пароль – правильный?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. раздел <a href="Encryption%20Scheme.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Схема шифрования</a> (глава <a href="Technical%20Details.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Технические подробности</a>) в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div id="encrypt-in-place" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли зашифровать раздел/диск без потери находящихся там данных?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, но должны быть соблюдены следующие условия:</div>
+<ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Если вы хотите зашифровать весь системный диск (который может содержать несколько разделов) или системный раздел
+(другими словами, если нужно зашифровать диск или раздел, где установлена Windows), вы можете это сделать при
+условии, что используете Windows XP или более новую версию Windows (например Windows 7) <span style="text-align:left; font-size:10px; line-height:12px">
+(выберите <em style="text-align:left">Система</em> &gt; <em style="text-align:left">Зашифровать системный
+раздел/диск</em> и следуйте инструкциям мастера)</span>.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Если вы хотите зашифровать несистемный раздел «на месте», то можете это сделать при условии, что он содержит
+файловую систему NTFS и что вы используете Windows Vista или более новую версию Windows (например Windows 7)
+<span style="text-align:left; font-size:10px; line-height:12px">(выберите <em style="text-align:left">Тома</em> &gt;
+<em style="text-align:left">Создать том</em> &gt; <em style="text-align:left">Зашифровать раздел или диск без
+системы</em> &gt; <em style="text-align:left">Обычный том VeraCrypt</em> &gt; <em style="text-align:left">Выбрать
+устройство</em> &gt; <em style="text-align:left">Зашифровать раздел на  месте</em> и следуйте инструкциям мастера)</span>.
+</li></ul>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли использовать VeraCrypt, не устанавливая в систему?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, см. главу <a href="Portable%20Mode.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Переносной (портативный) режим</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<a name="tpm" style="text-align:left; color:#0080c0; text-decoration:none"></a><br style="text-align:left">
+<strong style="text-align:left">Некоторые программы шифрования для предотвращения атак применяют криптопроцессор TPM.
+Будет ли его также использовать и VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Нет. Такие программы используют TPM для защиты против атак, при которых <em style="text-align:left">
+необходимо</em>, чтобы неприятель имел права администратора или физический доступ к компьютеру, и неприятелю нужно,
+чтобы после его доступа вы воспользовались компьютером.
+<em style="text-align:left">Однако если удовлетворено любое из этих условий, защитить компьютер в действительности
+невозможно</em> (см. ниже), поэтому нужно прекратить им пользоваться (а не полагаться на TPM).
+<br style="text-align:left">
+<br style="text-align:left">
+Если неприятель обладает правами администратора, он может, например, выполнить сброс TPM, захватить
+содержимое ОЗУ (с хранящимися там мастер-ключами) или файлов в смонтированных томах VeraCrypt (расшифрованных
+«на лету»), которое затем может быть переправлено неприятелю через Интернет или сохранено на незашифрованном
+локальном диске (с которого неприятель считает эту информацию, когда получит физический доступ к компьютеру).
+<br style="text-align:left">
+<br style="text-align:left">
+Если у неприятеля есть физический доступ к аппаратной части компьютера (и вы пользовались ПК после того,
+как с ним имел дело неприятель), он может, например, внедрить в него вредоносный компонент (скажем,
+аппаратный модуль слежения за нажатием клавиш на клавиатуре), который будет захватывать пароли,
+содержимое ОЗУ (с хранящимися там мастер-ключами) или файлов в смонтированных томах VeraCrypt
+(расшифрованных «на лету»), после чего пересылать все эти данные неприятелю по Интернету или
+сохранять на незашифрованном локальном диске (с которого неприятель сможет считать их, когда 
+нова получит физический доступ к компьютеру). <br style="text-align:left">
+<br style="text-align:left">
+Единственная вещь, которую TPM почти способен гарантировать, – создание ложного чувства безопасности
+(одно только имя – &quot;Trusted Platform Module&quot;, Модуль доверенной платформы – вводит в заблуждение
+и создаёт ложное чувство безопасности). Для настоящей защиты TPM в действительности излишен (а внедрение
+избыточных функций, как правило, ведёт к созданию так называемого bloatware – функционально избыточного
+и ресурсоёмкого ПО). <br style="text-align:left">
+<br style="text-align:left">
+См. подробности в разделах <a title="Physical%20Security&quot;" style="text-align:left; color:#0080c0; text-decoration:none">
+Физическая безопасность</a> и <a href="Malware.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Вредоносное ПО (Malware)</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Нужно ли размонтировать тома VeraCrypt перед завершением работы или перезагрузкой Windows?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Нет. При завершении работы или перезагрузке системы VeraCrypt размонтирует все свои смонтированные тома автоматически.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Какой тип тома VeraCrypt лучше – раздел или файловый контейнер?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<a href="VeraCrypt%20Volume.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">Файлы-контейнеры</a>
+это обычные файлы, поэтому с ними можно обращаться точно так же, как с любыми обычными файлами (например,
+как и другие файлы, их можно перемещать, переименовывать и удалять). <a href="VeraCrypt%20Volume.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Разделы/диски</a> могут быть лучше в плане производительности. Примите к сведению, что если контейнер
+сильно фрагментирован, операции чтения и записи с ним могут выполняться значительно дольше. Чтобы решить
+эту проблему, дефрагментируйте файловую систему, в которой хранится этот контейнер (при размонтированном
+томе VeraCrypt).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Как лучше выполнять резервное копирование (backup) томов VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. главу <a href="How%20to%20Back%20Up%20Securely.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+О безопасном резервном копировании</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Что произойдёт, если я отформатирую раздел VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. вопрос <em style="text-align:left"><a href="#changing-filesystem" style="text-align:left; color:#0080c0; text-decoration:none">Можно ли
+изменить файловую систему в зашифрованном томе?</a></em> ниже.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left"><a name="changing-filesystem" style="text-align:left; color:#0080c0; text-decoration:none"></a>Можно ли
+изменить файловую систему в зашифрованном томе?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, будучи смонтированными, тома VeraCrypt могут быть отформатированы в FAT12, FAT16, FAT32, NTFS или
+в любую другую файловую систему. Тома VeraCrypt ведут себя как обычные дисковые устройства, поэтому можно
+щёлкнуть правой кнопкой мыши по значку устройства (например, в окне <em style="text-align:left">Компьютер</em>
+или <em style="text-align:left">Мой компьютер</em>) и выбрать пункт <em style="text-align:left">Форматировать</em>.
+Текущее содержимое тома будет при этом потеряно, но сам том останется полностью зашифрованным. Если вы
+отформатируете зашифрованный с помощью VeraCrypt раздел, когда том на основе этого раздела не смонтирован,
+то этот том будет уничтожен, а раздел перестанет быть зашифрованным (он станет пустым).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли смонтировать контейнер VeraCrypt, находящийся на CD или DVD?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. Однако если требуется монтировать том VeraCrypt на не допускающем записи носителе (таком, как CD или DVD)
+в среде Windows 2000, файловой системой внутри тома VeraCrypt должна быть FAT (Windows 2000 не может
+монтировать файловую систему NTFS на носителях, доступных только для чтения).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли изменить пароль для скрытого тома?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, диалоговое окно смены пароля работает как для обычных, так и для
+<a href="Hidden%20Volume.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+скрытых томов</a>. Просто введите в этом окне пароль для скрытого тома в поле <i>Текущий пароль</i>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px; font-size:10px; line-height:12px">
+Замечание: сначала VeraCrypt пытается расшифровать <a href="VeraCrypt%20Volume%20Format%20Specification.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+заголовок</a> обычного тома, и если это не удаётся, то пытается расшифровать область внутри тома, где может
+находиться заголовок скрытого тома (если внутри есть скрытый том). Если попытка успешна, пароль изменяется
+у скрытого тома. (При обеих попытках используется пароль, введённый в поле <i>Текущий пароль</i>.)</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Как записать на DVD контейнер VeraCrypt размером больше 2 гигабайт?</strong><br style="text-align:left">
+<br style="text-align:left">
+ПО для записи DVD должно позволять выбирать формат DVD. Выберите формат UDF (в формате ISO файлы размером
+больше 2 ГиБ не поддерживаются).</div>
+<div id="disk_defragmenter" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли использовать утилиты <em style="text-align:left">chkdsk</em>,
+дефрагментатор дисков и т. п. для данных, находящихся на смонтированном томе VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, тома VeraCrypt ведут себя как реальные физические дисковые устройства, поэтому с содержимым смонтированного
+тома VeraCrypt можно использовать любые программы для проверки, исправления и дефрагментации файловых систем.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Поддерживает ли VeraCrypt 64-разрядные версии Windows?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, поддерживает.<br>
+<span style="text-align:left; font-size:10px; line-height:12px">Примечание: 64-разрядные версии Windows
+загружают только те драйверы, которые имеют цифровую подпись с цифровым сертификатом, выданным центром
+сертификации, утверждённым для выдачи сертификатов подписи кода режима ядра. VeraCrypt соответствует этому
+требованию (драйвер VeraCrypt имеет <a href="Digital%20Signatures.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+цифровую подпись</a> с цифровым сертификатом IDRIX, выданным удостоверяющим центром Thawte).</span></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли монтировать тома VeraCrypt в Windows, Mac OS X (macOS) и Linux?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, тома VeraCrypt полностью кроссплатформенные.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Как удалить VeraCrypt в Linux?</strong>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Чтобы удалить VeraCrypt в Linux, выполните следующую команду в Терминале от имени пользователя root:
+<strong>veracrypt-uninstall.sh</strong>. В Ubuntu используйте &quot;<strong>sudo veracrypt-uninstall.sh</strong>&quot;.</div>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли где-нибудь ознакомиться со списком всех ОС, поддерживаемых VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, см. раздел <a href="Supported%20Operating%20Systems.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Поддерживаемые операционные системы</a> в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли устанавливать приложения в том VeraCrypt и запускать их оттуда?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Что произойдёт, если повредится часть тома VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Один повреждённый бит в зашифрованных данных обычно вызывает повреждение всего блока зашифрованного текста,
+в котором он расположен. В VeraCrypt используются блоки зашифрованного текста размером 16 байт (то есть 128 бит).
+Применающийся в VeraCrypt <a href="Modes%20of%20Operation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+режим работы</a> гарантирует, что если данные повреждены в пределах одного блока, остальные блоки это
+не затронет. См. также вопрос <em style="text-align:left">Что делать, если в томе VeraCrypt повреждена зашифрованная файловая система?</em> ниже.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Что делать, если в томе VeraCrypt повреждена зашифрованная файловая система?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Файловая система внутри тома VeraCrypt может повредиться так же, как и любая другая обычная незашифрованная
+файловая система. Если это произошло, для её исправления можно воспользоваться соответствующими средствами,
+входящими в состав операционной системы. В Windows это утилита <em style="text-align:left">chkdsk</em>.
+В VeraCrypt реализовано её простое применение: щёлкните правой кнопкой мыши по смонтированному тому в главном
+окне VeraCrypt (в списке дисков) и выберите в контекстном меню пункт <em style="text-align:left">Исправить файловую систему</em>.</div>
+<div id="reset_volume_password" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Мы используем VeraCrypt в корпоративном окружении/на предприятии. Есть ли
+способ для администратора сбросить пароль от тома или предзагрузочной аутентификации в случае, если
+пользователь его забыл (или потерял ключевой файл)?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да. В VeraCrypt не встроено никаких &quot;лазеек&quot; (бэкдоров). Однако сбросить пароли/<a href="Keyfiles.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">ключевые файлы</a> томов и пароли
+<a href="System%20Encryption.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+предзагрузочной аутентификации</a> можно. После того, как вы создадите том, сохраните резервную копию его заголовка в файле (выберите
+<em style="text-align:left">Сервис</em> -&gt; <em style="text-align:left">Создать резервную копию заголовка тома</em>)
+до того, как позволите 
+<a href="Using%20VeraCrypt%20Without%20Administrator%20Privileges.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+пользователю без прав администратора</a> начать работать с этим томом. Обратите внимание: в <a href="VeraCrypt%20Volume%20Format%20Specification.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+заголовке тома</a> (зашифрованного с помощью <a href="Header%20Key%20Derivation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+ключа заголовка</a>, сформированного из пароля/ключевого файла) содержится <a href="Encryption%20Scheme.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+мастер-ключ</a>, которым зашифрован том. Затем попросите пользователя выбрать пароль и установите его для
+него/неё (<em style="text-align:left">Тома</em> -&gt;
+<em style="text-align:left">Изменить пароль тома</em>) или сгенерируйте для пользователя ключевой файл.
+После этого вы можете разрешить пользователю начать работать с томом и изменять пароль/ключевые файлы без
+вашего участия/разрешения. Теперь если пользователь забудет свой пароль или потеряет ключевой файл, вы сможете
+сбросить пароль/ключевые файлы тома в ваши исходные администраторские пароль/ключевые файлы, восстановив
+заголовок тома из файла с резервной копией (<em style="text-align:left">Сервис</em> -&gt;
+<em style="text-align:left">Восстановить заголовок тома</em>). <br style="text-align:left">
+<br style="text-align:left">
+Аналогичным образом можно сбросить пароль к <a href="System%20Encryption.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+предзагрузочной аутентификации</a><a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">.
+</a>Чтобы создать резервную копию данных мастер-ключа (которая будет сохранена на <a href="VeraCrypt%20Rescue%20Disk.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+диске восстановления VeraCrypt</a> и зашифрована вашим паролем администратора), выберите <em style="text-align:left">Система</em> &gt; <a href="VeraCrypt%20Rescue%20Disk.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none"><em style="text-align:left.html">Создать
+ диск восстановления</em></a>. Чтобы установить пользовательский пароль <a href="System%20Encryption.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+предзагрузочной аутентификации</a>, выберите <em style="text-align:left">Система</em> &gt; <em style="text-align:left">Изменить пароль</em>.
+Чтобы восстановить ваш пароль администратора, загрузитесь с диска восстановления VeraCrypt, выберите <em style="text-align:left">Repair
+ Options</em> &gt; <em style="text-align:left">Restore key data</em> и введите свой пароль администратора.
+<br style="text-align:left">
+<span style="text-align:left; font-size:10px; line-height:12px">Примечание: записывать каждый ISO-образ
+<a href="VeraCrypt%20Rescue%20Disk.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+диска восстановления VeraCrypt</a> на CD/DVD не требуется. Можно завести централизованное хранилище ISO-образов
+для всех рабочих станций (вместо хранилища дисков CD/DVD). Подробности см. в разделе
+<a href="Command%20Line%20Usage.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Использование в командной строке</a> (опция <em style="text-align:left">/noisocheck</em>).</span></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Можно ли нашей коммерческой компании использовать VeraCrypt бесплатно?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+При условии, что выполняются все условия <a href="VeraCrypt%20License.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Лицензии VeraCrypt</a>, вы можете устанавливать и использовать VeraCrypt бесплатно на любом количестве ваших компьютеров.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Мы совместно используем том по сети. Есть ли способ автоматически восстанавливать
+общий сетевой ресурс при перезапуске системы?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. главу <a href="Sharing%20over%20Network.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Общий доступ по сети</a> в
+<a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Возможен ли одновременный доступ к одному и тому же тому VeraCrypt из
+нескольких операционных систем (например, к общему том по сети)?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. главу <a href="Sharing%20over%20Network.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Общий доступ по сети</a> в
+<a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Может ли пользователь получить доступ к своему тому VeraCrypt через сеть?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. главу <a href="Sharing%20over%20Network.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Общий доступ по сети</a> в
+<a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>.</div>
+<div id="non_system_drive_letter" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">После шифрования несистемного раздела его исходная буква диска по-прежнему
+видна в окне <span style="text-align:left; font-style:italic">Мой компьютер</span>. Если дважды щёлкнуть мышью по этой букве диска, Windows выдаёт запрос на форматирование этого диска. Можно ли как-нибудь скрыть или высвободить эту букву диска?</strong>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, можно. Чтобы высвободить букву диска, сделайте следующее:</div>
+<ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Щёлкните правой кнопкой мыши по значку <em style="text-align:left">Компьютер</em> (или <span style="text-align:left; font-style:italic">Мой компьютер</span>) на рабочем столе или в меню "Пуск" и выберите пункт 
+<span style="text-align:left; font-style:italic">Управление</span>. Появится окно <span style="text-align:left; font-style:italic">Управление компьютером</span>.
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+В списке слева выберите <span style="text-align:left; font-style:italic">Управление дисками</span> (в подветви
+<span style="text-align:left; font-style:italic">Запоминающие устройства</span>). </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Щёлкните правой кнопкой мыши по зашифрованному разделу/устройству и выберите <span style="text-align:left; font-style:italic">
+Изменить букву диска или путь к диску</span>. </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Нажмите <span style="text-align:left; font-style:italic">Удалить</span>. </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Если Windows попросит подтвердить действие, нажмите <span style="text-align:left; font-style:italic">
+Да</span>. </li></ol>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left"><br style="text-align:left">
+Когда я подключаю к компьютеру зашифрованную USB-флешку, Windows предлагает её отформатировать. Можно ли
+сделать, чтобы этот запрос не появлялся?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, можно, но потребуется удалить присвоенную этому устройству букву диска. О том, как это сделать, см. выше
+вопрос <em style="text-align:left">После шифрования несистемного раздела его исходная буква диска по-прежнему видна в окне <i>Мой компьютер</i>.</em></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left"><br style="text-align:left">
+Как удалить или отменить шифрование, если оно мне больше не нужно? Как окончательно расшифровать том?
+</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. раздел <a href="Removing%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Как удалить шифрование</a> в
+<a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Что изменится, если включить параметр <em style="text-align:left">Монтировать тома как сменные носители</em>?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. раздел <a href="Removable%20Medium%20Volume.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Том, смонтированный как сменный носитель</a> в
+<a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+Руководстве пользователя VeraCrypt</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Доступна ли онлайн-документация для загрузки в виде одного файла?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Да, документация содержится в файле <em style="text-align:left">VeraCrypt User Guide.chm</em>, включённом
+в официальный установщик VeraCrypt для Windows. Вы также можете скачать файл CHM по ссылке на главной странице
+<a href="https://www.veracrypt.fr/en/Downloads.html" target="_blank">https://www.veracrypt.fr/en/downloads/</a>.
+Обратите внимание, что вам
+<em style="text-align:left">не</em> нужно устанавливать VeraCrypt, чтобы получить документацию в файле CHM.
+Просто запустите самораспаковывающийся установочный пакет и затем на втором экране мастера установки VeraCrypt
+выберите <em style="text-align:left">Извлечь</em> (вместо <em style="text-align:left">
+Установить</em>). Также обратите внимание, что когда вы <em style="text-align:left">устанавливаете</em> VeraCrypt,
+документация в формате CHM автоматически копируется в папку, в которую установлена программа, и она становится
+доступной через пользовательский интерфейс VeraCrypt (по нажатию F1 или при выборе в меню
+<em style="text-align:left">Справка</em> &gt; <em style="text-align:left">Руководство пользователя</em>).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Нужно ли «затирать» свободное место и/или файлы в томе VeraCrypt?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<span style="text-align:left; font-size:10px; line-height:12px">Примечание: &quot;затереть&quot; (wipe) = надёжно стереть;
+перезаписать конфиденциальные данные, чтобы сделать их невосстановимыми.
+</span><br style="text-align:left">
+<br style="text-align:left">
+Если вы полагаете, что неприятель сможет расшифровать том (например, вынудив вас сообщить пароль), тогда ответ – да.
+В противном случае в этом нет необходимости, так как том полностью зашифрован.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+<strong style="text-align:left">Как VeraCrypt определяет алгоритм, с помощью которого зашифрован том?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. раздел <a href="Encryption%20Scheme.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Схема шифрования</a> (глава <a href="Technical%20Details.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Технические подробности</a>) в <a href="https://www.veracrypt.fr/en/Documentation.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none">
+документации</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Как выполнить встроенное резервное копирование Windows на томе VeraCrypt?
+Том VeraCrypt не отображается в списке доступных путей резервного копирования.<br>
+</strong>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Встроенная утилита резервного копирования Windows ищет только физические диски, поэтому не отображает тома VeraCrypt.
+Тем не менее, вы всё равно можете сделать резервную копию тома VeraCrypt, используя хитрость: активируйте общий
+доступ к тому VeraCrypt через интерфейс Проводника (разумеется, при этом нужно поставить правильное разрешение,
+чтобы избежать несанкционированного доступа), а затем выберите опцию &quot;Удалить общую папку (Remote shared folder)&quot;
+(конечно, она не удалённая, но Windows нужен сетевой путь). Там вы можете ввести путь к общему диску (пример: \\ServerName\sharename),
+и резервное копирование будет настроено правильно.</div>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Уязвимо ли используемое в VeraCrypt шифрование для квантовых атак?</strong>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+VeraCrypt использует для шифрования блочные шифры (AES, Serpent, Twofish). Квантовые атаки на эти блочные
+шифры – это просто более быстрый метод перебора, поскольку наиболее известная атака на эти алгоритмы – полный
+перебор (атаки на связанные ключи не имеют отношения к нашему случаю, потому что все ключи случайны и независимы
+друг от друга).<br>
+Поскольку VeraCrypt всегда использует 256-битные случайные и независимые ключи, мы уверены в 128-битном уровне
+защиты от квантовых алгоритмов, что делает шифрование VeraCrypt невосприимчивым к таким атакам.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong>Как сделать том VeraCrypt доступным для индексации поиска Windows?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Чтобы иметь возможность индексировать том VeraCrypt с помощью поиска Windows, том должен быть смонтирован
+во время загрузки (быть системным избранным томом), либо службы поиска Windows должны быть перезапущены
+после монтирования тома. Это необходимо, поскольку поиск Windows может индексировать только те диски,
+которые доступны при его запуске.</div>
+ <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong>При монтировании файлового контейнера VeraCrypt в macOS возникает ошибка "Операция не разрешена" ("Operation not permitted"). Как решить эту проблему?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+
+<p>Об этой специфической ошибке, которая появляется в виде "Operation not permitted: /var/folders/w6/d2xssyzx.../T/.veracrypt_aux_mnt1/control VeraCrypt::File::Open:232", сообщают некоторые пользователи. Это результат того, что macOS не предоставила VeraCrypt необходимых разрешений. Вот пара способов, которые вы можете попробовать:</p>
+
+<ul>
+<li>А. Предоставление VeraCrypt полного доступа к диску:
+<p>
+<ol>
+    <li>Перейдите в <code>Apple Menu</code> > <code>System Settings</code>.</li>
+    <li>Щёлкните по вкладке <code>Privacy & Security</code>.</li>
+    <li>Прокрутите экран вниз и выберите <code>Full Disk Access</code>.</li>
+    <li>Нажмите кнопку "<code>+</code>", перейдите в папку Applications, выберите <code>VeraCrypt</code> и нажмите <code>Open</code>.</li>
+    <li>Убедитесь, что установлен флажок рядом с VeraCrypt.</li>
+    <li>Закройте окно системных настроек и попробуйте снова использовать VeraCrypt.</li>
+</p>
+</ol>
+</li>
+<li>Б. Использование sudo для запуска VeraCrypt:
+<p>Вы можете запустить VeraCrypt из терминала, используя повышенные разрешения:
+
+<pre>
+sudo /Applications/VeraCrypt.app/Contents/MacOS/VeraCrypt
+</pre>
+
+Запуск VeraCrypt с помощью sudo часто позволяет обойти определённые проблемы, связанные с разрешениями, но всегда, когда это возможно, рекомендуется предоставлять необходимые разрешения через системные настройки.</p>
+</li>
+</ul>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Почему VeraCrypt показывает в своём списке неизвестное устройство, которое не отображается как физический диск в Windows-компоненте "Управление дисками" или в выводе утилиты DiskPart?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<p>
+Начиная с Windows 10 версии 1903 и в более поздних версиях Microsoft добавила функцию под названием <b>Песочница Windows</b> (Sandbox). Это изолированная среда, предназначенная для безопасного запуска ненадёжных приложений. В рамках этой функции Windows создаёт динамический виртуальный жёсткий диск (VHDX), который представляет собой чистую установку Windows. Этот VHDX содержит базовый образ системы, пользовательские данные и состояние времени выполнения, а его размер может варьироваться в зависимости от конфигурации и использования системы.
+</p>
+<p>
+Когда VeraCrypt перечисляет устройства в системе, определяются все доступные дисковые устройства, используя формат пути к устройству, например <b>\Device\HardDiskX\PartitionY</b>. VeraCrypt выводит список этих устройств, в том числе виртуальных, например тех, которые связаны с Песочницей Windows, не делая различий по их физической или виртуальной природе. Таким образом, вы можете обнаружить неожиданное устройство в VeraCrypt, даже если оно не отображается как физический диск в таких инструментах, как DiskPart.
+</p>
+<p>
+Более подробную информацию о Песочнице Windows и связанном с ней виртуальном жёстком диске см. в <a href="https://techcommunity.microsoft.com/t5/windows-os-platform-blog/windows-sandbox/ba-p/301849">официальной статье Microsoft</a>.
+</p>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Что делать, если здесь нет ответа на мой вопрос?</strong></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Попробуйте поискать ответ в документации VeraCrypt и на сайте программы.</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Favorite Volumes.html b/doc/html/ru/Favorite Volumes.html
new file mode 100644
index 00000000..7bff6271
--- /dev/null
+++ b/doc/html/ru/Favorite Volumes.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="VeraCrypt%20Volume.html">Том VeraCrypt</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Favorite%20Volumes.html">Избранные тома</a>
+</p></div>
+
+<div class="wikidoc">
+<h2 style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; margin-bottom:17px">
+Избранные тома</h2>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<p>Избранные тома удобны во многих случаях. Например, если у вас есть:</p>
+<ul>
+<li>том, который всегда должен <strong>монтироваться на конкретную букву диска</strong>;</li>
+<li>том, который нужно <strong>автоматически монтировать при подключении к компьютеру устройства с этим томом
+</strong>(скажем, контейнер, находящийся на USB-флешке или внешнем жёстком диске USB);</li>
+<li>том, который нужно <strong>автоматически монтировать при входе в вашу учётную запись</strong>
+в операционной системе;</li>
+<li>том, который нужно всегда <strong>монтировать только для чтения</strong> или как
+<strong>сменный носитель</strong>. </li></ul>
+<p>
+<strong>Примечание:</strong> см. раздел <a href="Issues%20and%20Ограничения.html">Замеченные проблемы и
+ограничения</a> о проблемах, которые могут повлиять на избранные тома, если в Windows включена функция "Быстрый запуск".
+</p>
+<h3>Чтобы сконфигурировать том VeraCrypt как избранный, сделайте следующее:</h3>
+<ol>
+<li>Смонтируйте том (на ту букву диска, на которую вы хотите его монтировать всегда).</li>
+<li>В главном окне VeraCrypt щёлкните правой кнопкой мыши по смонтированному тому и выберите команду
+<em>Добавить в избранные</em>.</li>
+<li>В появившемся окне упорядочивания избранных томов выберите нужные параметры для этого тома (см. ниже).</li>
+<li>Нажмите <em>OK</em>. </li></ol>
+<strong>Избранные тома можно монтировать несколькими способами:</strong> Чтобы смонтировать все избранные тома, выберите
+<em>Избранное</em> &gt; <em>Смонтировать избранные тома</em> или нажмите горячую клавишу монтирования избранных томов
+(<em>Настройки</em> &gt; <em>Горячие клавиши</em>). Если нужно смонтировать только один из избранных томов, выберите его из списка в меню
+<em>Избранное</em>. При этом будет нужно ввести для данного тома пароль (и/или ключевые файлы) (если только он
+не находится в кэше). Если ввод правильный, том будет смонтирован. Если он уже смонтирован, то будет открыто
+окно Проводника с ним.
+<h3>Избранные тома (указанные или все) можно автоматически монтировать при каждом входе в Windows</h3>
+<p>Чтобы это настроить, сделайте следующее:</p>
+<ol>
+<li>Смонтируйте том, который должен автоматически монтироваться при вашем входе в свою учётную запись Windows
+(на ту букву, на которую нужно, чтобы он монтировался всегда).</li>
+<li>В главном окне VeraCrypt щёлкните правой кнопкой мыши на смонтированном томе и выберите команду
+<em>Добавить в избранные</em>.</li>
+<li>В появившемся окне упорядочивания избранных томов включите параметр <em>Монтировать выбранный том
+при входе в систему</em> и нажмите <em>OK</em>. </li></ol>
+<p>Теперь при каждом входе в Windows станет нужно указывать для тома пароль (и/или ключевые файлы), и если
+данные введены правильно, том будет смонтирован.<br>
+<br>
+Примечание: VeraCrypt не будет спрашивать пароль, если включено кэширование (запоминание) пароля предзагрузочной
+аутентификации (<em>Настройки</em> &gt; <em>Шифрование системы</em>), а пароль у тома такой же, как
+у системного раздела/диска.</p>
+<h3>Избранные тома (указанные или все) можно автоматически монтировать при каждом подключении к ПК устройства, на котором они находятся</h3>
+<p>Чтобы это настроить, сделайте следующее:</p>
+<ol>
+<li>Смонтируйте том (на ту букву, на которую нужно, чтобы он монтировался всегда).</li>
+<li>В главном окне VeraCrypt щёлкните правой кнопкой мыши на смонтированном томе и выберите команду
+<em>Добавить в избранные</em>.</li>
+<li>В появившемся окне упорядочивания избранных томов включите параметр <em>Монтировать выбранный том
+при подключении устройства, на котором он расположен</em> и нажмите <em>OK</em>. </li></ol>
+<p>Теперь всякий раз, когда вы будете, например, вставлять в USB-порт компьютера флеш-накопитель USB с томом
+VeraCrypt, станет выдаваться запрос пароля (и/или ключевых файлов) (если только он не кэширован), и если
+данные введены правильно, том будет смонтирован.<br>
+<br>
+Примечание: VeraCrypt не будет спрашивать пароль, если включено кэширование (запоминание) пароля предзагрузочной
+аутентификации (<em>Настройки</em> &gt; <em>Шифрование системы</em>), а пароль у тома такой же, как
+у системного раздела/диска.</p>
+<h3>Каждому избранному тому можно присвоить особую метку</h3>
+<p>Эта метка – не то же самое, что метка тома в файловой системе, она отображается внутри интерфейса VeraCrypt
+вместо пути тома. Чтобы присвоить тому метку, сделайте следующее:</p>
+<ol>
+<li>Выберите <em>Избранное</em> &gt; <em>Упорядочить избранные тома</em>.</li>
+<li>В появившемся окне упорядочивания избранных томов выберите том, метку которого вы хотите отредактировать.</li>
+<li>Введите метку в поле <em>Метка выбранного избранного тома</em> и нажмите OK.
+</li></ol>
+<h3>Для каждого избранного тома можно настроить ряд других параметров</h3>
+<p>Например, любой том можно монтировать как доступный только для чтения или как сменный носитель.
+Чтобы это настроить, сделайте следующее:</p>
+<ol>
+<li>Выберите <em>Избранное</em> &gt; <em>Упорядочить избранные тома</em>.</li>
+<li>В появившемся окне упорядочивания избранных томов выберите том, параметры которого вы хотите настроить.</li>
+<li>Выберите нужные вам параметры и нажмите OK.</li></ol>
+<p>Системные избранные тома отображаются в окне упорядочивания избранного (<em>Избранное</em> &gt; <em>Упорядочить
+избранные тома</em>) в <strong>порядке их монтирования</strong>, когда вы выбираете команду <em>Избранное</em> &gt; <em>Смонтировать
+избранные тома</em> или нажимаете соответствующую горячую клавишу (<em>Настройки</em> &gt; <em>Горячие клавиши</em>).
+Чтобы изменить порядок отображения томов, используйте кнопки <em>Выше</em> и <em>Ниже</em>.<br>
+<br>
+Обратите внимание, что избранный том может также быть <strong>разделом, входящим в область действия ключа шифрования
+системы, смонтированным без предзагрузочной аутентификации</strong> (например, разделом на зашифрованном системном
+диске с другой операционной системой, которая сейчас не выполняется). Когда вы монтируете такой том и добавляете его
+в избранные, больше не нужно выбирать команду <em>Система</em> &gt; <em>Смонтировать без предзагрузочной аутентификации</em>
+включать параметр монтирования раздела с шифрованием системы без предзагрузочной аутентификации. Вы можете просто
+смонтировать избранный том (как объяснено выше) без установки каких-либо параметров, поскольку режим монтирования
+тома сохранён в конфигурационном файле со списком ваших избранных томов.</p>
+<p>ВНИМАНИЕ: Если буква диска, присвоенная избранному тому (сохранённая в конфигурационном файле) занята, этот том
+не будет смонтирован, а сообщение об ошибке не выводится.<br>
+<br>
+Чтобы <strong>удалить том из списка избранных</strong>, в меню <em>Избранное</em> выберите команду <em>Упорядочить
+избранные тома</em>, выделите нужный том, нажмите кнопку <em>Убрать</em> и затем нажмите OK.</p>
+<p></p>
+<p><a href="System%20Favorite%20Volumes.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></p>
+</div>
+</div>
+</body></html>
diff --git a/doc/html/ru/Hardware Acceleration.html b/doc/html/ru/Hardware Acceleration.html
new file mode 100644
index 00000000..90368b8c
--- /dev/null
+++ b/doc/html/ru/Hardware Acceleration.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Hardware%20Acceleration.html">Аппаратное ускорение</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Аппаратное ускорение</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Некоторые процессоры (ЦП) поддерживают аппаратное ускорение шифрования* <a href="AES.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+AES</a>, которое в этом случае выполняется, как правило, в 4-8 раз быстрее, чем чисто программное
+шифрование при использовании тех же процессоров.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+По умолчанию VeraCrypt использует аппаратное ускорение AES на компьютерах, оснащённых процессорами,
+поддерживающими инструкции Intel AES-NI. В частности, VeraCrypt использует инструкции AES-NI** при выполнении
+так называемых AES-раундов (то есть основных частей алгоритма AES).
+Для генерирования ключей никакие инструкции AES-NI в VeraCrypt не применяются.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Примечание: по умолчанию VeraCrypt использует аппаратное ускорение AES также при загрузке зашифрованной
+системы Windows и при её выходе из состояния гибернации (при условии, что процессор поддерживает инструкции
+Intel AES-NI).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Чтобы выяснить, способен ли VeraCrypt использовать аппаратное ускорение AES в вашем компьютере, выберите
+<em style="text-align:left">Настройки</em> &gt; <em style="text-align:left">Производительность и драйвер</em> и
+посмотрите, что написано в поле <em style="text-align:left">Процессор в этом ПК поддерживает аппаратное
+ускорение AES-операций</em>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Если вы собираетесь приобрести процессор, то узнать, поддерживает ли он инструкции Intel AES-NI (также именуемые
+&quot;AES New Instructions&quot; – &quot;Новые инструкции AES&quot;), которые VeraCrypt применяет для
+аппаратного ускорения AES-операций, можно в документации на процессор или у поставщика/производителя.
+Кроме того, официальный список процессоров Intel, поддерживающих инструкции AES-NI, доступен
+<a href="http://ark.intel.com/search/advanced/?AESTech=true" style="text-align:left; color:#0080c0; text-decoration:none">
+здесь</a>. Примите, однако, к сведению, что некоторые процессоры Intel, присутствующие в списке совместимых
+с AES-NI на сайте Intel, в действительности поддерживают инструкции AES-NI только с обновлением конфигурации
+процессора (например, i7-2630/2635QM, i7-2670/2675QM, i5-2430/2435M, i5-2410/2415M). В этом случае необходимо
+связаться с поставщиком системной платы/компьютера и обновить системную BIOS, чтобы она включала новейшее
+обновление конфигурации процессора.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Если нужно отключить аппаратное ускорение AES (например, чтобы использовать только реализацию AES с полностью
+открытым исходным кодом), выберите <em style="text-align:left">Настройки</em> &gt;
+<em style="text-align:left">Производительность и драйвер</em> и отключите опцию
+<em style="text-align:left">Ускорять (де)шифрование AES с помощью AES-инструкций процессора</em>.
+Обратите внимание, что при изменении состояния этой опции нужно перезагрузить операционную систему, чтобы
+изменение режима подействовало на все компоненты VeraCrypt. Также учтите, что когда вы создаёте диск
+восстановления VeraCrypt (Rescue Disk), состояние этой опции записывается в Диск восстановления и используется
+при каждой загрузке с него (влияя на фазы перед загрузкой и начальной загрузки). Чтобы создать новый диск
+восстановления VeraCrypt, выберите
+<em style="text-align:left">Система</em> &gt; <em style="text-align:left">Создать Диск восстановления</em>.</div>
+<p>&nbsp;</p>
+<hr align="left" size="1" width="189" style="text-align:left; height:0px; border-width:0px 1px 1px; border-style:solid; border-color:#000000">
+<p><span style="text-align:left; font-size:10px; line-height:12px">* В этой главе термин "шифрование" также означает и дешифрование.</span><br style="text-align:left">
+<span style="text-align:left; font-size:10px; line-height:12px">** Эти инструкции включают
+<em style="text-align:left">AESENC</em>, <em style="text-align:left">AESENCLAST</em>,
+<em style="text-align:left">AESDEC</em>, and <em style="text-align:left">AESDECLAST</em>, и они выполняют следующие преобразования AES:
+<em style="text-align:left">ShiftRows</em>, <em style="text-align:left">SubBytes</em>,
+<em style="text-align:left">MixColumns</em>, <em style="text-align:left">InvShiftRows</em>,
+<em style="text-align:left">InvSubBytes</em>, <em style="text-align:left">InvMixColumns</em> и
+<em style="text-align:left">AddRoundKey</em> (подробности об этих преобразованиях см. в [3])</span><span style="text-align:left; font-size:10px; line-height:12px">.</span></p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Hash Algorithms.html b/doc/html/ru/Hash Algorithms.html
new file mode 100644
index 00000000..a7f2b678
--- /dev/null
+++ b/doc/html/ru/Hash Algorithms.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Hash%20Algorithms.html">Алгоритмы хеширования</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Алгоритмы хеширования</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Выбор алгоритма хеширования предлагается в мастере создания томов, в диалоговом окне смены пароля,
+а также в окне генератора ключевых файлов. Выбранный пользователем алгоритм хеширования применяется
+во встроенном в VeraCrypt генераторе случайных чисел как функция псевдослучайного &quot;смешивания&quot;,
+а также в функции формирования ключа заголовка (HMAC – алгоритме усиления криптостойкости других
+криптоалгоритмов на основе хеш-функции, как определено в PKCS #5 v2.0) как псевдослучайная функция.
+При создании нового тома, генератором случайных чисел создаются мастер-ключ, вторичный ключ (режим XTS)
+и соль. Более подробную информацию см. в разделах <a href="Random%20Number%20Generator.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Генератор случайных чисел</a> и <a href="Header%20Key%20Derivation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Формирование ключа заголовка, соль и количество итераций</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+В настоящее время VeraCrypt поддерживает следующие алгоритмы хеширования:</div>
+<ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="BLAKE2s-256.html"><strong style="text-align:left.html">BLAKE2s-256</strong></a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="SHA-256.html"><strong style="text-align:left.html">SHA-256</strong></a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="SHA-512.html"><strong style="text-align:left.html">SHA-512</strong></a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<a href="Whirlpool.html"><strong style="text-align:left.html">Whirlpool</strong></a>
+</li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left"><a href="Streebog.html">Streebog</a></strong>
+</li></ul>
+<p><a href="BLAKE2s-256.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Header Key Derivation.html b/doc/html/ru/Header Key Derivation.html
new file mode 100644
index 00000000..81652dbd
--- /dev/null
+++ b/doc/html/ru/Header Key Derivation.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Технические подробности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Header%20Key%20Derivation.html">Формирование ключа заголовка, соль и количество итераций</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Формирование ключа заголовка, соль и количество итераций</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Ключ заголовка используется для шифрования и дешифрования зашифрованной области заголовка тома
+VeraCrypt (в случае 
+<a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+шифрования системы</a> – области ключевых данных), которая содержит мастер-ключ и другую информацию (см. разделы
+<a href="Encryption%20Scheme.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Схема шифрования</a> и <a href="VeraCrypt%20Volume%20Format%20Specification.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Спецификация формата томов VeraCrypt</a>). В томах, созданных с помощью VeraCrypt (и для
+<a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+шифрования системы</a>), эта область зашифрована в режиме XTS (см. раздел <a href="Modes%20of%20Operation.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Режимы работы</a>). Для генерирования ключа заголовка и вторичного ключа заголовка (режим XTS)
+VeraCrypt использует метод PBKDF2, определённый в PKCS #5 v2.0; см.
+<a href="References.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+[7]</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+В программе применяется 512-битовая соль, что означает 2<sup style="text-align:left; font-size:85%">512</sup>
+ключей для каждого пароля. Благодаря этому значительно повышается устойчивость к атакам с офлайн-словарями/"радужной
+таблицей" (соль крайне осложняет предвычисление всех ключей для словаря паролей) [7]. Соль состоит из
+случайных значений, созданных
+<a href="Random%20Number%20Generator.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+генератором случайных чисел VeraCrypt</a> в процессе создания тома. Функция формирования (деривации) ключа
+заголовка основана на HMAC-SHA-512, HMAC-SHA-256, HMAC-BLAKE2S-256, HMAC-Whirlpool или HMAC-Streebog (см. [8, 9, 20, 22]) &ndash;
+какая из них будет применяться, выбирается пользователем. Длина сформированного ключа не зависит от
+размера вывода лежащей в основе хеш-функции. Например, длина ключа заголовка для шифра AES-256 всегда равна
+256 битам, даже если используется HMAC-SHA-512 (в режиме XTS применяется дополнительный 256-битовый
+вторичный ключ заголовка; следовательно, для AES-256 в целом применяются два 256-битовых ключа). Более
+подробную информацию см. в [7]. Для формирования ключа заголовка выполняется большое количество итераций,
+что увеличивает время, необходимое для полного поиска паролей (то есть атакой методом перебора)&nbsp;[7].</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<p>До версии 1.12 в VeraCrypt всегда использовалось фиксированное количество итераций, зависящее только от типа
+тома и алгоритма формирования ключа.</p>
+<ul></ul>
+<p>Начиная с версии 1.12, поле <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">
+PIM</a> (<a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">Персональный множитель итераций</a>)
+даёт пользователям больший контроль за количеством итераций, используемых в функции формирования ключа.</p>
+<p>Если <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">
+PIM</a> не указан или равен нулю, VeraCrypt использует следующие стандартные значения:</p>
+<ul>
+<li>Для шифрования системы (шифрование загрузки), если используется SHA-256, BLAKE2s-256 или Streebog, <i>число итераций</i> = <strong>200 000</strong>.</li>
+<li>Для шифрования системы, если используется SHA-512 или Whirlpool, а также для несистемных разделов и файловых контейнеров <i>число итераций</i> = <strong>500 000</strong>.
+</li></ul>
+</p>
+<p>Если <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">
+PIM</a> указан, то количество итераций функции формирования ключа вычисляется следующим образом:</p>
+<ul>
+<li>Для шифрования системы, если не используется SHA-512 или Whirlpool, <i>число итераций</i> = <strong>PIM &times; 2048</strong>.</li>
+<li>Для шифрования системы, если используется SHA-512 или Whirlpool, а также для несистемных разделов и файлов-контейнеров <i>число итераций</i> = <strong>15 000 &#43; (PIM &times; 1000)</strong>.
+</li></ul>
+</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Ключи заголовка, используемые шифрами при каскадном (последовательном) шифровании, не зависят друг от друга,
+хотя они и сформированы из одного пароля (к которому могут быть применены ключевые файлы). Например, для
+каскада AES-Twofish-Serpent функция формирования ключа заголовка получает 768-битный ключ шифрования из
+заданного пароля (и, для режима XTS, вдобавок 768-битовый <em style="text-align:left">вторичный</em> ключ
+заголовка из заданного пароля). Сгенерированный 768-битовый ключ заголовка затем разделяется на три 256-битовых
+ключа (для режима XTS <em style="text-align:left">вторичный</em> ключ разделяется тоже на три 256-битовых ключа,
+поэтому в действительности каскад в целом использует шесть 256-битовых ключей), из которых первый ключ
+используется шифром Serpent, второй – шифром Twofish, а третьй – шифром AES (кроме того, для режима XTS
+первый вторичный ключ используется шифром Serpent, второй вторичный ключ – шифром Twofish, и третий вторичный
+ключ – шифром AES). Отсюда следует, что даже если у неприятеля окажется один из ключей, он не сможет им
+воспользоваться для формирования остальных, поскольку не существует реально осуществимого способа определить
+пароль по полученному из него в результате формирования ключу (за исключением атаки полным перебором при
+слабом пароле).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<a href="Random%20Number%20Generator.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Hibernation File.html b/doc/html/ru/Hibernation File.html
new file mode 100644
index 00000000..bfea2477
--- /dev/null
+++ b/doc/html/ru/Hibernation File.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Security%20Requirements%20and%20Precautions.html">Требования безопасности и меры предосторожности</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Data%20Leaks.html">Утечки данных</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Hibernation%20File.html">Файл гибернации</a>
+</p></div>
+
+<div class="wikidoc">
+<div>
+<h1>Файл гибернации</h1>
+<p>Примечание: описанная ниже проблема вас не касается, если системный раздел или системный диск зашифрован<span>*</span>
+(см. подробности в главе <a href="System%20Encryption.html">
+<em>Шифрование системы</em></a>) и если файл гибернации расположен на одном из разделов, входящих в область
+действия шифрования системы (что, как правило, принимается по умолчанию), например, на разделе, в котором
+установлена. Когда компьютер переходит в состояние гибернации, данные шифруются на лету перед тем, как они
+будут сохранены в файле гибернации.</p>
+<p>Когда компьютер переходит в состояние гибернации (или входит в режим энергосбережения), содержимое его
+оперативной памяти записывается в так называемый файл гибернации на жёстком диске. Вы можете настроить
+VeraCrypt (<em>Настройки</em> &gt; <em>Параметры</em> &gt; <em>Размонтировать все тома при: входе в энергосбережение</em>)
+на автоматическое размонтирование всех смонтированных томов VeraCrypt, удаление их хранящихся в ОЗУ мастер-ключей
+и очистку кэшированных в ОЗУ паролей (если они есть) перед тем, как компьютер перейдёт в состояние гибернации
+(или войдёт в режим энергосбережения). Нужно, однако, иметь в виду, что если не используется шифрование системы
+(см. главу <a href="System%20Encryption.html"><em>Шифрование системы</em></a>), VeraCrypt не может надёжно
+препятствовать сохранению в файле гибернации в незашифрованном виде содержимого конфиденциальных файлов,
+открытых в ОЗУ. Помните, что когда вы открываете файл, хранящийся в томе VeraCrypt, например, в текстовом
+редакторе, содержимое этого файла в <i>незашифрованном</i> виде помещается в ОЗУ (и может оставаться в ОЗУ
+<i>незашифрованным</i>, пока не будет выключен компьютер).<br>
+<br>
+Обратите внимание, что когда компьютер переходит в режим сна, на самом деле он может быть настроен на переход
+в так называемый гибридный спящий режим, вызывающий гибернацию. Также учтите, что операционная система может
+быть настроена на переход в режим гибернации или в гибридный спящий режим при выборе пункта «Завершить работу»
+(см. подробности в документации на свою операционную систему).<br>
+<br>
+<strong>Чтобы избежать описанных выше проблем</strong>, зашифруйте системный раздел/диск (о том, как это сделать,
+см. в главе <a href="System%20Encryption.html"><em>Шифрование системы</em></a>) и убедитесь, что файл гибернации
+находится на одном из разделов, входящих в область действия шифрования системы (что, как правило, принимается
+по умолчанию), например, на разделе, в котором установлена Windows. Когда компьютер переходит в состояние гибернации,
+данные шифруются на лету перед тем, как они будут сохранены в файле гибернации.</p>
+<p>Примечание: ещё один подходящий вариант – создать скрытую операционную систему (см. подробности в разделе
+<a href="Hidden%20Operating%20System.html">
+<em>Скрытая операционная система</em></a>)<span>.</span></p>
+<p>Если по каким-то причинам вы не можете использовать шифрование системы, отключите или не допускайте гибернации
+в своём компьютере, по крайней мере, в течение каждого сеанса, когда вы работаете с секретными данными и монтируете
+том VeraCrypt.</p>
+<p><span>*</span> ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ: Поскольку Windows XP и Windows 2003 не предоставляют никакого API
+для шифрования файлов гибернации, VeraCrypt пришлось модифицировать недокументированные компоненты Windows XP/2003,
+чтобы позволить пользователям шифровать файлы гибернации. Поэтому VeraCrypt не может гарантировать, что файлы
+гибернации Windows XP/2003 будут всегда зашифрованы. В ответ на нашу публичную жалобу на отсутствие API, компания
+Microsoft начала предоставлять общедоступный API для шифрования файлов гибернации в Windows Vista и более поздних версиях
+Windows. VeraCrypt использует этот API и поэтому может безопасно шифровать файлы гибернации в Windows Vista и более
+поздних версиях Windows. Поэтому если вы используете Windows XP/2003 и хотите, чтобы файл гибернации был надёжно
+зашифрован, настоятельно рекомендуем вам выполнить обновление до Windows Vista или более поздней версии.</p>
+</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Hidden Operating System.html b/doc/html/ru/Hidden Operating System.html
new file mode 100644
index 00000000..c544d23f
--- /dev/null
+++ b/doc/html/ru/Hidden Operating System.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="System%20Encryption.html">Шифрование системы</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Hidden%20Operating%20System.html">Скрытая операционная система</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Скрытая операционная система</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Возможны ситуации, когда кто-то вынудит вас расшифровать операционную систему. Зачастую вы просто не сможете
+этому воспротивиться (например, при вымогательстве). На этот случай VeraCrypt позволяет создать скрытую операционную
+систему, наличие которой должно быть невозможно доказать (при условии соблюдения некоторых правил). Таким образом,
+вам не потребуется расшифровывать скрытую операционную систему или сообщать от неё пароль. См. подробности в разделе
+<a href="VeraCrypt%20Hidden%20Operating%20System.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Скрытая операционная система</a>, глава <a href="Plausible%20Deniability.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Правдоподобное отрицание наличия шифрования</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+&nbsp;</div>
+<p><a href="Supported%20Systems%20for%20System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></p>
+</div>
+</body></html>
diff --git a/doc/html/ru/Hidden Volume.html b/doc/html/ru/Hidden Volume.html
new file mode 100644
index 00000000..54c0f92f
--- /dev/null
+++ b/doc/html/ru/Hidden Volume.html
@@ -0,0 +1,123 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Plausible%20Deniability.html">Правдоподобное отрицание наличия шифрования</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Hidden%20Volume.html">Скрытый том</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Скрытый том</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Возможны ситуации, когда кто-то заставит вас сообщить пароль от зашифрованного тома. В ряде случаев вы просто
+не сможете отказаться это сделать (например, при вымогательстве). Благополучно выходить из таких ситуаций, не сообщая
+пароль от тома с вашими данными, позволяет так называемый скрытый том.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<img src="Beginner's Tutorial_Image_024.png" alt="Макет стандартного тома VeraCrypt до и после создания в нём скрытого тома." width="606" height="412"></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<em style="text-align:left">Схема обычного тома VeraCrypt до и после создания внутри него скрытого тома.</em></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+Принцип такой: том VeraCrypt создается внутри другого тома VeraCrypt (в свободном месте тома). Даже если смонтирован
+внешний том, невозможно гарантированно утверждать, есть ли внутри него скрытый том или его нет*, так как
+свободное место в <em style="text-align:left">любом</em> томе VeraCrypt всегда заполняется случайными данными
+при его создании**, и никакую часть (несмонтированного) скрытого тома нельзя отличить от случайных данных.
+Обратите внимание, что VeraCrypt никак не модифицирует файловую систему (информацию о свободном месте и т. д.)
+внутри внешнего тома.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+Пароль для скрытого тома должен существенно отличаться от пароля для внешнего тома. Перед созданием скрытого
+тома следует скопировать во внешний том некоторое количество осмысленно выглядящих файлов, которые на самом деле
+вам скрывать НЕ требуется.
+Эти файлы нужны, чтобы ввести в заблуждение того, кто вынудит вас сообщить пароль. Вы сообщите только пароль
+от внешнего тома, но не от скрытого. Файлы, действительно представляющие для вас ценность, останутся в
+неприкосновенности в скрытом томе.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Скрытый том монтируется так же, как обычный том VeraCrypt: нажмите кнопку
+<em style="text-align:left">Выбрать файл</em> или <em style="text-align:left">Выбрать устройство</em>,
+выберите внешний (хост) том (важно: убедитесь, что этот том <em style="text-align:left">
+не</em> смонтирован). Затем нажмите кнопку <em style="text-align:left">Смонтировать</em> и введите пароль
+для скрытого тома. Какой том будет смонтирован – скрытый или внешний – определяется только введённым паролем
+(то есть если введён пароль для внешнего тома, то будет смонтирован внешний том, а если указать пароль для скрытого,
+то смонтируется скрытый том).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Используя введённый пароль, VeraCrypt сначала пытается расшифровать заголовок обычного тома. Если это не удаётся,
+выполняется загрузка области, где может находиться заголовок скрытого тома (то есть байты 65 536&ndash;131 071,
+содержащие исключительно случайные данные, если внутри тома нет скрытого тома), в ОЗУ и попытка расшифровать
+её с помощью указанного пароля. Обратите внимание, что заголовки скрытых томов нельзя идентифицировать,
+так как они выглядят как абсолютно случайные данные. Если заголовок успешно расшифрован (информацию о том, как
+VeraCrypt определяет, успешно ли он расшифрован, см. в разделе <a href="Encryption%20Scheme.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Схема шифрования</a>), то из расшифрованного заголовка (который по-прежнему находится в ОЗУ) извлекаются
+сведения о размере скрытого тома и выполняется монтирование скрытого тома (по его размеру также определяется
+его смещение).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Скрытый том можно создавать внутри тома VeraCrypt любого типа, то есть внутри тома на основе файла или тома на
+основе устройства (для этого требуются права администратора). Чтобы создать скрытый том VeraCrypt, в главном окне
+программы нажмите кнопку <em style="text-align:left">Создать том</em> и выберите
+<em style="text-align:left">Создать скрытый том VeraCrypt</em>. В окне мастера будет вся информация, необходимая
+для успешного создания скрытого тома VeraCrypt.</div>
+<div id="hidden_volume_size_issue" style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+При создании скрытого тома для неопытного пользователя может быть весьма затруднительно или даже вообще невозможно
+установить размер скрытого тома так, чтобы тот не перекрывал данные во внешнем томе. Поэтому мастер создания
+томов автоматически сканирует карту кластеров внешнего тома (перед созданием внутри него скрытого тома) и определяет
+максимально возможный размер скрытого тома.***</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+В случае возникновения каких-либо проблем при создании скрытого тома, см. возможные решения в главе
+<a href="Troubleshooting.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Устранение затруднений</a>.<br style="text-align:left">
+<br style="text-align:left">
+<br style="text-align:left">
+Обратите внимание, что также можно создавать и загружать операционную систему, располагающуюся в скрытом томе
+(см. раздел
+<a href="Hidden%20Operating%20System.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Скрытая операционная система</a>, глава <a href="Plausible%20Deniability.html">
+Правдоподобное отрицание наличия шифрования</a>).</div>
+<hr align="left" size="1" width="189" style="text-align:left; height:0px; border-width:0px 1px 1px; border-style:solid; border-color:#000000">
+<p><span style="text-align:left; font-size:10px; line-height:12px">* При условии, что были соблюдены все
+инструкции мастера создания томов VeraCrypt, а также требования и меры предосторожности, указанные в подразделе
+<a href="Security%20Requirements%20for%20Hidden%20Volumes.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Требования безопасности и меры предосторожности, касающиеся скрытых томов</a><em style="text-align:left">.</em></span><br style="text-align:left">
+<span style="text-align:left; font-size:10px; line-height:12px">** При условии, что отключены опции
+<em style="text-align:left">Быстрое форматирование</em> и <em style="text-align:left">Динамический</em>,
+а также что том не содержит файловую систему, которая была зашифрована на месте (VeraCrypt не позволяет пользователю
+создавать скрытый том внутри такого тома). Информацию о методе заполнения свободного пространства тома случайными
+данными см. в главе
+<a href="Technical%20Details.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Технические подробности</a>, раздел <a href="VeraCrypt%20Volume%20Format%20Specification.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Спецификация формата томов VeraCrypt</a><em style="text-align:left">.</em></span><br style="text-align:left">
+<span style="text-align:left; font-size:10px; line-height:12px">*** Мастер сканирует карту кластеров, чтобы
+определить размер непрерывной свободной области (если она есть), конец которого совпадает с концом внешнего тома.
+Эта область вмещает скрытый том, поэтому её размером ограничивается максимально возможный размер скрытого тома.
+В Linux и Mac OS X мастер фактически не сканирует карту кластеров, но драйвер обнаруживает любые данные, записанные
+на внешний том, и использует их местоположение, как описано ранее.</span></p>
+<p>&nbsp;</p>
+<p><a href="Protection%20of%20Hidden%20Volumes.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Home_VeraCrypt_Default_Mount_Parameters.png b/doc/html/ru/Home_VeraCrypt_Default_Mount_Parameters.png
new file mode 100644
index 00000000..87267c77
--- /dev/null
+++ b/doc/html/ru/Home_VeraCrypt_Default_Mount_Parameters.png
diff --git a/doc/html/ru/Home_VeraCrypt_menu_Default_Mount_Parameters.png b/doc/html/ru/Home_VeraCrypt_menu_Default_Mount_Parameters.png
new file mode 100644
index 00000000..ba016d0a
--- /dev/null
+++ b/doc/html/ru/Home_VeraCrypt_menu_Default_Mount_Parameters.png
diff --git a/doc/html/ru/Home_facebook_veracrypt.png b/doc/html/ru/Home_facebook_veracrypt.png
new file mode 100644
index 00000000..42f39af7
--- /dev/null
+++ b/doc/html/ru/Home_facebook_veracrypt.png
diff --git a/doc/html/ru/Home_reddit.png b/doc/html/ru/Home_reddit.png
new file mode 100644
index 00000000..32db76b7
--- /dev/null
+++ b/doc/html/ru/Home_reddit.png
diff --git a/doc/html/ru/Home_utilities-file-archiver-3.png b/doc/html/ru/Home_utilities-file-archiver-3.png
new file mode 100644
index 00000000..c2d97fc3
--- /dev/null
+++ b/doc/html/ru/Home_utilities-file-archiver-3.png
diff --git a/doc/html/ru/Hot Keys.html b/doc/html/ru/Hot Keys.html
new file mode 100644
index 00000000..022e1fb0
--- /dev/null
+++ b/doc/html/ru/Hot Keys.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Hot%20Keys.html">Горячие клавиши</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Горячие клавиши</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<br style="text-align:left">
+Чтобы задать общесистемные горячие клавиши VeraCrypt, в меню <i>Настройки</i> выберите пункт <i>Горячие клавиши</i>.
+Обратите внимание, что горячие клавиши функционируют, только когда VeraCrypt запущен или работает в фоновом режиме.</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/How to Back Up Securely.html b/doc/html/ru/How to Back Up Securely.html
new file mode 100644
index 00000000..04a12330
--- /dev/null
+++ b/doc/html/ru/How to Back Up Securely.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="How%20to%20Back%20Up%20Securely.html">О безопасном резервном копировании</a>
+</p></div>
+<div class="wikidoc">
+<div>
+<h2>О безопасном резервном копировании</h2>
+<p>Из-за аппаратных или программных ошибок/сбоев файлы в томе VeraCrypt могут оказаться повреждёнными. Поэтому
+мы настоятельно рекомендуем регулярно делать резервные копии всех важных файлов (разумеется, это относится к
+любым важным данным, а не только к зашифрованным в томах VeraCrypt).</p>
+<h3>Несистемные тома</h3>
+<p>Чтобы безопасно создать резервную копию несистемного тома VeraCrypt, рекомендуем следующую последовательность действий:</p>
+<ol>
+<li>Создайте новый том VeraCrypt с помощью мастера создания томов VeraCrypt (не включайте опции
+<em>Быстрое форматирование</em> и <em>Динамический</em>). Это будет ваш <em>резервный</em> том, поэтому он должен
+совпадать по размеру с <em>основным</em> томом (или быть больше него).<br>
+<br>
+Если <em>основной</em> том VeraCrypt – скрытый (см. раздел <a href="Hidden%20Volume.html">
+<em>Скрытый том</em></a>), то <em>резервный</em> том также должен быть скрытым томом VeraCrypt. Прежде чем создать скрытый
+<em>резервный</em> том, вы должны создать для него новый том, в котором он будет храниться (внешний том), не включая
+опцию <em>Быстрое форматирование</em>. Кроме того, особенно если <em>резервный</em> том – на основе файла, скрытый
+<em>резервный</em> том должен занимать лишь очень маленькую часть контейнера, а внешний том должен быть почти целиком
+заполнен файлами (иначе это может неблагоприятно сказаться на правдоподобности отрицания наличия скрытого тома).</li>
+<li>Смонтируйте вновь созданный <em>резервный</em> том.</li>
+<li>Смонтируйте <em>основной</em> том.</li>
+<li>Скопируйте все файлы из смонтированного <em>основного</em> тома непосредственно в смонтированный <em>резервный</em> том.</li></ol>
+<h4>ВАЖНО: Если вы храните резервный том в месте, к которому может регулярно обращаться злоумышленник (например,
+на устройстве, хранящемся в сейфе банка), вам следует повторять все описанные выше действия (включая шаг 1)
+всякий раз, когда вы будете изготавливать резервную копию тома (см. ниже).</h4>
+<p>Если вы будете выполнять все указанные выше действия, то этим помешаете неприятелю выяснить:</p>
+<ul>
+<li>какие сектора томов изменяются (так как вы всегда выполняете шаг 1), что особенно важно, например, если
+устройство с резервным томом находится в банковском сейфе (или любом другом месте, к которому может регулярно
+обращаться злоумышленник), и в томе содержится скрытый том (см. подробности в подразделе
+<a href="Security%20Requirements%20for%20Hidden%20Volumes.html">
+<em>Требования безопасности и меры предосторожности, относящиеся к скрытым томам</em></a> в главе
+<a href="Plausible%20Deniability.html"><em>Правдоподобное отрицание наличия шифрования</em></a>);</li>
+<li>что один из томов является резервной копией другого. </li></ul>
+<h3>Системные разделы</h3>
+<p>Примечание: Помимо резервного копирования файлов также рекомендуется делать резервные копии диска
+восстановления VeraCrypt (выберите <em>Система</em> &gt; <em>Создать Диск восстановления</em>). Более подробную
+информацию см. в разделе <em>Диск восстановления VeraCrypt</em>.</p>
+<p>Чтобы надёжно и безопасно сделать резервную копию зашифрованного системного раздела, рекомендуем следующую
+последовательность действий:</p>
+<ol>
+<li>Если в компьютере установлено несколько операционных систем, загрузите ту из них, которая не требует
+предзагрузочной аутентификации.<br>
+<br>
+Если в компьютере установлена только одна операционная система, можно загрузиться с CD/DVD, содержащего WinPE
+или BartPE (live-версию Windows, целиком хранящуюся на CD/DVD и оттуда же загружающуюся; подробности ищите в главе
+<a href="FAQ.html"><em>Вопросы и ответы</em></a> по ключевому слову &lsquo;BartPE&rsquo;).<br>
+<br>
+Если оба указанных выше варианта невозможны, подключите свой системный диск как вторичный накопитель к другому
+компьютеру и затем загрузите операционную систему, установленную в том компьютере.<br>
+<br>
+Примечание: Если операционная система, резервную копию которой вы хотите сделать, находится в скрытом томе
+VeraCrypt (см. раздел <a href="Hidden%20Operating%20System.html">
+<em>Скрытая операционная система</em></a>), то, из соображений безопасности, операционная система, которую вы
+загружаете на этом этапе, должна быть либо ещё одной скрытой ОС, либо системой "live-CD" (см. выше). Более
+подробную информацию см. в подразделе
+<a href="Security%20Requirements%20for%20Hidden%20Volumes.html">
+<em>Требования безопасности и меры предосторожности, касающиеся скрытых томов</em></a> в главе
+<a href="Plausible%20Deniability.html"><em>Правдоподобное отрицание наличия шифрования</em></a>.
+</li><li>Создайте новый несистемный том VeraCrypt с помощью мастера создания томов VeraCrypt (не включая опции
+<em>Быстрое форматирование</em> и <em>Динамический</em>). Это будет ваш <em>резервный</em> том, поэтому
+он по размеру должен совпадать с системным разделом (или превосходить его), резервную копию которого
+вы намереваетесь сделать.<br>
+<br>
+Если операционная система, резервную копию которой вы хотите создать, установлена в скрытом томе
+VeraCrypt (см. раздел <em>Скрытая операционная система</em>), то <em>резервный</em> том тоже должен быть скрытым.
+Прежде чем создать скрытый <em>резервный</em> том, вы должны создать для него новый том, в котором он будет
+храниться (внешний том), не включая опцию <em>Быстрое форматирование</em>. Кроме того, особенно если
+<em>резервный</em> том – на основе файла, скрытый <em>резервный</em> том должен занимать лишь очень маленькую
+часть контейнера, а внешний том должен быть почти целиком заполнен файлами (иначе это может неблагоприятно
+сказаться на правдоподобности отрицания наличия скрытого тома).</li>
+<li>Смонтируйте вновь созданный <em>резервный</em> том.</li>
+<li>Смонтируйте системный раздел, резервную копию которого вы хотите сделать, выполнив следующее:
+<ol type="a">
+<li>Нажмите кнопку <em>Выбрать устройство</em> и выберите системный раздел, с которого нужно сделать
+резервную копию (в случае скрытой ОС, выберите раздел, содержащий скрытый том, в котором установлена
+скрытая ОС).</li>
+<li>Нажмите <em>OK</em>. </li>
+<li>Выберите <em>Система</em> &gt; <em>Смонтировать без предзагрузочной аутентификации</em>.</li>
+<li>Введите свой пароль предзагрузочной аутентификации и нажмите <em>OK</em>.</li></ol>
+</li><li>Смонтируйте <em>резервный</em> том, а затем с помощью какой-либо сторонней программы или
+средствами Windows создайте образ файловой системы, находящейся в системном разделе (который на предыдущем
+этапе был смонтирован как обычный том VeraCrypt) и сохраните этот образ непосредственно в смонтированном
+резервном томе. </li></ol>
+<h4>ВАЖНО: Если вы храните резервный том в месте, к которому может регулярно обращаться злоумышленник (например,
+на устройстве, хранящемся в сейфе банка), вам следует повторять все описанные выше действия (включая шаг 2)
+всякий раз, когда вы будете изготавливать резервную копию тома (см. ниже).</h4>
+<p>Если вы будете выполнять все указанные выше действия, то этим помешаете неприятелю выяснить:</p>
+<ul>
+<li>какие сектора томов изменяются (так как вы всегда выполняете шаг 2), что особенно важно, например, если
+устройство с резервным томом находится в банковском сейфе (или любом другом месте, к которому может регулярно
+обращаться злоумышленник), и в томе содержится скрытый том (см. подробности в подразделе
+<a href="Security%20Requirements%20for%20Hidden%20Volumes.html">
+<em>Требования безопасности и меры предосторожности, касающиеся скрытых томов</em></a> в главе
+<a href="Plausible%20Deniability.html"><em>Правдоподобное отрицание наличия шифрования</em></a>);
+</li><li>что один из томов является резервной копией другого. </li></ul>
+<h3>Общие замечания</h3>
+<p>Если вы храните резервную копию тома в месте, где неприятель может сделать копию тома, имеет смысл
+шифровать том каскадом (последовательностью) алгоритмов (например, AES-Twofish-Serpent). В противном
+случае, если том зашифрован только одним алгоритмом, и этот алгоритм в дальнейшем удастся взломать
+(например, вследствие прогресса в криптоанализе), неприятель сумеет расшифровать имеющиеся у него копии
+тома. Вероятность взлома сразу трёх разных алгоритмов шифрования значительно ниже, чем одного из них.</p>
+</div>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Incompatibilities.html b/doc/html/ru/Incompatibilities.html
new file mode 100644
index 00000000..a5965d66
--- /dev/null
+++ b/doc/html/ru/Incompatibilities.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Incompatibilities.html">Несовместимости</a>
+</p></div>
+
+<div class="wikidoc">
+<h1>Несовместимости</h1>
+<h2>
+Активация Adobe Photoshop&reg; и других продуктов с помощью FLEXnet Publisher&reg; / SafeCast</h2>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<em style="text-align:left">Примечание: описанная ниже проблема вас <strong style="text-align:left">
+не</strong> касается, если используется алгоритм шифрования без каскадирования (то есть AES, Serpent или Twofish).*
+Эта проблема вас также <strong style="text-align:left">не</strong> касается, если вы не используете
+<a href="System%20Encryption.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+шифрование системы</a> (предзагрузочную аутентификацию).</em></div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+ПО активации Acresso FLEXnet Publisher, в прошлом – Macrovision SafeCast (применяемое для активации сторонних программ,
+например, Adobe Photoshop), записывает данные в первую дорожку диска. Если это происходит, когда системный раздел/диск
+зашифрован с помощью VeraCrypt, часть загрузчика VeraCrypt оказывается повреждённой, и загрузить Windows не удастся.
+В этом случае воспользуйтесь своим
+<a href="VeraCrypt%20Rescue%20Disk.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+диском восстановления VeraCrypt</a>, чтобы вновь получить доступ к системе. Сделать это можно двумя способами:</div>
+<ol style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Если вы хотите, чтобы у стороннего ПО сохранилась активация, вам придётся
+<em style="text-align:left">каждый раз</em> загружать систему с помощью CD/DVD-диска восстановления VeraCrypt.
+Для этого просто вставьте свой Диск восстановления в CD/DVD-накопитель и введите пароль на появившемся
+экране диска.</li>
+<li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Если вы не желаете каждый раз загружать систему с CD/DVD-диска восстановления VeraCrypt, то можете восстановить
+загрузчик VeraCrypt на системном диске. Чтобы это сделать, на экране Диска восстановления выберите
+<em style="text-align:left">Repair Options</em> &gt; <em style="text-align:left">
+Restore VeraCrypt Boot Loader</em>. Однако стороннее ПО будет при этом деактивировано.
+</li></ol>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+О том, как пользоваться диском восстановления VeraCrypt, см. в главе <a href="VeraCrypt%20Rescue%20Disk.html" style="text-align:left; color:#0080c0; text-decoration:none.html">
+Диск восстановления VeraCrypt</a>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+<strong style="text-align:left">Возможное постоянное решение</strong>: расшифруйте системный раздел/диск,
+а затем зашифруйте снова, используя алгоритм без каскадирования (то есть AES, Serpent или Twofish).*</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Примите к сведению, что это не ошибка в VeraCrypt (данная проблема вызвана некорректным механизмом активации
+в стороннем ПО).</div>
+<h2>Outpost Firewall и Outpost Security Suite</h2>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Если установлен пакет Outpost Firewall или Outpost Security Suite с включённой проактивной защитой,
+компьютер на 5-10 секунд полностью перестаёт отзываться при монтировании/демонтировании тома. Это вызвано
+конфликтом между опцией Outpost System Guard, защищающей объекты «Активный рабочий стол», и окном ожидания
+VeraCrypt, отображаемым во время операций монтирования/демонтирования.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Эту проблему можно обойти, отключив показ ожидания в настройках VeraCrypt. Для этого выберите
+<i>Настройки &gt; Параметры</i> и включите опцию <i>Не показывать окно ожидания во время операций</i>.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+См. подробности здесь: <a href="https://sourceforge.net/p/veracrypt/tickets/100/">https://sourceforge.net/p/veracrypt/tickets/100/</a>
+</div>
+<hr align="left" size="1" width="189" style="text-align:left; height:0px; border-width:0px 1px 1px; border-style:solid; border-color:#000000">
+<p><span style="text-align:left; font-size:10px; line-height:12px">* Причина в том, что загрузчик VeraCrypt
+меньше, чем тот, который используется для каскадов шифров, и поэтому на первой дорожке диска достаточно места
+для резервной копии загрузчика VeraCrypt. Следовательно, всякий раз, когда загрузчик VeraCrypt повреждается,
+вместо этого автоматически запускается его резервная копия.</span><br style="text-align:left">
+<br style="text-align:left">
+<br style="text-align:left">
+<br style="text-align:left">
+&nbsp;&nbsp;См. также: <a href="Issues%20and%20Ограничения.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">
+Замеченные проблемы и ограничения</a>,&nbsp;&nbsp;<a href="Troubleshooting.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Устранение затруднений</a></p>
+</div><div class="ClearBoth"></div></body></html>
diff --git a/doc/html/ru/Introduction.html b/doc/html/ru/Introduction.html
new file mode 100644
index 00000000..6ee03e3a
--- /dev/null
+++ b/doc/html/ru/Introduction.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Начало</a></li>
+	  <li><a href="/code/">Исходный код</a></li>
+	  <li><a href="Downloads.html">Загрузить</a></li>
+	  <li><a class="active" href="Documentation.html">Документация</a></li>
+	  <li><a href="Donation.html">Поддержать разработку</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Форум</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Документация</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Introduction.html">Введение</a>
+</p>
+</div>
+
+<div class="wikidoc">
+<h1>Введение</h1>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+VeraCrypt это программное обеспечение, предназначенное для создания томов (устройств хранения данных) и
+работы с ними с использованием шифрования на лету (on-the-fly encryption). Шифрование на лету означает, что
+данные автоматически зашифровываются непосредственно перед записью их на диск и расшифровываются сразу же
+после их считывания, то есть без какого-либо вмешательства пользователя. Никакие данные, хранящиеся в
+зашифрованном томе, невозможно прочитать (расшифровать) без правильного указания пароля/ключевых файлов или
+правильных ключей шифрования. Полностью шифруется вся файловая система (имена файлов и папок, содержимое
+каждого файла, свободное место, метаданные и др.).</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+Файлы можно копировать со смонтированного тома VeraCrypt и на него точно так же, как и при использовании
+любого обычного диска (например, с помощью перетаскивания). При чтении или копировании из зашифрованного
+тома VeraCrypt файлы автоматически на лету расшифровываются (в память/ОЗУ). Аналогично, файлы, записываемые
+или копируемые в том VeraCrypt, автоматически на лету зашифровываются в ОЗУ (непосредственно перед их
+сохранением на диск). Обратите внимание: это <i>не</i> означает, что перед шифрованием/дешифрованием в ОЗУ
+должен находиться <i>весь</i> обрабатываемый файл. Никакой дополнительной памяти (ОЗУ) для VeraCrypt
+не требуется. Пояснение, как всё это работает, приведено в следующем абзаце.<br style="text-align:left">
+<br style="text-align:left">
+Предположим, у нас есть видеофайл формата .avi, хранящийся в томе VeraCrypt (следовательно, этот видеофайл
+полностью зашифрован). Пользователь указывает правильный пароль (и/или ключевой файл) и монтирует (открывает)
+том VeraCrypt. Когда пользователь дважды щёлкает мышью по значку этого видеофайла, операционная система
+запускает приложение, ассоциированное с файлами такого типа – в данном случае это, как правило, мультимедийный
+проигрыватель. Затем мультимедийный проигрыватель начинает загружать маленькую начальную часть видеофайла
+из зашифрованного тома VeraCrypt в ОЗУ (память), чтобы приступить к воспроизведению. Во время загрузки части
+файла VeraCrypt автоматически расшифровывает её (в ОЗУ), после чего расшифрованная часть видео (хранящаяся
+в ОЗУ) воспроизводится медиапроигрывателем. Пока эта часть воспроизводится, медиапроигрыватель начинает
+считывать другую небольшую часть видеофайла из зашифрованного тома VeraCrypt в ОЗУ (память), и процесс
+повторяется. Данная операция называется шифрованием/дешифрованием на лету, она работает для файлов любых
+типов (не только видео).</div>
+<p>Обратите внимание: VeraCrypt никогда не сохраняет на диске никаких данных в незашифрованном виде – такие
+данные временно хранятся только в ОЗУ (оперативной памяти). Даже когда том смонтирован, хранящиеся в нём
+данные по-прежнему остаются зашифрованными. При перезагрузке Windows или выключении компьютера том будет
+размонтирован, а хранящиеся в нём файлы станут недоступными (и зашифрованными). Даже в случае непредвиденного
+перебоя питания (без правильного завершения работы системы), хранящиеся в томе файлы останутся недоступными
+(и зашифрованными). Чтобы получить к ним доступ вновь, нужно смонтировать том (и правильно указать пароль
+и/или ключевой файл).
+<br><br>Краткий учебник по началу работы см. в главе <i>Руководство для начинающих</i>.</p>
+</div>
+</body></html>
diff --git a/doc/html/ru/Issues and Limitations.html b/doc/html/ru/Issues and Limitations.html
new file mode 100644
index 00000000..6c89f912
--- /dev/null
+++ b/doc/html/ru/Issues and Limitations.html
@@ -0,0 +1,176 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Бесплатное надёжное шифрование дисков с открытым исходным кодом</title>
+<meta name="description" content="VeraCrypt это бесплатное программное обеспечение для шифрования дисков с открытым исходным кодом для Windows, Mac OS X (macOS) и Linux. В случае, если злоумышленник вынуждает вас раскрыть пароль, VeraCrypt обеспечивает правдоподобное отрицание наличия шифрования. В отличие от пофайлового шифрования, VeraCrypt шифрует данные в реальном времени (на лету), автоматически, прозрачно, требует очень мало памяти и не использует временные незашифрованные файлы."/>
+<meta name="keywords" content="encryption, security, шифрование, безопасность"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>