chore: bump ampache.cfg.php config to version 40

conf/ampache.cfg.php

@@ -7,7 +7,13 @@
 ; if this config file is up to date
 ; this is compared against a value hard-coded
 ; into the init script
-config_version = 34
+config_version = 40
+
+; Allow you to hard code a default git branch for Ampache
+; If you set this value the inbuilt updater will use this branch for updates.
+; POSSIBLE VALUES: master develop
+; DEFAULT: ""
+;github_force_branch = "develop"
 
 ;#########################################################
 ; Path Vars                                              #
@@ -24,7 +30,7 @@ http_host = "__DOMAINTOCHANGE__"
 ; DEFAULT:
 ;http_port = 80
 
-; The public path to your ampache install
+; The public path to your Ampache install
 ; Do not put a trailing / on this path
 ; For example if your site is located at http://localhost
 ; than you do not need to enter anything for the web_path
@@ -34,6 +40,12 @@ http_host = "__DOMAINTOCHANGE__"
 web_path = "__PATHTOCHANGE__"
 
 ; The local http url of your server.
+; This is used to access the server from within the
+; same host where ampache is running.
+; For example, if the ampache server is not
+; directly accessed via the public domain but via a reverse
+; proxy, local_web_path would need to be changed
+; to a localhost URL.
 ; If not set, retrieved automatically from server information.
 ; DEFAULT: ""
 ;local_web_path = "http://localhost/ampache"
@@ -46,21 +58,21 @@ web_path 	= "__PATHTOCHANGE__"
 ; Hostname of your database
 ; For socket authentication, set the path to socket file (e.g. /var/run/mysqld/mysqld.sock)
 ; DEFAULT: localhost
-database_hostname = localhost
+database_hostname = "localhost"
 
 ; Port to use when connecting to your database
 ; DEFAULT: none
 ;database_port = 3306
 
-; Name of your ampache database
+; Name of your Ampache database
 ; DEFAULT: ampache
 database_name = "__DBNAME__"
 
-; Username for your ampache database
+; Username for your Ampache database
 ; DEFAULT: ""
 database_username = "__DBUSER__"
 
-; Password for your ampache database, this can not be blank
+; Password for your Ampache database, this can not be blank
 ; this is a 'forced' security precaution, the default value
 ; will not work (except if using socket authentication)
 ; DEFAULT: ""
@@ -78,35 +90,35 @@ secret_key = "__RANDOMKEYTOCHANGE__"
 ; Length that a session will last expressed in seconds. Default is
 ; one hour.
 ; DEFAULT: 3600
-session_length = 3600
+session_length = "3600"
 
 ; Length that the session for a single streaming instance will last
 ; the default is two hours. With some clients, and long songs this can
 ; cause playback to stop, increase this value if you experience that
 ; DEFAULT: 7200
-stream_length = 7200
+stream_length = "7200"
 
 ; This length defines how long a 'remember me' session and cookie will
 ; last, the default is 86400, same as length. It is up to the administrator
 ; of the box to increase this, for reference 86400 = 1 day,
 ; 604800 = 1 week, and 2419200 = 1 month
 ; DEFAULT: 604800
-remember_length = 604800
+remember_length = "604800"
 
 ; Name of the Session/Cookie that will sent to the browser
 ; default should be fine
 ; DEFAULT: ampache
-session_name = ampache
+session_name = "ampache"
 
 ; Lifetime of the Cookie, 0 == Forever (until browser close) , otherwise in terms of seconds
 ; If you want cookies to last past a browser close set this to a value in seconds.
 ; DEFAULT: 0
-session_cookielife = 0
+session_cookielife = "0"
 
 ; Is the cookie a "secure" cookie? This should only be set to 1 (true) if you are
 ; running a secure site (HTTPS).
 ; DEFAULT: 0
-session_cookiesecure = 1
+session_cookiesecure = "1"
 
 ; Auth Methods
 ; This defines which auth methods Auth will attempt to use and in which order.
@@ -134,7 +146,7 @@ auth_password_save = "true"
 ; logout_redirect = "http://sso.example.com/logout"
 
 ; Use Access List
-; Toggle this on if you want ampache to pay attention to the access list
+; Toggle this on if you want Ampache to pay attention to the access list
 ; and only allow streaming/downloading/api-rpc from known hosts api-rpc
 ; will not work without this on.
 ; NOTE: Default Behavior is DENY FROM ALL
