diff --git a/docs/man-xlate/nmap-de.1 b/docs/man-xlate/nmap-de.1
index 931c739ae..67e9c8327 100644
--- a/docs/man-xlate/nmap-de.1
+++ b/docs/man-xlate/nmap-de.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 12.08.2019
+.\"      Date: 05.10.2020
 .\"    Manual: Nmap-Referenz-Handbuch
 .\"    Source: Nmap
 .\"  Language: German
 .\"
-.TH "NMAP" "1" "12.08.2019" "Nmap" "Nmap\-Referenz\-Handbuch"
+.TH "NMAP" "1" "05.10.2020" "Nmap" "Nmap\-Referenz\-Handbuch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -176,7 +176,7 @@ TIMING AND PERFORMANCE:
   (seconds), \*(Aqm\*(Aq (minutes), or \*(Aqh\*(Aq (hours) to the value (e\&.g\&. 30m)\&.
   \-T<0\-5>: Set timing template (higher is faster)
   \-\-min\-hostgroup/max\-hostgroup <size>: Parallel host scan group sizes
-  \-\-min\-parallelism/max\-parallelism <time>: Probe parallelization
+  \-\-min\-parallelism/max\-parallelism <numprobes>: Probe parallelization
   \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <time>: Specifies
       probe round trip time\&.
   \-\-max\-retries <tries>: Caps number of port scan probe retransmissions\&.
diff --git a/docs/man-xlate/nmap-es.1 b/docs/man-xlate/nmap-es.1
index bdc9c6bf5..78141bce2 100644
--- a/docs/man-xlate/nmap-es.1
+++ b/docs/man-xlate/nmap-es.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 12/08/2019
+.\"      Date: 05/10/2020
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Spanish
 .\"
-.TH "NMAP" "1" "12/08/2019" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -225,7 +225,7 @@ DETECCIÓN DE SERVICIO/VERSIÓN:
 TEMPORIZADO Y RENDIMIENTO:
   \-T[0\-5]: Seleccionar plantilla de temporizado (los números altos son más rápidos)
   \-\-min\-hostgroup/max\-hostgroup <tamaño>: Paralelizar los sondeos
-  \-\-min\-parallelism/max\-parallelism <msegs>: Paralelización de sondeos
+  \-\-min\-parallelism/max\-parallelism <numsondas>: Paralelización de sondeos
   \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <msegs>: Indica 
     el tiempo de ida y vuelta de la sonda
   \-\-max\-retries <reintentos>: Limita el número máximo de retransmisiones de las
diff --git a/docs/man-xlate/nmap-fr.1 b/docs/man-xlate/nmap-fr.1
index f650ae08b..3f212290f 100644
--- a/docs/man-xlate/nmap-fr.1
+++ b/docs/man-xlate/nmap-fr.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Auteur" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 12/08/2019
+.\"      Date: 05/10/2020
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: French
 .\"
-.TH "NMAP" "1" "12/08/2019" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -205,7 +205,7 @@ Les options qui prennent un argument de temps sont en milisecondes a moins que v
 (secondes), \*(Aqm\*(Aq (minutes), ou \*(Aqh\*(Aq (heures) à la valeur (e\&.g\&. 30m)\&.
 
 \-T[0\-5]: Choisit une politique de temporisation (plus élevée, plus rapide)
-\-\-min\-hostgroup/max\-hostgroup <msec>: Tailles des groupes d\*(Aqhôtes à scanner en parallèle
+\-\-min\-hostgroup/max\-hostgroup <nombre>: Tailles des groupes d\*(Aqhôtes à scanner en parallèle
 \-\-min\-parallelism/max\-parallelism <nombre>: Parallélisation des paquets de tests (probes)
 \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <msec>: Spécifie le temps d\*(Aqaller\-retour des paquets de tests
 \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <msec>: Spécifie le temps d\*(Aqaller\-retour des paquets de tests
@@ -934,7 +934,7 @@ L\*(Aqune des priorités les plus importantes dans le développement de Nmap a t
 .PP
 Les techniques permettant d\*(Aqaffiner les temps de scan sont entre autres d\*(Aqéviter les tests non essentiels et d\*(Aqavoir les versions les plus récentes de Nmap (les augmentations de performance sont fréquentes)\&. Optimiser ses paramètres de temps en temps peut ainsi faire toute la différence\&. Ces options sont décrites ci\-dessous\&.
 .PP
-\fB\-\-min\-hostgroup <millisecondes>\fR; \fB\-\-max\-hostgroup <millisecondes>\fR (Ajuste la quantité du groupe de scans en parallèle)
+\fB\-\-min\-hostgroup <nombre>\fR; \fB\-\-max\-hostgroup <nombre>\fR (Ajuste la quantité du groupe de scans en parallèle)
 .RS 4
 Nmap peut scanner des ports ou faire un scan de version sur de multiples hôtes en parallèle\&. Pour ce faire, Nmap divise la plage des adresses IP des cibles en groupe puis scanne ces groupes un à la fois\&. En général, scanner un grand nombre de groupes améliore l\*(Aqefficacité de la procédure\&. En contrepartie, les résultats ne peuvent être fournis que lorsque tout le groupe d\*(Aqhôtes a été scanné\&. Par conséquent, si Nmap a commencé avec un groupe de 50, l\*(Aqutilisateur ne recevra aucun résultat tant que les premiers 50 hôtes ne seront pas terminés (exception faite des informations données en mode verbeux)\&.
 .sp
@@ -1097,7 +1097,7 @@ L\*(Aqune des priorités les plus importantes dans le développement de Nmap a t
 .PP
 Les techniques permettant d\*(Aqaffiner les temps de scan sont entre autres d\*(Aqéviter les tests non essentiels et d\*(Aqavoir les versions les plus récentes de Nmap (les augmentations de performance sont fréquentes)\&. Optimiser ses paramètres de temps en temps peut ainsi faire toute la différence\&. Ces options sont décrites ci\-dessous\&.
 .PP
-\fB\-\-min\-hostgroup <millisecondes>\fR; \fB\-\-max\-hostgroup <millisecondes>\fR (Ajuste la quantité du groupe de scans en parallèle)
+\fB\-\-min\-hostgroup <nombre>\fR; \fB\-\-max\-hostgroup <nombre>\fR (Ajuste la quantité du groupe de scans en parallèle)
 .RS 4
 Nmap peut scanner des ports ou faire un scan de version sur de multiples hôtes en parallèle\&. Pour ce faire, Nmap divise la plage des adresses IP des cibles en groupe puis scanne ces groupes un à la fois\&. En général, scanner un grand nombre de groupes améliore l\*(Aqefficacité de la procédure\&. En contrepartie, les résultats ne peuvent être fournis que lorsque tout le groupe d\*(Aqhôtes a été scanné\&. Par conséquent, si Nmap a commencé avec un groupe de 50, l\*(Aqutilisateur ne recevra aucun résultat tant que les premiers 50 hôtes ne seront pas terminés (exception faite des informations données en mode verbeux)\&.
 .sp
@@ -1111,7 +1111,7 @@ et Nmap tentera de garder la quantité de groupes au\-dessus de cette valeur\&.
 Le premier usage de ces options est de spécifier un minimum assez grand pour que le scan entier se fasse plus vite\&. Un choix fréquent est 256 pour scanner un réseau de Classe C\&. S\*(Aqil s\*(Aqagit d\*(Aqun scan incluanrt beaucoup de ports, dépasser cette valeur n\*(Aqaidera pas à grand chose\&. S\*(Aqil s\*(Aqagit de scans sur peu de ports, une quantité de groupes de 2 048 ou plus peut faciliter la procédure\&.
 .RE
 .PP
-\fB\-\-min\-parallelism <millisecondes>\fR; \fB\-\-max\-parallelism\*(Aq <millisecondes>\fR (Ajuste la mise en parallèle des paquets de test, probes)
+\fB\-\-min\-parallelism <nombre>\fR; \fB\-\-max\-parallelism\*(Aq <nombre>\fR (Ajuste la mise en parallèle des paquets de test, probes)
 .RS 4
 Ces options permettent de contrôler le nombre total de probes idéal pour un groupe d\*(Aqhôtes\&. Elles permettent de scanner des ports et de découvrir des hôtes (host discovery)\&. Par défaut, Nmap calcule un parallélisme idéal et variable basé sur les performances du réseau\&. Si des paquets sont rejetés, Nmap ralentit sa cadence en permettant moins de probes simultanés\&. Le nombre idéal de probes augmente graduellement en même temps que le réseau démontre ses performances\&. Ces options fixent les limites maximales et minimales selon cette variable\&. Par défaut, le parallélisme idéal peut chuter à 1 si le réseau s\*(Aqavère trop faible et monter à plusieurs centaines dans des conditions parfaites\&.
 .sp
diff --git a/docs/man-xlate/nmap-hr.1 b/docs/man-xlate/nmap-hr.1
index a0bb00c2a..8f0785d78 100644
--- a/docs/man-xlate/nmap-hr.1
+++ b/docs/man-xlate/nmap-hr.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 08/12/2019
+.\"      Date: 10/05/2020
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Croatian
 .\"
-.TH "NMAP" "1" "08/12/2019" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "10/05/2020" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -168,8 +168,8 @@ DETEKCIJA OS\-a:
   \-\-osscan\-guess: Pogađaj OS malo agresivnije
 TIMING I PERFORMANSE:
   \-T[0\-6]: Podesi predložak za timing (veći broj je brže)
-  \-\-min\-hostgroup/max\-hostgroup <msec>: Paralelno skeniraj hostove / veličina sken grupe
-  \-\-min\-parallelism/max\-parallelism <msec>: Paraleliziraj sonde
+  \-\-min\-hostgroup/max\-hostgroup <numhosts>: Paralelno skeniraj hostove / veličina sken grupe
+  \-\-min\-parallelism/max\-parallelism <numprobes>: Paraleliziraj sonde
   \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <msec>: Navedi vrijeme potrebno za povratak (engl\&. round trip time) sonde\&.
   \-\-host\-timeout <msec>: Odustani od skeniranja ciljanog računala nakon navedenog vremena u milisekundama
   \-\-scan\-delay/\-\-max\-scan\-delay <msec>: Podesi pauzu između slanja upita
diff --git a/docs/man-xlate/nmap-hu.1 b/docs/man-xlate/nmap-hu.1
index 0cf355fe2..e3c56d66a 100644
--- a/docs/man-xlate/nmap-hu.1
+++ b/docs/man-xlate/nmap-hu.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 12/08/2019
+.\"      Date: 05/10/2020
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Hungarian
 .\"
-.TH "NMAP" "1" "12/08/2019" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-id.1 b/docs/man-xlate/nmap-id.1
index 04f1697fb..901adcb86 100644
--- a/docs/man-xlate/nmap-id.1
+++ b/docs/man-xlate/nmap-id.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Penulis" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 08/12/2019
+.\"      Date: 10/05/2020
 .\"    Manual: Panduan Referensi Nmap
 .\"    Source: Nmap
 .\"  Language: Indonesian
 .\"
-.TH "NMAP" "1" "08/12/2019" "Nmap" "Panduan Referensi Nmap"
+.TH "NMAP" "1" "10/05/2020" "Nmap" "Panduan Referensi Nmap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -178,7 +178,7 @@ TIMING AND PERFORMANCE:
   (seconds), \*(Aqm\*(Aq (minutes), or \*(Aqh\*(Aq (hours) to the value (e\&.g\&. 30m)\&.
   \-T<0\-5>: Set timing template (higher is faster)
   \-\-min\-hostgroup/max\-hostgroup <size>: Parallel host scan group sizes
-  \-\-min\-parallelism/max\-parallelism <time>: Probe parallelization
+  \-\-min\-parallelism/max\-parallelism <numprobes>: Probe parallelization
   \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <time>: Specifies
       probe round trip time\&.
   \-\-max\-retries <tries>: Caps number of port scan probe retransmissions\&.
diff --git a/docs/man-xlate/nmap-it.1 b/docs/man-xlate/nmap-it.1
index f6de371b9..85cfc4a7f 100644
--- a/docs/man-xlate/nmap-it.1
+++ b/docs/man-xlate/nmap-it.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autore" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 12/08/2019
+.\"      Date: 05/10/2020
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Italian
 .\"
-.TH "NMAP" "1" "12/08/2019" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-ja.1 b/docs/man-xlate/nmap-ja.1
index e04714c79..16ac457c0 100644
--- a/docs/man-xlate/nmap-ja.1
+++ b/docs/man-xlate/nmap-ja.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 12/08/2019
+.\"      Date: 05/10/2020
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Japanese
 .\"
-.TH "NMAP" "1" "12/08/2019" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -138,8 +138,8 @@ OS DETECTION:
   \-\-osscan\-guess: Guess OS more aggressively
 TIMING AND PERFORMANCE:
   \-T[0\-6]: Set timing template (higher is faster)
-  \-\-min\-hostgroup/max\-hostgroup <msec>: Parallel host scan group sizes
-  \-\-min\-parallelism/max\-parallelism <msec>: Probe parallelization
+  \-\-min\-hostgroup/max\-hostgroup <size>: Parallel host scan group sizes
+  \-\-min\-parallelism/max\-parallelism <numprobes>: Probe parallelization
   \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <msec>: Specifies
       probe round trip time\&.
   \-\-host\-timeout <msec>: Give up on target after this long
@@ -572,7 +572,7 @@ Nmapの開発を行ううえで、常に優先事項の1つとして念頭に置
 .PP
 スキャン時間を改善するテクニックとしては、重要でないテストの省略や、Nmapを最新版にアップグレードする(パフォーマンスの強化は頻繁に行われている)などが挙げられる。タイミング(時間調節)パラメタを最適化すると、かなりの違いが生じる場合もある。この種のオプションを、以下に列挙する。
 .PP
-\fB\-\-min\-hostgroup <milliseconds>\fR; \fB\-\-max\-hostgroup <milliseconds>\fR (並列スキャンのグループサイズを調節する)
+\fB\-\-min\-hostgroup <size>\fR; \fB\-\-max\-hostgroup <size>\fR (並列スキャンのグループサイズを調節する)
 .RS 4
 Nmapには、複数のホストを並行してポートスキャンやバージョンスキャンする能力がある。これは、ターゲットのIP空間をいくつかのグループに分割し、一度に1グループずつスキャンすることで行われる。一般に、グループの規模を大きくするほど、効率がよくなる。デメリットは、グループ全体のスキャンが終了してからでないと、ホストの結果が得られないことである。そのため、グループサイズが50から始めた場合、ユーザがレポートを受け取るのは、(冗長モードで最新情報が提供される場合を除く)最初の50台のホストが完了してからになる。
 .sp
@@ -583,7 +583,7 @@ Nmapには、複数のホストを並行してポートスキャンやバージ
 このオプションの主な使用法は、スキャンをより高速に完了できるように、グループサイズの最小値に大きな値を指定することである。クラスC規模のネットワークをスキャンするには通常、256を指定する。数多くのポートに対してスキャンを実行する場合は、これ以上の数値を設定しても、あまり効果は期待できない。ポート数がごくわずかのスキャンを行う場合は、ホストのグループサイズを2048以上に設定すると有効だろう。
 .RE
 .PP
-\fB\-\-min\-parallelism <milliseconds>\fR; \fB\-\-max\-parallelism <milliseconds>\fR (プローブの並列処理を調節する)
+\fB\-\-min\-parallelism <numprobes>\fR; \fB\-\-max\-parallelism <numprobes>\fR (プローブの並列処理を調節する)
 .RS 4
 ホストグループに向けて送信されるプローブの総数を決めるオプションで、ポートスキャンやホスト発見に用いられる。デフォルトでは、Nmapは、ネットワークパフォーマンスに基づいて、常に変化する理想的な並列処理可能数を算出している。パケットが続けて破棄される場合は、Nmapは処理速度を落とし、送信するプローブの数を減らす。理想的なプローブ数は、ネットワークが示すパフォーマンスの高さに応じて、緩やかに増加する。これらのオプションは、この変数に対して上限と下限を設定する。デフォルトでは、理想的な並列処理可能数は、ネットワークの信頼性が低い場合は1まで下がり、最高の状態の場合は数百まで上がる場合もある。
 .sp
diff --git a/docs/man-xlate/nmap-pl.1 b/docs/man-xlate/nmap-pl.1
index 7fced54b5..ccff9ac31 100644
--- a/docs/man-xlate/nmap-pl.1
+++ b/docs/man-xlate/nmap-pl.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 09/28/2018
+.\"      Date: 10/05/2020
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Polish
 .\"
-.TH "NMAP" "1" "09/28/2018" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "10/05/2020" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -149,7 +149,7 @@ SPECYFIKACJA CELU:
 WYKRYWANIE HOSTÓW:
   \-sL: Lista skanowania \- tylko wyświetla listę hostów do skanowania
   \-sP: Skanowanie Ping \- tylko wykrywanie dostępności hostów
-  \-P0: Traktuj wszystkie hosty jako dosępne \- pomijanie wykrywania
+  \-P0: Traktuj wszystkie hosty jako dostępne \- pomijanie wykrywania
   \-PS/PA/PU [lista_portów]: Wykrywanie TCP SYN/ACK lub UDP na wybranych portach
   \-PE/PP/PM: Zykrywanie za pomocą ICMP echo, timestamp, zapytania o maskę sieci
   \-n/\-R: Nie używaj zapytań DNS/Zawsze odpytuj DNS [domyślnie: czasami]
@@ -180,7 +180,7 @@ DETEKCJA OS:
 WYDAJNOŚĆ I ZALEŻNOŚCI CZASOWE:
   \-T[0\-5]: Ustaw szablon (wyższy jest szybszy)
   \-\-min\-hostgroup/max\-hostgroup <rozmiar>: Rozmiary grup do równoległego skanowania
-  \-\-min\-parallelism/max\-parallelism <msec>: Zrównoleglenie testów
+  \-\-min\-parallelism/max\-parallelism <ilość_prób>: Zrównoleglenie testów
   \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <msec>: Specyfikuje czas testów
   \-\-max\-retries <ilość>: Ustala ilość możliwych powtórzeń testu
   \-\-host\-timeout <msec>: Pomijaj po zadanym czasie
diff --git a/docs/nmap.1 b/docs/nmap.1
index 9468d36ea..4bf2a9177 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/01/2020
+.\"      Date: 10/05/2020
 .\"    Manual: Nmap Reference Guide
 .\"    Source: Nmap
 .\"  Language: English
 .\"
-.TH "NMAP" "1" "10/01/2020" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "10/05/2020" "Nmap" "Nmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -119,7 +119,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .RS 4
 .\}
 .nf
-Nmap 7\&.90 ( https://nmap\&.org )
+Nmap 7\&.90SVN ( https://nmap\&.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc\&.
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index d1c65f157..fadba069d 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 7.90 ( https://nmap.org )
+Nmap 7.90SVN ( https://nmap.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
diff --git a/docs/zenmap.1 b/docs/zenmap.1
index 097b5c33a..b396b38f9 100644
--- a/docs/zenmap.1
+++ b/docs/zenmap.1
@@ -2,12 +2,12 @@
 .\"     Title: zenmap
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 08/12/2019
+.\"      Date: 10/05/2020
 .\"    Manual: Zenmap Reference Guide
 .\"    Source: Zenmap
 .\"  Language: English
 .\"
-.TH "ZENMAP" "1" "08/12/2019" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "10/05/2020" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1
index 766bf747c..08a75c741 100644
--- a/ncat/docs/ncat.1
+++ b/ncat/docs/ncat.1
@@ -2,12 +2,12 @@
 .\"     Title: Ncat
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 08/12/2019
+.\"      Date: 10/05/2020
 .\"    Manual: Ncat Reference Guide
 .\"    Source: Ncat
 .\"  Language: English
 .\"
-.TH "NCAT" "1" "08/12/2019" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "10/05/2020" "Ncat" "Ncat Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,7 +43,7 @@ Among Ncat\*(Aqs vast number of features there is the ability to chain Ncats tog
 .RS 4
 .\}
 .nf
-Ncat 7\&.80 ( https://nmap\&.org/ncat )
+Ncat 7\&.90SVN ( https://nmap\&.org/ncat )
 Usage: ncat [options] [hostname] [port]
 
 Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds,
@@ -95,7 +95,8 @@ Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds,
       \-\-ssl\-verify           Verify trust and domain name of certificates
       \-\-ssl\-trustfile        PEM file containing trusted SSL certificates
       \-\-ssl\-ciphers          Cipherlist containing SSL ciphers to use
-      \-\-ssl\-alpn             ALPN protocol list to use\&.
+      \-\-ssl\-servername       Request distinct server name (SNI)
+      \-\-ssl\-alpn             ALPN protocol list to use
       \-\-version              Display Ncat\*(Aqs version information and exit
 
 See the ncat(1) manpage for full options, descriptions and usage examples
@@ -286,6 +287,11 @@ This option sets the list of ciphersuites that Ncat will use when connecting to
 ALL:!aNULL:!eNULL:!LOW:!EXP:!RC4:!MD5:@STRENGTH
 .RE
 .PP
+\fB\-\-ssl\-servername \fR\fB\fIname\fR\fR (Request distinct server name)
+.RS 4
+In client mode, this option sets the TLS SNI (Server Name Indication) extension, which tells the server the name of the logical server Ncat is contacting\&. This is important when the target server hosts multiple virtual servers at a single underlying network address\&. If the option is not provided, the TLS SNI extension will be populated with the target server hostname\&.
+.RE
+.PP
 \fB\-\-ssl\-alpn \fR\fB\fIALPN list\fR\fR (Specify ALPN protocol list)
 .RS 4
 This option allows you to specify a comma\-separated list of protocols to send via the Application\-Layer Protocol Negotiation (ALPN) TLS extension\&. Not supported by all versions of OpenSSL\&.
@@ -327,6 +333,10 @@ In connect mode, gives the credentials that will be used to connect to the proxy
 or
 \fB\-\-proxy\-type socks5\fR, the form should be username:password\&. For
 \fB\-\-proxy\-type socks4\fR, it should be a username only\&.
+.sp
+These credentials can be alternatively passed onto Ncat by setting environment variable
+\fBNCAT_PROXY_AUTH\fR, which reduces the risk of the credentials being captured in process logs\&. (Option
+\fB\-\-proxy\-auth\fRtakes precedence\&.)
 .RE
 .PP
 \fB\-\-proxy\-dns \fR\fB\fItype\fR\fR (Specify where to resolve proxy destination)
@@ -705,14 +715,14 @@ Netcat (or any other implementation), Ncat is most definitely based on Netcat in
 .SH "LEGAL NOTICES"
 .SS "Ncat Copyright and Licensing"
 .PP
-Ncat is (C) 2005\(en2018 Insecure\&.Com LLC\&. It is distributed as free and open source software under the same license terms as our Nmap software\&. Precise terms and further details are available
+Ncat is (C) 2005\(en2020 Insecure\&.Com LLC\&. It is distributed as free and open source software under the same license terms as our Nmap software\&. Precise terms and further details are available
 from \m[blue]\fB\%https://nmap.org/man/man-legal.html\fR\m[]\&.
 .SS "Creative Commons License for this Ncat Guide"
 .PP
 This
 Ncat Reference Guide
 is (C) 2005\(en2018 Insecure\&.Com LLC\&. It is hereby placed under version 3\&.0 of the
-\m[blue]\fBCreative Commons Attribution License\fR\m[]\&\s-2\u[1]\d\s+2\&. This allows you redistribute and modify the work as you desire, as long as you credit the original source\&. Alternatively, you may choose to treat this document as falling under the same license as Ncap itself (discussed previously)\&.
+\m[blue]\fBCreative Commons Attribution License\fR\m[]\&\s-2\u[1]\d\s+2\&. This allows you redistribute and modify the work as you desire, as long as you credit the original source\&. Alternatively, you may choose to treat this document as falling under the same license as Ncat itself (discussed previously)\&.
 .SS "Source Code Availability and Community Contributions"
 .PP
 Source is provided to this software because we believe users have a right to know exactly what a program is going to do before they run it\&. This also allows you to audit the software for security holes (none have been found so far)\&.
@@ -723,9 +733,9 @@ for possible incorporation into the main distribution\&. By sending these change
 but this is important because the inability to relicense code has caused devastating problems for other Free Software projects (such as KDE and NASM)\&. We also occasionally relicense the code to third parties as discussed in the Nmap man page\&. If you wish to specify special license conditions of your contributions, just say so when you send them\&.
 .SS "No Warranty"
 .PP
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. See the GNU General Public License v2\&.0 for more details at
-\m[blue]\fB\%http://www.gnu.org/licenses/gpl-2.0.html\fR\m[], or in the
-COPYING
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. See the Nmap Public Source License for more details at
+\m[blue]\fB\%https://nmap.org/npsl/\fR\m[], or in the
+LICENSE
 file included with Nmap\&.
 .SS "Inappropriate Usage"
 .PP
diff --git a/ncat/docs/ncat.usage.txt b/ncat/docs/ncat.usage.txt
index 3515f7634..7e508f69e 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 7.90 ( https://nmap.org/ncat )
+Ncat 7.90SVN ( https://nmap.org/ncat )
 Usage: ncat [options] [hostname] [port]
 
 Options taking a time assume seconds. Append 'ms' for milliseconds,
diff --git a/ncat/ncat.h b/ncat/ncat.h
index 259213b08..39d88dfeb 100644
--- a/ncat/ncat.h
+++ b/ncat/ncat.h
@@ -84,7 +84,7 @@
 /* Ncat information for output, etc. */
 #define NCAT_NAME "Ncat"
 #define NCAT_URL "https://nmap.org/ncat"
-#define NCAT_VERSION "7.90"
+#define NCAT_VERSION "7.90SVN"
 
 #ifndef __GNUC__
 #ifndef __attribute__
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index f8a858138..41f1b2249 100644
--- a/ndiff/docs/ndiff.1
+++ b/ndiff/docs/ndiff.1
@@ -2,12 +2,12 @@
 .\"     Title: ndiff
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 08/12/2019
+.\"      Date: 10/05/2020
 .\"    Manual: User Commands
 .\"    Source: Ndiff
 .\"  Language: English
 .\"
-.TH "NDIFF" "1" "08/12/2019" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "10/05/2020" "Ndiff" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index d15a803d4..a8ac17988 100644
--- a/nmap.h
+++ b/nmap.h
@@ -121,8 +121,8 @@
 #ifndef NMAP_VERSION
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
-#define NMAP_VERSION "7.90"
-#define NMAP_NUM_VERSION "7.0.90.0"
+#define NMAP_VERSION "7.90SVN"
+#define NMAP_NUM_VERSION "7.0.90.1"
 #endif
 
 #define NMAP_XMLOUTPUTVERSION "1.05"
diff --git a/nping/docs/nping.1 b/nping/docs/nping.1
index 4eea26b6d..975f1ab09 100644
--- a/nping/docs/nping.1
+++ b/nping/docs/nping.1
@@ -2,12 +2,12 @@
 .\"     Title: nping
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 08/12/2019
+.\"      Date: 10/05/2020
 .\"    Manual: Nping Reference Guide
 .\"    Source: Nping
 .\"  Language: English
 .\"
-.TH "NPING" "1" "08/12/2019" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "10/05/2020" "Nping" "Nping Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nping/nping.h b/nping/nping.h
index ab2b19a05..224a1ad12 100644
--- a/nping/nping.h
+++ b/nping/nping.h
@@ -266,7 +266,7 @@
 /* General tunable defines  **************************************************/
 #define NPING_NAME "Nping"
 #define NPING_URL "https://nmap.org/nping"
-#define NPING_VERSION "0.7.90"
+#define NPING_VERSION "0.7.90SVN"
 
 
 #define DEFAULT_VERBOSITY VB_0
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version
index 68242008a..93102f87a 100644
--- a/zenmap/share/zenmap/config/zenmap_version
+++ b/zenmap/share/zenmap/config/zenmap_version
@@ -1 +1 @@
-7.90
+7.90SVN
diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
index ffb465d6e..ed32b5631 100644
--- a/zenmap/zenmapCore/Version.py
+++ b/zenmap/zenmapCore/Version.py
@@ -1 +1 @@
-VERSION = "7.90"
+VERSION = "7.90SVN"