diff --git a/devel/py-python-dtrace/Makefile b/devel/py-python-dtrace/Makefile
index b9f689b52b6e..5bd80e7c1042 100644
--- a/devel/py-python-dtrace/Makefile
+++ b/devel/py-python-dtrace/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	python-dtrace
 PORTVERSION=	0.0.13
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gcj21@cl.cam.ac.uk
 COMMENT=	DTrace consumer for Python based on libdtrace
 WWW=		https://tmetsch.github.io/python-dtrace/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils cython cython_run
 
 .include <bsd.port.pre.mk>
 
 # We need to pass the path to the source for older FreeBSD versions that
 # don't install dtrace.h to /usr/include.
 .if !exists(/usr/include/dtrace.h)
 .if !exists(${SRC_BASE}/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h)
 IGNORE=	requires kernel source files in SRC_BASE=${SRC_BASE}
 .endif
 MAKE_ENV+=	FREEBSD_SRC_DIR=${SRC_BASE}
 .endif
 
 # Tests not included in the release tarball, uncomment if this changes.
-# TEST_DEPENDS=→${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
+# TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 #do-test:
 #	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.post.mk>
diff --git a/emulators/mame/files/target.ini.in b/emulators/mame/files/target.ini.in
index af82c5b55f90..45f332852e02 100644
--- a/emulators/mame/files/target.ini.in
+++ b/emulators/mame/files/target.ini.in
@@ -1,396 +1,396 @@
-#
+#
 # CORE CONFIGURATION OPTIONS
 #
 readconfig                1
 writeconfig               0
 
 #
 # CORE SEARCH PATH OPTIONS
 #
 homepath                  ~/.%%MTARGET%%
 rompath                   ~/.%%MTARGET%%/roms;%%DATADIR%%/roms/
 hashpath                  ~/.%%MTARGET%%/hash;%%DATADIR%%/hash/
 samplepath                ~/.%%MTARGET%%/samples;%%DATADIR%%/samples/
 artpath                   ~/.%%MTARGET%%/artwork;%%DATADIR%%/artwork/
 ctrlrpath                 ~/.%%MTARGET%%/ctrlr;%%DATADIR%%/ctrlr/
 inipath                   ~/.%%MTARGET%%/;.;~/.%%MTARGET%%/ini;%%DATADIR%%/ini/
 fontpath                  ~/.%%MTARGET%%/font;%%DATADIR%%/font/
 cheatpath                 ~/.%%MTARGET%%/cheat;%%DATADIR%%/cheat/
 crosshairpath             ~/.%%MTARGET%%/crosshair;%%DATADIR%%/crosshair/
 pluginspath               ~/.%%MTARGET%%/plugins;%%DATADIR%%/plugins/
 languagepath              ~/.%%MTARGET%%/language;%%DATADIR%%/language/
 swpath                    ~/.%%MTARGET%%/software;%%DATADIR%%/software/
 
 #
 # CORE OUTPUT DIRECTORY OPTIONS
 #
 cfg_directory             ~/.%%MTARGET%%/cfg
 nvram_directory           ~/.%%MTARGET%%/nvram
 input_directory           ~/.%%MTARGET%%/inp
 state_directory           ~/.%%MTARGET%%/state
 snapshot_directory        ~/.%%MTARGET%%/snapshot
 diff_directory            ~/.%%MTARGET%%/diff
 comment_directory         ~/.%%MTARGET%%/comments
 share_directory           ~/.%%MTARGET%%/share
 
 #
 # CORE STATE/PLAYBACK OPTIONS
 #
 state                     
 autosave                  0
 rewind                    0
 rewind_capacity           100
 playback                  
 record                    
 exit_after_playback       0
 mngwrite                  
 aviwrite                  
 wavwrite                  
 snapname                  %g/%i
 snapsize                  auto
 snapview                  auto
 snapbilinear              1
 statename                 %g
 burnin                    0
 
 #
 # CORE PERFORMANCE OPTIONS
 #
 autoframeskip             0
 frameskip                 0
 seconds_to_run            0
 throttle                  1
 sleep                     1
 speed                     1.0
 refreshspeed              0
 lowlatency                0
 
 #
 # CORE RENDER OPTIONS
 #
 keepaspect                1
 unevenstretch             1
 unevenstretchx            0
 unevenstretchy            0
 autostretchxy             0
 intoverscan               0
 intscalex                 0
 intscaley                 0
 
 #
 # CORE ROTATION OPTIONS
 #
 rotate                    1
 ror                       0
 rol                       0
 autoror                   0
 autorol                   0
 flipx                     0
 flipy                     0
 
 #
 # CORE ARTWORK OPTIONS
 #
 artwork_crop              0
 fallback_artwork          
 override_artwork          
 
 #
 # CORE SCREEN OPTIONS
 #
 brightness                1.0
 contrast                  1.0
 gamma                     1.0
 pause_brightness          0.65
 effect                    none
 
 #
 # CORE VECTOR OPTIONS
 #
 beam_width_min            1.0
 beam_width_max            1.0
 beam_dot_size             1.0
 beam_intensity_weight     0
 flicker                   0
 
 #
 # CORE SOUND OPTIONS
 #
 samplerate                48000
 samples                   1
 volume                    0
 compressor                1
 speaker_report            0
 
 #
 # CORE INPUT OPTIONS
 #
 coin_lockout              1
 ctrlr                     
 mouse                     0
 joystick                  1
 lightgun                  0
 multikeyboard             0
 multimouse                0
 steadykey                 0
 ui_active                 0
 offscreen_reload          0
 joystick_map              auto
 joystick_deadzone         0.3
 joystick_saturation       0.85
 natural                   0
 joystick_contradictory    0
 coin_impulse              0
 
 #
 # CORE INPUT AUTOMATIC ENABLE OPTIONS
 #
 paddle_device             keyboard
 adstick_device            keyboard
 pedal_device              keyboard
 dial_device               keyboard
 trackball_device          keyboard
 lightgun_device           keyboard
 positional_device         keyboard
 mouse_device              mouse
 
 #
 # CORE DEBUGGING OPTIONS
 #
 verbose                   0
 log                       0
 oslog                     0
 debug                     0
 update_in_pause           0
 debugscript               
 debuglog                  0
 
 #
 # CORE COMM OPTIONS
 #
 comm_localhost            0.0.0.0
 comm_localport            15112
 comm_remotehost           127.0.0.1
 comm_remoteport           15112
 comm_framesync            0
 
 #
 # CORE MISC OPTIONS
 #
 drc                       1
 drc_use_c                 0
 drc_log_uml               0
 drc_log_native            0
 bios                      
 cheat                     0
 skip_gameinfo             0
 uifont                    default
 ui                        cabinet
 ramsize                   
 confirm_quit              0
 ui_mouse                  1
 language                  
 nvram_save                1
 
 #
 # SCRIPTING OPTIONS
 #
 autoboot_command          
 autoboot_delay            0
 autoboot_script           
 console                   0
 plugins                   1
 plugin                    
 noplugin                  
 
 #
 # HTTP SERVER OPTIONS
 #
 http                      0
 http_port                 8080
 http_root                 web
 
 #
 # OSD KEYBOARD MAPPING OPTIONS
 #
 uimodekey                 auto
 
 #
 # OSD FONT OPTIONS
 #
 uifontprovider            auto
 
 #
 # OSD OUTPUT OPTIONS
 #
 output                    auto
 
 #
 # OSD INPUT OPTIONS
 #
 keyboardprovider          auto
 mouseprovider             auto
 lightgunprovider          auto
 joystickprovider          auto
 
 #
 # OSD DEBUGGING OPTIONS
 #
 debugger                  auto
 debugger_port             23946
 debugger_font             auto
 debugger_font_size        0
 watchdog                  0
 
 #
 # OSD PERFORMANCE OPTIONS
 #
 numprocessors             auto
 bench                     0
 
 #
 # OSD VIDEO OPTIONS
 #
 video                     auto
 numscreens                1
 window                    0
 maximize                  1
 waitvsync                 0
 syncrefresh               0
 monitorprovider           auto
 
 #
 # OSD PER-WINDOW VIDEO OPTIONS
 #
 screen                    auto
 aspect                    auto
 resolution                auto
 view                      auto
 screen0                   auto
 aspect0                   auto
 resolution0               auto
 view0                     auto
 screen1                   auto
 aspect1                   auto
 resolution1               auto
 view1                     auto
 screen2                   auto
 aspect2                   auto
 resolution2               auto
 view2                     auto
 screen3                   auto
 aspect3                   auto
 resolution3               auto
 view3                     auto
 
 #
 # OSD FULL SCREEN OPTIONS
 #
 switchres                 0
 
 #
 # OSD ACCELERATED VIDEO OPTIONS
 #
 filter                    1
 prescale                  1
 
 #
 # OpenGL-SPECIFIC OPTIONS
 #
 gl_forcepow2texture       0
 gl_notexturerect          0
 gl_vbo                    1
 gl_pbo                    1
 gl_glsl                   0
 gl_glsl_filter            1
 glsl_shader_mame0         none
 glsl_shader_mame1         none
 glsl_shader_mame2         none
 glsl_shader_mame3         none
 glsl_shader_mame4         none
 glsl_shader_mame5         none
 glsl_shader_mame6         none
 glsl_shader_mame7         none
 glsl_shader_mame8         none
 glsl_shader_mame9         none
 glsl_shader_screen0       none
 glsl_shader_screen1       none
 glsl_shader_screen2       none
 glsl_shader_screen3       none
 glsl_shader_screen4       none
 glsl_shader_screen5       none
 glsl_shader_screen6       none
 glsl_shader_screen7       none
 glsl_shader_screen8       none
 glsl_shader_screen9       none
 
 #
 # OSD SOUND OPTIONS
 #
 sound                     auto
 audio_latency             2
 
 #
 # BGFX POST-PROCESSING OPTIONS
 #
 bgfx_path                 %%DATADIR%%/bgfx
 bgfx_backend              auto
 bgfx_debug                0
 bgfx_screen_chains        default
 bgfx_shadow_mask          slot-mask.png
 bgfx_lut                  lut-default.png
 bgfx_avi_name             auto
 
 #
 # SDL PERFORMANCE OPTIONS
 #
 sdlvideofps               0
 
 #
 # SDL VIDEO OPTIONS
 #
 centerh                   1
 centerv                   1
 scalemode                 none
 
 #
 # SDL FULL SCREEN OPTIONS
 #
 useallheads               0
 attach_window             
 
 #
 # SDL KEYBOARD MAPPING
 #
 keymap                    0
 keymap_file               keymap.dat
 
 #
 # SDL JOYSTICK MAPPING
 #
 sixaxis                   0
 
 #
 # SDL LIGHTGUN MAPPING
 #
 lightgun_index1           auto
 lightgun_index2           auto
 lightgun_index3           auto
 lightgun_index4           auto
 lightgun_index5           auto
 lightgun_index6           auto
 lightgun_index7           auto
 lightgun_index8           auto
 
 #
 # SDL LOW-LEVEL DRIVER OPTIONS
 #
 videodriver               auto
 renderdriver              auto
 audiodriver               auto
 gl_lib                    auto
 
 #
 # FRONTEND COMMAND OPTIONS
 #
 dtd                       1