@@ -142,7 +154,7 @@ auth_password_save = "true"
 access_control = "true"
 
 ; Require Session
-; If this is set to true ampache will make sure that the URL passed when
+; If this is set to true Ampache will make sure that the URL passed when
 ; attempting to retrieve a song contains a valid Session ID This prevents
 ; others from guessing URL's. This setting is ignored if you have use_auth
 ; disabled.
@@ -150,7 +162,7 @@ access_control	= "true"
 require_session = "true"
 
 ; Require LocalNet Session
-; If this is set to true then ampache will require that a valid session
+; If this is set to true then Ampache will require that a valid session
 ; is passed even on hosts defined in the Local Network ACL. This setting
 ; has no effect if access_control is not enabled
 ; DEFAULT: true
@@ -170,7 +182,7 @@ require_localnet_session = "true"
 
 ; This determines the tag order for all cataloged
 ; music. If none of the listed tags are found then
-; ampache will randomly use whatever was found.
+; Ampache will randomly use whatever was found.
 ; POSSIBLE VALUES: ape asf avi id3v1 id3v2 lyrics3 matroska mpeg quicktime riff
 ;     vorbiscomment
 ; DEFAULT: id3v2 id3v1 vorbiscomment quicktime matroska ape asf avi mpeg riff
@@ -215,7 +227,7 @@ deferred_ext_metadata = "true"
 ; This list specifies possible delimiters additional to \0
 ; This setting takes a regex pattern.
 ; DEFAULT: // / \ | , ;
-additional_genre_delimiters = "[/]{2}|[/|\\\\|\|,|;]"
+additional_genre_delimiters = "[/]{2}|[/|\\|\|,|;]"
 
 ; Enable importing custom metadata from files.
 ; This will need a bit of time during the import. So you may want to disable this
@@ -238,14 +250,14 @@ catalog_file_pattern = "mp3|mpc|m4p|m4a|aac|ogg|oga|wav|aif|aiff|rm|wma|asf|flac
 ; Video Pattern
 ; This defines which video file types Ampache will attempt to catalog
 ; You can specify any file extension you want in here separating them with
-; a | but ampache may not be able to parse them
+; a | but Ampache may not be able to parse them
 ; DEAFULT: avi|mpg|mpeg|flv|m4v|mp4|webm|mkv|wmv|ogv|mov|divx|m2ts
 catalog_video_pattern = "avi|mpg|mpeg|flv|m4v|mp4|webm|mkv|wmv|ogv|mov|divx|m2ts"
 
 ; Playlist Pattern
 ; This defines which playlist types Ampache will attempt to catalog
 ; You can specify any file extension you want in here separating them with
-; a | but ampache may not be able to parse them
+; a | but Ampache may not be able to parse them
 ; DEFAULT: m3u|m3u8|pls|asx|xspf
 catalog_playlist_pattern = "m3u|m3u8|pls|asx|xspf"
 
@@ -262,7 +274,7 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 ;catalog_disable = "false"
 
 ; Delete from disk
-; This determines if catalog manager users can delete medias from disk.
+; This determines if catalog manager users can delete media from disk.
 ; DEFAULT: false
 ;delete_from_disk = "false"
 
@@ -280,7 +292,7 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 
 ; Track User IPs
 ; If this is enabled Ampache will log the IP of every completed login
-; it will store user,ip,time at one row per login. The results are
+; it will store user, ip and time at one row per login. The results are
 ; displayed in Admin --> Users
 ; DEFAULT: false
 ;track_user_ip = "false"
@@ -326,6 +338,16 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 ; DEFAULT: #FF0000
 ;waveform_color = "#FF0000"
 
+; Waveform height
+; The waveform height.
+; DEFAULT: 32
+;waveform_height = 32
+
+; Waveform width
+; The waveform width.
+; DEFAULT: 400
+;waveform_width = 400
+
 ; Temporary Directory Path
 ; If Waveform is enabled this must be set to tell
 ; Ampache which directory to save the temporary file to. Do not put a
@@ -346,16 +368,16 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 ; DEFAULT: false
 ;generate_video_preview = "true"
 
-; Un comment if don't want ampache to follow symlinks
+; Un comment if don't want Ampache to follow symlinks
 ; DEFAULT: false
 ;no_symlinks = "false"
 
 ; Use auth?
