[ jEdit-commits ] [ jEdit core ] jEdit core branch master updated. v5.7.0-29-gdd6ced0c7

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jEdit core".

The branch, master has been updated
       via  dd6ced0c71837f1facd3133dc4ef94195f37d6c3 (commit)
       via  c47795ae32555d6374b722fa47264ffe8371d88f (commit)
       via  158bb9e0613c6480af5ed7c8c09627f949927aa8 (commit)
       via  f81bb86be51622bf06f5d3612039c13e60031872 (commit)
      from  70840836eb6a3dffa42ef2fea7091f5cc8e5b922 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit: https://sourceforge.net/p/jedit/jEdit/ci/dd6ced0c71837f1facd3133dc4ef94195f37d6c3/
tree: https://sourceforge.net/p/jedit/jEdit/ci/dd6ced0c71837f1facd3133dc4ef94195f37d6c3/tree/

commit dd6ced0c71837f1facd3133dc4ef94195f37d6c3
Author: Björn Kautler <Bj...@Ka...>
Date:   Tue Apr 1 03:23:47 2025 +0200

    Use HTTPS to download mirror list, plugin list, and plugins (#4043)

diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index edad4a440..70ad326fb 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -60,6 +60,9 @@ for contributing to this release.
 - Prevent multiple jEdit instances using the same settings directory using a
   file lock (Björn Kautler)
 
+- Use HTTPS to download mirror list, plugin list, and plugins
+  (#4043 - Björn Kautler)
+
 }}}
 {{{ API Changes
 
diff --git a/org/gjt/sp/jedit/jedit_gui.props b/org/gjt/sp/jedit/jedit_gui.props
index e2f611bf2..878c8b6b8 100644
--- a/org/gjt/sp/jedit/jedit_gui.props
+++ b/org/gjt/sp/jedit/jedit_gui.props
@@ -1003,8 +1003,8 @@ vfs.browser.open-in=vfs.browser.open-view \
 #}}}
 
 #{{{ Plugin manager
-plugin-manager.export-url=http://plugins.jedit.org/export/gzip_plugin_manager.php
-plugin-manager.mirror-url=http://plugins.jedit.org/export/mirror_list.php
+plugin-manager.export-url=https://plugins.jedit.org/export/gzip_plugin_manager.php
+plugin-manager.mirror-url=https://plugins.jedit.org/export/mirror_list.php
 
 #{{{ Plugin management
 manage-plugins.restore.icon=22x22/actions/document-open.png
diff --git a/org/gjt/sp/jedit/pluginmgr/Roster.java b/org/gjt/sp/jedit/pluginmgr/Roster.java
index 4b43f743f..e7104b2a9 100644
--- a/org/gjt/sp/jedit/pluginmgr/Roster.java
+++ b/org/gjt/sp/jedit/pluginmgr/Roster.java
@@ -447,9 +447,9 @@ class Roster
 		{
 			try
 			{
-				String host = jEdit.getProperty("plugin-manager.mirror.id");
-				if (host == null || host.equals(MirrorList.Mirror.NONE))
-					host = "default";
+				String mirror = jEdit.getProperty("plugin-manager.mirror.id");
+				if (mirror == null || mirror.equals(MirrorList.Mirror.NONE))
+					mirror = "default";
 
 				// follow HTTP redirects
 				boolean finalUrlFound = false;
@@ -465,7 +465,7 @@ class Roster
 					int responseCode = httpConn.getResponseCode();
 					String locationHeader = httpConn.getHeaderField("Location");
 					if ((responseCode >= 300) && (responseCode < 400) && (locationHeader != null))
-						finalUrl = locationHeader.replaceFirst("^https:", "http:");
+						finalUrl = locationHeader;
 					else
 						finalUrlFound = true;
 				}
@@ -475,8 +475,8 @@ class Roster
 				String path = MiscUtilities.constructPath(getDownloadDir(),fileName);
 				Matcher hostMatcher = HOST_REGEX.matcher(finalUrl);
 				if (hostMatcher.find())
-					host = hostMatcher.group();
-				String progressMessage = jEdit.getProperty("plugin-manager.progress", new String[]{fileName, host});
+					mirror = hostMatcher.group();
+				String progressMessage = jEdit.getProperty("plugin-manager.progress", new String[]{fileName, mirror});
 				progress.setStatus(progressMessage);
 				try (InputStream in = conn.getInputStream();
 				     FileOutputStream out = new FileOutputStream(path))

commit: https://sourceforge.net/p/jedit/jEdit/ci/c47795ae32555d6374b722fa47264ffe8371d88f/
tree: https://sourceforge.net/p/jedit/jEdit/ci/c47795ae32555d6374b722fa47264ffe8371d88f/tree/

commit c47795ae32555d6374b722fa47264ffe8371d88f
Author: Björn Kautler <Bj...@Ka...>
Date:   Tue Apr 1 02:08:06 2025 +0200

    Use correct macOS name everywhere consistently

diff --git a/README.SRC.txt b/README.SRC.txt
index ebaebb8b6..62825eeae 100644
--- a/README.SRC.txt
+++ b/README.SRC.txt
@@ -29,17 +29,17 @@ General jEdit documentation can be found in the 'doc' directory.
     <https://adoptium.net/de/temurin/releases/?version=11> or from
     your package manager - e.g. openjdk-11-jdk.
 
- For building the windows installer (for the final step):
+ For building the Windows installer (for the final step):
 
   - Inno Setup 6.0.0 or newer. Get it from <https://www.jrsoftware.org/isdl.php>
   - A box running windows or wine, e.g. on *nix. If Inno Setup should be
     run via wine, a wine version of at least 1.3.10 is required because
     of a bug in earlier wine versions.
 
- For building the OS X disk image (DMG) for easy distribution
+ For building the macOS disk image (DMG) for easy distribution
  (for the final step):
 
-  - A box running OS X
+  - A box running macOS
 
 
 * Tasks
@@ -49,7 +49,7 @@ General jEdit documentation can be found in the 'doc' directory.
 
  - retrieve                retrieve the dependencies
   retrieves almost all dependencies needed for building jEdit, only InnoSetup for the
-  windows installer and wine, if InnoSetup should be run on *nix or OS X, have to
+  windows installer and wine, if InnoSetup should be run on *nix or macOS, have to
   be installed and configured in build.properties manually.
 
  - build                   build the jEdit JAR-file with full debug-information
@@ -86,7 +86,7 @@ General jEdit documentation can be found in the 'doc' directory.
   in the build-folder, configured in build.properties.
 
  - dist                    build all distribution files
-  builds all distribution files or prepares the final step for some of them (Win and Mac)
+  builds all distribution files or prepares the final step for some of them (Win and macOS)
   in the dist-folder, configured in build.properties.
 
  - dist-deb                build the DEB Package
@@ -98,17 +98,17 @@ General jEdit documentation can be found in the 'doc' directory.
  - dist-java               build the Java-installer
   builds the Java installer in the dist-folder, configured in build.properties.
 
- - dist-mac                build the OS X disk image (DMG-file)
-  builds the OS X internet-enabled disk image (DMG-file) if building on a box
-  running OS X. If building on a box running something else, there will be a file
+ - dist-mac                build the macOS disk image (DMG-file)
+  builds the macOS internet-enabled disk image (DMG-file) if building on a box
+  running macOS. If building on a box running something else, there will be a file
   called jedit<version_here>-dist-mac-finish.tar.bz2 in the dist-folder,
-  configured in build.properties. Give that to someone running OS X and ask him
+  configured in build.properties. Give that to someone running macOS and ask him
   to extract the archive and to execute "ant dist-mac-finish".
   The only thing that needs to be installed for this final step is Apache Ant.
 
- - dist-mac-finish         finish building the OS X disk image (DMG-file) on OS X
-  builds the OS X internet-enabled disk image (DMG-file) in the dist-folder,
-  configured in build.properties if building on a box running OS X.
+ - dist-mac-finish         finish building the macOS disk image (DMG-file) on macOS
+  builds the macOS internet-enabled disk image (DMG-file) in the dist-folder,
+  configured in build.properties if building on a box running macOS.
   This target is normally only run directly, if someone just has to do
   the final step that was prepared by "dist-mac" or "dist".
 
@@ -186,7 +186,7 @@ java build path.
 The ant build process creates a subfolder called "build" for its work.
 Eclipse does the same and may pick the same folder.
 It is recommended you check/ensure that a different build
-directory ("Default Ouptut Folder") for Eclipse is used.
+directory ("Default Output Folder") for Eclipse is used.
 
 Some of the source directories are only needed for building packages on
 certain platforms. If you add jEdit source to an IDE like Eclipse that tries
diff --git a/build.xml b/build.xml
index 12ad74bb8..ce1e352f1 100644
--- a/build.xml
+++ b/build.xml
@@ -512,7 +512,7 @@
 		</copy>
 		<copy todir="${jar.location}/jars">
 			<fileset dir="${lib.dir}/default-plugins">
-				<exclude name="MacOSX.jar"/>
+				<exclude name="MacOS.jar"/>
 			</fileset>
 		</copy>
 		<contrib:if>
@@ -520,7 +520,7 @@
 			<contrib:then>
 				<copy todir="${jar.location}/jars">
 					<fileset dir="${lib.dir}/default-plugins">
-						<include name="MacOSX.jar"/>
+						<include name="MacOS.jar"/>
 					</fileset>
 				</copy>
 			</contrib:then>
@@ -598,7 +598,7 @@
 				       osfamily="mac"/>
 			</contrib:case>
 			<contrib:default>
-				<fail message="Unsupported OS family (${osfamily}). If you are on Windows, *nix or MacOS, please report this as bug, if not, please report it as a feature request"/>
+				<fail message="Unsupported OS family (${osfamily}). If you are on Windows, *nix or macOS, please report this as bug, if not, please report it as a feature request"/>
 			</contrib:default>
 		</contrib:switch>
 		<taskdef name="create"
@@ -1018,7 +1018,7 @@
 					      startup/**
 					      ${jar.filename}"
 				    excludes="doc/api/**
-					      jars/MacOSX.jar"/>
+					      jars/MacOS.jar"/>
 		</tar>
 		<tar destfile="${dist.dir}/jedit-windows.tar.bz2"
 		     longfile="gnu"
@@ -1032,7 +1032,7 @@
 		     compression="bzip2">
 			<tarfileset id="jedit-mac"
 				    dir="${dist.dir}"
-				    includes="jars/MacOSX.jar"/>
+				    includes="jars/MacOS.jar"/>
 		</tar>
 		<tar destfile="${dist.dir}/jedit-api.tar.bz2"
 		     longfile="gnu"
@@ -1184,8 +1184,8 @@
 
 	<target name="dist-mac-finish"
 		depends="init,retrieve,setup"
-		description="finish building the Mac OS X disk image (DMG-file) on Mac OS X">
-		<fail message="The disk image (DMG-file) for easy distribution on Mac OS X can only be built on Mac OS X currently">
+		description="finish building the macOS disk image (DMG-file) on macOS">
+		<fail message="The disk image (DMG-file) for easy distribution on macOS can only be built on macOS currently">
 			<condition>
 				<not>
 					<os family="mac"/>
@@ -1325,7 +1325,7 @@
 
 	<target name="dist-mac"
 		depends="init,retrieve,setup,prepare-dist-files"
-		description="build the Mac OS X disk image (DMG-file)">
+		description="build the macOS disk image (DMG-file)">
 		<contrib:if>
 			<os family="mac"/>
 			<contrib:then>
@@ -1519,7 +1519,7 @@
 					      properties/**
 					      startup/**
 					      ${jar.filename}"
-				    excludes="jars/MacOSX.jar"
+				    excludes="jars/MacOS.jar"
 				    username="root"
 				    group="root"
 				    prefix="usr/share/jedit-${jedit.version}/"/>
@@ -1655,7 +1655,7 @@
 					   properties/**
 					   startup/**
 					   ${jar.filename}"
-				 excludes="jars/MacOSX.jar"/>
+				 excludes="jars/MacOS.jar"/>
 		</mod:calculatesize>
 		<copy todir="${dist.dir}/classes/package-files/linux/deb"
 		      encoding="UTF-8"
@@ -1717,7 +1717,7 @@
 			<datafileset file="."
 				     fullpath="usr/share/jEdit/jars/"/>
 			<datafileset dir="${dist.dir}/jars"
-				     excludes="MacOSX.jar"
+				     excludes="MacOS.jar"
 				     prefix="usr/share/jEdit/jars/"/>
 			<datafileset file="."
 				     fullpath="usr/share/man/"/>
@@ -2055,7 +2055,7 @@ Press Return key to continue...
 					       ${config.dist.dir}/modes/**
 					       ${config.dist.dir}/properties/**
 					       ${config.dist.dir}/startup/**"
-				     excludes="${config.dist.dir}/jars/MacOSX.jar"
+				     excludes="${config.dist.dir}/jars/MacOS.jar"
 				     compression="bzip2"/>
 			</contrib:else>
 		</contrib:if>
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index b24bc9fb9..edad4a440 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -49,6 +49,8 @@ for contributing to this release.
 
 - Replace outdated URLs and use HTTPS where possible (Björn Kautler)
 
+- Use correct macOS name everywhere consistently (Björn Kautler)
+
 }}}
 {{{ Miscellaneous
 
diff --git a/doc/FAQ/faq-general.xml b/doc/FAQ/faq-general.xml
index b65948335..5b5d98565 100644
--- a/doc/FAQ/faq-general.xml
+++ b/doc/FAQ/faq-general.xml
@@ -18,7 +18,7 @@
                     <para>jEdit is a programmer's text editor written in Java,
                     originally developed by Slava Pestov, now maintained by
                     others. It has an easy to use interface that resembles that
-                    of many other Windows and MacOS text editors. It is also
+                    of many other Windows and macOS text editors. It is also
                     highly customizable, and contains a <quote>plugin</quote>
                     architecture that allows its features to be extended by
                     additional programs.</para>
diff --git a/doc/FAQ/faq-install.xml b/doc/FAQ/faq-install.xml
index 413b1b642..7a88f7729 100644
--- a/doc/FAQ/faq-install.xml
+++ b/doc/FAQ/faq-install.xml
@@ -124,17 +124,17 @@
 				</qandadiv>
 
 				<qandadiv id="install-mac">
-						<title>Installing jEdit on MacOS</title>
+						<title>Installing jEdit on macOS</title>
 
 						<qandaentry>
 								<question id="install.mac9-basic">
-										<para>How do I install jEdit on MacOS 8 or MacOS 9? s</para>
+										<para>How do I install jEdit on macOS 8 or macOS 9?</para>
 								</question>
 
 								<answer>
 										<para>The latest version of jEdit requires
-										MacOS X (preferably 10.5 or later), because the Java
-										platforms of earlier MacOS version are outdated.</para>
+										macOS (preferably 10.5 or later), because the Java
+										platforms of earlier macOS version are outdated.</para>
 
 										<para>Once you have completed installing jEdit locate the
 										jedit.jar file and do the following:</para>
@@ -167,16 +167,14 @@
 
 						<qandaentry>
 								<question>
-										<para>How do I uninstall jEdit for Mac OS?</para>
+										<para>How do I uninstall jEdit for macOS?</para>
 								</question>
 
 								<answer>
 										<para>There are no system files, so simply drop the jEdit
 										folder in the trash. If you want to remove the settings
 										directory used by jEdit you will find it at
-										<filename>~/.jedit</filename>. It is hidden, so you will
-										need to remove it from the command line, or use one of the
-										various uilities available that will let you see it.</para>
+										<filename>~/Library/jEdit</filename>.</para>
 								</answer>
 						</qandaentry>
 				</qandadiv>
diff --git a/doc/FAQ/faq-problems.xml b/doc/FAQ/faq-problems.xml
index a30c13792..66d9a9363 100644
--- a/doc/FAQ/faq-problems.xml
+++ b/doc/FAQ/faq-problems.xml
@@ -42,7 +42,7 @@
                     <para>If jEdit does load using this procedure, you need to
                     examine the <quote>shortcut</quote> loading mechanism you
                     wish to use.</para>
-                    <para>On Linux and MacOS X, you need to find and examine the
+                    <para>On Linux and macOS, you need to find and examine the
                     <filename>jedit</filename> shell script provided by the
                     installation routine to confirm that the script's commands
                     target the correct files and locations, and that variables
@@ -71,7 +71,7 @@
                     settings, unsupported plugins) in your jEdit
                     settings directory (<literal>~/.jedit</literal> on Linux,
                     <literal>%APPDATA%\jEdit</literal> on Windows, or
-                    <literal>~/Library/jEdit</literal> on MacOS).
+                    <literal>~/Library/jEdit</literal> on macOS).
                     You may want to try renaming the offending directory
                     to something else, and restarting jEdit with fresh settings.
                     You can later copy things from your old settings back
@@ -242,7 +242,7 @@ view.unsplitCurrent();
                     solve. Depending on your platform, there should be
                     information logged about what caused the crash to occur. For
                     Unix type systems you will likely get an error in the
-                    console (and for Mac OS X you may also get a report in
+                    console (and for macOS you may also get a report in
                     ~/Library/Logs/CrashReporter/JavaApplicationStub.crash.log).
 					</para>
                 </answer>
diff --git a/doc/releasing-jedit.txt b/doc/releasing-jedit.txt
index 1e781bbeb..f011b0764 100644
--- a/doc/releasing-jedit.txt
+++ b/doc/releasing-jedit.txt
@@ -53,11 +53,11 @@ Workflow
       - Release
       - Release.gpg
 [/iffinal]
-6.2. If you have jedit[version]-dist-win-finish.tar.bz2 in your [tag]/dist folder you probably don't run a Windows box and don't have wine installed and set up, so please hand over this file to someone (e. g. <Björn "Vampire" Kautler> Va...@jE...) who does and ask him to unpack the file and run
+6.2. If you have jedit[version]-dist-win-finish.tar.bz2 in your [tag]/dist folder you probably don't run a Windows box and don't have wine installed and set up, so please hand over this file to someone (e. g. <Björn Kautler> Va...@jE...) who does and ask him to unpack the file and run
           ant dist-win-finish
      and to hand over the resulting file jedit[version]install.exe to you. The requirements for this are described in README.SRC.txt
 
-6.3. If you have jedit[version]-dist-mac-finish.tar.bz2 in your [tag]/dist folder you probably don't run a Mac OS X box, so please hand over this file to someone (e. g. Björn "Vampire" Kautler <Va...@jE...>) who does and ask him to unpack the file and run
+6.3. If you have jedit[version]-dist-mac-finish.tar.bz2 in your [tag]/dist folder you probably don't run a macOS box, so please hand over this file to someone (e. g. Björn Kautler <Va...@jE...>) who does and ask him to unpack the file and run
           ant dist-mac-finish
      and to hand over the resulting file jedit[version]install.dmg to you. The requirements for this are described in README.SRC.txt
 
@@ -92,7 +92,7 @@ Workflow
             - Download Button: Manual in A4 Paper size
             - Default Download For: <none>
         - jedit[version]install.dmg
-            - Download Button: Mac OS X Installer
+            - Download Button: macOS Installer
             - Default Download For: [ifdevel]<none>[/ifdevel][iffinal]mac[/iffinal]
         - jedit[version]install.exe
             - Download Button: Windows Installer
diff --git a/doc/users-guide/conventions.xml b/doc/users-guide/conventions.xml
index 8dca2d37e..c7d3b120a 100644
--- a/doc/users-guide/conventions.xml
+++ b/doc/users-guide/conventions.xml
@@ -35,7 +35,7 @@
                 <row>
                     <entry><keycap>C</keycap></entry>
 
-                    <entry>The primary modifier key in jEdit. On MacOS X, this
+                    <entry>The primary modifier key in jEdit. On macOS, this
                     is actually the key known as <quote>Command</quote>. On most
                     other keyboards, this key is labelled
                     <quote>Control</quote>.</entry>
@@ -44,7 +44,7 @@
                 <row>
                     <entry><keycap>A</keycap></entry>
 
-                    <entry>The secondary modifier key in jEdit. On MacOS X, this
+                    <entry>The secondary modifier key in jEdit. On macOS, this
                     is actually the key labelled <quote>Control</quote>. On most
                     other keyboards, this key is labelled
                     <quote>Alt</quote>.</entry>
@@ -94,7 +94,7 @@
                     interface widget. The "F10" key can also be pressed to put
                     focus on the menu bar, it has the same functionality as the 
                     Alt key in Windows. Note that this functionality is not
-                    available on MacOS X with the <quote>MacOS Adaptive</quote>
+                    available on macOS with the <quote>macOS Adaptive</quote>
                     look and feel. See <xref linkend="appearance-pane" /> for
                     information on changing the look and feel.</entry>
                 </row>
diff --git a/doc/users-guide/customizing.xml b/doc/users-guide/customizing.xml
index d8618d75d..865953554 100644
--- a/doc/users-guide/customizing.xml
+++ b/doc/users-guide/customizing.xml
@@ -682,7 +682,7 @@
         <para>The location of the settings directory is system-specific
         <footnote><para> On Linux, it is <literal>~/.jedit</literal>.
            On Windows, you will find it in <literal>%APPDATA%\jEdit</literal>.
-           On the Mac, it is <literal>~/Library/jEdit</literal>.
+           On macOS, it is <literal>~/Library/jEdit</literal>.
         </para></footnote>.
         It is printed to the activity log
         (<guimenu>Utilities</guimenu>&gt;<guisubmenu>Troubleshooting</guisubmenu>&gt;<guimenuitem>Activity
diff --git a/doc/users-guide/files.xml b/doc/users-guide/files.xml
index 75af6a700..abd17fdcc 100644
--- a/doc/users-guide/files.xml
+++ b/doc/users-guide/files.xml
@@ -206,7 +206,7 @@
         <title>Line Separators</title>
 
         <para>Unix systems use newlines (<literal>\n</literal>) to mark line
-        endings in text files. The MacOS uses carriage-returns
+        endings in text files. The macOS uses carriage-returns
         (<literal>\r</literal>). Windows uses a carriage-return followed by a
         newline (<literal>\r\n</literal>). jEdit can read and write files in all
         three formats.</para>
@@ -276,9 +276,9 @@
         <guimenuitem>Options</guimenuitem>
         dialog box; see <xref linkend="encodings-pane" />.
         Unless you change this setting, it will be your operating system's
-        native encoding, for example <literal>MacRoman</literal> on the MacOS,
-        <literal>windows-1252</literal> on Windows, and
-        <literal>ISO-8859-1</literal> on Unix.</para>
+        native encoding, for example <literal>MacRoman</literal> on macOS,
+        <literal>windows-1252</literal> on many Windows installations, and
+        <literal>UTF-8</literal> on many Linux installations.</para>
 
         <para>An encoding can be explicitly set when opening a file in the file
         system browser's
@@ -494,7 +494,7 @@
                 <listitem>
                     <para><guimenuitem>Root Directory</guimenuitem> - on Unix,
                     goes to the root directory (<filename>/</filename>). On
-                    Windows and MacOS X, lists all mounted drives and network
+                    Windows and macOS, lists all mounted drives and network
                     shares. The forward slash (/) achieves this too. </para>
                 </listitem>
 
diff --git a/doc/users-guide/macro-index.xml b/doc/users-guide/macro-index.xml
index 86f84b325..f68f724dc 100644
--- a/doc/users-guide/macro-index.xml
+++ b/doc/users-guide/macro-index.xml
@@ -367,7 +367,7 @@
 
                 <para>Toggles a local file's read-only flag. Uses
                 platform-specific commands, so it only works on Windows, Unix
-                and MacOS X.</para>
+                and macOS.</para>
             </listitem>
         </itemizedlist>
     </section>
diff --git a/doc/users-guide/starting.xml b/doc/users-guide/starting.xml
index 03767e522..f62ed1f6b 100644
--- a/doc/users-guide/starting.xml
+++ b/doc/users-guide/starting.xml
@@ -25,11 +25,11 @@
     having to wait for it to start the first time. The downside of this is
     increased memory usage.</para>
 
-    <para>When running on MacOS X, the <userinput>-background</userinput>
+    <para>When running on macOS, the <userinput>-background</userinput>
     command-line switch is active by default, so that jEdit conforms to the
     platform convention that programs should stay open until the
     <guimenuitem>Quit</guimenuitem> command is explicitly invoked by the user,
-    even if all windows are closed. To disable background mode on MacOS X, use
+    even if all windows are closed. To disable background mode on macOS, use
     the <userinput>-nobackground</userinput> switch.</para>
 
     <para>For more information about command line switches that control the
@@ -398,7 +398,7 @@
       directory as <literal>jEdit.exe</literal> and place one JVM option per
       line. </para>
 
-      <para> On Mac OS X, the jEdit.app bundle gets JVM options from a file called
+      <para> On macOS, the jEdit.app bundle gets JVM options from a file called
       <literal>Contents/Info.plist</literal>, which can be edited with a text editor.
       </para>
 
diff --git a/doc/users-guide/text-edit.xml b/doc/users-guide/text-edit.xml
index 88f2348f5..dfed12449 100644
--- a/doc/users-guide/text-edit.xml
+++ b/doc/users-guide/text-edit.xml
@@ -754,7 +754,7 @@
             <para>The quick copy feature is accessed using the middle mouse
             button. If you do not have a three-button mouse, then either
             <keycap>Alt</keycap>-click (on Windows and Unix) or
-            <keycap>Option</keycap>-click (on MacOS X). The quick copy feature
+            <keycap>Option</keycap>-click (on macOS). The quick copy feature
             enables the following behavior:</para>
 
             <itemizedlist>
diff --git a/installer/install.props b/installer/install.props
index 943dc4021..38241ba20 100644
--- a/installer/install.props
+++ b/installer/install.props
@@ -46,11 +46,11 @@ com...@je...@
 comp.3.fileset=jedit-windows
 comp.3.os=Windows
 
-comp.4.name=MacOS desktop integration
+comp.4.name=macOS desktop integration
 com...@je...@
 com...@je...@
 comp.4.fileset=jedit-mac
-comp.4.os=MacOS
+comp.4.os=macOS
 
 comp.5.name=OS/2 start script
 com...@je...@
diff --git a/keymaps/German_Keyboard_keys.props b/keymaps/German_Keyboard_keys.props
index 13393a045..2a897735e 100644
--- a/keymaps/German_Keyboard_keys.props
+++ b/keymaps/German_Keyboard_keys.props
@@ -63,7 +63,7 @@ delete-line.shortcut=C+d
 # C+e is a prefix
 find.shortcut=C+f
 find-next.shortcut=F3
-# C+h is not usable on MacOS X
+# C+h is not usable on macOS
 indent-lines.shortcut=C+i
 join-lines.shortcut=C+j
 swap-marker.shortcut=C+k
diff --git a/keymaps/jEdit_keys.props b/keymaps/jEdit_keys.props
index 7b736f294..defe4b074 100644
--- a/keymaps/jEdit_keys.props
+++ b/keymaps/jEdit_keys.props
@@ -11,7 +11,7 @@ delete-line.shortcut=C+d
 # C+e is a prefix
 find.shortcut=C+f
 find-next.shortcut=F3
-# C+h is not usable on MacOS X
+# C+h is not usable on macOS
 indent-lines.shortcut=C+i
 join-lines.shortcut=C+j
 swap-marker.shortcut=C+k
diff --git a/macros/Files/Toggle_ReadOnly.bsh b/macros/Files/Toggle_ReadOnly.bsh
index 4358d4a8c..30d74b7c0 100644
--- a/macros/Files/Toggle_ReadOnly.bsh
+++ b/macros/Files/Toggle_ReadOnly.bsh
@@ -23,8 +23,8 @@
 
 // Localization
 final static String OnlyLocalFilesError = jEdit.getProperty("macro.rs.ToggleReadOnly.OnlyLocalFiles.error", "This macro only works on local files.");
-final static String OnlyWindowsUnixMacosError = jEdit.getProperty("macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error", "This macro only works on Windows, Unix, & MacOS X.");
-	
+final static String OnlyWindowsUnixMacosError = jEdit.getProperty("macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error", "This macro only works on Windows, Unix, & macOS.");
+
 //Process
 CmdThread(cmd, view)
 {
@@ -80,7 +80,7 @@ ToggleReadOnly(view);
 <listitem>
 	<para><filename>Toggle_ReadOnly.bsh</filename></para>
 	<abstract><para>
-	Toggles a local file's read-only flag. Uses platform-specific commands, so it only works on Windows, Unix and MacOS X.
+	Toggles a local file's read-only flag. Uses platform-specific commands, so it only works on Windows, Unix and macOS.
 	</para></abstract>
 </listitem>
 
diff --git a/macros/Properties/Insert_Buffer_Properties.bsh b/macros/Properties/Insert_Buffer_Properties.bsh
index 2ef49a666..91632262d 100644
--- a/macros/Properties/Insert_Buffer_Properties.bsh
+++ b/macros/Properties/Insert_Buffer_Properties.bsh
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 2002, 2003 Ollie Rutherfurd <ol...@ru...>
  *
- * BugFixed by Björn "Vampire" Kautler <Vam...@gm...>
+ * BugFixed by Björn Kautler <Va...@jE...>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/misc/clojure/README.txt b/misc/clojure/README.txt
index 49bbd6bb1..9dec43e63 100644
--- a/misc/clojure/README.txt
+++ b/misc/clojure/README.txt
@@ -58,5 +58,4 @@ afficionado will ever use. The result is these hacky instructions. In attempting
 an elegant laziness I perhaps doom future maintainers to editing two files.
 Mea culpa. Feel free to patch in a project.clj file or whatever.
 
-Regarding instructions for Windows, Mac, whatever. Please feel free to add some.
-
+Regarding instructions for Windows, macOS, whatever. Please feel free to add some.
diff --git a/modes/clojure.xml b/modes/clojure.xml
index 8bfe95daf..263092048 100644
--- a/modes/clojure.xml
+++ b/modes/clojure.xml
@@ -11,7 +11,7 @@
       Want to do something about it?
       Do you know Clojure?
       Do you use linux?
-        (or are you knowledgeable enought to translate to your os?)
+        (or are you knowledgeable enough to translate to your os?)
 
     Verify file coverage of Clojure namespace symbols using code in:
       misc/clojure
diff --git a/modes/django.xml b/modes/django.xml
index 098a6c1ad..4af58e1bb 100644
--- a/modes/django.xml
+++ b/modes/django.xml
@@ -7,9 +7,9 @@ Django 1.2 templates edit mode
 
 Updated 2010-09-10 by Jakub Roztocil <ja...@we...>
 * Added missing filters, tags, operators, etc.
-* Higlight Django syntax inside tags and attributes
-* Higlight CSS (and to some extent also Django tags) inside <style>
-* Higlight JavaScript inside <script>
+* Highlight Django syntax inside tags and attributes
+* Highlight CSS (and to some extent also Django tags) inside <style>
+* Highlight JavaScript inside <script>
 
 CSS & JS integration and tag highlighting inspired by the PHP mode.
 
diff --git a/org/gjt/sp/jedit/Debug.java b/org/gjt/sp/jedit/Debug.java
index 9fa6d6fd1..dae5b2036 100644
--- a/org/gjt/sp/jedit/Debug.java
+++ b/org/gjt/sp/jedit/Debug.java
@@ -103,11 +103,11 @@ public class Debug
 	 * Logs messages when BeanShell code is evaluated.
 	 */
 	public static boolean BEANSHELL_DEBUG;
-	
+
 	/**
 	 * If true, A+ shortcuts are disabled. If you use this, you should also
-	 * remap the the modifiers so that A+ is actually something else.
-	 * <b>On by default on MacOS.</b>
+	 * remap the modifiers so that A+ is actually something else.
+	 * <b>On by default on macOS.</b>
 	 */
 	public static boolean ALT_KEY_PRESSED_DISABLED = OperatingSystem.isMacOS();
 
@@ -133,7 +133,7 @@ public class Debug
 
 	/**
 	 * Create new search dialogs instead of reusing instances.
-	 * <b> Off by default on Mac OS because it can cause search dialogs to
+	 * <b> Off by default on macOS because it can cause search dialogs to
 	 * show up on the wrong space. </b>
 	 */
 	public static boolean DISABLE_SEARCH_DIALOG_POOL = OperatingSystem.isMacOS();
diff --git a/org/gjt/sp/jedit/GUIUtilities.java b/org/gjt/sp/jedit/GUIUtilities.java
index 432aee4ce..4e9eca691 100644
--- a/org/gjt/sp/jedit/GUIUtilities.java
+++ b/org/gjt/sp/jedit/GUIUtilities.java
@@ -562,8 +562,8 @@ public class GUIUtilities
 	//{{{ getPlatformShortcutLabel() method
 	/**
 	* Translates a shortcut description string (e.g. "CS+SEMICOLON") to
-	* a platform-localized description.  On OS X this puts in the pretty
-	* unicode characters for Shift, Cmd, etc.
+	* a platform-localized description. On macOS this puts in the pretty
+	* Unicode characters for Shift, Cmd, etc.
 	*/
 	public static String getPlatformShortcutLabel(String label)
 	{
@@ -1184,7 +1184,7 @@ public class GUIUtilities
 		}
 		catch(Exception e)
 		{
-			/* Workaround for OS X bug. */
+			/* Workaround for macOS bug. */
 			Log.log(Log.ERROR,GUIUtilities.class,e);
 		}
 
@@ -1716,8 +1716,8 @@ public class GUIUtilities
 	private static HashMap<String, String> macKeySymbols = null;
 
 	/*
-	 * Create a list of unicode characters to be used in displaying keyboard shortcuts
-	 * on Mac OS X.
+	 * Create a list of Unicode characters to be used in displaying keyboard shortcuts
+	 * on macOS.
 	 */
 	static
 	{
diff --git a/org/gjt/sp/jedit/OperatingSystem.java b/org/gjt/sp/jedit/OperatingSystem.java
index 2f77c672d..0e3f8a22b 100644
--- a/org/gjt/sp/jedit/OperatingSystem.java
+++ b/org/gjt/sp/jedit/OperatingSystem.java
@@ -187,7 +187,7 @@ public class OperatingSystem
 
 	//{{{ isUnix() method
 	/**
-	 * Returns if we're running Unix (this includes MacOS X).
+	 * Returns if we're running Unix (this includes macOS).
 	 */
 	public static boolean isUnix()
 	{
@@ -196,7 +196,7 @@ public class OperatingSystem
 
 	//{{{ isMacOS() method
 	/**
-	 * Returns if we're running MacOS X.
+	 * Returns if we're running macOS.
 	 */
 	public static boolean isMacOS()
 	{
@@ -225,7 +225,7 @@ public class OperatingSystem
 
 	//{{{ isMacOSLF() method
 	/**
-	* Returns if we're running MacOS X and using the native look and feel.
+	* Returns if we're running macOS and using the native look and feel.
 	*/
 	public static boolean isMacOSLF()
 	{
@@ -234,7 +234,7 @@ public class OperatingSystem
 
 	//{{{ hasScreenMenuBar() method
 	/**
-	 * Returns whether the screen menu bar on Mac OS X is in use.
+	 * Returns whether the screen menu bar on macOS is in use.
 	 * @since jEdit 4.2pre1
 	*/
 	public static boolean hasScreenMenuBar()
diff --git a/org/gjt/sp/jedit/SettingsReloader.java b/org/gjt/sp/jedit/SettingsReloader.java
index 442cdadfe..3d86f8c70 100644
--- a/org/gjt/sp/jedit/SettingsReloader.java
+++ b/org/gjt/sp/jedit/SettingsReloader.java
@@ -48,7 +48,7 @@ class SettingsReloader
 		String jEditHome = jEdit.getJEditHome();
 		String settingsDirectory = jEdit.getSettingsDirectory();
 
-		// On Windows and MacOS, path names are case insensitive
+		// On Windows and macOS, path names are case insensitive
 		if((VFSManager.getVFSForPath(path).getCapabilities()
 			& VFS.CASE_INSENSITIVE_CAP) != 0)
 		{
diff --git a/org/gjt/sp/jedit/View.java b/org/gjt/sp/jedit/View.java
index 86b614b67..1d7bea5f6 100644
--- a/org/gjt/sp/jedit/View.java
+++ b/org/gjt/sp/jedit/View.java
@@ -1264,7 +1264,7 @@ public class View extends JFrame implements InputHandlerProvider
 
 		StringBuilder title = new StringBuilder();
 
-		/* On Mac OS X, apps are not supposed to show their name in the
+		/* On macOS, apps are not supposed to show their name in the
 		title bar. */
 		if(!OperatingSystem.isMacOS())
 		{
@@ -1363,7 +1363,7 @@ public class View extends JFrame implements InputHandlerProvider
 
 		enableEvents(AWTEvent.KEY_EVENT_MASK);
 
-		// OS X users expect a preview of the window rather than an icon
+		// macOS users expect a preview of the window rather than an icon
 		if (!OperatingSystem.isMacOS())
 			setIconImage(GUIUtilities.getEditorIcon());
 
diff --git a/org/gjt/sp/jedit/bufferio/BufferIORequest.java b/org/gjt/sp/jedit/bufferio/BufferIORequest.java
index 26cd5a6c5..7bdf1dfc7 100644
--- a/org/gjt/sp/jedit/bufferio/BufferIORequest.java
+++ b/org/gjt/sp/jedit/bufferio/BufferIORequest.java
@@ -180,7 +180,7 @@ public abstract class BufferIORequest extends IoTask
 		// means this is a DOS/Windows file
 		boolean CRLF = false;
 
-		// A \r was read, hence a MacOS file
+		// A \r was read, hence a macOS file
 		boolean CROnly = false;
 
 		// Was the previous read character a \r?
@@ -210,7 +210,7 @@ public abstract class BufferIORequest extends IoTask
 				case '\r':
 					// If we read a \r and
 					// lastWasCR is also true,
-					// it is probably a Mac file
+					// it is probably a macOS file
 					// (\r\r in stream)
 					if(lastWasCR)
 					{
@@ -268,7 +268,7 @@ public abstract class BufferIORequest extends IoTask
 				default:
 					/*  If we find some other character that follows
 					 a \r, so it is not a Windows file, and probably
-					 a Mac file */
+					 a macOS file */
 					if(lastWasCR)
 					{
 						CROnly = true;
diff --git a/org/gjt/sp/jedit/gui/ColorWellButton.java b/org/gjt/sp/jedit/gui/ColorWellButton.java
index 178d54764..a74cfa2b3 100644
--- a/org/gjt/sp/jedit/gui/ColorWellButton.java
+++ b/org/gjt/sp/jedit/gui/ColorWellButton.java
@@ -48,7 +48,7 @@ public class ColorWellButton extends JButton
 		setMargin(new Insets(2, 2, 2, 2));
 		addActionListener(new ActionHandler());
 
-		// according to krisk this looks better on OS X...
+		// according to krisk this looks better on macOS...
 		if(OperatingSystem.isMacOSLF())
 			putClientProperty("JButton.buttonType","toolbar");
 	} //}}}
diff --git a/org/gjt/sp/jedit/gui/KeyEventTranslator.java b/org/gjt/sp/jedit/gui/KeyEventTranslator.java
index 20d151679..4409abb6d 100644
--- a/org/gjt/sp/jedit/gui/KeyEventTranslator.java
+++ b/org/gjt/sp/jedit/gui/KeyEventTranslator.java
@@ -129,14 +129,14 @@ public class KeyEventTranslator
 			int ignoreMods;
 			if(Debug.ALT_KEY_PRESSED_DISABLED)
 			{
-				/* on MacOS, A+ can be user input */
+				/* on macOS, A+ can be user input */
 				ignoreMods = InputEvent.SHIFT_DOWN_MASK
 					| InputEvent.ALT_GRAPH_DOWN_MASK
 					| InputEvent.ALT_DOWN_MASK;
 			}
 			else
 			{
-				/* on MacOS, A+ can be user input */
+				/* on macOS, A+ can be user input */
 				ignoreMods = InputEvent.SHIFT_DOWN_MASK
 					| InputEvent.ALT_GRAPH_DOWN_MASK;
 			}
diff --git a/org/gjt/sp/jedit/gui/OptionsDialog.java b/org/gjt/sp/jedit/gui/OptionsDialog.java
index e32013045..40d167315 100644
--- a/org/gjt/sp/jedit/gui/OptionsDialog.java
+++ b/org/gjt/sp/jedit/gui/OptionsDialog.java
@@ -285,7 +285,7 @@ public abstract class OptionsDialog extends EnhancedDialog implements TreeSelect
 		paneTree.setVisibleRowCount(1);
 		paneTree.setCellRenderer(new PaneNameRenderer());
 
-		// looks bad with the OS X L&F, apparently...
+		// looks bad with the macOS L&F, apparently...
 		if(!OperatingSystem.isMacOSLF())
 			paneTree.putClientProperty("JTree.lineStyle", "Angled");
 
diff --git a/org/gjt/sp/jedit/gui/VariableGridLayout.java b/org/gjt/sp/jedit/gui/VariableGridLayout.java
index 5e0f322d2..f819fdd15 100644
--- a/org/gjt/sp/jedit/gui/VariableGridLayout.java
+++ b/org/gjt/sp/jedit/gui/VariableGridLayout.java
@@ -64,7 +64,7 @@ import java.util.Arrays;
  * <li>Ability to span components over more than one cell horizontally and vertically.
  * </ul>
  *
- * @author Dirk Moebius, Björn "Vampire" Kautler
+ * @author Dirk Moebius, Björn Kautler
  * @version 1.5
  * @see java.awt.GridLayout
  */
diff --git a/org/gjt/sp/jedit/help/HelpTOCPanel.java b/org/gjt/sp/jedit/help/HelpTOCPanel.java
index 83454821d..41018c4ca 100644
--- a/org/gjt/sp/jedit/help/HelpTOCPanel.java
+++ b/org/gjt/sp/jedit/help/HelpTOCPanel.java
@@ -51,7 +51,7 @@ public class HelpTOCPanel extends JPanel
 
 		toc = new TOCTree();
 
-		// looks bad with the OS X L&F, apparently...
+		// looks bad with the macOS L&F, apparently...
 		if(!OperatingSystem.isMacOSLF())
 			toc.putClientProperty("JTree.lineStyle", "Angled");
 
diff --git a/org/gjt/sp/jedit/io/FileRootsVFS.java b/org/gjt/sp/jedit/io/FileRootsVFS.java
index 293f31f08..b474d7ced 100644
--- a/org/gjt/sp/jedit/io/FileRootsVFS.java
+++ b/org/gjt/sp/jedit/io/FileRootsVFS.java
@@ -92,7 +92,7 @@ public class FileRootsVFS extends VFS
 		{
 			// Nasty hardcoded values
 			File[] volumes = new File("/Volumes").listFiles();
-			assert volumes != null : "Volumes cannot be null on MacOS";
+			assert volumes != null : "Volumes cannot be null on macOS";
 			LinkedList<File> roots = new LinkedList<>();
 
 			roots.add(new File("/"));
diff --git a/org/gjt/sp/jedit/io/FileVFS.java b/org/gjt/sp/jedit/io/FileVFS.java
index a0c554cf7..f4ba8e3e0 100644
--- a/org/gjt/sp/jedit/io/FileVFS.java
+++ b/org/gjt/sp/jedit/io/FileVFS.java
@@ -447,7 +447,7 @@ public class FileVFS extends VFS
 			toCanonPath = to;
 		}
 
-		// this is needed because on OS X renaming to a non-existent
+		// this is needed because on macOS renaming to a non-existent
 		// directory causes problems
 		File parent = new File(_to.getParent());
 		if(parent.exists())
diff --git a/org/gjt/sp/jedit/jEdit.java b/org/gjt/sp/jedit/jEdit.java
index 4082f4d97..c958f6c1d 100644
--- a/org/gjt/sp/jedit/jEdit.java
+++ b/org/gjt/sp/jedit/jEdit.java
@@ -146,7 +146,7 @@ public class jEdit
 
 		settingsDirectory = MiscUtilities.constructPath(
 				System.getProperty("user.home"), ".jedit");
-		// On mac, different rules (should) apply
+		// On macOS, different rules (should) apply
 		if(OperatingSystem.isMacOS())
 			settingsDirectory = MiscUtilities.constructPath(
 				System.getProperty("user.home"), "Library/jEdit" );
@@ -157,7 +157,7 @@ public class jEdit
 				settingsDirectory = MiscUtilities.constructPath(
 					appData, "jEdit");
 		}
-		// MacOS users expect the app to keep running after all windows
+		// macOS users expect the app to keep running after all windows
 		// are closed
 		background = OperatingSystem.isMacOS();
 
@@ -417,7 +417,7 @@ public class jEdit
 		logTime("after splash screen activation");
 		//{{{ Settings migration code.
 		// Windows check introduced in 5.0pre1.
-		// MacOS check introduced in 4.3.
+		// macOS check introduced in 4.3.
 		if((OperatingSystem.isMacOS() || OperatingSystem.isWindows())
 			&& shouldRelocateSettings && settingsDirectory != null)
 		{
diff --git a/org/gjt/sp/jedit/jedit.props b/org/gjt/sp/jedit/jedit.props
index a9e9edea2..2b5a32947 100644
--- a/org/gjt/sp/jedit/jedit.props
+++ b/org/gjt/sp/jedit/jedit.props
@@ -35,7 +35,7 @@ helpviewer.fontstyle=0
 decorate.frames=false
 decorate.dialogs=false
 
-# Draw multi-key shortcuts on screen menu bar? (OS X only)
+# Draw multi-key shortcuts on screen menu bar? (macOS only)
 menu.multiShortcut=false
 
 # If true, welcome screen will be displayed.
@@ -158,7 +158,7 @@ largefilemode=ask
 # The OS default will be used if this is not specified
 # Unix=\n
 # Windows=\r\n
-# MacOS=\r
+# macOS=\r
 #buffer.lineSeparator=\n
 
 # Encoding
@@ -503,7 +503,6 @@ plugin-manager.showAll=true
 plugin-manager.mirror.id=NONE
 plugin-manager.deleteDownloads=true
 plugin-manager.hide-libraries.toggle=true
-plugin-blacklist.MacOS.jar=true
 #}}}
 
 #{{{ Hidden settings
diff --git a/org/gjt/sp/jedit/jedit_gui.props b/org/gjt/sp/jedit/jedit_gui.props
index a7a383b9f..e2f611bf2 100644
--- a/org/gjt/sp/jedit/jedit_gui.props
+++ b/org/gjt/sp/jedit/jedit_gui.props
@@ -577,7 +577,7 @@ about.text.contributors=Slava Pestov\n\
 	Bernhard Walle\n\
 	Bertalan Fodor\n\
 	Bill McMilleon\n\
-	Björn "Vampire" Kautler\n\
+	Björn Kautler\n\
 	Brad Mace\n\
 	Brant Langer Gurganus\n\
 	Brett Smith\n\
diff --git a/org/gjt/sp/jedit/pluginmgr/InstallPanel.java b/org/gjt/sp/jedit/pluginmgr/InstallPanel.java
index 8389832a1..ac5f3d6bf 100644
--- a/org/gjt/sp/jedit/pluginmgr/InstallPanel.java
+++ b/org/gjt/sp/jedit/pluginmgr/InstallPanel.java
@@ -4,7 +4,7 @@
  * :folding=explicit:collapseFolds=1:
  *
  * Copyright (C) 2002-2013 Kris Kopicki, Slava Pestov, Dale Anson,
- *      Matthieu Casanova, Alan Ezust, Björn "Vampire" Kautler
+ *      Matthieu Casanova, Alan Ezust, Björn Kautler
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/org/gjt/sp/jedit/search/HyperSearchResults.java b/org/gjt/sp/jedit/search/HyperSearchResults.java
index fcbe1d831..0f6b45019 100644
--- a/org/gjt/sp/jedit/search/HyperSearchResults.java
+++ b/org/gjt/sp/jedit/search/HyperSearchResults.java
@@ -111,7 +111,7 @@ public class HyperSearchResults extends JPanel implements DefaultFocusComponent
 		//so we remove this keystroke binding bug #1955140
 		KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
 		resultTree.getInputMap().remove(keyStroke);
-		// looks bad with the OS X L&F, apparently...
+		// looks bad with the macOS L&F, apparently...
 		if(!OperatingSystem.isMacOSLF())
 			resultTree.putClientProperty("JTree.lineStyle", "Angled");
 
diff --git a/org/jedit/localization/jedit_cs.props b/org/jedit/localization/jedit_cs.props
index 89d50e6fc..7ec0923b5 100644
--- a/org/jedit/localization/jedit_cs.props
+++ b/org/jedit/localization/jedit_cs.props
@@ -38,9 +38,9 @@ common.clearAll=Vyčistit vše
 common.selectAll=Označit vše
 common.selectNone=Odznačit vše
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.CR=Classic MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2186,7 +2186,7 @@ macro.rs.OpenPath.PathName.label=Název cesty:
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=Toto makro funguje pouze s lokálními soubory-
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=Toto makro funguje pouze na OS Windows, Unix, & MacOS X.
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=Toto makro funguje pouze na OS Windows, Unix, & macOS.
 #}}}
 
 #}}}
diff --git a/org/jedit/localization/jedit_de.props b/org/jedit/localization/jedit_de.props
index 91c212a35..dd080b374 100644
--- a/org/jedit/localization/jedit_de.props
+++ b/org/jedit/localization/jedit_de.props
@@ -75,9 +75,9 @@ common.selectNone=Nichts wählen
 common.loading=Lade...
 common.reset=Zurücksetzen
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.CR=Classic MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2462,7 +2462,7 @@ macro.rs.OpenPath.PathName.label=Pfadname:
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=Dieses Makro funktioniert nur mit lokalen Dateien
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=Dieses Makro funktioniert nur unter Windows, Unix und MacOS X.
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=Dieses Makro funktioniert nur unter Windows, Unix und macOS.
 #}}}
 
 #}}}
diff --git a/org/jedit/localization/jedit_en.props b/org/jedit/localization/jedit_en.props
index d37b752ec..c851752f4 100644
--- a/org/jedit/localization/jedit_en.props
+++ b/org/jedit/localization/jedit_en.props
@@ -40,9 +40,9 @@ common.selectNone=Select None
 common.loading=Loading...
 common.reset=Reset
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.CR=Classic MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2443,7 +2443,7 @@ macro.rs.OpenPath.PathName.label=Path name:
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=This macro only works on local files.
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=This macro only works on Windows, Unix, & MacOS X.
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=This macro only works on Windows, Unix, & macOS.
 #}}}
 
 #}}}
diff --git a/org/jedit/localization/jedit_fr.props b/org/jedit/localization/jedit_fr.props
index 656fb89ea..ac20cd722 100644
--- a/org/jedit/localization/jedit_fr.props
+++ b/org/jedit/localization/jedit_fr.props
@@ -39,9 +39,9 @@ common.selectAll=Tout sélectionner
 common.selectNone=Ne rien sélectionner
 common.loading=Chargement...
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.CR=Classic MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2184,7 +2184,7 @@ macro.rs.OpenPath.PathName.label=Nom du chemin :
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=Cette macro ne fonctionne que sur les fichiers locaux.
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=Cette macro ne fonctionne que sur Windows, Unix, & MacOS X.
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=Cette macro ne fonctionne que sur Windows, Unix, & macOS.
 #}}}
 
 #}}}
diff --git a/org/jedit/localization/jedit_ja.props b/org/jedit/localization/jedit_ja.props
index 318a965ba..2c9be9dbd 100644
--- a/org/jedit/localization/jedit_ja.props
+++ b/org/jedit/localization/jedit_ja.props
@@ -38,9 +38,9 @@ common.clearAll=すべてクリア
 common.selectAll=すべて選択
 common.selectNone=選択解除
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.CR=Classic MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2182,7 +2182,7 @@ macro.rs.OpenPath.PathName.label=パス名:
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=このマクロはローカルファイルでしか動きません。
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=このマクロは Windows か Unix か MacOS X でしか動きません。
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=このマクロは Windows か Unix か macOS でしか動きません。
 #}}}
 
 #}}}
diff --git a/org/jedit/localization/jedit_ko.props b/org/jedit/localization/jedit_ko.props
index 53c7e29e7..82546c6fe 100644
--- a/org/jedit/localization/jedit_ko.props
+++ b/org/jedit/localization/jedit_ko.props
@@ -39,9 +39,9 @@ common.selectAll=전체 선택
 common.selectNone=선택 해제
 common.loading=로딩...
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.CR=Classic MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2152,7 +2152,7 @@ macro.rs.OpenPath.PathName.label=경로 이름:
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=이 매크로는 내부 파일만 지원합니다.
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=이 매크로는 Windows, Unix, & MacOS X에서만 지원합니다.
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=이 매크로는 Windows, Unix, & macOS에서만 지원합니다.
 #}}}
 
 #}}}
diff --git a/org/jedit/localization/jedit_ru.props b/org/jedit/localization/jedit_ru.props
index d6535332c..802c07375 100644
--- a/org/jedit/localization/jedit_ru.props
+++ b/org/jedit/localization/jedit_ru.props
@@ -40,9 +40,9 @@ common.selectNone=Отменить выделение
 common.loading=Загрузка...
 common.reset=Сброс
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.CR=Classic MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2406,7 +2406,7 @@ macro.rs.OpenPath.PathName.label=Путь:
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=Этот макрос работает только с локальными файлами.
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=Этот макрос работает только с Windows, Unix и MacOS X.
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=Этот макрос работает только с Windows, Unix и macOS.
 #}}}
 
 #}}}
diff --git a/org/jedit/localization/jedit_zh-tw.props b/org/jedit/localization/jedit_zh-tw.props
index 2fe83cc2a..6f6d32d4d 100644
--- a/org/jedit/localization/jedit_zh-tw.props
+++ b/org/jedit/localization/jedit_zh-tw.props
@@ -38,9 +38,9 @@ common.clearAll=全部清除
 common.selectAll=全部選取
 common.selectNone=全部清除
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.LF=MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2349,7 +2349,7 @@ macro.rs.OpenPath.PathName.label=路徑名:
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=這個巨集僅適用於本機檔案.
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=這個巨集僅適用於 Windows, Unix, 以及 MacOS X.
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=這個巨集僅適用於 Windows, Unix, 以及 macOS.
 #}}}
 
 #}}}
diff --git a/org/jedit/localization/jedit_zh.props b/org/jedit/localization/jedit_zh.props
index 4cb02bba0..5b8474eed 100644
--- a/org/jedit/localization/jedit_zh.props
+++ b/org/jedit/localization/jedit_zh.props
@@ -38,9 +38,9 @@ common.clearAll=全部清除
 common.selectAll=全选
 common.selectNone=反选
 
-lineSep.LF=Unix/MacOS (\\n)
+lineSep.LF=Unix/macOS (\\n)
 lineSep.CRLF=DOS/Windows (\\r\\n)
-lineSep.CR=Classic MacOS (\\r)
+lineSep.CR=Classic macOS (\\r)
 #}}}
 
 #{{{ Miscellaneous
@@ -2168,7 +2168,7 @@ macro.rs.OpenPath.PathName.label=路径名:
 
 #{{{Toggle ReadOnly
 macro.rs.ToggleReadOnly.OnlyLocalFiles.error=这个宏仅适用于本地文件.
-macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=这个宏仅适用于 Windows, Unix, 以及 MacOS X.
+macro.rs.ToggleReadOnly.OnlyWindowsUnixMacos.error=这个宏仅适用于 Windows, Unix, 以及 macOS.
 #}}}
 
 #}}}
diff --git a/org/jedit/options/OptionGroupPane.java b/org/jedit/options/OptionGroupPane.java
index 7a22a2fa2..c1f55433e 100644
--- a/org/jedit/options/OptionGroupPane.java
+++ b/org/jedit/options/OptionGroupPane.java
@@ -301,7 +301,7 @@ public class OptionGroupPane extends AbstractOptionPane implements TreeSelection
 
 		stage = new JPanel(new BorderLayout());
 
-		// looks bad with the OS X L&F, apparently...
+		// looks bad with the macOS L&F, apparently...
 		if (!OperatingSystem.isMacOSLF())
 			paneTree.putClientProperty("JTree.lineStyle", "Angled");
 
diff --git a/startup/startup.bsh b/startup/startup.bsh
index 9e1ae24ed..1a11b1cc6 100644
--- a/startup/startup.bsh
+++ b/startup/startup.bsh
@@ -74,14 +74,14 @@ s(search,replace,flags)
 //	InputEvent.ALT_MASK, InputEvent.META_MASK,
 //	InputEvent.SHIFT_MASK);
 
-/* ... and this the MacOS default: */
+/* ... and this the macOS default: */
 //KeyEventTranslator.setModifierMapping(InputEvent.META_MASK,  /* == C+ */
 //	InputEvent.CTRL_MASK,  /* == A+ */
 //	InputEvent.ALT_MASK,   /* == M+ */
 //	InputEvent.SHIFT_MASK  /* == S+ */);
 
-/* ... if you want MacOS keyboard to behave like a Linux or Windows keyboard
-   (This is also a MacOSX plugin option): */
+/* ... if you want macOS keyboard to behave like a Linux or Windows keyboard
+   (This is also a MacOS plugin option): */
 
 // KeyEventTranslator.setModifierMapping(InputEvent.CTRL_MASK,
 //	InputEvent.META_MASK, InputEvent.ALT_MASK,

commit: https://sourceforge.net/p/jedit/jEdit/ci/158bb9e0613c6480af5ed7c8c09627f949927aa8/
tree: https://sourceforge.net/p/jedit/jEdit/ci/158bb9e0613c6480af5ed7c8c09627f949927aa8/tree/

commit 158bb9e0613c6480af5ed7c8c09627f949927aa8
Author: Björn Kautler <Bj...@Ka...>
Date:   Tue Apr 1 01:55:39 2025 +0200

    Replace outdated URLs and use HTTPS where possible

diff --git a/README.SRC.txt b/README.SRC.txt
index 2bd79b721..ebaebb8b6 100644
--- a/README.SRC.txt
+++ b/README.SRC.txt
@@ -8,7 +8,7 @@ General jEdit documentation can be found in the 'doc' directory.
 
  For all tasks:
 
-  - Apache Ant. Get it from <http://ant.apache.org>.
+  - Apache Ant. Get it from <https://ant.apache.org>.
     1.9.10 or newer has to be used.
   - The Ant Optional package. This is included in the download from ants website,
     as well as the AntPlugin from the Plugin Manager,
@@ -19,20 +19,20 @@ General jEdit documentation can be found in the 'doc' directory.
  For building jEdit, the API documentation or any of the
  distribution files except of the source package:
 
-  - A Java compiler of version 11, such as OpenJDK's javac which is
-    included in the JDK. Get it from <http://www.java.com/download>
-    or from your package manager - e. g. openjdk-11-jdk.
+  - A Java compiler of version 11, such as Temurin's javac which is included in
+    the JDK. Get it from <https://adoptium.net/de/temurin/releases/?version=11>
+    or from your package manager - e.g. openjdk-11-jdk.
 
  For building the API documentation:
 
-  - Sun's javadoc tool, which is included in the JDK.
-    Get it from <http://www.java.com/download> or from your package
-    manager - e. g. openjdk-11-jdk.
+  - Sun's javadoc tool, which is included in the JDK. Get it from
+    <https://adoptium.net/de/temurin/releases/?version=11> or from
+    your package manager - e.g. openjdk-11-jdk.
 
  For building the windows installer (for the final step):
 
-  - Inno Setup 6.0.0 or newer. Get it from <http://www.jrsoftware.org/isdl.php>
-  - A box running windows or wine, e. g. on *nix. If Inno Setup should be
+  - Inno Setup 6.0.0 or newer. Get it from <https://www.jrsoftware.org/isdl.php>
+  - A box running windows or wine, e.g. on *nix. If Inno Setup should be
     run via wine, a wine version of at least 1.3.10 is required because
     of a bug in earlier wine versions.
 
diff --git a/build.xml b/build.xml
index 9928ed7fc..12ad74bb8 100644
--- a/build.xml
+++ b/build.xml
@@ -102,7 +102,7 @@
 		depends="init,check-ivy"
 		unless="ivy.jar.present">
 		<mkdir dir="${ivy.jar.dir}"/>
-		<get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${config.ivy.version}/ivy-${config.ivy.version}.jar"
+		<get src="https://repo.maven.apache.org/maven2/org/apache/ivy/ivy/${config.ivy.version}/ivy-${config.ivy.version}.jar"
 		     dest="${ivy.jar.file}"
 		     usetimestamp="true"/>
 	</target>
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 96f2dcacf..b24bc9fb9 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -47,6 +47,8 @@ for contributing to this release.
 
 - Fix htaccess edit mode to be context sensitive (#3812 - Björn Kautler)
 
+- Replace outdated URLs and use HTTPS where possible (Björn Kautler)
+
 }}}
 {{{ Miscellaneous
 
diff --git a/doc/FAQ/faq-general.xml b/doc/FAQ/faq-general.xml
index 101212b94..b65948335 100644
--- a/doc/FAQ/faq-general.xml
+++ b/doc/FAQ/faq-general.xml
@@ -65,7 +65,7 @@
                 <answer>
                     <para>The short answer is, too many to list here. There is a
                     detailed list available on the <ulink
-                    url="http://www.jedit.org/index.php?page=features">jEdit web
+                    url="https://www.jedit.org/index.php?page=features">jEdit web
                     site</ulink>, but here are some of the major
                     features:</para>
                     <itemizedlist>
@@ -174,7 +174,7 @@
                     installed, and kept current from within jEdit's
                     <quote>Plugin Manager</quote>. There is also a section of
                     the jEdit web site called <ulink
-                    url="http://plugins.jedit.org/">Plugin Central</ulink> that
+                    url="https://plugins.jedit.org/">Plugin Central</ulink> that
                     maintains a descriptive index and download links for all
                     publicly available plugins.</para>
                     <para>Additional questions and answers regarding plugins may
@@ -190,7 +190,7 @@
                     <para>There is a comprehensive User's Guide available from
                     within the program using the <guimenu>Help</guimenu> menu.
                     The User's Guide can also be downloaded from the <ulink
-                    url="http://www.jedit.org/index.php?page=download&amp;platform=source">
+                    url="https://www.jedit.org/index.php?page=download&amp;platform=source">
                     jEdit web site</ulink> in Portable Document Format (PDF),
                     suitable for online display or printing.</para>
                 </answer>
@@ -207,20 +207,20 @@
                     <itemizedlist>
                         <listitem>
                             <para>The <ulink
-                            url="http://lists.sourceforge.net/lists/listinfo/jedit-users">
+                            url="https://lists.sourceforge.net/lists/listinfo/jedit-users">
                             jedit-users list</ulink>, for comments and questions
                             about using jEdit and its features</para>
                         </listitem>
                         <listitem>
                             <para>The <ulink
-                            url="http://lists.sourceforge.net/lists/listinfo/jedit-devel">
+                            url="https://lists.sourceforge.net/lists/listinfo/jedit-devel">
                             jedit-devel list</ulink>, for discussion of
                             development issues by members of the developer team
                             and other interested persons</para>
                         </listitem>
                         <listitem>
                             <para>The <ulink
-           ...
 
[truncated message content]