diff --git a/emulators/virtualbox-ose-additions/pkg-message b/emulators/virtualbox-ose-additions/pkg-message
index 221b43a1fee4..9b858849abdb 100644
--- a/emulators/virtualbox-ose-additions/pkg-message
+++ b/emulators/virtualbox-ose-additions/pkg-message
@@ -1,36 +1,36 @@
 [
 { type: install
   message: <<EOM
 VirtualBox Guest Additions are installed.
 
 To enable and start the required services:
 
 # sysrc vboxguest_enable="YES"
 # sysrc vboxservice_enable="YES"
 
 To start the services, restart the system.
 
 In some situations, a panic will occur when the kernel module loads.
 Having no more than one virtual CPU might mitigate the issue.
 
 For features such as window scaling and clipboard sharing, membership of
-the wheel group is required. With username jerry as an example:
+the wheel group is required. With username "jerry" as an example:
 
 # pw groupmod wheel -m jerry
 
 The settings dialogue for FreeBSD guests encourages use of the VMSVGA
 graphics controller. Whilst this might suit installations of FreeBSD
 without a desktop environment (a common use case), it is not appropriate
 where Guest Additions are installed.
 
 Where Guest Additions are installed:
 
 1. prefer VBoxSVGA
 
 2. do not enable 3D acceleration (doing so will invisibly
    lose the preference for VBoxSVGA)
 
-– you may ignore the yellow alert that encourages use of VMSVGA.
+You may ignore the yellow alert that encourages use of VMSVGA.
 EOM
 }
 ]
