New upstream version 1.18.4.upstream/1.18.4

2 files changed, 80 insertions, 13 deletions

diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index 363ff0a..edf1068 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2021-08-13" "1.18.3" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2021-09-04" "1.18.4" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index 008129f..869d605 100644
--- a/data/man/gallery-dl.conf.5
+++ b/data/man/gallery-dl.conf.5
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL.CONF" "5" "2021-08-13" "1.18.3" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2021-09-04" "1.18.4" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -224,17 +224,6 @@ For example with \f[I]"parent-metadata": "_p_"\f[]:
 Share number of skipped downloads between parent and child extractors.
 
 
-.SS extractor.*.url-metadata
-.IP "Type:" 6
-\f[I]string\f[]
-
-.IP "Default:" 9
-\f[I]null\f[]
-
-.IP "Description:" 4
-Insert a file's download URL into its metadata dictionary as the given name.
-
-
 .SS extractor.*.path-restrict
 .IP "Type:" 6
 \f[I]string\f[] or \f[I]object\f[]
@@ -299,6 +288,28 @@ Note: In a string with 2 or more characters, \f[I][]^-\\\f[] need to be
 escaped with backslashes, e.g. \f[I]"\\\\[\\\\]"\f[]
 
 
+.SS extractor.*.path-strip
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"auto"\f[]
+
+.IP "Description:" 4
+Set of characters to remove from the end of generated path segment names
+using \f[I]str.rstrip()\f[]
+
+Special values:
+
+.br
+* \f[I]"auto"\f[]: Use characters from \f[I]"unix"\f[] or \f[I]"windows"\f[]
+depending on the local operating system
+.br
+* \f[I]"unix"\f[]: \f[I]""\f[]
+.br
+* \f[I]"windows"\f[]: \f[I]". "\f[]
+
+
 .SS extractor.*.extension-map
 .IP "Type:" 6
 \f[I]object\f[]
@@ -599,6 +610,17 @@ Default value used for missing or undefined keyword names in
 \f[I]format strings\f[].
 
 
+.SS extractor.*.url-metadata
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]null\f[]
+
+.IP "Description:" 4
+Insert a file's download URL into its metadata dictionary as the given name.
+
+
 .SS extractor.*.category-transfer
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -777,6 +799,17 @@ functions (\f[I]postprocessors\f[], \f[I]download archive\f[], etc.)
 will be executed as normal.
 
 
+.SS extractor.*.fallback
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]true\f[]
+
+.IP "Description:" 4
+Use fallback download URLs when a download fails.
+
+
 .SS extractor.*.image-range
 .IP "Type:" 6
 \f[I]string\f[]
@@ -997,6 +1030,17 @@ to access 18+ content without \f[I]API Key\f[].
 See \f[I]Filters\f[] for details.
 
 
+.SS extractor.deviantart.comments
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Extract \f[I]comments\f[] metadata.
+
+
 .SS extractor.deviantart.extra
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -1160,6 +1204,18 @@ Note: The \f[I]refresh-token\f[] becomes invalid
 or whenever your \f[I]cache file\f[] is deleted or cleared.
 
 
+.SS extractor.deviantart.auto-watch
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Automatically watch users when encountering "Watchers-Only Deviations"
+(requires a \f[I]refresh-token\f[]).
+
+
 .SS extractor.deviantart.wait-min
 .IP "Type:" 6
 \f[I]integer\f[]
@@ -2155,6 +2211,17 @@ Fetch media from all Tweets and replies in a \f[I]conversation
 <https://help.twitter.com/en/using-twitter/twitter-conversations>\f[].
 
 
+.SS extractor.twitter.logout
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Logout and retry as guest when access to another user's Tweets is blocked.
+
+
 .SS extractor.twitter.quoted
 .IP "Type:" 6
 \f[I]bool\f[]