-; If this is set to "Yes" ampache will require a valid
+; If this is set to "Yes" Ampache will require a valid
-; Username and password. If this is set to false then ampache
+; Username and password. If this is set to false then Ampache
 ; will not ask you for a username and password. false is only
 ; recommended for internal only instances
-; DEFAULT true
+; DEFAULT: true
 use_auth = "true"
 
 ; Default Auth Level
@@ -368,13 +390,30 @@ use_auth	= "true"
 default_auth_level = "guest"
 
 ; 5 Star Ratings
-; This allows ratings for almost any object in ampache
+; This allows ratings for almost any object in Ampache
 ; POSSIBLE VALUES: false true
 ; DEFAULT: true
 ratings = "true"
 
+; Enable filtering on browse pages for artists and albums.
+; If you enable this setting the get_random and browse pages
+; will remove artists and albums that are <= to that rating
+; DEFAULT: false
+;rating_browse_filter = "false"
+
+; Set the rating that will be filtered
+; e.g. 2 will filter 1 and 2 star albums and artists
+; this setting must be set for the filter to work
+; DEFAULT: null
+;rating_browse_minimum_stars = 1
+
+; Set the amount of items Album/Video of the Moment will display
+; This was previously hardcoded into the site
+; DEFAULT: 6
+;of_the_moment = 6
+
 ; User flags/favorites
-; This allows user flags for almost any object in ampache as favorite
+; This allows user flags for almost any object in Ampache as favorite
 ; POSSIBLE VALUES: false true
 ; DEFAULT: true
 userflags = "true"
@@ -386,7 +425,7 @@ userflags = "true"
 directplay = "true"
 
 ; Sociable
-; This turns on / off all of the "social" features of ampache
+; This turns on / off all of the "social" features of Ampache
 ; default is on, but if you don't care and just want music
 ; turn this off to disable all social features.
 ; DEFAULT: true
@@ -407,7 +446,7 @@ sociable = "true"
 ; This turns the caching mechanisms on or off, due to a large number of
 ; problems with people with very large catalogs and low memory settings
 ; this is off by default as it does significantly increase the memory
-; requirments on larger catalogs. If you have the memory this can create
+; requirements on larger catalogs. If you have the memory this can create
 ; a 2-3x speed improvement.
 ; DEFAULT: false
 ;memory_cache = "false"
@@ -423,7 +462,7 @@ sociable = "true"
 ; Specify a filename to look for if you always give the same filename
 ; i.e. "folder.jpg" Ampache currently only supports jpg/gif and png
 ; Especially useful if you have a front and a back image in a folder
-; comment out if ampache should search for any jpg,gif or png
+; comment out if Ampache should search for any jpg, gif or png
 ; DEFAULT: folder.jpg
 ;album_art_preferred_filename = "folder.jpg"
 
@@ -479,14 +518,19 @@ sociable = "true"
 ;playlist_art = "false"
 
 ; Statistical Graphs * Requires PHP-GD *
-; Set this to true if you want Ampache to generate statistical
+; Set this to true if you want Ampache to generate statistical graphs on usages / users.
-; graphs on usages / users.
+; This is false by default due to issues around the licensing of c-pchart.
+;  https://github.com/ampache/ampache/issues/1515
+;  http://www.pchart.net/license
+; REFERENCE: https://github.com/ampache/ampache/wiki/chart-faq
+; You can enable c-chart with the following command
+;  composer require 'szymach/c-pchart'
 ; DEFAULT: false
 ;statistical_graphs = "false"
 
 ; Art Gather Order
 ; Simply arrange the following in the order you would like
-; ampache to search. If you want to disable one of the search
+; Ampache to search. If you want to disable one of the search
 ; methods simply leave it out. DB should be left as the first
 ; method unless you want it to overwrite what's already in the
 ; database
@@ -573,11 +617,40 @@ live_stream = "true"
 
 ; Refresh Limit
 ; This defines the default refresh limit in seconds for
-; pages with dynamic content, such as now playing
+; pages with dynamic content, such as Now Playing
 ; DEFAULT: 60
 ; Possible Values: Int > 5
 refresh_limit = "60"
 