diff --git a/games/openbor/pkg-descr b/games/openbor/pkg-descr
index a10151ef8bc3..109d77e1a257 100644
--- a/games/openbor/pkg-descr
+++ b/games/openbor/pkg-descr
@@ -1,7 +1,7 @@
 OpenBOR is a royalty free sprite-based side scrolling gaming
 engine. From humble beginnings in 2004, it has since grown into the
 most versatile, easy to use, and powerful engine of its type you will
-find anywhere. OpenBOR is optimized for side-scrolling "beat 'em up"
+find anywhere. OpenBOR is optimized for side-scrolling beat 'em up
 style games (Double Dragon, Streets of Rage, Final Fight), but easily
 accommodates any sort of gameplay style and feature set you can
 imagine.
diff --git a/games/pysolfc/pkg-message b/games/pysolfc/pkg-message
index 32648f49242d..bf0feec03850 100644
--- a/games/pysolfc/pkg-message
+++ b/games/pysolfc/pkg-message
@@ -1,51 +1,51 @@
 [
 { type: install
   message: <<EOD
 Please note that only the default set of cards was installed.  If you would
 like to install more cardsets, please proceed as follows:
 
 $ fetch https://netcologne.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.1/PySolFC-Cardsets-2.1.tar.bz2
 $ tar xf PySolFC-Cardsets-2.1.tar.bz2
 $ mkdir -p ~/.PySolFC/cardsets
 $ cp -r PySolFC-Cardsets-2.1/cardset-* ~/.PySolFC/cardsets/
 EOD
 }
 { type: upgrade
   maximum_version: 2.12.0
   message: <<EOD
 Please note that the new version of PySolFC contains only a default set of
 cards.  If you should miss one or more cardsets, you can set them up as
 follows:
 
 $ fetch https://github.com/shlomif/PySolFC-Cardsets/archive/refs/tags/2.0.tar.gz
 $ tar xf 2.0.tar.gz
 $ cp -r PySolFC-Cardsets-2.0/cardsets* ~/.PySolFC/cardsets/
 EOD
 }
 { type: upgrade
   maximum_version: 2.16.0
   message: <<EOD
 Since PySolFC 2.16 a new high resolution default display was introduced.  It
 uses high resolution cardsets and scaling to offer an improved look on larger
 monitors.
 
 Please note that the new high-resolution options will not override your
 currently selected options for existing users.  If you want to use the new
 settings, you can delete or rename your options.cfg file.
 
 Also note that because of these changes, upgrading your version of PySolFC
-Cardsets is required even if you’re using the minimal package.  If you are
+Cardsets is required even if you're using the minimal package.  If you are
 installing from pkg/ports, this will be handled automatically.
 
 If you're using the larger collection of cardsets, please use the following
 steps to upgrade your cardsets:
 
 $ mv ~/.PySolFC/cardsets ~/.PySolFC/cardsets.bak
 $ fetch https://netcologne.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.1/PySolFC-Cardsets-2.1.tar.bz2
 $ tar xf PySolFC-Cardsets-2.1.tar.bz2
 $ mkdir -p ~/.PySolFC/cardsets
 $ cp -r PySolFC-Cardsets-2.1/cardset-* ~/.PySolFC/cardsets/
 $ rm -r ~/.PySolFC/cardsets.bak
 EOD
 }
 ]
