branch master updated: Rename texi2any config file

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 26492ca9e7 Rename texi2any config file
26492ca9e7 is described below

commit 26492ca9e7dc396280bbc4fff19a03c4b2313147
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jun 25 12:10:30 2023 +0100

    Rename texi2any config file
    
    * tp/texi2any.pl ($conf_file_name): Rename config file from
    'Config' to 'texi2any-config.pm', as 'Config' is too generic
    and can clash with other uses.
    * doc/texi2any_api.texi (Loading Init Files): Update.
    
    Report from Jun T <takimoto-j@kba.biglobe.ne.jp>.
---
 ChangeLog             | 11 +++++++++++
 doc/texi2any_api.texi | 18 +++++++++---------
 tp/texi2any.pl        |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c2dfc84ed..02bf7325fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-06-25  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Rename texi2any config file
+
+       * tp/texi2any.pl ($conf_file_name): Rename config file from
+       'Config' to 'texi2any-config.pm', as 'Config' is too generic
+       and can clash with other uses.
+       * doc/texi2any_api.texi (Loading Init Files): Update.
+
+       Report from Jun T <takimoto-j@kba.biglobe.ne.jp>.
+
 2023-06-11  Gavin Smith <gavinsmith0123@gmail.com>
 
        @link for LaTeX
diff --git a/doc/texi2any_api.texi b/doc/texi2any_api.texi
index 093540bf6e..77e7bbe6a4 100644
--- a/doc/texi2any_api.texi
+++ b/doc/texi2any_api.texi
@@ -91,18 +91,18 @@ conversion of tree elements can be fully customized.
 @cindex Initialization files, loading
 @cindex Search paths, for initialization files
 
-@c @pindex Config @r{init files loaded}
-@cindex @file{Config} init files loaded
+@c @pindex texi2any-config.pm @r{init files loaded}
+@cindex @file{texi2any-config.pm} init files loaded
 
 @quotation Warning
-The @file{Config} file related paths and even the use
-of @file{Config} files is not definitive.
+The @file{texi2any-config.pm} file related paths and even the use
+of @file{texi2any-config.pm} files is not definitive.
 @end quotation
 
 You can write so-called @dfn{initialization files}, or @dfn{init
 files} for short, to modify almost every aspect of output formatting.
-The program loads init files named @file{Config} each time it is run.
-Those files are looked for in the following directories:
+The program loads init files named @file{texi2any-config.pm} each time it
+is run.  Those files are looked for in the following directories:
 
 @table @file
 @item @var{datadir}/texi2any/
@@ -122,9 +122,9 @@ compile-time, e.g., @file{/usr/local/share})
 (the current directory)
 @end table
 
-All @file{Config} files found are loaded, in the above order.  Thus,
-@file{./Config} can override entries in, say,
-@file{/usr/local/share/makeinfo/Config}.
+All @file{texi2any-config.pm} files found are loaded, in the above order.
+Thus, @file{./texi2any-config.pm} can override entries in, say,
+@file{/usr/local/share/makeinfo/texi2any-config.pm}.
 
 @c @opindex --init-file
 @cindex @option{--init-file}
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 2f6357da8c..cbc18e3d32 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -358,7 +358,7 @@ my $main_program_default_options = {
 # determine configuration directories.
 
 # used as part of binary strings
-my $conf_file_name = 'Config' ;
+my $conf_file_name = 'texi2any-config.pm';
 
 # directories for texinfo configuration files, used as part of binary strings.
 my @language_config_dirs = File::Spec->catdir($curdir, '.texinfo');