+; Embedded Now Playing Page
+; Set this to true to enable the embedded Now Playing page (now_playing.php).
+; This page allows for embedding a Now Playing badge into a stream
+; or status page. Use with the parameter 'user_id' to filter by a
+; specific user. This page is like rss in that it doesn't require a
+; login to view.
+; DEFAULT: false
+;use_now_playing_embedded = "false"
+
+; Now Playing Refresh Limit
+; This defines the refresh limit in seconds for the
+; Now Playing embedded page. This (now_playing.php) is not
+; part of the normal application and is designed to be
+; embedded in another app, like a stream or status page.
+; If this value is not valid, automatic refresh will be disabled.
+; DEFAULT: -1
+; Possible Values; Int > 1
+;now_playing_refresh_limit = "-1"
+
+; Now Playing Custom CSS
+; This defines the custom css file for the Now Playing embedded
+; page. This (now_playing.php) is not part of the normal
+; application and is designed to be embedded in another app, like
+; a stream or status page.
+; If this value is not set, no CSS will be used. Custom CSS can
+; still be applied in the other application, like OBS.
+; DEFAULT: Not enabled
+;now_playing_css_file = "templates/now-playing.css"
+
 ; Footer Statistics
 ; This defines whether statistics (Queries, Cache Hits, Load Time)
 ; are shown in the page footer.
@@ -597,6 +670,12 @@ show_footer_statistics = "true"
 ; DEFAULT: false
 ;allow_php_themes = "false"
 
+; Subsonic clients all seem to ignore the download method
+; This setting will not scrobble actions from stream actions.
+; (This means you can sync playlists without overloading your server)
+; Make sure you enable scrobbling in your client to keep recording stats!
+; DEFAULT: "true"
+;subsonic_stream_scrobble = "false"
 
 ;#########################################################
 ; Debugging                                              #
@@ -610,17 +689,17 @@ show_footer_statistics = "true"
 ; Debug Level
 ; This should always be set in conjunction with the
 ; debug option, it defines how prolific you want the
-; debugging in ampache to be. values are 1-5.
+; debugging in Ampache to be. values are 1-5.
-; 1 == Errors only
+; 1 == Basic Errors
-; 2 == Error + Failures (login attempts etc.)
+; 2 == Errors + Failures (login attempts etc.)
-; 3 == ??
+; 3 == Full Error Information
-; 4 == ?? (Profit!)
+; 4 == General Information
-; 5 == Information (cataloging progress etc.)
+; 5 == Full Information (cataloging progress etc.)
 ; DEFAULT: 5
-debug_level = 5
+debug_level = "5"
 
 ; Path to Log File
-; This defines where you want ampache to log events to
+; This defines where you want Ampache to log events to
 ; this will only happen if debug is turned on. Do not
 ; include trailing slash. You will need to make sure that
 ; the specified directory exists and your HTTP server has
@@ -642,7 +721,7 @@ log_filename = "%name.%Y%m%d.log"
 ; Charset of generated HTML pages
 ; Default of UTF-8 should work for most people
 ; DEFAULT: UTF-8
-site_charset = UTF-8
+site_charset = "UTF-8"
 
 ; Locale Charset
 ; Local charset (mainly for file operations) if different
@@ -702,12 +781,12 @@ ldap_search_dn = "ou=users,dc=yunohost,dc=org"
 
 ; LDAP objectClass (required)
 ; DEFAULT: none
-ldap_objectclass = "mailAccount"          ; OpenLDAP
+ldap_objectclass = "mailAccount"
 ;ldap_objectclass = "organizationalPerson"  ; Microsoft Active Directory
 
 ; LDAP filter for search (required)
 ; DEFAULT: none
-ldap_filter = "(uid=%v)"                   ; OpenLDAP
+ldap_filter = "(uid=%v)"
 ;ldap_filter = "(sAMAccountName=%v)"        ; Microsoft Active Directory
 
 ; Require that the user is in a specific group (optional)
@@ -715,12 +794,12 @@ ldap_filter = "(uid=%v)"                   ; OpenLDAP
 ;ldap_require_group = "cn=yourgroup,ou=yourorg,dc=yoursubdomain,dc=yourdomain,dc=yourtld"
 
 ; LDAP name field
-; DEFAULT = "cn"
+; DEFAULT: = "cn"
 ldap_name_field = "cn"
 ;ldap_name_field = "displayName"
 
 ; LDAP email field
-; DEFAULT = "mail"
+; DEFAULT: = "mail"
 ;ldap_email_field = "mail"
 
 ; LDAP avatar field
@@ -747,7 +826,6 @@ ldap_name_field = "cn"
 ;ldap_member_attribute = "memberuid"
 
 