diff --git a/multimedia/navidrome/files/config.toml.sample.in b/multimedia/navidrome/files/config.toml.sample.in
index 9cadbe155d1f..29fdfc953dff 100644
--- a/multimedia/navidrome/files/config.toml.sample.in
+++ b/multimedia/navidrome/files/config.toml.sample.in
@@ -1,73 +1,73 @@
 # Navidrome Configuration File
 # Anything that is commented out will use the default value shown
 #
 # Note: This file is installed by the port and not distributed as part of Navidrome
 
 # Folder where your music library is stored. Can be read-only
 MusicFolder = "%%DATADIR%%/music"
-# Folder to store application data (DB, cache…).
+# Folder to store application data (database, cache, etc.)
 #DataFolder 	= "/var/db/navidrome"
 # How frequently to scan for changes in your music library. Set it to 0 to disable scans
 #ScanInterval = "1m"
 
 # Log level. Useful for troubleshooting. Possible values: error, info, debug, trace. Default: info
 LogLevel	= "info"
 
 # HTTP port Navidrome will use
 #Port		= 4533
 # IP address the server will bind to. Comment out to use 0.0.0.0 and :: (all IPs)
 Address	= "127.0.0.1"
 
 # Enables transcoding configuration in the UI
 #EnableTranscodingConfig = false
 # Size of transcoding cache. Set to 0 to disable cache
 #TranscodingCacheSize 	= "100MB"
 # Size of image (art work) cache. Set to 0 to disable cache
 #ImageCacheSize			= "100MB"
 # Enable/disable .m3u playlist auto-import
 #AutoImportPlaylists		= true
 
 # Base URL (only the path part) to configure Navidrome behind a proxy (ex: /music).  Comment out to leave empty
 #BaseUrl				= ""
 # Change background image used in the Login page.  Comment out to use random music image from Unsplash.com
 #UILoginBackgroundUrl 	= ""
 # Add a welcome message to the login screen
 #UIWelcomeMessage		= ""
 # Send basic info to your own Google Analytics account. Must be in the format UA-XXXXXXXX 	Empty (disabled)
 #GATrackingID 			= ""
 
 # List of ignored articles when sorting/indexing artists
 #IgnoredArticles		= "The El La Los Las Le Les Os As O A"
 # Match query strings anywhere in searchable fields, not only in word boundaries. Useful for languages where words are not space separated
 #SearchFullString	= false
 
 # Configure the order to look for cover art images. Use special embedded value to get embedded images from the audio files
 #CoverArtPriority 	= "embedded, cover.*, folder.*, front.*"
 # Set JPEG quality percentage for resized cover art images
 #CoverJpegQuality	= 75
 # Enable the option in the UI to download music/albums/artists/playlists from the server
 #EnableDownloads		= true
 
 # How long Navidrome will wait before closing web ui idle sessions
 #SessionTimeout		= "24h"
 # How many login requests can be processed from a single IP during the AuthWindowLength. Set to 0 to disable the limit rater
 #AuthRequestLimit	= 5
 # Window Length for the authentication rate limit
 #AuthWindowLength	= "20s"
 # Select metadata extractor implementation. Options: taglib or ffmpeg
 #Scanner.Extractor	= "taglib"
 
 # Last.FM ApiKey
 #LastFM.ApiKey		= ""
 # Last.FM Shared Secret
 #LastFM.Secret		= ""
