Merge remote-tracking branch 'upstream/develop' into copy.to.tmp

configure.ac

@@ -1,7 +1,7 @@
 dnl configure.ac: this file is processed by autoconf to produce ./configure.
 
 AC_PREREQ([2.71])
-AC_INIT([Eggdrop],[1.9.5],[[email protected]])
+AC_INIT([Eggdrop],[1.9.5],[[email protected]],[eggdrop],[https://www.eggheads.org])
 AC_COPYRIGHT([Copyright (C) 1999 - 2023 Eggheads Development Team])
 AC_LANG([C])
 AC_REVISION([m4_esyscmd([misc/getcommit])])

doc/Changes1.1

@@ -735,7 +735,7 @@ Eggdrop Changes (since version 1.0)
   - Added SILENCE define for ircdu's silence command
     Patch by: Wild
 
-  - Changed channel defalts to +DYNAMICBANS instead of +ENFORCBANS (my test
+  - Changed channel defaults to +DYNAMICBANS instead of +ENFORCBANS (my test
     bot kept dumping 200+ bans to channels that i added, even when it wasn't
     opped :/ )
     Patch by: Wild
@@ -938,7 +938,7 @@ Eggdrop Changes (since version 1.0)
     Patch by: Beldin
 
   - Fixed the showinfo on join, so that nasty '@' wouldnt show up, also, a
-    globaly locked info line will override a channel one, unless the channel
+    globally locked info line will override a channel one, unless the channel
     one is locked too (comments???)
     Patch by: Beldin
 
@@ -1095,7 +1095,7 @@ Eggdrop Changes (since version 1.0)
     Patch by: Beldin
 
   - Fixed the showinfo on join, so that nasty '@' wouldnt show up, also, a
-    globaly locked info line will override a channel one, unless the channel
+    globally locked info line will override a channel one, unless the channel
     one is locked too (comments???)
     Patch by: Beldin
 

doc/Changes1.3

@@ -1753,7 +1753,7 @@ Eggdrop Changes (since version 1.3.0)
 1.3.11 (February 25, 1998):
 
   - newsplit() doesn't need to set what's 0 to 0 (this is what was really
-    causeing the no-args botnet crash, only join actually didn't handle no
+    causing the no-args botnet crash, only join actually didn't handle no
     args correctly)
     Found by: easton / Patch by: Beldin
 

doc/Changes1.4

@@ -562,7 +562,7 @@ Eggdrop Changes (since version 1.4.0)
     Patch by: drummer
 
   - Bot now doesn't return "Can't link there" anymore if the first botlink
-    attempt failes
+    attempt fails
     Found by: Dude / Patch by: Fabian
 
   - Crash in gotnotice for invalid channels as notice target
@@ -587,7 +587,7 @@ Eggdrop Changes (since version 1.4.0)
   - Not sending ISON during irc login now
     Patch by: Fabian
 
-  - Added several sanity checks to avoid crashs in obscure situations, e.g.
+  - Added several sanity checks to avoid crashes in obscure situations, e.g.
     -1 channel members
     Found by: arthur2 / Patch by: Fabian
 
@@ -647,7 +647,7 @@ Eggdrop Changes (since version 1.4.0)
     Patch by: Tothwolf
 
   - Major rewrite of configure.in and all the Makefiles, including better
-    Tcl detection and support for more Tcl versons. better support for IRIX,
+    Tcl detection and support for more Tcl versions. better support for IRIX,
     OSF, Lynx, and Cygwin (however support for Cygwin is unsupported)
     Patch by: Tothwolf
 
@@ -1005,7 +1005,7 @@ Eggdrop Changes (since version 1.4.0)
   - Fixed .chat to accept the proper channel range (0-99999)
     Patch by: rtc
 
-  - Several putlogs had superflous newlines
+  - Several putlogs had superfluous newlines
     Patch by: rtc
 
   - Fixed memleak in fstat_unpack
@@ -1096,7 +1096,7 @@ Eggdrop Changes (since version 1.4.0)
   - Race in tmp-dir test
     Found by: poptix / Patch by: Fabian
 
-  - Tiny compability fix in misc.c for osf
+  - Tiny compatibility fix in misc.c for osf
     Found by: SuperS / Patch by: Fabian
 
   - New .stick handling
@@ -1212,7 +1212,7 @@ Eggdrop Changes (since version 1.4.0)
   - memberlistflag-fixes
     Patch by: Eule
 
-  - Mutliple modes were sent by bot. missing SENTDEOP/OP/DEVOICE/VOICE/KICK
+  - Multiple modes were sent by bot. missing SENTDEOP/OP/DEVOICE/VOICE/KICK
     flags in irc.mod.
     Found by: TheUnknown / Patch by: arthur2
 
@@ -1258,7 +1258,7 @@ Eggdrop Changes (since version 1.4.0)
     cleartext passwords while linking :))))
     Patch by: Cybah
 
-  - Removed all occurences of movefile
+  - Removed all occurrences of movefile
     Patch by: Fabian
 
   - Only reading notes file on join when really needed

doc/man1/eggdrop.1

@@ -20,12 +20,12 @@
 .\" distribute this file as part of a program that contains a
 .\" configuration script generated by Autoconf, you may include it under
 .\" the same distribution terms that you use for the rest of that program.
-.\"
 .\" Originally by Robey Pointer, redone by rtc
 .\" * 1999-11-08 rtc       A line wasn't displayed
 .\" * 2000-10-07 Fabian    Updated and slightly re-organized.
 .\" * 2004-08-08 Wcc       Updated.
