Fix typos

Fix multiple typos that appear in the codebase.

No other changes

diff --git a/.gitattributes b/.gitattributes
index 2f20357d74c19f5aa54abd314f6fabb6dc676e87..aba5904587e15a488a3dcd04ae258c7cf1e78e75 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 .git* export-ignore
 .mailmap export-ignore
 examples/testfile.pcl -text
-exampels/testfile.txt -text
+examples/testfile.txt -text
 scripts export-ignore

diff --git a/CHANGES.md b/CHANGES.md
index 3a21d1242a6a33d9d41eb9e75b15a4655480a9f0..2b497faa7713a89dd60b7530006a1a8453b65333 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,7 +40,7 @@ Changes in CUPS v2.4.2 (26th May 2022)
 - Fixed conditional jump based on uninitialized value in cups/ppd.c (Issue #329)
 - Fixed CSS related issues in CUPS Web UI (Issue #344)
 - Fixed copyright in CUPS Web UI trailer template (Issue #346)
-- mDNS hostname in device uri is not resolved when installaling a permanent
+- mDNS hostname in device uri is not resolved when installing a permanent
   IPP Everywhere queue (Issues #340, #343)
 - The `lpstat` command now reports when the scheduler is not running
   (Issue #352)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d6dc68be76038f53e8ce5f8eb7bc374c8100465..f20e3090c3b6eea9c7cd0edda6ab836c0102b66d 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,5 +6,5 @@ the Apache License, Version 2.0 with exceptions to allow linking to GPL2/LGPL2
 code.
 
 Contributions should be submitted either as pull requests or as attachments
-(unified diffs) to bug reports on the OpenPrinting CUPS Github project at
+(unified diffs) to bug reports on the OpenPrinting CUPS GitHub project at
 <https://github.com/openprinting/cups>.

diff --git a/CREDITS.md b/CREDITS.md
index 0fee64354859c718dd87619e4b1fdc50c47c8720..665125ecc70190bf065b6cf2c033ac2c28009c79 100644 (file)
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -16,7 +16,7 @@ to thank the following individuals for their contributions:
                                      fixes.
     Bjoern Jacke                   - I18N stuff.
     Wang Jian                      - CUPS RPM corrections.
-    Roderick Johnstone             - Beta tester of the millenium.
+    Roderick Johnstone             - Beta tester of the millennium.
     Till Kamppeter                 - Bug fixes, beta testing, evangelism.
     Tomohiro Kato                  - Japanese localization.
     Kiko                           - Bug fixes.

diff --git a/backend/backend-private.h b/backend/backend-private.h
index d19b06b823b6d77a8bb3e4861de8d0d59c174dfe..72b454a903b462986e21b304f69a5d2fe23d0ea2 100644 (file)
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -268,7 +268,7 @@ extern "C" {
 #define CUPS_TC_hours                          11
 #define CUPS_TC_thousandthsOfOunces            12
 #define CUPS_TC_tenthsOfGrams                  13
-#define CUPS_TC_hundrethsOfFluidOunces         14
+#define CUPS_TC_hundredthsOfFluidOunces                14
 #define CUPS_TC_tenthsOfMilliliters            15
 #define CUPS_TC_feet                           16
 #define CUPS_TC_meters                         17

diff --git a/backend/ipp.c b/backend/ipp.c
index 619bbb7d409e41feb7b65696a61337036f022678..5bbc8cd22f2a87f7304a58beeb61cfedcde8641f 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -3283,7 +3283,7 @@ run_as_user(char       *argv[],           /* I - Command-line arguments */
                                         fprintf(stderr, "DEBUG: Connection invalid for service %s.\n",
                                                 xpc_connection_get_name(conn));
                                       else
-                                        fprintf(stderr, "DEBUG: Unxpected error for service %s: %s\n",
+                                        fprintf(stderr, "DEBUG: Unexpected error for service %s: %s\n",
                                                 xpc_connection_get_name(conn),
                                                 xpc_dictionary_get_string(event, XPC_ERROR_KEY_DESCRIPTION));
                                     }

diff --git a/backend/lpd.c b/backend/lpd.c
index c4aab8b989a6159c5a3e931c1757d3a14cc43813..720499a941b9a3975edbaecb561106dcfed3cac1 100644 (file)
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -61,7 +61,7 @@ static int    abort_job = 0;          /* Non-zero if we get SIGTERM */
  * What to reserve...
  */
 
-#define RESERVE_NONE           0       /* Don't reserve a priviledged port */
+#define RESERVE_NONE           0       /* Don't reserve a privileged port */
 #define RESERVE_RFC1179                1       /* Reserve port 721-731 */
 #define RESERVE_ANY            2       /* Reserve port 1-1023 */
 
@@ -114,7 +114,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
   int          banner;                 /* Print banner page? */
   int          format;                 /* Print format */
   int          order;                  /* Order of control/data files */
-  int          reserve;                /* Reserve priviledged port? */
+  int          reserve;                /* Reserve privileged port? */
   int          sanitize_title;         /* Sanitize title string? */
   int          manual_copies,          /* Do manual copies? */
                timeout,                /* Timeout */
@@ -768,7 +768,7 @@ lpd_queue(const char      *hostname,        /* I - Host to connect to */
         return (CUPS_BACKEND_FAILED);
 
      /*
-      * Choose the next priviledged port...
+      * Choose the next privileged port...
       */
 
       if (!addr)
@@ -805,7 +805,7 @@ lpd_queue(const char      *hostname,        /* I - Host to connect to */
       {
        /*
        * We're running as root and want to comply with RFC 1179.  Reserve a
-       * priviledged lport between 721 and 731...
+       * privileged lport between 721 and 731...
        */
 
        if ((fd = cups_rresvport(&lport, addr->addr.addr.sa_family)) < 0)

diff --git a/backend/testbackend.c b/backend/testbackend.c
index 6412a022b766fbda099b681d9d25150d1ca306f0..2d2b719d9a2878bb47f08d09890d967907829b03 100644 (file)
--- a/backend/testbackend.c
+++ b/backend/testbackend.c
@@ -503,7 +503,7 @@ main(int  argc,                             /* I - Number of command-line args */
   if (do_side_tests)
   {
     int                        length;         /* Length of buffer */
-    char               buffer[2049];   /* Buffer for reponse */
+    char               buffer[2049];   /* Buffer for response */
     cups_sc_status_t   scstatus;       /* Status of side-channel command */
     static const char * const statuses[] =
     {

diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index f0d04ab42cec8df0aa64caada361ea039fa49b30..de66fe5c936500e8850af04ee72cdf72a8c5c2b1 100644 (file)
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -955,7 +955,7 @@ static void *read_thread(void *reference)
       fputs("DEBUG: Got USB return aborted during read\n", stderr);
 
    /*
-    * Make sure this loop executes no more than once every 250 miliseconds...
+    * Make sure this loop executes no more than once every 250 milliseconds...
     */
 
     if ((readstatus != kIOReturnSuccess || rbytes == 0) && (g.wait_eof || !g.read_thread_stop))
@@ -978,7 +978,7 @@ static void *read_thread(void *reference)
          if (readstatus == kIOReturnSuccess && rbytes > 0 && readbuffer[rbytes-1] == 0x4)
            break;
 
-         /* Make sure this loop executes no more than once every 250 miliseconds... */
+         /* Make sure this loop executes no more than once every 250 milliseconds... */
          mach_wait_until(start + delay);
        }
      }
@@ -1128,7 +1128,7 @@ static void iterate_printers(iterator_callback_t callBack, void *userdata)
 
   iterator_reference_t reference = { callBack, userdata, true };
 
-  IONotificationPortRef addNotification = IONotificationPortCreate(kIOMasterPortDefault);
+  IONotificationPortRef addNotification = IONotificationPortCreate(kIOMainPortDefault);
 
   int printingClass = kUSBPrintingClass;
   int printingSubclass = kUSBPrintingSubclass;
@@ -2347,7 +2347,7 @@ static void parse_pserror(char *sockBuffer,
 
       if ((logstrlen = snprintf(logstr, sizeof(logstr), "%s: %s\n", logLevel, pCommentBegin)) >= sizeof(logstr))
       {
-       /* If the string was trucnated make sure it has a linefeed before the nul */
+       /* If the string was truncated make sure it has a linefeed before the nul */
        logstrlen = sizeof(logstr) - 1;
        logstr[logstrlen - 1] = '\n';
       }

diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index 542a875340c3967f91277bf6729f1aa791fadc27..09e343668c988999dad9c3015ba6b8da4aecbae0 100644 (file)
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1748,7 +1748,7 @@ static void *read_thread(void *reference)
       fputs("DEBUG: Got USB return aborted during read.\n", stderr);
 
    /*
-    * Make sure this loop executes no more than once every 250 miliseconds...
+    * Make sure this loop executes no more than once every 250 milliseconds...
     */
 
     if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) &&

diff --git a/cgi-bin/template.c b/cgi-bin/template.c
index 3300a8852e01f8706001f0c12758c9a6f0b6e958..33d738e9c9e3623588c15a8fdbdbe8346868f1a1 100644 (file)
--- a/cgi-bin/template.c
+++ b/cgi-bin/template.c
@@ -432,7 +432,7 @@ cgi_copy(FILE *out,                 /* I - Output file */
       if (ch == '?')
       {
        /*
-        * Test for existance...
+        * Test for existence...
        */
 
         if (name[0] == '?')

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 91ca677d69ae191747bd46f3b5c0bfe8f2df735c..b46c9b5dfbc7ea2d67c53ba2160770e9eceb4ac7 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -212,9 +212,9 @@ AS_IF([test -n "$GCC"], [
     ], [*], [
        # Running some other operating system; inform the user
        # they should contribute the necessary options via
-       # Github...
+       # GitHub...
        echo "Building CUPS with default compiler optimizations."
-       echo "Contact the OpenPrinting CUPS developers on Github with the uname and compiler"
+       echo "Contact the OpenPrinting CUPS developers on GitHub with the uname and compiler"
        echo "options needed for your platform, or set the CFLAGS and LDFLAGS environment"
        echo "variables before running configure."
        echo ""

diff --git a/configure b/configure
index f98e74416b3654062ffc8938fce57905685bef94..75afc8a472e766714118a56c43ac961c132876be 100755 (executable)
--- a/configure
+++ b/configure
@@ -8337,9 +8337,9 @@ fi
 
        # Running some other operating system; inform the user
        # they should contribute the necessary options via
-       # Github...
+       # GitHub...
        echo "Building CUPS with default compiler optimizations."
-       echo "Contact the OpenPrinting CUPS developers on Github with the uname and compiler"
+       echo "Contact the OpenPrinting CUPS developers on GitHub with the uname and compiler"
        echo "options needed for your platform, or set the CFLAGS and LDFLAGS environment"
        echo "variables before running configure."
        echo ""

diff --git a/cups/api-admin.shtml b/cups/api-admin.shtml
index ab00c9be8aaf3fb7b36d2bba0f821ad2f12b7238..3c1c1fa71420217cbdbf56873733b46443b15173 100644 (file)
--- a/cups/api-admin.shtml
+++ b/cups/api-admin.shtml
@@ -64,7 +64,7 @@ enable_web_interface(void)
 
 <h3><a name="DEVICES">Devices</a></h3>
 
-<p>Printers can be discovered through the CUPS scheduler using the <a href="#cupsGetDevices"><code>cupsGetDevices</code></a> API. Typically this API is used to locate printers to add the the system. Each device that is found will cause a supplied callback function to be executed. For example, to list the available printer devices that can be found within 30 seconds:</p>
+<p>Printers can be discovered through the CUPS scheduler using the <a href="#cupsGetDevices"><code>cupsGetDevices</code></a> API. Typically this API is used to locate printers to add to the system. Each device that is found will cause a supplied callback function to be executed. For example, to list the available printer devices that can be found within 30 seconds:</p>
 
 <pre class="example">
 #include &lt;cups/cups.h&gt;

diff --git a/cups/array.c b/cups/array.c
index 860cb4636b2a3f3cd58532c8cd73ae87abdb61d5..41289a5c22ae26235c857c90ae512f9041ed31bb 100644 (file)
--- a/cups/array.c
+++ b/cups/array.c
@@ -1098,7 +1098,7 @@ cups_array_add(cups_array_t *a,           /* I - Array */
     else if (!diff)
     {
      /*
-      * Compared equal, make sure we add to the begining or end of
+      * Compared equal, make sure we add to the beginning or end of
       * the current run of equal elements...
       */
 
@@ -1240,7 +1240,7 @@ cups_array_find(cups_array_t *a,  /* I - Array */
       else
       {
        /*
-        * Start wih previous on left side...
+        * Start with previous on left side...
        */
 
         left  = prev;

diff --git a/cups/cupspm.md b/cups/cupspm.md
index 9ebff737dcd624483e19508b47e18d644f433383..25575fb9375bc7a7c291d078669aaa1a4bd9b47c 100644 (file)
--- a/cups/cupspm.md
+++ b/cups/cupspm.md
@@ -5,7 +5,7 @@ copyright: Copyright © 2021-2022 by OpenPrinting. All Rights Reserved.
 version: 2.4.0
 ...
 
-> Please [file issues on Github](https://github.com/openprinting/cups/issues) to
+> Please [file issues on GitHub](https://github.com/openprinting/cups/issues) to
 > provide feedback on this document.
 
 
@@ -47,7 +47,7 @@ standard management operations to control the state of those printers and jobs.
 > CUPS printer drivers necessarily depend on specific file formats and certain
 > implementation details of the CUPS software.  Please consult the Postscript
 > and raster printer driver developer documentation on the
-> [OpenPrinting CUPS web site](https://openprinting.github.io/cups) for more
+> [OpenPrinting CUPS website](https://openprinting.github.io/cups) for more
 > information.
 
 
@@ -64,7 +64,7 @@ Printing Protocol (IPP) request.
 
 ## Compiling Programs That Use the CUPS API
 
-The CUPS libraries can be used from any C, C++, or Objective C program.
+The CUPS libraries can be used from any C, C++, or Objective-C program.
 The method of compiling against the libraries varies depending on the
 operating system and installation of CUPS. The following sections show how
 to compile a simple program (shown below) in two common environments.
@@ -832,7 +832,7 @@ which printer is being queried:
 > If we wanted to query the scheduler instead of the device, we would look
 > up the "printer-uri-supported" option instead of the "device-uri" value.
 
-The `ippAddString` function adds the "printer-uri" attribute the the IPP
+The `ippAddString` function adds the "printer-uri" attribute to the IPP
 request.  The `IPP_TAG_OPERATION` argument specifies that the attribute is part
 of the operation.  The `IPP_TAG_URI` argument specifies that the value is a
 Universal Resource Identifier (URI) string.  The `NULL` argument specifies there

diff --git a/cups/dest-localization.c b/cups/dest-localization.c
index 39fe8330cad040a3e38598d1a95c52d06eea2b5b..73c6491cf2ca79373f095ef0beaac2bae027dd94 100644 (file)
--- a/cups/dest-localization.c
+++ b/cups/dest-localization.c
@@ -325,7 +325,7 @@ cupsLocalizeDestValue(
 static void
 cups_create_localizations(
     http_t       *http,                        /* I - Connection to destination */
-    cups_dinfo_t *dinfo)               /* I - Destination informations */
+    cups_dinfo_t *dinfo)               /* I - Destination information */
 {
   http_t               *http2;         /* Connection for strings file */
   http_status_t                status;         /* Request status */

diff --git a/cups/dest.c b/cups/dest.c
index 5233d04540e23a4c8853f97d48674d8be48dd3a0..100560f9786dc6401ee525988c5bfd6e427fcebb 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -3996,7 +3996,7 @@ cups_find_dest(const char  *name, /* I - Destination name */
     else
     {
      /*
-      * Start wih previous on left side...
+      * Start with previous on left side...
       */
 
       left  = prev;

diff --git a/cups/file.c b/cups/file.c
index 48969e64aa98eb2b8ac4978a35e0c7c3ca35423b..d9b0233e44080a30e30da465c78bd3bf905bbfa5 100644 (file)
--- a/cups/file.c
+++ b/cups/file.c
@@ -1367,7 +1367,7 @@ cupsFilePrintf(cups_file_t *fp,           /* I - CUPS file */
   if (!fp->printf_buffer)
   {
    /*
-    * Start with an 1k printf buffer...
+    * Start with a 1k printf buffer...
     */
 
     if ((fp->printf_buffer = malloc(1024)) == NULL)

diff --git a/cups/http.h b/cups/http.h
index ea648f8fdc58776f2da44f761f836c1d685e33d2..ad26343084a777481b8484856aae3c987ca23c2a 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -178,7 +178,7 @@ typedef enum http_field_e           /**** HTTP field names ****/
   HTTP_FIELD_SERVER,                   /* Server field @since CUPS 1.7/macOS 10.9@ */
   HTTP_FIELD_AUTHENTICATION_INFO,      /* Authentication-Info field @since CUPS 2.2.9@ */
   HTTP_FIELD_ACCESS_CONTROL_ALLOW_CREDENTIALS,
-                                       /* CORS/Fetch Access-Control-Allow-Cresdentials field @since CUPS 2.4@ */
+                                       /* CORS/Fetch Access-Control-Allow-Credentials field @since CUPS 2.4@ */
   HTTP_FIELD_ACCESS_CONTROL_ALLOW_HEADERS,
                                        /* CORS/Fetch Access-Control-Allow-Headers field @since CUPS 2.4@ */
   HTTP_FIELD_ACCESS_CONTROL_ALLOW_METHODS,

diff --git a/cups/ipp.c b/cups/ipp.c
index 42cf2fcaf778ab9b6b31c370324861804dbbf0a9..86ebeff8affe2be6009295d46771a4c5f17b4723 100644 (file)
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1929,7 +1929,7 @@ ippFindNextAttribute(ipp_t      *ipp,     /* I - IPP message */
                      const char *name, /* I - Name of attribute */
                     ipp_tag_t  type)   /* I - Type of attribute */
 {
-  ipp_attribute_t      *attr,          /* Current atttribute */
+  ipp_attribute_t      *attr,          /* Current attribute */
                        *childattr;     /* Child attribute */
   ipp_tag_t            value_tag;      /* Value tag */
   char                 parent[1024],   /* Parent attribute name */

diff --git a/cups/options.c b/cups/options.c
index e45858c2c9e9c7f879d432c9d872c490e052c730..4fcc281b10e6327beeb5e7572457d91fe735905a 100644 (file)
--- a/cups/options.c
+++ b/cups/options.c
@@ -684,7 +684,7 @@ cups_find_option(
     else
     {
      /*
-      * Start wih previous on left side...
+      * Start with previous on left side...
       */
 
       left  = prev;

diff --git a/cups/ppd.c b/cups/ppd.c
index 54368ac4c16a05d32651667127384402670d3a65..50eec655c08e210ca3594dcd7d22f76e32534eb3 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -3380,7 +3380,7 @@ ppd_read(cups_file_t    *fp,              /* I - File to read from */
     if (*lineptr == ':')
     {
      /*
-      * Get string after triming leading and trailing whitespace...
+      * Get string after trimming leading and trailing whitespace...
       */
 
       lineptr ++;

diff --git a/cups/raster-interpret.c b/cups/raster-interpret.c
index fbe52f37522f9c4141da5b17aaa1a8aff0d5766f..1eb7835bd36cd858e7ee7b1fa450d1bac55cad0b 100644 (file)
--- a/cups/raster-interpret.c
+++ b/cups/raster-interpret.c
@@ -54,7 +54,7 @@ typedef struct
     char       name[64];               /* Name value */
     double     number;                 /* Number value */
     char       other[64];              /* Other operator */
-    char       string[64];             /* Sring value */
+    char       string[64];             /* String value */
   }                    value;          /* Value */
 } _cups_ps_obj_t;
 
@@ -129,7 +129,7 @@ _cupsRasterInterpretPPD(
     cups_option_t       *options,      /* I - Options */
     cups_interpret_cb_t func)          /* I - Optional page header callback (@code NULL@ for none) */
 {
-  int          status;                 /* Cummulative status */
+  int          status;                 /* Cumulative status */
   char         *code;                  /* Code to run */
   const char   *val;                   /* Option value */
   ppd_size_t   *size;                  /* Current size */

diff --git a/cups/raster.h b/cups/raster.h
index 7d98a4e8ae68debaa2354eb876e080cc7680ad99..6ae004ecb19c34a9652812547df1e2b49fdf9da1 100644 (file)
--- a/cups/raster.h
+++ b/cups/raster.h
@@ -335,7 +335,7 @@ typedef struct cups_page_header2_s  /**** Version 2 page header @since CUPS 1.2/m
   unsigned     cupsRowStep;            /* Spacing between lines */
 
   /**** Version 2 Dictionary Values ****/
-  unsigned     cupsNumColors;          /* Number of color compoents @since CUPS 1.2/macOS 10.5@ */
+  unsigned     cupsNumColors;          /* Number of color components @since CUPS 1.2/macOS 10.5@ */
   float                cupsBorderlessScalingFactor;
                                        /* Scaling that was applied to page data @since CUPS 1.2/macOS 10.5@ */
   float                cupsPageSize[2];        /* Floating point PageSize (scaling *

diff --git a/cups/rasterbench.c b/cups/rasterbench.c
index f7d8c56c5c43dcc512a1ec3a920d7332cef8d224..e4dee66b5d06c789dc5d764d152afa912ce8dff7 100644 (file)
--- a/cups/rasterbench.c
+++ b/cups/rasterbench.c
@@ -125,7 +125,7 @@ compute_median(double *secs)                /* I - Array of time samples */
 
 
  /*
-  * Sort the array into ascending order using a quicky bubble sort...
+  * Sort the array into ascending order using a quick bubble sort...
   */
 
   for (i = 0; i < (TEST_PASSES - 1); i ++)

diff --git a/cups/test.ppd b/cups/test.ppd
index 00bbe9b532700e0e920fac7501716ca9ff8823c2..7e2461773a56ca461fca5742056ac408efbc4210 100644 (file)
--- a/cups/test.ppd
+++ b/cups/test.ppd
@@ -3,7 +3,7 @@
 *% Test PPD file for CUPS.
 *%
 *% This file is used to test the CUPS PPD API functions and cannot be
-*% used with any known printers.  Look on the CUPS web site for working PPD
+*% used with any known printers.  Look on the CUPS website for working PPD
 *% files.
 *%
 *% If you are a PPD file developer, consider using the PPD compiler (ppdc)

diff --git a/cups/test2.ppd b/cups/test2.ppd
index 4f8d4ea6dfa8325303d8a3592a7c07c72cdafd4d..9a5b4fd39de19dd624d595d52fbb3b81da35695e 100644 (file)
--- a/cups/test2.ppd
+++ b/cups/test2.ppd
@@ -3,7 +3,7 @@
 *% Test PPD file #2 for CUPS.
 *%
 *% This file is used to test the CUPS PPD API functions and cannot be
-*% used with any known printers.  Look on the CUPS web site for working PPD
+*% used with any known printers.  Look on the CUPS website for working PPD
 *% files.
 *%
 *% If you are a PPD file developer, consider using the PPD compiler (ppdc)

diff --git a/cups/testclient.c b/cups/testclient.c
index 6b947ff9613b1e4d619b1ee6bf6886d01262802c..1d468a402f418c61dc6787015d71b522b86dd338 100644 (file)
--- a/cups/testclient.c
+++ b/cups/testclient.c
@@ -392,7 +392,7 @@ make_raster_file(ipp_t      *response,  /* I - Printer attributes */
   }
 
  /*
-  * Figure out the the media, resolution, and color mode...
+  * Figure out the media, resolution, and color mode...
   */
 
   if ((attr = ippFindAttribute(response, "media-ready", IPP_TAG_KEYWORD)) != NULL)

diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index dfc6ea51b885d8603d9ec351b455cc20d4cc1595..6caf548e0512297285da876db9c190eb2c514426 100644 (file)
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -253,7 +253,7 @@ cupsMakeServerCredentials(
   CFNumberRef  usage = CFNumberCreate(kCFAllocatorDefault, kCFNumberCFIndexType, &usageInt);
   CFIndex      lenInt = 0;
   CFNumberRef  len = CFNumberCreate(kCFAllocatorDefault, kCFNumberCFIndexType, &lenInt);
-  CFTypeRef certKeys[] = { kSecCSRBasicContraintsPathLen, kSecSubjectAltName, kSecCertificateKeyUsage };
+  CFTypeRef certKeys[] = { kSecCSRBasicConstraintsPathLen, kSecSubjectAltName, kSecCertificateKeyUsage };
   CFTypeRef certValues[] = { len, cfcommon_name, usage };
   CFDictionaryRef certParams = CFDictionaryCreate(kCFAllocatorDefault, certKeys, certValues, sizeof(certKeys) / sizeof(certKeys[0]), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
   CFRelease(usage);

diff --git a/cups/tls-darwin.h b/cups/tls-darwin.h
index ca4136e3aca9bbb44f6862fc81b3d21d55ea3be3..a8f691470e86f82060c5115216d659e1144d9df7 100644 (file)
--- a/cups/tls-darwin.h
+++ b/cups/tls-darwin.h
@@ -20,7 +20,7 @@ typedef CF_OPTIONS(uint32_t, SecKeyUsage) {
 extern const void * kSecCSRChallengePassword;
 extern const void * kSecSubjectAltName;
 extern const void * kSecCertificateKeyUsage;
-extern const void * kSecCSRBasicContraintsPathLen;
+extern const void * kSecCSRBasicConstraintsPathLen;
 extern const void * kSecCertificateExtensions;
 extern const void * kSecCertificateExtensionsEncoded;
 extern const void * kSecOidCommonName;

diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c
index ca88ee23bc61b28786328326c194e7b9dd9be310..5a99ee8f0c70103e99617c942af35c419aa6786a 100644 (file)
--- a/cups/tls-sspi.c
+++ b/cups/tls-sspi.c
@@ -1690,7 +1690,7 @@ http_sspi_find_credentials(
   }
 
  /*
-  * Set supported protocols (can also be overriden in the registry...)
+  * Set supported protocols (can also be overridden in the registry...)
   */
 
 #ifdef SP_PROT_TLS1_2_SERVER

diff --git a/cups/util.c b/cups/util.c
index 0961ac9b562cfe70173c0ae3fd2a639b46265258..e81e4704d427e77312c93ac5760c98884bcc0ef4 100644 (file)
--- a/cups/util.c
+++ b/cups/util.c
@@ -908,7 +908,7 @@ cupsStartDocument(
     const char *format,                        /* I - MIME type or @code CUPS_FORMAT_foo@ */
     int        last_document)          /* I - 1 for last document in job, 0 otherwise */
 {
-  char         resource[1024],         /* Resource for destinatio */
+  char         resource[1024],         /* Resource for destination */
                printer_uri[1024];      /* Printer URI */
   ipp_t                *request;               /* Send-Document request */
   http_status_t        status;                 /* HTTP status */

diff --git a/cups/versioning.h b/cups/versioning.h
index ad398ed8b1c2882fb090125f58f5d20197e16ce2..6363680da6ef21083991025a35b2141c619c74b9 100644 (file)
--- a/cups/versioning.h
+++ b/cups/versioning.h
@@ -82,7 +82,7 @@
 
 
 /*
- * Define _CUPS_INTERNAL, _CUPS_PRIVATE, and _CUPS_PUBLIC visibilty macros for
+ * Define _CUPS_INTERNAL, _CUPS_PRIVATE, and _CUPS_PUBLIC visibility macros for
  * internal/private/public functions...
  */
 

diff --git a/doc/help/api-admin.html b/doc/help/api-admin.html
index 0309a11d0d8b290d1def0d71268753a60c33ccb1..62b91c64801d3f042e97e863e879d8c26d920618 100644 (file)
--- a/doc/help/api-admin.html
+++ b/doc/help/api-admin.html
@@ -364,7 +364,7 @@ enable_web_interface(void)
 
 <h3><a name="DEVICES">Devices</a></h3>
 
-<p>Printers can be discovered through the CUPS scheduler using the <a href="#cupsGetDevices"><code>cupsGetDevices</code></a> API. Typically this API is used to locate printers to add the the system. Each device that is found will cause a supplied callback function to be executed. For example, to list the available printer devices that can be found within 30 seconds:</p>
+<p>Printers can be discovered through the CUPS scheduler using the <a href="#cupsGetDevices"><code>cupsGetDevices</code></a> API. Typically this API is used to locate printers to add to the system. Each device that is found will cause a supplied callback function to be executed. For example, to list the available printer devices that can be found within 30 seconds:</p>
 
 <pre class="example">
 #include &lt;cups/cups.h&gt;

diff --git a/doc/help/cupspm.html b/doc/help/cupspm.html
index 17a829ffdf6ea3c70996e13ea76dfa9c7f954e3b..afec88f87348bd0ee42397914afde8c4b46e4efd 100644 (file)
--- a/doc/help/cupspm.html
+++ b/doc/help/cupspm.html
@@ -688,7 +688,7 @@ span.string {
 </div>
 <div class="body">
 <blockquote>
-<p>Please <a href="https://github.com/openprinting/cups/issues">file issues on Github</a> to provide feedback on this document.</p>
+<p>Please <a href="https://github.com/openprinting/cups/issues">file issues on GitHub</a> to provide feedback on this document.</p>
 </blockquote>
 <h2 class="title" id="introduction">Introduction</h2>
 <p>CUPS provides the &quot;cups&quot; library to talk to the different parts of CUPS and with Internet Printing Protocol (IPP) printers. The &quot;cups&quot; library functions are accessed by including the <code>&lt;cups/cups.h&gt;</code> header.</p>
@@ -709,12 +709,12 @@ span.string {
 <p>Similarly, printer and job management applications can use standard query operations to obtain the status information in a common, generic form and use standard management operations to control the state of those printers and jobs.</p>
 <blockquote>
 <p><strong>Note:</strong></p>
-<p>CUPS printer drivers necessarily depend on specific file formats and certain implementation details of the CUPS software. Please consult the Postscript and raster printer driver developer documentation on the <a href="https://openprinting.github.io/cups">OpenPrinting CUPS web site</a> for more information.</p>
+<p>CUPS printer drivers necessarily depend on specific file formats and certain implementation details of the CUPS software. Please consult the Postscript and raster printer driver developer documentation on the <a href="https://openprinting.github.io/cups">OpenPrinting CUPS website</a> for more information.</p>
 </blockquote>
 <h3 class="title" id="terms-used-in-this-document">Terms Used in This Document</h3>
 <p>A <em>Destination</em> is a printer or print queue that accepts print jobs. A <em>Print Job</em> is a collection of one or more documents that are processed by a destination using options supplied when creating the job. A <em>Document</em> is a file (JPEG image, PDF file, etc.) suitable for printing. An <em>Option</em> controls some aspect of printing, such as the media used. <em>Media</em> is the sheets or roll that is printed on. An <em>Attribute</em> is an option encoded for an Internet Printing Protocol (IPP) request.</p>
 <h3 class="title" id="compiling-programs-that-use-the-cups-api">Compiling Programs That Use the CUPS API</h3>
-<p>The CUPS libraries can be used from any C, C++, or Objective C program. The method of compiling against the libraries varies depending on the operating system and installation of CUPS. The following sections show how to compile a simple program (shown below) in two common environments.</p>
+<p>The CUPS libraries can be used from any C, C++, or Objective-C program. The method of compiling against the libraries varies depending on the operating system and installation of CUPS. The following sections show how to compile a simple program (shown below) in two common environments.</p>
 <p>The following simple program lists the available destinations:</p>
 <pre><code>#include &lt;stdio.h&gt;
 #include &lt;cups/cups.h&gt;
@@ -1280,7 +1280,7 @@ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
 <p><strong>Note:</strong></p>
 <p>If we wanted to query the scheduler instead of the device, we would look up the &quot;printer-uri-supported&quot; option instead of the &quot;device-uri&quot; value.</p>
 </blockquote>
-<p>The <code>ippAddString</code> function adds the &quot;printer-uri&quot; attribute the the IPP request. The <code>IPP_TAG_OPERATION</code> argument specifies that the attribute is part of the operation. The <code>IPP_TAG_URI</code> argument specifies that the value is a Universal Resource Identifier (URI) string. The <code>NULL</code> argument specifies there is no language (English, French, Japanese, etc.) associated with the string, and the <code>printer_uri</code> argument specifies the string value.</p>
+<p>The <code>ippAddString</code> function adds the &quot;printer-uri&quot; attribute to the IPP request. The <code>IPP_TAG_OPERATION</code> argument specifies that the attribute is part of the operation. The <code>IPP_TAG_URI</code> argument specifies that the value is a Universal Resource Identifier (URI) string. The <code>NULL</code> argument specifies there is no language (English, French, Japanese, etc.) associated with the string, and the <code>printer_uri</code> argument specifies the string value.</p>
 <p>The IPP Get-Printer-Attributes request also supports an IPP attribute called &quot;requested-attributes&quot; that lists the attributes and values you are interested in. For example, the following code requests the printer state attributes:</p>
 <pre><code>static const char * const requested_attributes[] =
 {
@@ -7546,7 +7546,7 @@ bottom, right, top) </td></tr>
 <tr><th>cupsMediaType </th>
 <td class="description">Media type code</td></tr>
 <tr><th>cupsNumColors <span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span></th>
-<td class="description">Number of color compoents </td></tr>
+<td class="description">Number of color components </td></tr>
 <tr><th>cupsPageSizeName[64] <span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span></th>
 <td class="description">PageSize name </td></tr>
 <tr><th>cupsPageSize[2] <span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span></th>

diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html
index 4bc3dadeb548aa6b00bcfff8748c3dc6ec4c22ed..161eac7548662ecdd170fe3717680e8c9ebe1180 100644 (file)
--- a/doc/help/man-cups.html
+++ b/doc/help/man-cups.html
@@ -44,7 +44,7 @@ Additionally, your operating system may include graphical user interfaces or aut
 <h3><a name="HOW_DO_I_GET_HELP_">How Do I Get Help?</a></h3>
 The
 <b>OpenPrinting</b><b>CUPS</b>
-web site (<a href="https://openprinting.github.io/cups">https://openprinting.github.io/cups</a>) provides access to the
+website (<a href="https://openprinting.github.io/cups">https://openprinting.github.io/cups</a>) provides access to the
 <i>cups</i>
 and
 <i>cups-devel</i>

diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html
index a0ff0eb6781b539cfbfec0f44ad593b6a008f3e8..2ba2179099f3a397ab8a89cb56e82fbd623abda0 100644 (file)
--- a/doc/help/spec-ipp.html
+++ b/doc/help/spec-ipp.html
@@ -1497,7 +1497,7 @@ CUPS-Get-PPDs Response:
 
 <h4><a name="auth-info">auth-info (1setOf text(MAX))</a><span class="info">CUPS 1.3/macOS 10.5</span></h4>
 
-<p>The "auth-info" attribute specifies the authentication information to use when printing to a remote device. The order and content of each text value is specifed by the <a href="#auth-info-required">auth-info-required</a> printer attribute.
+<p>The "auth-info" attribute specifies the authentication information to use when printing to a remote device. The order and content of each text value is specified by the <a href="#auth-info-required">auth-info-required</a> printer attribute.
 
 <h4><a name="job-cancel-after">job-cancel-after (integer(1:MAX))</a><span class='info'>CUPS 2.0</span></h4>
 

diff --git a/doc/help/translation.html b/doc/help/translation.html
index cb8e4bb953f2e1483a49ea8eab2ad248ce256303..50e3bbd6832c1ba296fbf9c6a931b5e53323c4e7 100644 (file)
--- a/doc/help/translation.html
+++ b/doc/help/translation.html
@@ -42,7 +42,7 @@ tar cvf <I>ll_CC</I>.tar.gz desktop/cups.desktop doc/<I>ll_CC</I> locale/cups_<I
 
 <P>Replace "ll_CC" with the locale name for your translation. Once you have created the archive, go to the <A HREF="https://github.com/apple/cups" TARGET="_blank">CUPS project page</A> and submit a bug report, attaching the translation to the report.</P>
 
-<P>Alternately, you can clone the CUPS project on Github, make your changes, and submit a pull request from the same link.</P>
+<P>Alternately, you can clone the CUPS project on GitHub, make your changes, and submit a pull request from the same link.</P>
 
 
 <H2 CLASS="title" ID="DESKTOP">The Desktop File</H2>

diff --git a/filter/common.c b/filter/common.c
index e0cbcd384083025743d0e2af37f50150a70a468c..1d3c73736cd83aab53d59bd5ad160ec2733afb9a 100644 (file)
--- a/filter/common.c
+++ b/filter/common.c
@@ -206,7 +206,7 @@ UpdatePageVars(void)
 
   switch (Orientation & 3)
   {
-    case 0 : /* Portait */
+    case 0 : /* Portrait */
         break;
 
     case 1 : /* Landscape */

diff --git a/man/cups.1 b/man/cups.1
index 57729cddefa0cc703e65e388699ba16c6e7066cd..03813725401d87c29074dc981a1b94dca4d98f32 100644 (file)
--- a/man/cups.1
+++ b/man/cups.1
@@ -53,7 +53,7 @@ Additionally, your operating system may include graphical user interfaces or aut
 .SS HOW DO I GET HELP?
 The
 .B OpenPrinting CUPS
-web site (https://openprinting.github.io/cups) provides access to the
+website (https://openprinting.github.io/cups) provides access to the
 .I cups
 and
 .I cups-devel

diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx
index 54e5245931c7c3efea6864e8a967eec7b16cfc73..43da9e977d2cb4d1c7236b197b6cb82b2205f10c 100644 (file)
--- a/ppdc/ppdc-constraint.cxx
+++ b/ppdc/ppdc-constraint.cxx
@@ -1,5 +1,5 @@
 //
-// Contraint class for the CUPS PPD Compiler.
+// Constraint class for the CUPS PPD Compiler.
 //
 // Copyright 2007-2009 by Apple Inc.
 // Copyright 2002-2005 by Easy Software Products.

diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx
index cf5ded4799387ca7f497a2f337891f83c39992bb..51bb6ee3771c9247dd436d80979e34486145c977 100644 (file)
--- a/ppdc/ppdc-file.cxx
+++ b/ppdc/ppdc-file.cxx
@@ -83,7 +83,7 @@ ppdcFile::get()
 int                                    // O - Next character in file
 ppdcFile::peek()
 {
-  // Return immediaely if there is no open file...
+  // Return immediately if there is no open file...
   if (!fp)
     return (EOF);
 

diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index 0a0e40592e1a8b49d595c1475a5d81441653d0e0..e1657c6b04c6f0ff56906a95aa2b7f810473d37e 100644 (file)
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -3479,7 +3479,7 @@ ppdcSource::write_file(const char *f)     // I - File to write
                    d->model_name->value);
     cupsFilePuts(fp, "{\n");
 
-    // Write the copyright stings...
+    // Write the copyright strings...
     for (st = (ppdcString *)d->copyright->first();
          st;
         st = (ppdcString *)d->copyright->next())

diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h
index 075cdcb5041539fd1c3e38edebaf77ee0e8fc041..256ce7dd2b4621ad911e54aae29291d9d99037a0 100644 (file)
--- a/ppdc/ppdc.h
+++ b/ppdc/ppdc.h
@@ -467,7 +467,7 @@ class ppdcSource                    //// Source File
                *po_files,              // Message catalogs
                *sizes,                 // Predefined media sizes
                *vars;                  // Defined variables
-  int          cond_state,             // Cummulative conditional state
+  int          cond_state,             // Cumulative conditional state
                *cond_current,          // Current #if state
                cond_stack[101];        // #if state stack
 

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 66c95cb03e0b8038e90d33978e6f5469f0c0f5cc..3ce6c85ce1d383de693ab30a182346274dc65cf4 100644 (file)
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -2237,7 +2237,7 @@ load_ppd(const char  *filename,           /* I - Real filename */
   if (ptr)
   {
    /*
-    * Setup the country suffix...
+    * Set the country suffix...
     */
 
     country[0] = '_';

diff --git a/scheduler/env.c b/scheduler/env.c
index 6e738c6e2bda72eca00a0c8a5658b4b044a1792c..e0553df4ceecb0917413d33770bbb253037f6575 100644 (file)
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -102,7 +102,7 @@ void
 cupsdSetEnv(const char *name,          /* I - Name of variable */
             const char *value)         /* I - Value of variable */
 {
-  int  i;                              /* Index into environent array */
+  int  i;                              /* Index into environment array */
 
 
  /*

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index ace375521cb090c58db8f5dbfef5e94a5bb3bff4..f468a350ec91f4f549fce95f679448bdc54c840b 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -10221,7 +10221,7 @@ send_ipp_status(cupsd_client_t *con,    /* I - Client connection */
                ...)                    /* I - Additional args as needed */
 {
   va_list      ap;                     /* Pointer to additional args */
-  char         formatted[1024];        /* Formatted errror message */
+  char         formatted[1024];        /* Formatted error message */
 
 
   va_start(ap, message);

diff --git a/scheduler/job.c b/scheduler/job.c
index b83ea64856af9de1d771d4413218903028b173e8..f9e013e86b64aed7a5a30cbc02ccc5b4d09b9974 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1269,7 +1269,7 @@ cupsdContinueJob(cupsd_job_t *job)        /* I - Job */
 
       if (pid == 0)
       {
-       abort_message = "Stopping job because the sheduler could not execute "
+       abort_message = "Stopping job because the scheduler could not execute "
                        "the backend.";
 
         goto abort_job;

diff --git a/scheduler/listen.c b/scheduler/listen.c
index dbf959b25aac2a32c55464472789b38d62d1ad89..f6f7c3a25d5f621b1b904728464c565dff7f849b 100644 (file)
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -120,7 +120,7 @@ cupsdStartListening(void)
 {
   int                  p;              /* Port number */
   cupsd_listener_t     *lis;           /* Current listening socket */
-  char                 s[256];         /* String addresss */
+  char                 s[256];         /* String address */
   const char           *have_domain;   /* Have a domain socket? */
   static const char * const encryptions[] =
                {                       /* Encryption values */

diff --git a/scheduler/main.c b/scheduler/main.c
index 0380faa81d1fc10b85c3164c11f783e61c08a3fe..65030ba8e4452944dc31119f268c5e49482dcc99 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1862,7 +1862,7 @@ service_add_listener(int fd,              /* I - Socket file descriptor */
   cupsd_listener_t     *lis;           /* Listeners array */
   http_addr_t          addr;           /* Address variable */
   socklen_t            addrlen;        /* Length of address */
-  char                 s[256];         /* String addresss */
+  char                 s[256];         /* String address */
 
 
   addrlen = sizeof(addr);

diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h
index 9be5fe62f5bd69fabc89b1065f69dc7d99392885..6f524062efde0dd29071ab1f2bca18ac11add82a 100644 (file)
--- a/scheduler/subscriptions.h
+++ b/scheduler/subscriptions.h
@@ -64,7 +64,7 @@ typedef enum
 
 
 /*
- * Notiification support structures...
+ * Notification support structures...
  */
 
 typedef struct cupsd_event_s           /**** Event structure ****/

diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index f6fc98da74e49b00ff3c0f4984e1b396fc3852a6..b1b5e003d4c00f1b6bd12c1f36a92ecaa91b0679 100644 (file)
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -260,9 +260,9 @@ static CFStringRef  ComputerNameKey = NULL,
                        HostNamesKey = NULL,
                                        /* Host name key */
                        NetworkInterfaceKeyIPv4 = NULL,
-                                       /* Netowrk interface key */
+                                       /* Network interface key */
                        NetworkInterfaceKeyIPv6 = NULL;
-                                       /* Netowrk interface key */
+                                       /* Network interface key */
 static cupsd_sysevent_t        LastSysEvent;   /* Last system event (for delayed sleep) */
 static int             NameChanged = 0;/* Did we get a 'name changed' event during sleep? */
 static int             PSToken = 0;    /* Power source notifications */

diff --git a/scheduler/type.c b/scheduler/type.c
index f8417b9f9fc518f3a186ae681248e302e3e67188..5e8879fc264294932b6f4d024e0c657d2df4e896 100644 (file)
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -1217,9 +1217,9 @@ mime_check_rules(
       result = !result;
 
    /*
-    * OK, now if the current logic is OR and this result is true, the this
+    * OK, now if the current logic is OR and this result is true, this
     * rule set is true.  If the current logic is AND and this result is false,
-    * the the rule set is false...
+    * the rule set is false...
     */
 
     DEBUG_printf(("5mime_check_rules: result of test %p (MIME_MAGIC_%s) is %d",

diff --git a/scripts/copydocs b/scripts/copydocs
index 7ff56df36623b178217de188aaaad9fde8b777b5..d17a786ae9fb08c4fdccda2a300612d928e5d5b0 100755 (executable)
--- a/scripts/copydocs
+++ b/scripts/copydocs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Script to copy the CUPS online help files to a CUPS web site subdirectory.
+# Script to copy the CUPS online help files to a CUPS website subdirectory.
 # The normal HTML headers are replaced by Jekyll headers.
 #
 # Usage: scripts/copydocs DESTINATION-DIR

diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
index f819a6a8c283c304ab4b67504570009542194221..a03da8968177b891eebb9f91ee252306451af369 100644 (file)
--- a/tools/ippeveprinter.c
+++ b/tools/ippeveprinter.c
@@ -402,7 +402,7 @@ main(int  argc,                             /* I - Number of command-line args */
                duplex = 0,             /* Duplex mode */
                ppm = 10,               /* Pages per minute for mono */
                ppm_color = 0,          /* Pages per minute for color */
-               web_forms = 1;          /* Enable web site forms? */
+               web_forms = 1;          /* Enable website forms? */
   ipp_t                *attrs = NULL;          /* Printer attributes */
   char         directory[1024] = "";   /* Spool directory */
   cups_array_t *docformats = NULL;     /* Supported formats */
@@ -5854,7 +5854,7 @@ process_client(ippeve_client_t *client)   /* I - Client */
   }
 
  /*
-  * Close the conection to the client and return...
+  * Close the connection to the client and return...
   */
 
   delete_client(client);
@@ -7622,7 +7622,7 @@ respond_ipp(ippeve_client_t *client,      /* I - Client */
 static void
 respond_unsupported(
     ippeve_client_t   *client,         /* I - Client */
-    ipp_attribute_t *attr)             /* I - Atribute */
+    ipp_attribute_t *attr)             /* I - Attribute */
 {
   ipp_attribute_t      *temp;          /* Copy of attribute */
 

diff --git a/tools/ippeveps.c b/tools/ippeveps.c
index 9284f5617ac9dcdf7fe786837a56045da87c8624..8cde19521768508c05442176555f4cdac523d7fa 100644 (file)
--- a/tools/ippeveps.c
+++ b/tools/ippeveps.c
@@ -301,7 +301,7 @@ dsc_header(int num_pages)           /* I - Number of pages or 0 if not known */
  */
 
 static void
-dsc_page(int page)                     /* I - Page numebr (1-based) */
+dsc_page(int page)                     /* I - Page number (1-based) */
 {
   printf("%%%%Page: (%d) %d\n", page, page);
 
@@ -543,7 +543,7 @@ jpeg_to_ps(const char    *filename, /* I - Filename */
   float                page_left,              /* Left margin */
                page_top,               /* Top margin */
                page_width,             /* Page width in points */
-               page_height,            /* Page heigth in points */
+               page_height,            /* Page height in points */
                x_factor,               /* X image scaling factor */
                y_factor,               /* Y image scaling factor */
                page_scaling;           /* Image scaling factor */
@@ -1016,7 +1016,7 @@ ps_to_ps(const char    *filename, /* I - Filename */
  *
  * The current implementation locally-decodes the raster data and then writes
  * whole, non-blank lines as 1-line high images with base-85 encoding, resulting
- * in between 10 and 20 times larger output.  A alternate implementation (if it
+ * in between 10 and 20 times larger output.  An alternate implementation (if it
  * is deemed necessary) would be to implement a PostScript decode procedure that
  * handles the modified packbits decompression so that we just have the base-85
  * encoding overhead (25%).  Furthermore, Level 3 PostScript printers also

diff --git a/tools/ipptool.c b/tools/ipptool.c
index 072aebe42a30126421e8148f1cad3e8794feaab5..a0335e5b80c033cd062206c08ea5c24f818de54f 100644 (file)
--- a/tools/ipptool.c
+++ b/tools/ipptool.c
@@ -3518,7 +3518,7 @@ print_fatal_error(
 
 
 /*
- * 'print_ippserver_attr()' - Print a attribute suitable for use by ippserver.
+ * 'print_ippserver_attr()' - Print an attribute suitable for use by ippserver.
  */
 
 static void