New upstream version 1.17.2.upstream/1.17.2

2 files changed, 47 insertions, 19 deletions

diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index c420d9b..1ab1ec6 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2021-03-05" "1.17.0" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2021-04-02" "1.17.2" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index c0629bb..608c2e5 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-03-05" "1.17.0" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2021-04-02" "1.17.2" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -155,6 +155,17 @@ Use an extractor's current target directory as
 for any spawned child extractors.
 
 
+.SS extractor.*.parent-metadata
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Overwrite any metadata provided by a child extractor with its parent's.
+
+
 .SS extractor.*.path-restrict
 .IP "Type:" 6
 \f[I]string\f[] or \f[I]object\f[]
@@ -352,6 +363,8 @@ and optional for
 .br
 * \f[I]subscribestar\f[]
 .br
+* \f[I]tapas\f[]
+.br
 * \f[I]tsumino\f[]
 .br
 * \f[I]twitter\f[]
@@ -863,7 +876,7 @@ See \f[I]Filters\f[] for details.
 \f[I]false\f[]
 
 .IP "Description:" 4
-Download embedded Deviations and Sta.sh resources from
+Download extra Sta.sh resources from
 description texts and journals.
 
 Note: Enabling this option also enables deviantart.metadata_.
@@ -1046,21 +1059,6 @@ depending on the input URL
 * \f[I]"exhentai.org"\f[]: Use \f[I]exhentai.org\f[] for all URLs
 
 
-.SS extractor.exhentai.limits
-.IP "Type:" 6
-\f[I]bool\f[] or \f[I]integer\f[]
-
-.IP "Default:" 9
-\f[I]true\f[]
-
-.IP "Description:" 4
-Check image download limits
-and stop extraction when they are exceeded.
-
-If this value is an \f[I]integer\f[], it gets used as the limit maximum
-instead of the value listed on \f[I]https://e-hentai.org/home.php\f[]
-
-
 .SS extractor.exhentai.metadata
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -1272,7 +1270,7 @@ A (comma-separated) list of subcategories to include
 when processing a user profile.
 
 Possible values are
-\f[I]"posts"\f[], \f[I]"stories"\f[], \f[I]"highlights"\f[], \f[I]"channel"\f[].
+\f[I]"posts"\f[], \f[I]reels\f[], \f[I]"stories"\f[], \f[I]"highlights"\f[], \f[I]"channel"\f[].
 
 You can use \f[I]"all"\f[] instead of listing all values separately.
 
@@ -1599,6 +1597,7 @@ linked to in the initial set of submissions.
 This value sets the maximum recursion depth.
 
 Special values:
+
 .br
 * \f[I]0\f[]: Recursion is disabled
 .br
@@ -1844,6 +1843,35 @@ will be taken from the original Tweets, not the Retweets.
 Extract \f[I]TwitPic\f[] embeds.
 
 
+.SS extractor.twitter.users
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"timeline"\f[]
+
+.IP "Example:" 4
+"https://twitter.com/search?q=from:{legacy[screen_name]}"
+
+.IP "Description:" 4
+Format string for user URLs generated from
+.br
+\f[I]following\f[] and \f[I]list-members\f[] queries,
+whose replacement field values come from Twitter \f[I]user\f[] objects
+.br
+(\f[I]Example\f[])
+
+Special values:
+
+.br
+* \f[I]"timeline"\f[]: \f[I]https://twitter.com/i/user/{rest_id}\f[]
+.br
+* \f[I]"media"\f[]: \f[I]https://twitter.com/id:{rest_id}/media\f[]
+
+Note: To allow gallery-dl to follow custom URL formats, set the \f[I]blacklist\f[]
+for \f[I]twitter\f[] to a non-default value, e.g. an empty string \f[I]""\f[].
+
+
 .SS extractor.twitter.videos
 .IP "Type:" 6
 \f[I]bool\f[] or \f[I]string\f[]