-
 ;#########################################################
 ; OpenID login info (optional)                           #
 ;#########################################################
@@ -762,15 +840,15 @@ ldap_name_field = "cn"
 ; Public Registration settings, defaults to disabled     #
 ;#########################################################
 
-; This setting will silently create an ampache account
+; This setting will silently create an Ampache account
 ; for anyone who can login using LDAP (or any other login
 ; extension). The default is to create new users as guests
 ; see auto_user config option if you would like to change this
 ; DEFAULT: false
 auto_create = "true"
 
-; This setting will silently update an ampache account's
+; This setting will silently update an Ampache account's
-; informations for anyone who can login using LDAP
+; information for anyone who can login using LDAP
 ; (or any other login extension).
 ; DEFAULT: false
 ;external_auto_update = "false"
@@ -874,66 +952,54 @@ registration_mandatory_fields = "fullname"
 ; transcode_TYPE         = {allowed|required|false}
 ; DEFAULT: false
 ;;; Audio
-transcode_m4a      = allowed
+transcode_m4a = "allowed"
-transcode_flac     = required
+transcode_flac = "required"
-transcode_mpc      = required
+transcode_mpc = "required"
-transcode_ogg      = required
+transcode_ogg = "required"
-transcode_oga      = required
+transcode_oga = "required"
-transcode_wav      = required
+transcode_wav = "required"
-transcode_wma      = required
+transcode_wma = "required"
-transcode_aif      = required
+transcode_aif = "required"
-transcode_aiff     = required
+transcode_aiff = "required"
-transcode_ape     = required
+transcode_ape = "required"
-transcode_shn     = required
+transcode_shn = "required"
-transcode_mp3      = allowed
+transcode_mp3 = "allowed"
 ;;; Video
-transcode_avi      = allowed
+transcode_avi = "allowed"
-transcode_mkv      = allowed
+transcode_mkv = "allowed"
-transcode_mpg      = allowed
+transcode_mpg = "allowed"
-transcode_mpeg     = allowed
+transcode_mpeg = "allowed"
-transcode_m4v      = allowed
+transcode_m4v = "allowed"
-transcode_mp4      = allowed
+transcode_mp4 = "allowed"
-transcode_mov      = allowed
+transcode_mov = "allowed"
-transcode_wmv      = allowed
+transcode_wmv = "allowed"
-transcode_ogv      = allowed
+transcode_ogv = "allowed"
-transcode_divx     = allowed
+transcode_divx = "allowed"
-transcode_m2ts     = allowed
+transcode_m2ts = "allowed"
-transcode_webm     = allowed
+transcode_webm = "allowed"
 
 ; Default audio output format
 ; DEFAULT: none
-encode_target = mp3
+encode_target = "mp3"
 
 ; Default video output format
 ; DEFAULT: none
-encode_video_target = webm
+encode_video_target = "webm"
 
 ; Override the default output format on a per-type basis, for example,
 ; to stream lossless encoded files in lossy formats.
 ; encode_target_TYPE = TYPE
 ; DEFAULT: none
-encode_target_flac = opus
+encode_target_flac = "opus"
 
 ; Override the default TYPE transcoding behavior on a per-player basis, for example,
 ; to stream lossless using the api and lossy using the web interface.
 ; transcode_player_PLAYER_TYPE = TYPE
 ; Valid PLAYER is: webplayer, api
 ; DEFAULT: none
-transcode_player_webplayer_m4a = required
+transcode_player_webplayer_m4a = "required"
-transcode_player_webplayer_flac = required
+transcode_player_webplayer_flac = "required"
-transcode_player_webplayer_mpc = required
+transcode_player_webplayer_mpc = "required"
-transcode_player_webplayer_avi      = required
-transcode_player_webplayer_mkv      = required
-transcode_player_webplayer_mpg      = required
-transcode_player_webplayer_mpeg     = required
-transcode_player_webplayer_m4v      = required
-transcode_player_webplayer_mp4      = required
-transcode_player_webplayer_mov      = required
-transcode_player_webplayer_wmv      = required
-transcode_player_webplayer_ogv      = required
-transcode_player_webplayer_divx     = required
-transcode_player_webplayer_m2ts     = required
-
 
 ; Override the default output format on a per-player basis
 ; encode_player_PLAYER_target = TYPE
