Hi,

The Lintian tool used in Debian includes a number of checks for
spelling mistakes. It currently complains about "informations" which
appears in graphite output as well as code comments.

The attached patches fix the code (output) and the comments,
separately. I believe they're trivial enough not to require copyright
assignment. They were built against gcc 4.6.1 as packaged in Debian
but they apply to the current svn trunk too.

Regards,

Stephen
--- gcc-mingw-w64.orig/src/gcc/graphite-poly.c
+++ gcc-mingw-w64/src/gcc/graphite-poly.c
@@ -1174,7 +1174,7 @@
   if (VEC_length (poly_dr_p, PBB_DRS (pbb)) == 0)
     {
       if (verbosity > 0)
-	fprintf (file, "# Access informations are not provided\n");\
+	fprintf (file, "# Access information is not provided\n");\
       fprintf (file, "0\n");
       return;
     }
@@ -1183,7 +1183,7 @@
     fprintf (file, "# Data references (\n");
 
   if (verbosity > 0)
-    fprintf (file, "# Access informations are provided\n");
+    fprintf (file, "# Access information is provided\n");
   fprintf (file, "1\n");
 
   FOR_EACH_VEC_ELT (poly_dr_p, PBB_DRS (pbb), i, pdr)
@@ -1196,7 +1196,7 @@
     fprintf (file, "# Read data references (\n");
 
   if (verbosity > 0)
-    fprintf (file, "# Read access informations\n");
+    fprintf (file, "# Read access information\n");
   fprintf (file, "%d\n", nb_reads);
 
   FOR_EACH_VEC_ELT (poly_dr_p, PBB_DRS (pbb), i, pdr)
@@ -1210,7 +1210,7 @@
     fprintf (file, "# Write data references (\n");
 
   if (verbosity > 0)
-    fprintf (file, "# Write access informations\n");
+    fprintf (file, "# Write access information\n");
   fprintf (file, "%d\n", nb_writes);
 
   FOR_EACH_VEC_ELT (poly_dr_p, PBB_DRS (pbb), i, pdr)
--- gcc-mingw-w64.orig/src/gcc/ada/9drpc.adb
+++ gcc-mingw-w64/src/gcc/ada/9drpc.adb
@@ -600,7 +600,7 @@
       Header     : aliased Params_Stream_Type (Header_Size);
 
    begin
-      --  For more informations, see above
+      --  For more information, see above
       --  Request = 0 as we are not waiting for a reply message
       --  Result length = 0 as we don't expect a result at all
 
--- gcc-mingw-w64.orig/src/gcc/ada/s-interr.ads
+++ gcc-mingw-w64/src/gcc/ada/s-interr.ads
@@ -191,8 +191,8 @@
    --  with it (types to be used are New_Handler_Item and New_Handler_Array).
    --  On finalization, we need to restore the handlers that were installed
    --  before the elaboration of the PO, so we need to store these previous
-   --  handlers. This is also done by Install_Handlers, the room for these
-   --  informations is provided by adding a discriminant which is the number
+   --  handlers. This is also done by Install_Handlers, the room for this
+   --  information is provided by adding a discriminant which is the number
    --  of Attach_Handler pragmas and an array of this size in the protection
    --  type, Static_Interrupt_Protection.
 
--- gcc-mingw-w64.orig/src/gcc/ada/s-taskin.ads
+++ gcc-mingw-w64/src/gcc/ada/s-taskin.ads
@@ -611,7 +611,7 @@
       --  Task_Info pragma.
 
       Analyzer  : System.Stack_Usage.Stack_Analyzer;
-      --  For storing informations used to measure the stack usage
+      --  For storing information used to measure the stack usage
 
       Global_Task_Lock_Nesting : Natural;
       --  This is the current nesting level of calls to
--- gcc-mingw-w64.orig/src/gcc/ada/s-traces.ads
+++ gcc-mingw-w64/src/gcc/ada/s-traces.ads
@@ -34,17 +34,17 @@
 --  Warning : NO dependencies to tasking should be created here
 
 --  This package, and all its children are used to implement debug
---  informations
+--  information
 
 --  A new primitive, Send_Trace_Info (Id : Trace_T; 'data') is introduced.
