texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: Correct spelling


From: Gavin D. Smith
Subject: branch master updated: Correct spelling
Date: Tue, 10 Dec 2024 12:16:54 -0500

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 ab2c3918b0 Correct spelling
ab2c3918b0 is described below

commit ab2c3918b0a1a50a232c49a09876c69a7ea4f9a4
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Dec 10 17:16:44 2024 +0000

    Correct spelling
    
    * texi2any (merge_opened_files),
    * tp/Texinfo/Convert/HTML.pm (_do_jslicenses_file)
    * tp/Texinfo/Convert/Utils.pm (output_files_disable_output_encoding),
    * tp/Texinfo/XS/convert/convert_html.c (do_jslicenses_file),
    * tp/Texinfo/XS/main/convert_utils.c (output_files_open_out):
    Correct spelling of "overwriting".
---
 ChangeLog                                                     | 11 +++++++++++
 tp/Texinfo/Convert/HTML.pm                                    |  2 +-
 tp/Texinfo/Convert/Utils.pm                                   |  2 +-
 tp/Texinfo/XS/convert/convert_html.c                          |  2 +-
 tp/Texinfo/XS/main/convert_utils.c                            |  2 +-
 .../res_parser/js_license_reuse_output_file/split_nocopying.2 |  2 +-
 .../formatting/res_parser/reuse_macro_expand_file/simplest.2  |  2 +-
 tp/texi2any.pl                                                |  4 ++--
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b11d9b8b8..128e95f8ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-12-10  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Correct spelling
+
+       * texi2any (merge_opened_files),
+       * tp/Texinfo/Convert/HTML.pm (_do_jslicenses_file)
+       * tp/Texinfo/Convert/Utils.pm (output_files_disable_output_encoding),
+       * tp/Texinfo/XS/convert/convert_html.c (do_jslicenses_file),
+       * tp/Texinfo/XS/main/convert_utils.c (output_files_open_out):
+       Correct spelling of "overwriting".
+
 2024-12-09  Gavin Smith <gavinsmith0123@gmail.com>
 
        Excise tp/Texinfo/XS/gnulib/po
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index bff83aeaed..64c0f7879d 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -11814,7 +11814,7 @@ sub _do_jslicenses_file {
                          $licence_file_path);
   if ($overwritten_file) {
     $self->converter_document_warn(
-     sprintf(__("overwritting output file with js licences: %s"),
+     sprintf(__("overwriting output file with js licences: %s"),
              $license_file));
   }
   if (defined($fh)) {
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index 79021594dd..af79d4d686 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -90,7 +90,7 @@ sub output_files_disable_output_encoding($$)
 # Returns
 #  - the opened filehandle, or undef if opening failed,
 #  - the $! error message or undef if opening succeeded.
-#  - 1 if the $FILE_PATH was already opened, which means overwritting.
+#  - 1 if the $FILE_PATH was already opened, which means overwriting.
 sub output_files_open_out($$$;$$)
 {
   my $self = shift;
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 2ce8ed6958..7ed4085b8f 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -2360,7 +2360,7 @@ do_jslicenses_file (CONVERTER *self)
   if (overwritten_file)
     {
       message_list_document_warn (&self->error_messages, self->conf, 0,
-                           "overwritting output file with js licences: %s",
+                           "overwriting output file with js licences: %s",
                                   license_file);
     }
 
diff --git a/tp/Texinfo/XS/main/convert_utils.c 
b/tp/Texinfo/XS/main/convert_utils.c
index ca21707cdb..45230d7f6e 100644
--- a/tp/Texinfo/XS/main/convert_utils.c
+++ b/tp/Texinfo/XS/main/convert_utils.c
@@ -782,7 +782,7 @@ clear_output_files_information (OUTPUT_FILES_INFORMATION 
*self)
   - as return value, the opened filehandle, or 0 if opening failed,
   - in *error_message, the errno message or 0 if opening succeeded.
   - in *overwritten_file, 1 if the FILE_PATH was already opened,
-    which means overwritting.
+    which means overwriting.
 */
 FILE *
 output_files_open_out (OUTPUT_FILES_INFORMATION *self, const char *file_path,
diff --git 
a/tp/tests/formatting/res_parser/js_license_reuse_output_file/split_nocopying.2 
b/tp/tests/formatting/res_parser/js_license_reuse_output_file/split_nocopying.2
index d1d81b38d8..17be7f1d7f 100644
--- 
a/tp/tests/formatting/res_parser/js_license_reuse_output_file/split_nocopying.2
+++ 
b/tp/tests/formatting/res_parser/js_license_reuse_output_file/split_nocopying.2
@@ -1 +1 @@
-texi2any: warning: overwritting output file with js licences: 
formatting/out_parser/js_license_reuse_output_file/Ch1.html
+texi2any: warning: overwriting output file with js licences: 
formatting/out_parser/js_license_reuse_output_file/Ch1.html
diff --git a/tp/tests/formatting/res_parser/reuse_macro_expand_file/simplest.2 
b/tp/tests/formatting/res_parser/reuse_macro_expand_file/simplest.2
index 3166ee084e..8d99dcb9e9 100644
--- a/tp/tests/formatting/res_parser/reuse_macro_expand_file/simplest.2
+++ b/tp/tests/formatting/res_parser/reuse_macro_expand_file/simplest.2
@@ -1 +1 @@
-texi2any: warning: overwritting file: 
formatting/out_parser/reuse_macro_expand_file/simplest.info
+texi2any: warning: overwriting file: 
formatting/out_parser/reuse_macro_expand_file/simplest.info
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index a5bc9a74d6..ab015139a2 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -1488,7 +1488,7 @@ sub _handle_errors($)
   }
 }
 
-# If the file overwritting becomes an error, should increase $ERROR_COUNT.
+# If the file overwriting becomes an error, should increase $ERROR_COUNT.
 sub merge_opened_files($$$)
 {
   my $error_count = shift;
@@ -1500,7 +1500,7 @@ sub merge_opened_files($$$)
       # NOTE paths are not normalized, therefore different paths names
       # that refers to the same file will not trigger the message.
       if (exists($opened_files->{$opened_file})) {
-        document_warn(sprintf(__('overwritting file: %s'),
+        document_warn(sprintf(__('overwriting file: %s'),
                       $opened_file));
       } else {
         $opened_files->{$opened_file} = 1;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]