Merge branch 'master' into image-rewrite

config/config

@@ -701,3 +701,13 @@ scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png"
 # NOTE: If you'd like another image host to be added to Neofetch.
 #       Open an issue on github.
 image_host="teknik"
+
+
+# Misc Options
+
+
+# Config version.
+#
+# NOTE: Don't change this value, neofetch reads this to determine
+# how to handle backwards compatibility.
+config_version="2.1.0"

neofetch

@@ -294,6 +294,7 @@ get_model() {
     model="${model//Undefined}"
     model="${model//Default string}"
     model="${model//Not Specified}"
+    model="${model//Type1ProductConfigId}"
 }
 
 get_title() {
@@ -3632,7 +3633,7 @@ INFO:
     --cpu_shorthand type        Shorten the output of CPU
                                 Possible values: name, speed, tiny, on, off
     --cpu_cores type            Whether or not to display the number of CPU cores
-                                Takes: logical, physical, off
+                                Possible values: logical, physical, off
 
                                 NOTE: 'physical' doesn't work on BSD.
 
@@ -3665,7 +3666,7 @@ INFO:
     --shell_path on/off         Enable/Disable showing \$SHELL path
     --shell_version on/off      Enable/Disable showing \$SHELL version
     --disk_show value           Which disks to display.
-                                Takes: '/', '/dev/sdXX', '/path/to/mount point'
+                                Possible values: '/', '/dev/sdXX', '/path/to/mount point'
 
                                 NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1')
 
@@ -3702,13 +3703,13 @@ BARS:
     --bar_colors num num        Colors to make the bar.
                                 Set in this order: elapsed, total
     --cpu_display mode          Bar mode.
-                                Takes: bar, infobar, barinfo, off
+                                Possible values: bar, infobar, barinfo, off
     --memory_display mode       Bar mode.
-                                Takes: bar, infobar, barinfo, off
+                                Possible values: bar, infobar, barinfo, off
     --battery_display mode      Bar mode.
-                                Takes: bar, infobar, barinfo, off
+                                Possible values: bar, infobar, barinfo, off
     --disk_display mode         Bar mode.
-                                Takes: bar, infobar, barinfo, off
+                                Possible values: bar, infobar, barinfo, off
 
 IMAGE BACKEND:
     --image_backend backend     Which image backend to use.
@@ -3769,7 +3770,7 @@ SCREENSHOT:
     -s, --scrot /path/to/img    Take a screenshot, if path is left empty the screen-
                                 shot function will use \$scrot_dir and \$scrot_name.
     -su, --upload /path/to/img  Same as --scrot but uploads the scrot to a website.
-    --image_host                Website to upload scrots to. Takes: imgur, teknik
+    --image_host imgur/teknik   Website to upload scrots to.
     --scrot_cmd cmd             Screenshot program to launch
 
 OTHER:

neofetch.1

@@ -36,7 +36,7 @@ Possible values: name, speed, tiny, on, off
 .TP
 \fB\-\-cpu_cores\fR type
 Whether or not to display the number of CPU cores
-Takes: logical, physical, off
+Possible values: logical, physical, off
 .IP
 NOTE: 'physical' doesn't work on BSD.
 .TP
@@ -92,7 +92,7 @@ Enable/Disable showing $SHELL version
 .TP
 \fB\-\-disk_show\fR value
 Which disks to display.
-Takes: '/', '/dev/sdXX', '/path/to/mount point'
+Possible values: '/', '/dev/sdXX', '/path/to/mount point'
 .IP
 NOTE: Multiple values can be given. (\fB\-\-disk_show\fR '/' '/dev/sdc1')
 .TP
@@ -158,19 +158,19 @@ Set in this order: elapsed, total
 .TP
 \fB\-\-cpu_display\fR mode
 Bar mode.
-Takes: bar, infobar, barinfo, off
+Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-memory_display\fR mode
 Bar mode.
-Takes: bar, infobar, barinfo, off
+Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-battery_display\fR mode
 Bar mode.
-Takes: bar, infobar, barinfo, off
+Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-disk_display\fR mode
 Bar mode.
-Takes: bar, infobar, barinfo, off
+Possible values: bar, infobar, barinfo, off
 .SS "IMAGE BACKEND:"
 .TP
 \fB\-\-image_backend\fR backend
@@ -270,8 +270,8 @@ Take a screenshot, if path is left empty the screenshot function will use $scrot
 \fB\-su\fR, \fB\-\-upload\fR \fI\,/path/to/img\/\fP
 Same as \fB\-\-scrot\fR but uploads the scrot to a website.
 .TP
-\fB\-\-image_host\fR
-Website to upload scrots to. Takes: imgur, teknik
+\fB\-\-image_host\fR imgur/teknik
+Website to upload scrots to.
 .TP
 \fB\-\-scrot_cmd\fR cmd
 Screenshot program to launch