---  Trace_T is an event identifier, 'data' are the informations to pass
+--  Trace_T is an event identifier, 'data' is the information to pass
 --  with the event. This procedure is used from within the Runtime to send
---  debug informations.
+--  debug information.
 
 --  This primitive is overloaded in System.Traces.Tasking and this package
 
 --  Send_Trace_Info calls Send_Trace, in System.Traces.Send, which is target
---  dependent, to send the debug informations to a debugger, stream ..
+--  dependent, to send the debug information to a debugger, stream ..
 
 --  To add a new event, just add them to the Trace_T type, and write the
 --  corresponding Send_Trace_Info procedure. It may be required for some
--- gcc-mingw-w64.orig/src/gcc/ada/sysdep.c
+++ gcc-mingw-w64/src/gcc/ada/sysdep.c
@@ -801,7 +801,7 @@
   tzi_status = GetTimeZoneInformation (&tzi);
 
   /* If GetTimeZoneInformation does not return a value between 0 and 2 then
-     it means that we were not able to retrieve timezone informations.
+     it means that we were not able to retrieve timezone information.
      Note that we cannot use here FileTimeToLocalFileTime as Windows will use
      in always in this case the current timezone setting. As suggested on
      MSDN we use the following three system calls to get the right information.
--- gcc-mingw-w64.orig/src/gcc/config/ia64/ia64.c
+++ gcc-mingw-w64/src/gcc/config/ia64/ia64.c
@@ -8693,7 +8693,7 @@
 /* The following function does insn bundling.  Bundling means
    inserting templates and nop insns to fit insn groups into permitted
    templates.  Instruction scheduling uses NDFA (non-deterministic
-   finite automata) encoding informations about the templates and the
+   finite automata) encoding information about the templates and the
    inserted nops.  Nondeterminism of the automata permits follows
    all possible insn sequences very fast.
 
--- gcc-mingw-w64.orig/src/gcc/tree-ssa-loop-niter.c
+++ gcc-mingw-w64/src/gcc/tree-ssa-loop-niter.c
@@ -2871,7 +2871,7 @@
   record_nonwrapping_iv (loop, base, step, stmt, low, high, false, true);
 }
 
-/* The following analyzers are extracting informations on the bounds
+/* The following analyzers are extracting information on the bounds
    of LOOP from the following undefined behaviors:
 
    - data references should not access elements over the statically
--- gcc-mingw-w64.orig/src/libjava/classpath/doc/cp-hacking.texinfo
+++ gcc-mingw-w64/src/libjava/classpath/doc/cp-hacking.texinfo
@@ -574,7 +574,7 @@
 (or higher). You will also need at least gstreamer-base and
 gstreamer-plugins-base. More plugins can be used to allow streaming of
 different sound types but are not a compile time requirement. See
-README.gstreamer in the source distribution for more informations.
+README.gstreamer in the source distribution for more information.
 
 @end table
 
--- gcc-mingw-w64.orig/src/libjava/classpath/examples/gnu/classpath/examples/sound/AudioPlayerSample.java
+++ gcc-mingw-w64/src/libjava/classpath/examples/gnu/classpath/examples/sound/AudioPlayerSample.java
@@ -99,7 +99,7 @@
         return;
       }
 
-    // get informations about the kind of file we are about to play
+    // get information about the kind of file we are about to play
     AudioFormat audioFormat = audioInputStream.getFormat();
 
     System.out.println("Playing file: " + file);
--- gcc-mingw-w64.orig/src/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java
+++ gcc-mingw-w64/src/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java
@@ -19,7 +19,7 @@
  * use the STYLE attribute in the same way). The expectation is that an
  * instance of the ElementCSSInlineStyle interface can be obtained by using
  * binding-specific casting methods on an instance of the Element interface
- * when the element supports inline CSS style informations.
+ * when the element supports inline CSS style information.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>Document Object Model (DOM) Level 2 Style Specification</a>.
  * @since DOM Level 2
  */