-# Two letter-code for language to be used to retrieve biographies from Last.FM 
+# Two letter-code for language to be used to retrieve biographies from Last.FM
 #LastFM.Language	= "en"
 
 # Spotify Client ID
 #Spotify.ID		= ""
 # Spotify Client Secret
 #Spotify.Secret	= ""
 
-# Use Gravatar images as the user profile image. Needs the user’s email to be filled.  Defaule: false
+# Use Gravatar images as the user profile image. Needs the user's email to be filled.  Default: false
 EnableGravatar	= true
diff --git a/net-im/jitsi-prosody-plugins/files/prosody.cfg.lua.in b/net-im/jitsi-prosody-plugins/files/prosody.cfg.lua.in
index 7c20c254d2da..a9a592b6a0de 100644
--- a/net-im/jitsi-prosody-plugins/files/prosody.cfg.lua.in
+++ b/net-im/jitsi-prosody-plugins/files/prosody.cfg.lua.in
@@ -1,170 +1,170 @@
 -- Place this file in %%LOCALBASE%%/etc/prosody/prosody.cfg.lua
 --
 -- Then run
 --
 --    prosodyctl cert generate jitsi.example.com
 --    prosodyctl cert generate auth.jitsi.example.com
 --    keytool -noprompt -keystore %%ETCDIR%%/jicofo/truststore.jks -importcert \
 --      -alias prosody -file /var/db/prosody/auth.jitsi.example.com.crt
 --
 --    prosodyctl register jvb auth.jitsi.example.com "supersecret"
 --    prosodyctl register focus auth.jitsi.example.com "supersecret"
 --    prosodyctl mod_roster_command subscribe focus.jitsi.example.com focus@auth.jitsi.example.com "supersecret"
 
 plugin_paths = { "%%LOCALBASE%%/lib/jitsi-prosody-plugins/" }
 
 log = {
-  -- Log files (change ‘info’ to ‘debug’ for debug logs):
+  -- Log files (change `info' to `debug' for debug logs):
   info = "/var/log/prosody.log";
   error = "/var/log/prosody.err";
   -- Syslog:
   --debug = "*syslog";
 }
 
 -- domain mapper options, must at least have domain base set to use the mapper
 muc_mapper_domain_base = "jitsi.example.com";
 
 -- external_service_secret = "__turnSecret__";
 -- external_services = {
 --     { type = "stun", host = "jitsi.example.com", port = 3478 },
 --     { type = "turn", host = "jitsi.example.com", port = 3478, transport = "udp", secret = true, ttl = 86400, algorithm = "turn" },
 --     { type = "turns", host = "jitsi.example.com", port = 5349, transport = "tcp", secret = true, ttl = 86400, algorithm = "turn" }
 --};
 
 --cross_domain_bosh = true;
 consider_bosh_secure = true;
 https_ports = { }; -- Remove this line to prevent listening on port 5284
 
 -- by default prosody 0.12 sends cors headers, if you want to disable it uncomment the following (the config is available on 0.12.1)
 --http_cors_override = {
 --    bosh = {
 --        enabled = false;
 --    };
 --    websocket = {
 --        enabled = false;
 --    };
 --}
 
 -- https://ssl-config.mozilla.org/#server=haproxy&version=2.1&config=intermediate&openssl=1.1.0g&guideline=5.4
 ssl = {
     protocol = "tlsv1_2+";
     ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
 }
 
 unlimited_jids = {
     "focus@auth.jitsi.example.com",
     "jvb@auth.jitsi.example.com"
 }
 
 VirtualHost "jitsi.example.com"
     -- enabled = false -- Remove this line to enable this host
     authentication = "anonymous"
     -- Properties below are modified by jitsi-meet-tokens package config
     -- and authentication above is switched to "token"
     --app_id="example_app_id"
     --app_secret="example_app_secret"
     -- Assign this host a certificate for TLS, otherwise it would use the one
     -- set in the global section (if any).
     -- Note that old-style SSL on port 5223 only supports one certificate, and will always
     -- use the global one.
     ssl = {
         key = "/var/db/prosody/jitsi.example.com.key";
         certificate = "/var/db/prosody/jitsi.example.com.crt";
     }
     av_moderation_component = "avmoderation.jitsi.example.com"
     speakerstats_component = "speakerstats.jitsi.example.com"
     conference_duration_component = "conferenceduration.jitsi.example.com"
     -- we need bosh
     modules_enabled = {
         "bosh";
         "pubsub";
         "ping"; -- Enable mod_ping
         "speakerstats";
         "external_services";
         "conference_duration";
         "muc_lobby_rooms";
         "muc_breakout_rooms";
         "av_moderation";
         "saslauth";
     }
     c2s_require_encryption = false
     lobby_muc = "lobby.jitsi.example.com"
     breakout_rooms_muc = "breakout.jitsi.example.com"
     main_muc = "conference.jitsi.example.com"
     -- muc_lobby_whitelist = { "recorder.jitsi.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
 
 Component "conference.jitsi.example.com" "muc"
     restrict_room_creation = true
     storage = "memory"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
         "polls";
         --"token_verification";
         "muc_rate_limit";
         "saslauth";
     }
     admins = { "focus@auth.jitsi.example.com" }
     muc_room_locking = false
     muc_room_default_public_jids = true
     c2s_require_encryption = false
 
 Component "breakout.jitsi.example.com" "muc"
     restrict_room_creation = true
     storage = "memory"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
         --"token_verification";
         "muc_rate_limit";
         "polls";
         "saslauth";
     }
     admins = { "focus@auth.jitsi.example.com" }
     muc_room_locking = false
     muc_room_default_public_jids = true
 
 -- internal muc component
 Component "internal.auth.jitsi.example.com" "muc"
     storage = "memory"
     modules_enabled = {
         "ping";
     }
     admins = { "focus@auth.jitsi.example.com", "jvb@auth.jitsi.example.com" }
     muc_room_locking = false
     muc_room_default_public_jids = true
     c2s_require_encryption = false
 
 VirtualHost "auth.jitsi.example.com"
     modules_enabled = {
         "limits_exception";
         "saslauth";
     }
