New upstream version 1.12.3upstream/1.12.3

2 files changed, 38 insertions, 2 deletions

diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index 7249537..a2cd77d 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2020-01-05" "1.12.2" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2020-01-19" "1.12.3" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index 7e7993a..d7bb941 100644
--- a/data/man/gallery-dl.conf.5
+++ b/data/man/gallery-dl.conf.5
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL.CONF" "5" "2020-01-05" "1.12.2" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2020-01-19" "1.12.3" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -1207,6 +1207,16 @@ Extract tweet text as \f[I]content\f[] metadata.
 .IP "Description:" 4
 Extract images from retweets.
 
+.SS extractor.twitter.twitpic
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Extract \f[I]TwitPic <https://twitpic.com/>\f[] embeds.
+
 .SS extractor.twitter.videos
 .IP "Type:" 6
 \f[I]bool\f[] or \f[I]string\f[]
@@ -1594,6 +1604,32 @@ be stored in them.
 Files with an extension not listed will be ignored and stored
 in their default location.
 
+.SS compare.action
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"replace"\f[]
+
+.IP "Description:" 4
+The action to take when files do not compare as equal.
+
+
+* \f[I]"replace"\f[]: Replace/Overwrite the old version with the new one
+
+* \f[I]"enumerate"\f[]: Add an enumeration index to the filename of the new
+version like \f[I]skip = "enumerate" <extractor.*.skip_>\f[]
+
+.SS compare.shallow
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Only compare file sizes. Do not read and compare their content.
+
 .SS exec.async
 .IP "Type:" 6
 \f[I]bool\f[]