--- gcc-mingw-w64.orig/src/libjava/classpath/gnu/javax/print/ipp/IppResponse.java
+++ gcc-mingw-w64/src/libjava/classpath/gnu/javax/print/ipp/IppResponse.java
@@ -708,7 +708,7 @@
   /**
    * Returns the set of job attributes group maps.
    * There may occur more than one group of type job attribute in a response
-   * because of e.g. multiple job or print service informations requested.
+   * because of e.g. multiple job or print service information requested.
    *
    * @return The list of job attribute group maps.
    */
@@ -720,7 +720,7 @@
   /**
    * Returns the set of operation attributes group maps.
    * There may occur more than one group of type job attribute in a response
-   * because of e.g. multiple job or print service informations requested.
+   * because of e.g. multiple job or print service information requested.
    *
    * @return The list of operation attribute group maps.
    */
@@ -732,7 +732,7 @@
   /**
    * Returns the set of printer attributes group maps.
    * There may occur more than one group of type job attribute in a response
-   * because of e.g. multiple job or print service informations requested.
+   * because of e.g. multiple job or print service information requested.
    *
    * @return The list of printer attribute group maps.
    */
@@ -765,7 +765,7 @@
   /**
    * Returns the set of unsupported attributes group maps.
    * There may occur more than one group of type job attribute in a response
-   * because of e.g. multiple job or print service informations requested.
+   * because of e.g. multiple job or print service information requested.
    *
    * @return The list of unsupported attribute group maps.
    */
--- gcc-mingw-w64.orig/src/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java
+++ gcc-mingw-w64/src/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.java
@@ -45,7 +45,7 @@
 
 /**
  * JobDetailedStatusMessages provides additional detailed and
- * technical job informations.
+ * technical job information.
  *
  * @author Wolfgang Baer (wb...@gmx.de)
  */
--- gcc-mingw-w64.orig/src/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java
+++ gcc-mingw-w64/src/libjava/classpath/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.java
@@ -46,7 +46,7 @@
 /**
  * JobDocumentAccessErrors provides additional information
  * for each access error for print-uri or document-uri jobs.
- * technical job informations.
+ * technical job information.
  *
  * @author Wolfgang Baer (wb...@gmx.de)
  */
--- gcc-mingw-w64.orig/src/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
+++ gcc-mingw-w64/src/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
@@ -56,7 +56,7 @@
 
 /**
  * An implementation of a general AudioFileReader. Uses GStreamer to
- * parse and retrieve informations about the file passed as input.
+ * parse and retrieve information about the file passed as input.
  *
  * @author Mario Torre <neug...@limasoftware.net>
  */
--- gcc-mingw-w64.orig/src/libjava/classpath/java/text/MessageFormat.java
+++ gcc-mingw-w64/src/libjava/classpath/java/text/MessageFormat.java
@@ -766,7 +766,7 @@
    * then it returns it at the right index. If not it uses the detected
    * formatters during a <code>format</code> call. If nothing is known
    * about that argument index it just puts null at that position.
-   * To get useful informations you may have to call <code>format</code>
+   * To get useful information you may have to call <code>format</code>
    * at least once.
    *
    * @return an array of formatters sorted by argument index.
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/ServiceUIFactory.java
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/ServiceUIFactory.java
@@ -45,7 +45,7 @@
  * A print service may provide a <code>ServiceUIFactory</code> implementation
  * if its <code>getServiceUIFactory()</code> method is called. If a factory
  * object is returned it can be queried for provided user interface dialogs.
- * Different roles are defined to denote dialogs providing informations about
+ * Different roles are defined to denote dialogs providing information about
  * the print service, dialogs for administration of a print service and for
  * end-user browsing dialogs.
  * </p><p>