-    -- authentication = "internal_plain" 
+    -- authentication = "internal_plain"
     c2s_require_encryption = false
     authentication = "internal_hashed"
 
 -- Proxy to jicofo's user JID, so that it doesn't have to register as a component.
 Component "focus.jitsi.example.com" "client_proxy"
     target_address = "focus@auth.jitsi.example.com"
 
 Component "speakerstats.jitsi.example.com" "speakerstats_component"
     muc_component = "conference.jitsi.example.com"
 
 Component "conferenceduration.jitsi.example.com" "conference_duration_component"
     muc_component = "conference.jitsi.example.com"
 
 Component "avmoderation.jitsi.example.com" "av_moderation_component"
     muc_component = "conference.jitsi.example.com"
 
 Component "lobby.jitsi.example.com" "muc"
     storage = "memory"
     restrict_room_creation = true
     muc_room_locking = false
     muc_room_default_public_jids = true
     modules_enabled = {
         "muc_rate_limit";
         "polls";
         "saslauth";
     }
     c2s_require_encryption = false
diff --git a/www/gitea/pkg-message b/www/gitea/pkg-message
index 7f100837b709..e3393b659d24 100644
--- a/www/gitea/pkg-message
+++ b/www/gitea/pkg-message
@@ -1,30 +1,30 @@
 [
 { type: upgrade
   maximum_version: 1.7.6
   message: <<EOM
 When upgrading from Gitea 1.7 or earlier, Gitea requires the addition of
 another secret to the config file in order to start up.  Either manually add
 JWT_SECRET to the ${PREFIX}/etc/gitea/conf/app.ini config file (see
 app.ini.sample), or allow Gitea to make the change for you by making the
 config file writable to the git user.
 EOM
 }
 { type: upgrade
   maximum_version: 1.15.0
   message: <<EOM
 Some config file options have been changed in Gitea 1.15. Please refer to
 the documentation at https://docs.gitea.io/en-us/customizing-gitea/ and
 the release notes.
 EOM
 }
 { type: upgrade
   maximum_version: 1.15.1
   message: <<EOM
-We remind users that a bug was discovered with gitea dump in 1.14.3–1.14.6
+We remind users that a bug was discovered with gitea dump in 1.14.3-1.14.6
 and 1.15.0.  Database dumps from these versions cause broken fields in the
 repo_unit and login_source tables causing the issue identified in #16961.
 Users on 1.14.x must upgrade to 1.14.7 before running gitea dump.  See the
 release notes for more information.
 EOM
 }
 ]