-.TH eggdrop 1 "August 2004" "Eggheads Development Team" "IRC Tools"
+.\" * 2023-03-11 mortmann  Typos and fixse
+.TH eggdrop 1 "March 2023" "Eggheads Development Team" "IRC Tools"
 .SH NAME
 eggdrop \- an IRC bot
 .SH SYNOPSIS
@@ -34,9 +34,9 @@ eggdrop \- an IRC bot
 .RB [ config-file ]
 .SH DESCRIPTION
 .B Eggdrop
-is the World's most popular Internet Relay Chat (IRC) bot; it is freely
+is the world's most popular Internet Relay Chat (IRC) bot; it is freely
 distributable under the GNU General Public License (GPL). Eggdrop
-is a feature rich program designed to be easily used and expanded upon by both
+is a feature-rich program designed to be easily used and expanded upon by both
 novice and advanced IRC users on a variety of hardware and software platforms.
 .PP
 An IRC bot is a program that sits on an IRC channel and performs automated
@@ -73,11 +73,11 @@ things while the bot is running. With \-n, you won't return to the shell prompt
 until the bot exits (which won't normally happen until it's killed). By default,
 \-n will send all log entries to the console.
 .TP
-.B \-nt
+.B \-t
 Don't background, use terminal. This is just like \-n, except that instead of
 seeing log entries, your console will simulate a DCC chat with the bot.
 .TP
-.B \-nc
+.B \-c
 Don't background, show channel info. This is just like \-n, except that instead
 of seeing log entries, every 10 seconds your screen will clear and you will see
 the current channel status, sort of like "top".
@@ -88,7 +88,7 @@ one and give owner status to the first person that introduces himself or
 herself to it. You'll need to do this when you first set up your bot.
 .TP
 .B \-v
-Show version info, then quit.
+Show version info and exit.
 .SH SIGNALS
 .TP
 .B SIGCHLD
@@ -109,9 +109,9 @@ registering with the EVNT bind and returning 1.
 .SH "ENVIRONMENT VARIABLES"
 .TP
 .B EGG_LANG
-This variable can be set to the language in which you want Eggdrop to speak
- to you. It defaults to English, but German, French, Finnish, and Danish
-are supported, too.
+This variable can be set to the language in which you want Eggdrop to speak to
+you. It defaults to English, but Danish, Finnish, French, German, Italian and
+Portuguese are supported, too.
 .TP
 .B EGG_LANGDIR
 Specifies the directory where all your language files are stored.
@@ -138,7 +138,7 @@ of Eggdrop.
 .SH "REPORTING BUGS"
 See \fBdoc/BUG-REPORT\fR.
 .PP
-Bugs can either be reported directly via GitHub at
+Bugs can be reported directly via GitHub at
 \fBhttps://github.com/eggheads/eggdrop/issues\fR.
 .SH COPYRIGHT
 Copyright (C) 1997 Robey Pointer

doc/sphinx_source/conf.py

@@ -28,7 +28,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = []
+extensions = ['sphinx_substitution_extensions']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -54,6 +54,8 @@
 version = '1.9.5'
 # The full version, including alpha/beta/rc tags.
 release = '1.9.5'
+# Just X.Y, for use in doc links (Geo)
+maj_version = ".".join(version.split(".")[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -256,3 +258,12 @@
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
+
+rst_prolog = """
+.. role:: raw-html(raw)
+   :format: html
+
+.. |dlink| replace:: :raw-html:`<a href=https://ftp.eggheads.org/pub/eggdrop/source/%s/eggdrop-%s.tar.gz>the current version of Eggdrop</a>`
+.. |majversion| replace:: %s
+.. |fullversion| replace:: %s
+""" % (maj_version, version, maj_version, version)

doc/sphinx_source/modules/included.rst

@@ -73,7 +73,7 @@ Modules included with Eggdrop
     later retrieval.
 
 :ref:`pbkdf2`
-    This modules updates Eggdrop to use PBKDF2 for hashing purposes, such as for userfile passwords. It was specifically designed to work with the blowfish module to make the transition from blowfish to pbkdf2 password hashing as easy as possible. If you are transitioning a userfile from 1.8 or earlier, you should load this AND the blowfish module. By doing so, Eggdrop will seamlessly update the old blowfish hashes to the new PBKDF2 hashes once a user logs in for the first time, and allow you to (eventually) remove the blowfish module altogether. For new bots, you should load this module by itself and not use the blowfish module. The blowfish module is still required for encrypting/decrypting strings. Eggdrop will not start without an encryption module loaded.
+    This modules updates Eggdrop to use PBKDF2 for hashing purposes, such as for userfile passwords. It was specifically designed to work with the blowfish module to make the transition from blowfish to pbkdf2 password hashing as easy as possible. If you are transitioning a userfile from 1.8 or earlier, you should load this AND the blowfish module. By doing so, Eggdrop will seamlessly update the old blowfish hashes to the new PBKDF2 hashes once a user logs in for the first time, and allow you to (eventually) remove the blowfish module altogether. For new bots, you should load this module by itself and not use the blowfish module. The blowfish module is still required if you use Tcl to encrypt/decrypt strings in Tcl (ie, some scripts). Eggdrop will not start without a password-hashing module loaded.
 
 :ref:`seen`
     This module provides very basic seen commands via msg, on channel

doc/sphinx_source/modules/index.rst

@@ -19,7 +19,7 @@ Please note that these are only basic instructions for compiling and installing
   2. Place the new module in its own directory (in the format of
      (modulename).mod) in src/mod.
 
-  3. Run ./configure (from eggdrop1.9.x/).
+  3. Run ./configure (from eggdrop-|version|/).
 
   4. Type 'make config' or 'make iconfig'.