4
0
Paul Eggert 21 жил өмнө
parent
commit
1e7d274cd8
3 өөрчлөгдсөн 13 нэмэгдсэн , 13 устгасан
  1. 2 2
      ChangeLog
  2. 10 10
      NEWS
  3. 1 1
      src/names.c

+ 2 - 2
ChangeLog

@@ -25,12 +25,12 @@
 	(names_done): Removed
 	(all_names_found): Changed prototype.
 	(ISFOUND,WASFOUND): New macros
-	* src/delete.c (delete_archive_members): Honor --occurence
+	* src/delete.c (delete_archive_members): Honor --occurrence
 	option.
 	* src/list.c (read_and): Likewise.
 	* src/names.c: Count number of occurrences of each name in the
 	archive.
-	(name_match): Honor --occurence option.
+	(name_match): Honor --occurrence option.
 	(names_done): Removed
 	(all_names_found,names_notfound): Rewritten.
 

+ 10 - 10
NEWS

@@ -37,19 +37,19 @@ version 1.13.26
 * New option --occurrence[=N] can be used in conjunction with one of 
   the subcommands --delete, --diff, --extract or --list when a list of
   files is given either on the command line or via -T option. This
-  option instructs tar to process only the Nth occurence of each named
-  file. N defaults to 1, so `tar -x -f archive --occurence filename'
-  extracts the first occurence of `filename' from `archive'
+  option instructs tar to process only the Nth occurrence of each named
+  file. N defaults to 1, so `tar -x -f archive --occurrence filename'
+  extracts the first occurrence of `filename' from `archive'
   and terminates without scanning to the end of the archive.
 
 * Removed obsolete command line options:
-** --absolute-paths superseeded by --absolute-names
+** --absolute-paths superseded by --absolute-names
 ** --block-compress is not needed any longer
-** --block-size superseeded by --blocking--factor
-** --modification-time superseeded by --touch
-** --read-full-blocks supeseeded by --read-full-records
-** --record-number superseeded by --block-number
-** --version-control superseeded by --backup
+** --block-size superseded by --blocking--factor
+** --modification-time superseded by --touch
+** --read-full-blocks superseded by --read-full-records
+** --record-number superseded by --block-number
+** --version-control superseded by --backup
 
 * New message translations fi (Finnish), gl (Galician), hr (Croatian),
   hu (Hungarian), ms (Malaysian), nb (Norwegian), ro (Romanian), sk
@@ -170,7 +170,7 @@ version 1.13.16 - Paul Eggert, 1999-12-13.
   To enable the old behavior, use the -P or --absolute-names option.
 
 * Tar now handles file names with multibyte encodings (e.g. UTF-8, Shift-JIS)
-  correctly.  It relies on the mbrtowc function to handle multibytes.
+  correctly.  It relies on the mbrtowc function to handle multibyte characters.
 
 * The file generated by -g or --listed-incremental now uses a format
   that is independent of locale, so that users need not worry about

+ 1 - 1
src/names.c

@@ -636,7 +636,7 @@ names_notfound (void)
 	  ERROR ((0, 0, _("%s: Not found in archive"),
 		  quotearg_colon (cursor->name)));
 	else
-	  ERROR ((0, 0, _("%s: Required occurence not found in archive"),
+	  ERROR ((0, 0, _("%s: Required occurrence not found in archive"),
 		  quotearg_colon (cursor->name)));
       }