@@ -58,7 +58,7 @@
  */
 public abstract class ServiceUIFactory
 {
-  /** A user interface providing informations about the print service. */
+  /** A user interface providing information about the print service. */
   public static final int ABOUT_UIROLE = 1;
 
   /** A user interface to administer the print service. */
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/URIException.java
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/URIException.java
@@ -43,7 +43,7 @@
 /**
  * <code>URIException</code> specifies methods a specific subclass of
  * {@link javax.print.PrintException} may implement to provide further
- * informations of printing errors if URI problems are involved.
+ * information on printing errors if URI problems are involved.
  * <p>
  * There exists no <code>PrintException</code> class implementing this
  * interface. Providing this extension in <code>PrintException</code>
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/attribute/package.html
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/attribute/package.html
@@ -52,7 +52,7 @@
 Existing attribute roles are:
 <ul>
 <li><a href="PrintServiceAttribute.html">PrintServiceAttribute</a>s  
-describing the state and other informations of a PrintService.</li>
+describing the state and other information of a PrintService.</li>
 <li><a href="PrintJobAttribute.html">PrintJobAttribute</a>s describing
 the state of the print job.</li>
 <li><a href="PrintRequestAttribute.html">PrintRequestAttribute</a>s specifying 
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java
@@ -45,7 +45,7 @@
 
 /**
  * The <code>JobStateReasons</code> attribute provides the set of
- * additional informations available about the current state of a print job.
+ * additional information available about the current state of a print job.
  * <p>
  * <b>IPP Compatibility:</b> JobStateReasons is an IPP 1.1 attribute.
  * </p>
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/attribute/standard/PrinterInfo.java
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/attribute/standard/PrinterInfo.java
@@ -46,7 +46,7 @@
 
 /**
  * The <code>PrinterInfo</code> printing attribute provides
- * informations about a printer device.
+ * information about a printer device.
  * <p>
  * <b>IPP Compatibility:</b> PrinterInfo is an IPP 1.1 attribute.
  * </p>
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/attribute/standard/PrinterMessageFromOperator.java
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/attribute/standard/PrinterMessageFromOperator.java
@@ -47,7 +47,7 @@
 /**
  * The <code>PrinterMessageFromOperator</code> printing attribute provides
  * a message from an operator or a system administrator related to the
- * printer. This may include informations about the status of the printer
+ * printer. This may include information about the status of the printer
  * or expected downtimes, etc.
  * <p>
  * <b>IPP Compatibility:</b> PrinterMessageFromOperator is an IPP 1.1
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
@@ -50,7 +50,7 @@
  * its manufacturer.
  * <p>
  * The URI may for example contain a reference to a website of the
- * manufacturer, containing informations and links to the latest firmware,
+ * manufacturer, containing information and links to the latest firmware,
  * printer drivers, manual etc. The information is normally intended for
  * end users.
  * </p>
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java
@@ -50,7 +50,7 @@
 
 /**
  * The <code>PrinterStateReasons</code> attribute provides the set of
- * additional informations available about the current state of the printer
+ * additional information available about the current state of the printer
  * device.
  * <p>
  * The attribute is basically a map with <code>PrinterStateReason</code>
--- gcc-mingw-w64.orig/src/libjava/classpath/javax/print/package.html
+++ gcc-mingw-w64/src/libjava/classpath/javax/print/package.html
@@ -129,7 +129,7 @@
 <li>Print service attributes:<br>
 These printing attributes of role 
 <a href="attribute/PrintServiceAttribute.html">PrintServiceAttribute</a> report 
-the status and other informations of a PrintService. Example for informations
+the status and other information of a PrintService. Examples of information
 available in the print services attributes are the attribute 
 <code>PagesPerMinute</code> providing the number of pages a printer can print 
 per minute. Status attributes like the <code>PrinterState</code> attribute
--- gcc-mingw-w64.orig/src/libjava/classpath/native/jni/gstreamer-peer/gstreamer_io_peer.c
+++ gcc-mingw-w64/src/libjava/classpath/native/jni/gstreamer-peer/gstreamer_io_peer.c
@@ -338,7 +338,7 @@
    * create the decoder element, this will decode the stream and retrieve
    * its properties.
    * We connect a signal to this element, to be informed when it is done
-   * in decoding the stream and to get the needed informations about the
+   * in decoding the stream and to get the needed information about the
    * audio file.
    */
   decoder = gst_element_factory_make ("decodebin", "decoder");
--- gcc-mingw-w64.orig/src/libstdc++-v3/include/profile/impl/profiler_hash_func.h
+++ gcc-mingw-w64/src/libstdc++-v3/include/profile/impl/profiler_hash_func.h
@@ -132,7 +132,7 @@
       if (!__is_on())
 	return;
 
-      // First find the item from the live objects and update the informations.
+      // First find the item from the live objects and update the information.
       __hashfunc_info* __objs = __get_object_info(__obj);
       if (!__objs)
 	return;

Reply via email to