@@ -959,8 +1025,8 @@ transcode_player_customize = "true"
 ; equivalent to the old default, but if you find that necessary you should be
 ; clever enough to figure out how on your own.
 ; DEFAULT: none
-;transcode_cmd = "ffmpeg"
 transcode_cmd = "avconv"
+;transcode_cmd = "avconv"
 ;transcode_cmd = "/usr/bin/neatokeen"
 
 ; Transcode input file argument
@@ -985,8 +1051,8 @@ encode_args_m4a = "-vn -b:a %BITRATE%K -c:a libfdk_aac -f adts pipe:1"
 encode_args_wav = "-vn -b:a %BITRATE%K -c:a pcm_s16le -f wav pipe:1"
 encode_args_flv = "-b:a %BITRATE%K -ar 44100 -ac 2 -v 0 -f flv -c:v libx264 -preset superfast -threads 0 pipe:1"
 encode_args_webm = "-q %QUALITY% -f webm -c:v libvpx -maxrate 800k -preset superfast -threads 0 pipe:1"
-;encode_args_webm = "-q %QUALITY% -f webm -c:v libvpx -maxrate %MAXBITRATE%k -preset superfast -threads 0 pipe:1"
 encode_args_ts = "-q %QUALITY% -s %RESOLUTION% -f mpegts -c:v libx264 -c:a libmp3lame -maxrate %MAXBITRATE%k -preset superfast -threads 0 pipe:1"
+encode_args_ogv = "-codec:v libtheora -qscale:v 7 -codec:a libvorbis -qscale:a 5 -f ogg pipe:1"
 
 ; Encoding arguments to retrieve an image from a single frame
 encode_get_image = "-ss %TIME% -f image2 -vframes 1 pipe:1"
@@ -1000,12 +1066,18 @@ encode_ss_frame = "-ss %TIME%"
 ; Encode segment duration argument
 encode_ss_duration = "-t %DURATION%"
 
+; Use segments for transcoding or send it all in one go.
+; Useful if you are having issues streaming the full track.
+; You can set it for all streams or a specific player
+; POSSIBLE VALUES: true webplayer api
+; DEFAULT: = false
+;send_full_stream = "webplayer"
 
 ;#########################################################
 ; Proxy Settings (optional)                              #
 ;#########################################################
 
-; If Ampache is behind an http proxy, specifiy the hostname or IP address
+; If Ampache is behind an http proxy, specify the hostname or IP address
 ; port, proxy username, and proxy password here.
 ; DEFAULT: not in use
 ;proxy_host = "192.168.0.1"
@@ -1014,7 +1086,7 @@ encode_ss_duration = "-t %DURATION%"
 ;proxy_pass = ""
 
 ; If Ampache is behind an https reverse proxy, force use HTTPS protocol.
-;Default: false
+; DEFAULT: false
 ;force_ssl = "true"
 
 
@@ -1022,6 +1094,12 @@ encode_ss_duration = "-t %DURATION%"
 ;  Mail Settings                                         #
 ;#########################################################
 
+; Enable or disable email server features
+; otherwise, you can reset your password
+; and never receive an email with the new one
+; Default: false
+;mail_enable = "false"
+
 ; Method used to send mail
 ; POSSIBLE VALUES: smtp sendmail php
 ; DEFAULT: php
@@ -1078,17 +1156,18 @@ encode_ss_duration = "-t %DURATION%"
 ; DEFAULT: false
 ;mail_auth = "true"
 
-;SMTP Username
+; SMTP username
 ; your mail auth username.
 ;mail_auth_user = ""
 
-; SMTP Password
+; SMTP password
 ; your mail auth password.
 ;mail_auth_pass = ""
 
 ;#############################
 ;   Abbreviation Filter      #
 ;#############################
-; For file name parsing. Any unecessary abbreviations in file names can be removed during parsing
+; For file name parsing. Any unnecessary abbreviations in file names can be removed during parsing
 ; by adding them to the list below so that they will be removed during the parsing process.
 common_abbr = "divx,xvid,dvdrip,hdtv,lol,axxo,repack,xor,pdtv,real,vtv,caph,2hd,proper,fqm,uncut,topaz,tvt,notv,fpn,fov,orenji,0tv,omicron,dsr,ws,sys,crimson,wat,hiqt,internal,brrip,boheme,vost,vostfr,fastsub,addiction,x264,LOL,720p,1080p,YIFY,evolve,fihtv,first,bokutox,bluray,tvboom,info"
+