Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.1.1@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,60 +1,6 @@
-CHANGES.txt - 08/04/2000
+CHANGES.txt - 07/21/2000
 ------------------------

-CHANGES IN CUPS v1.1.2
-
-	- Makefile/configure fixes
-	- RPM spec file and EPM list file fixes
-	- The cupsTempFile() function now uses a different
-	  algorithm for generating temp files and "reserves"
-	  them to avoid possible security exploitation.
-	- Now use /dev/random (if available) to seed the random
-	  number generator for certificates.
-	- The /var/spool/cups and /var/spool/cups/tmp directories
-	  were incorrectly owned by root; they are now owned by
-	  the filter user, typically "lp".
-	- The scheduler now resets the permissions on the spool
-	  and temp directories as needed to match the filter
-	  user.
-	- Now expose ppdCollect() as an externally callable
-	  function.
-	- The image filters now support filtering from the
-	  standard input.
-	- The imagetoraster filter now collects all printer
-	  options and job patch files and applies them to the
-	  page header as needed.
-	- Added format and banner options to LPD backend.
-	- The send-document operation didn't start a job
-	  immediately when last-document was true.
-	- The set-job-attributes operation didn't correctly
-	  replace the current job-hold-until value.
-	- Removed the option wrapper code from ppdEmit() and
-	  friends since it caused problems with Ghostscript
-	  and many PS printers.
-	- Was setting TZ environment variable twice for job
-	  filters.
-	- Added syslog logging in cups-lpd to aide in
-	  debugging problems.
-	- The HP-UX parallel port backend did not list the
-	  available parallel ports on some systems (printf
-	  calling problem...)
-	- The lp and lpr commands overrode user options if
-	  -d/-P were specified after -o.
-	- The scheduler would crash with a */* filter.
-	- Added support for a "default" filter for unknown file
-	  types.  The example provided in the mime.types and
-	  mime.convs file prints unknown files as if "-oraw" was
-	  specified for the job.  This functionality is disabled
-	  by default.
-	- The "compatibility" mode fix for older backends did not
-	  work for smbspool.  Added a workaround for it.
-	- The HP-GL/2 filter didn't perform the right pen scaling
-	  with some files and the "fitplot" option.
-	- New Software Performance Specification document that
-	  describes the memory, disk, and CPU usage of all the
-	  CUPS software.
-
-
 CHANGES IN CUPS v1.1.1

 	- The pstoraster Makefile still referenced one of the
@@ -30,7 +30,6 @@ AR	=	@AR@
 AWK	=	@AWK@
 CC	=	@LIBTOOL@ @CC@
 CHMOD	=	@CHMOD@
-CHOWN	=	@CHOWN@
 CP	=	@CP@
 CXX	=	@LIBTOOL@ @CXX@
 DSO	=	@DSO@
@@ -120,9 +119,8 @@ top_srcdir	=	@top_srcdir@
 BINDIR		=	@bindir@
 DATADIR		=	@CUPS_DATADIR@
 DOCDIR		=	@CUPS_DOCROOT@
+ESP_ROOT	=	@ESP_ROOT@
 INCLUDEDIR	=	$(includedir)
-INITDIR		=	@INITDIR@
-INITDDIR	=	@INITDDIR@
 LIBDIR		=	$(libdir)
 LOCALEDIR	= 	@CUPS_LOCALEDIR@
 LOGDIR		= 	@CUPS_LOGDIR@
@@ -28,7 +28,7 @@ include Makedefs
 # Directories to make...
 #

-DIRS	=	cups backend berkeley cgi-bin filter man pdftops pstoraster \
+DIRS	=	cups backend berkeley cgi-bin doc filter man pdftops pstoraster \
 		scheduler systemv

 #
@@ -64,20 +64,32 @@ install:
 	(cd conf; $(MAKE) $(MFLAGS) install)
 	echo Installing in data...
 	(cd data; $(MAKE) $(MFLAGS) install)
-	echo Installing in doc...
-	(cd doc; $(MAKE) $(MFLAGS) install)
 	echo Installing in fonts...
 	(cd fonts; $(MAKE) $(MFLAGS) install)
+	(cd fonts; $(MAKE) $(MFLAGS) install)
 	echo Installing in locale...
-	(cd locale; $(MAKE) $(MFLAGS) install)
+	echo Installing in ppd...
+	(cd ppd; $(MAKE) $(MFLAGS) install)
 	echo Installing in templates...
 	(cd templates; $(MAKE) $(MFLAGS) install)
 	echo Installing startup script...
-	if test "x$INITDIR" != "x"; then \
-		$(INSTALL_SCRIPT) cups.sh $prefix/$INITDIR/init.d/cups; \
-		$(CHMOD) ugo+rx $prefix/$INITDIR/init.d/cups; \
-		ln -s $INITDDIR/cups $prefix/$INITDIR/rc0.d/K00cups; \
-		ln -s $INITDDIR/cups $prefix/$INITDIR/rc2.d/S99cups; \
+	if test -d $(prefix)/sbin/init.d; then \
+		$(INSTALL_SCRIPT) cups.sh $(prefix)/sbin/init.d/cups; \
+		$(CHMOD) ugo+rx $(prefix)/sbin/init.d/cups; \
+		ln -s ../init.d/cups $(prefix)/sbin/rc0.d/K000cups; \
+		ln -s ../init.d/cups $(prefix)/sbin/rc2.d/S999cups; \
+	fi
+	if test -d $(prefix)/etc/rc.d/init.d; then \
+		$(INSTALL_SCRIPT) cups.sh $(prefix)/etc/rc.d/init.d/cups; \
+		$(CHMOD) ugo+rx $(prefix)/etc/rc.d/cups; \
+		ln -s ../init.d/cups $(prefix)/etc/rc.d/rc0.d/K00cups; \
+		ln -s ../init.d/cups $(prefix)/etc/rc.d/rc2.d/S99cups; \
+	fi
+	if test -d $(prefix)/etc/init.d; then \
+		$(INSTALL_SCRIPT) cups.sh $(prefix)/etc/init.d/cups; \
+		$(CHMOD) ugo+rx $(prefix)/etc/init.d/cups; \
+		ln -s ../init.d/cups $(prefix)/etc/rc0.d/K00cups; \
+		ln -s ../init.d/cups $(prefix)/etc/rc2.d/S99cups; \
 	fi

 #
@@ -1,4 +1,4 @@
-README - CUPS v1.1.2 - 08/04/2000
+README - CUPS v1.1.1 - 07/21/2000
 ---------------------------------

 INTRODUCTION
@@ -60,8 +60,7 @@ extern int	rresvport(int *port);	/* Hello?  No prototype for this... */

 static int	lpd_command(int lpd_fd, char *format, ...);
 static int	lpd_queue(char *hostname, char *printer, char *filename,
-		          char *user, char *title, int copies, int banner,
-			  int format);
+		          char *user, int copies);


 /*
@@ -80,15 +79,9 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	hostname[1024],	/* Hostname */
 	username[255],	/* Username info (not used) */
 	resource[1024],	/* Resource info (printer name) */
-	*options,	/* Pointer to options */
-	name[255],	/* Name of option */
-	value[255],	/* Value of option */
-	*ptr,		/* Pointer into name or value */
 	filename[1024];	/* File to print */
  int	port;		/* Port number (not used) */
  int	status;		/* Status of LPD job */
-  int	banner;		/* Print banner page? */
-  int	format;		/* Print format */


  if (argc == 1)
@@ -149,83 +142,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  httpSeparate(argv[0], method, username, hostname, &port, resource);

- /*
-  * See if there are any options...
-  */
-
-  banner = 0;
-  format = 'l';
-
-  if ((options = strchr(resource, '?')) != NULL)
-  {
-   /*
-    * Yup, terminate the device name string and move to the first
-    * character of the options...
-    */
-
-    *options++ = '\0';
-
-   /*
-    * Parse options...
-    */
-
-    while (*options)
-    {
-     /*
-      * Get the name...
-      */
-
-      for (ptr = name; *options && *options != '=';)
-        *ptr++ = *options++;
-      *ptr = '\0';
-
-      if (*options == '=')
-      {
-       /*
-        * Get the value...
-	*/
-
-        options ++;
-
-	for (ptr = value; *options && *options != '+';)
-          *ptr++ = *options++;
-	*ptr = '\0';
-
-	if (*options == '+')
-	  options ++;
-      }
-      else
-        value[0] = '\0';
-
-     /*
-      * Process the option...
-      */
-
-      if (strcasecmp(name, "banner") == 0)
-      {
-       /*
-        * Set the banner...
-	*/
-
-        banner = !value[0] ||
-	         strcasecmp(value, "on") == 0 ||
-		 strcasecmp(value, "yes") == 0 ||
-		 strcasecmp(value, "true") == 0;
-      }
-      else if (strcasecmp(name, "format") == 0 && value[0])
-      {
-       /*
-        * Set output format...
-	*/
-
-        if (strchr("cdfglnoprtv", value[0]) != NULL)
-	  format = value[0];
-	else
-	  fprintf(stderr, "ERROR: Unknown format character \"%c\"\n", value[0]);
-      }
-    }
-  }
-
 /*
  * Queue the job...
  */
@@ -233,16 +149,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  if (argc > 6)
  {
    status = lpd_queue(hostname, resource + 1, filename,
-                       argv[2] /* user */, argv[3] /* title */,
-		       atoi(argv[4]) /* copies */, banner, format);
+                       argv[2] /* user */, atoi(argv[4]) /* copies */);

    if (!status)
      fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
  }
  else
    status = lpd_queue(hostname, resource + 1, filename,
-                       argv[2] /* user */, argv[3] /* title */, 1,
-		       banner, format);
+                       argv[2] /* user */, 1);

 /*
  * Remove the temporary file if necessary...
@@ -317,10 +231,7 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
          char *printer,	/* I - Printer/queue name */
 	  char *filename,	/* I - File to print */
          char *user,		/* I - Requesting user */
-	  char *title,		/* I - Job title */
-	  int  copies,		/* I - Number of copies */
-	  int  banner,		/* I - Print LPD banner? */
-          int  format)		/* I - Format specifier */
+	  int  copies)		/* I - Number of copies */
 {
  FILE			*fp;		/* Job file */
  char			localhost[255];	/* Local host name */
@@ -443,18 +354,13 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
  gethostname(localhost, sizeof(localhost));
  localhost[31] = '\0'; /* RFC 1179, Section 7.2 - host name < 32 chars */

-  snprintf(control, sizeof(control), "H%s\nP%s\nJ%s\n", localhost, user, title);
+  snprintf(control, sizeof(control), "H%s\nP%s\n", localhost, user);
  cptr = control + strlen(control);

-  if (banner)
-  {
-    snprintf(cptr, sizeof(control) - (cptr - control), "L%s\n", user);
-    cptr   += strlen(cptr);
-  }
-
  while (copies > 0)
  {
-    snprintf(cptr, sizeof(control) - (cptr - control), "%cdfA%03d%s\n", format,
+    
+    snprintf(cptr, sizeof(control) - (cptr - control), "ldfA%03d%s\n",
             getpid() % 1000, localhost);
    cptr   += strlen(cptr);
    copies --;
@@ -497,8 +497,7 @@ list_devices(void)
    {
      sprintf(device, "/dev/c%dt%dd0_lp", i, j);
      if (access(device, 0) == 0)
-	printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d,%d\"\n",
-	       device, i, j);
+	printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d,%d\"\n", i, j);
    }

 /*
@@ -160,10 +160,9 @@ main(int  argc,		/* I - Number of command-line arguments */
            if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != NULL)
 	    {
 	      for (j = 0; j < dest->num_options; j ++)
-	        if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
-	          num_options = cupsAddOption(dest->options[j].name,
-		                              dest->options[j].value,
-					      num_options, &options);
+	        num_options = cupsAddOption(dest->options[j].name,
+		                            dest->options[j].value,
+					    num_options, &options);
 	    }
 	    break;

@@ -236,10 +235,9 @@ main(int  argc,		/* I - Number of command-line arguments */
 	printer = dests[j].name;

 	for (j = 0; j < dest->num_options; j ++)
-	  if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
-	    num_options = cupsAddOption(dest->options[j].name,
-		                        dest->options[j].value,
-					num_options, &options);
+	  num_options = cupsAddOption(dest->options[j].name,
+		                      dest->options[j].value,
+				      num_options, &options);
        break;
      }
  }
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs 1270 2000-08-03 18:05:22Z mike $"
+# "$Id: mime.convs 1019 2000-04-18 19:41:12Z mike $"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
@@ -59,17 +59,6 @@ application/vnd.cups-form application/vnd.cups-postscript 50 formtops
 image/*			application/vnd.cups-raster	50	imagetoraster
 application/vnd.cups-postscript	application/vnd.cups-raster	50	pstoraster

-########################################################################
 #
-# Raw filter...
-#
-# Uncomment the following filter and the application/octet-stream type
-# in mime.types to allow printing of arbitrary files without the -oraw
-# option.
-#
-
-#*/*			application/vnd.cups-raw	0	-
-
-#
-# End of "$Id: mime.convs 1270 2000-08-03 18:05:22Z mike $".
+# End of "$Id: mime.convs 1019 2000-04-18 19:41:12Z mike $".
 #
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 1270 2000-08-03 18:05:22Z mike $"
+# "$Id: mime.types 1152 2000-06-22 18:25:29Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
@@ -122,17 +122,6 @@ application/vnd.cups-postscript	string(0,<1B>%-12345X)
 application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw

-########################################################################
 #
-# Raw print file support...
-#
-# Uncomment the following type and the application/octet-stream
-# filter line in mime.convs to allow raw file printing without the
-# -oraw option.
-#
-
-#application/octet-stream
-
-#
-# End of "$Id: mime.types 1270 2000-08-03 18:05:22Z mike $".
+# End of "$Id: mime.types 1152 2000-06-22 18:25:29Z mike $".
 #
@@ -28,7 +28,7 @@
 * Version of software...
 */

-#define CUPS_SVERSION	"CUPS v1.1.2"
+#define CUPS_SVERSION	"CUPS v1.1.1"

 /*
 * Where are files stored?
@@ -121,7 +121,6 @@ AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(CHMOD,chmod)
-AC_PATH_PROG(CHOWN,chown)
 AC_PATH_PROG(CP,cp)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(NROFF,nroff)
@@ -415,53 +414,6 @@ AC_SUBST(CAT1EXT)
 AC_SUBST(CAT5EXT)
 AC_SUBST(CAT8EXT)

-dnl Setup init.d locations...
-if test $prefix = "/"; then
-	case "$uname" in
-		FreeBSD* | NetBSD* | OpenBSD*)
-			# *BSD
-			INITDIR=""
-			INITDDIR=""
-			;;
-
-		Linux*)
-			# Linux seems to choose an init.d directory at random...
-			if test -d /sbin/init.d; then
-				# SuSE
-				INITDIR="/sbin/init.d"
-				INITDDIR=".."
-			else
-				if test -d /etc/rc.d; then
-					# RedHat
-					INITDIR="/etc/rc.d"
-					INITDDIR="../init.d"
-				else
-					# Others
-					INITDIR="/etc"
-					INITDDIR="../init.d"
-				fi
-			fi
-			;;
-
-		OSF1* | HP-UX*)
-			INITDIR="/sbin"
-			INITDDIR="../init.d"
-			;;
-
-		*)
-			INITDIR="/etc"
-			INITDDIR="../init.d"
-			;;
-
-	esac
-else
-	INITDIR="/etc"
-	INITDDIR="../init.d"
-fi
-
-AC_SUBST(INITDIR)
-AC_SUBST(INITDDIR)
-
 dnl Setup default locations...
 CUPS_SERVERROOT='${prefix}/etc/cups'
 CUPS_LOGDIR='${prefix}/var/log/cups'
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list 1277 2000-08-04 14:53:49Z mike $"
+# "$Id: cups.list 1229 2000-07-20 16:51:42Z mike $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -28,7 +28,7 @@
 %vendor Easy Software Products
 %license LICENSE.txt
 %readme README.txt
-%version 1.1.2
+%version 1.1.1
 %incompat printpro

 %system all
@@ -111,8 +111,8 @@ l 0555 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2

 # Directories
 d 0755 root sys $LOGDIR -
-d 0700 lp sys $REQUESTS -
-d 1700 lp sys $REQUESTS/tmp -
+d 0710 root sys $REQUESTS -
+d 1770 root sys $REQUESTS/tmp -

 # Data files
 f 0444 root sys $LOCALEDIR/C/cups_C locale/C/cups_C
@@ -390,8 +390,6 @@ f 0444 root sys $DOCDIR/sdd.html doc/sdd.html
 f 0444 root sys $DOCDIR/sdd.pdf doc/sdd.pdf
 f 0444 root sys $DOCDIR/spm.html doc/spm.html
 f 0444 root sys $DOCDIR/spm.pdf doc/spm.pdf
-f 0444 root sys $DOCDIR/sps.html doc/sps.html
-f 0444 root sys $DOCDIR/sps.pdf doc/sps.pdf
 f 0444 root sys $DOCDIR/ssr.html doc/ssr.html
 f 0444 root sys $DOCDIR/ssr.pdf doc/ssr.pdf
 f 0444 root sys $DOCDIR/sum.html doc/sum.html
@@ -505,5 +503,5 @@ f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.man
 i 0555 root sys cups cups.sh

 #
-# End of "$Id: cups.list 1277 2000-08-04 14:53:49Z mike $".
+# End of "$Id: cups.list 1229 2000-07-20 16:51:42Z mike $".
 #
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec 1277 2000-08-04 14:53:49Z mike $"
+# "$Id: cups.spec 1214 2000-07-10 20:58:19Z mike $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
@@ -26,11 +26,11 @@

 Summary: Common Unix Printing System
 Name: cups
-Version: 1.1.2
+Version: 1.1
 Release: 0
 Copyright: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/%version/cups-%version-source.tar.gz
+Source: ftp://ftp.easysw.com/pub/cups/1.1/cups-1.1-source.tar.gz
 Url: http://www.cups.org
 Packager: Michael Sweet <mike@easysw.com>
 Vendor: Easy Software Products
@@ -68,86 +68,46 @@ make
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d

-make	prefix=$RPM_BUILD_ROOT \
+make	datadir=$RPM_BUILD_ROOT/usr/share \
 	exec_prefix=$RPM_BUILD_ROOT/usr \
-	BINDIR=$RPM_BUILD_ROOT/usr/bin \
-	DATADIR=$RPM_BUILD_ROOT/usr/share/cups \
-	DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/cups \
-	INCLUDEDIR=$RPM_BUILD_ROOT/usr/include \
-	LIBDIR=$RPM_BUILD_ROOT/usr/lib \
-	LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale \
-	MANDIR=$RPM_BUILD_ROOT/usr/man \
-	PAMDIR=$RPM_BUILD_ROOT/etc/pam.d \
-	REQUESTS=$RPM_BUILD_ROOT/var/spool/cups \
-	SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
-	SERVERBIN=$RPM_BUILD_ROOT/usr/lib/cups \
-	SERVERROOT=$RPM_BUILD_ROOT/etc/cups \
+	includedir=$RPM_BUILD_ROOT/usr/include \
+	infodir=$RPM_BUILD_ROOT/usr/info \
+	libdir=$RPM_BUILD_ROOT/usr/lib \
+	localestatedir=$RPM_BUILD_ROOT/var \
+	prefix=$RPM_BUILD_ROOT \
+	sharedstatedir=$RPM_BUILD_ROOT/usr/com \
+	sysconfdir=$RPM_BUILD_ROOT/etc \
 	install

-%post
-if test -x /sbin/chkconfig; then
-	/sbin/chkconfig --add cups
-	/sbin/chkconfig cups on
-fi
+install -m 755 -o root -g root cups.sh $RPM_BUILD_ROOT/etc/rc.d/init.d/cups

-if test -f /sbin/init.d/cups; then
-	/sbin/init.d/cups start
-fi
-if test -f /etc/rc.d/init.d/cups; then
-	/etc/rc.d/init.d/cups start
-fi
-if test -f /etc/init.d/cups; then
-	/etc/init.d/cups start
-fi
+%post
+/sbin/chkconfig --add cups
+/sbin/chkconfig cups on
+/etc/rc.d/init.d/cups start

 %preun
-if test -f /sbin/init.d/cups; then
-	/sbin/init.d/cups stop
-fi
-if test -f /etc/rc.d/init.d/cups; then
-	/etc/rc.d/init.d/cups stop
-fi
-if test -f /etc/init.d/cups; then
-	/etc/init.d/cups stop
-fi
-
-if test -x /sbin/chkconfig; then
-	/sbin/chkconfig --del cups
-fi
+/etc/rc.d/init.d/cups stop
+/sbin/chkconfig --del cups

 %clean
 rm -rf $RPM_BUILD_ROOT

 %files
 %defattr(-,root,root)
-/etc/cups/certs
-%config /etc/cups/classes.conf
-%config /etc/cups/client.conf
-%config /etc/cups/cupsd.conf
-/etc/cups/interfaces
-/etc/cups/mime.types
-/etc/cups/mime.convs
-/etc/cups/ppd
-%config /etc/cups/printers.conf
-/etc/pam.d/*
-/etc/init.d/*
-/etc/rc0.d/*
-/etc/rc2.d/*
-/etc/rc.d/*
+/etc/*
 /usr/bin/*
 /usr/lib/*.so*
 /usr/man/*
 /usr/sbin/*
 /usr/share/*
 /usr/lib/cups/*
-%attr(0700,lp,root) /var/spool/cups
-%attr(1700,lp,root) /var/spool/cups/tmp
-/sbin/init.d/*
+/var/*

 %files devel
 /usr/include/cups/*
 /usr/lib/*.a

 #
-# End of "$Id: cups.spec 1277 2000-08-04 14:53:49Z mike $".
+# End of "$Id: cups.spec 1214 2000-07-10 20:58:19Z mike $".
 #
@@ -25,10 +25,8 @@
 *
 * Contents:
 *
- *   ppdCollect() - Collect all marked options that reside in the specified
- *   ppdEmit()    - Emit code for marked options to a file.
- *   ppdEmitFd()  - Emit code for marked options to a file.
- *   ppd_sort()   - Sort options by ordering numbers...
+ *   ppdEmit()     - Emit code for marked options to a file.
+ *   ppdEmitFd()   - Emit code for marked options to a file.
 */

 /*
@@ -51,17 +49,184 @@
 */

 static int	ppd_sort(ppd_choice_t **c1, ppd_choice_t **c2);
+static int	ppd_collect(ppd_file_t *ppd, ppd_section_t section,
+		            ppd_choice_t ***choices);


 /*
- * 'ppdCollect()' - Collect all marked options that reside in the specified
- *                  section.
+ * 'ppdEmit()' - Emit code for marked options to a file.
 */

-int					/* O - Number of options marked */
-ppdCollect(ppd_file_t    *ppd,		/* I - PPD file data */
-           ppd_section_t section,	/* I - Section to collect */
-           ppd_choice_t  ***choices)	/* O - Pointers to choices */
+int					/* O - 0 on success, -1 on failure */
+ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
+        FILE          *fp,		/* I - File to write to */
+        ppd_section_t section)		/* I - Section to write */
+{
+  int		i,			/* Looping var */
+		count;			/* Number of choices */
+  ppd_choice_t	**choices;		/* Choices */
+  ppd_size_t	*size;			/* Custom page size */
+
+
+  if ((count = ppd_collect(ppd, section, &choices)) == 0)
+    return (0);
+
+  for (i = 0; i < count; i ++)
+    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
+    {
+     /*
+      * Send DSC comments with option...
+      */
+
+      if (fprintf(fp, "%%%%BeginFeature: %s %s\n",
+                  ((ppd_option_t *)choices[i]->option)->keyword,
+		  choices[i]->choice) < 0)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      fputs("[{\n", fp);
+
+      if (strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
+          strcasecmp(choices[i]->choice, "Custom") == 0)
+      {
+       /*
+        * Variable size; write out standard size options (this should
+	* eventually be changed to use the parameter positions defined
+	* in the PPD file...)
+	*/
+
+        size = ppdPageSize(ppd, "Custom");
+        fprintf(fp, "%.0f %.0f 0 0 0\n", size->width, size->length);
+
+	if (choices[i]->code == NULL)
+	{
+	 /*
+	  * This can happen with certain buggy PPD files that don't include
+	  * a CustomPageSize command sequence...  We just use a generic
+	  * Level 2 command sequence...
+	  */
+
+	  fputs("pop pop pop\n", fp);
+	  fputs("<</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice\n", fp);
+	}
+      }
+
+      if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
+      {
+        if (fputs(choices[i]->code, fp) < 0)
+        {
+          free(choices);
+          return (-1);
+        }
+
+        if (choices[i]->code[strlen(choices[i]->code) - 1] != '\n')
+          putc('\n', fp);
+      }
+
+      fputs("} stopped cleartomark\n", fp);
+
+      if (fputs("%%EndFeature\n", fp) < 0)
+      {
+        free(choices);
+        return (-1);
+      }
+    }
+    else if (fputs(choices[i]->code, fp) < 0)
+    {
+      free(choices);
+      return (-1);
+    }
+
+  free(choices);
+  return (0);
+}
+
+
+/*
+ * 'ppdEmitFd()' - Emit code for marked options to a file.
+ */
+
+int					/* O - 0 on success, -1 on failure */
+ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
+          int           fd,		/* I - File to write to */
+          ppd_section_t section)	/* I - Section to write */
+{
+  int		i,			/* Looping var */
+		count;			/* Number of choices */
+  ppd_choice_t	**choices;		/* Choices */
+  char		buf[1024];		/* Output buffer for feature */
+
+
+  if ((count = ppd_collect(ppd, section, &choices)) == 0)
+    return (0);
+
+  for (i = 0; i < count; i ++)
+    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
+    {
+     /*
+      * Send DSC comments with option...
+      */
+
+      sprintf(buf, "%%%%BeginFeature: %s %s\n",
+              ((ppd_option_t *)choices[i]->option)->keyword, choices[i]->choice);
+
+      if (write(fd, buf, strlen(buf)) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (write(fd, "%%EndFeature\n", 13) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+    }
+    else if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
+    {
+      free(choices);
+      return (-1);
+    }
+
+  free(choices);
+  return (0);
+}
+
+
+/*
+ * 'ppd_sort()' - Sort options by ordering numbers...
+ */
+
+static int			/* O - -1 if c1 < c2, 0 if equal, 1 otherwise */
+ppd_sort(ppd_choice_t **c1,	/* I - First choice */
+         ppd_choice_t **c2)	/* I - Second choice */
+{
+  if (((ppd_option_t *)(*c1)->option)->order < ((ppd_option_t *)(*c2)->option)->order)
+    return (-1);
+  else if (((ppd_option_t *)(*c1)->option)->order > ((ppd_option_t *)(*c2)->option)->order)
+    return (1);
+  else
+    return (0);
+}
+
+
+/*
+ * 'ppd_collect()' - Collect all marked options that reside in the specified
+ *                   section.
+ */
+
+static int				/* O - Number of options marked */
+ppd_collect(ppd_file_t    *ppd,		/* I - PPD file data */
+            ppd_section_t section,	/* I - Section to collect */
+            ppd_choice_t  ***choices)	/* O - Pointers to choices */
 {
  int		i, j, k, m;		/* Looping vars */
  ppd_group_t	*g,			/* Current group */
@@ -135,167 +300,6 @@ ppdCollect(ppd_file_t    *ppd,		/* I - PPD file data */
 }


-/*
- * 'ppdEmit()' - Emit code for marked options to a file.
- */
-
-int					/* O - 0 on success, -1 on failure */
-ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
-        FILE          *fp,		/* I - File to write to */
-        ppd_section_t section)		/* I - Section to write */
-{
-  int		i,			/* Looping var */
-		count;			/* Number of choices */
-  ppd_choice_t	**choices;		/* Choices */
-  ppd_size_t	*size;			/* Custom page size */
-
-
-  if ((count = ppdCollect(ppd, section, &choices)) == 0)
-    return (0);
-
-  for (i = 0; i < count; i ++)
-    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
-    {
-     /*
-      * Send DSC comments with option...
-      */
-
-      if (fprintf(fp, "%%%%BeginFeature: %s %s\n",
-                  ((ppd_option_t *)choices[i]->option)->keyword,
-		  choices[i]->choice) < 0)
-      {
-        free(choices);
-        return (-1);
-      }
-
-      if (strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
-          strcasecmp(choices[i]->choice, "Custom") == 0)
-      {
-       /*
-        * Variable size; write out standard size options (this should
-	* eventually be changed to use the parameter positions defined
-	* in the PPD file...)
-	*/
-
-        size = ppdPageSize(ppd, "Custom");
-        fprintf(fp, "%.0f %.0f 0 0 0\n", size->width, size->length);
-
-	if (choices[i]->code == NULL)
-	{
-	 /*
-	  * This can happen with certain buggy PPD files that don't include
-	  * a CustomPageSize command sequence...  We just use a generic
-	  * Level 2 command sequence...
-	  */
-
-	  fputs("pop pop pop\n", fp);
-	  fputs("<</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice\n", fp);
-	}
-      }
-
-      if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
-      {
-        if (fputs(choices[i]->code, fp) < 0)
-        {
-          free(choices);
-          return (-1);
-        }
-
-        if (choices[i]->code[strlen(choices[i]->code) - 1] != '\n')
-          putc('\n', fp);
-      }
-
-      if (fputs("%%EndFeature\n", fp) < 0)
-      {
-        free(choices);
-        return (-1);
-      }
-    }
-    else if (fputs(choices[i]->code, fp) < 0)
-    {
-      free(choices);
-      return (-1);
-    }
-
-  free(choices);
-  return (0);
-}
-
-
-/*
- * 'ppdEmitFd()' - Emit code for marked options to a file.
- */
-
-int					/* O - 0 on success, -1 on failure */
-ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
-          int           fd,		/* I - File to write to */
-          ppd_section_t section)	/* I - Section to write */
-{
-  int		i,			/* Looping var */
-		count;			/* Number of choices */
-  ppd_choice_t	**choices;		/* Choices */
-  char		buf[1024];		/* Output buffer for feature */
-
-
-  if ((count = ppdCollect(ppd, section, &choices)) == 0)
-    return (0);
-
-  for (i = 0; i < count; i ++)
-    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
-    {
-     /*
-      * Send DSC comments with option...
-      */
-
-      sprintf(buf, "%%%%BeginFeature: %s %s\n",
-              ((ppd_option_t *)choices[i]->option)->keyword, choices[i]->choice);
-
-      if (write(fd, buf, strlen(buf)) < 1)
-      {
-        free(choices);
-        return (-1);
-      }
-
-      if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
-      {
-        free(choices);
-        return (-1);
-      }
-
-      if (write(fd, "%%EndFeature\n", 13) < 1)
-      {
-        free(choices);
-        return (-1);
-      }
-    }
-    else if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
-    {
-      free(choices);
-      return (-1);
-    }
-
-  free(choices);
-  return (0);
-}
-
-
-/*
- * 'ppd_sort()' - Sort options by ordering numbers...
- */
-
-static int			/* O - -1 if c1 < c2, 0 if equal, 1 otherwise */
-ppd_sort(ppd_choice_t **c1,	/* I - First choice */
-         ppd_choice_t **c2)	/* I - Second choice */
-{
-  if (((ppd_option_t *)(*c1)->option)->order < ((ppd_option_t *)(*c2)->option)->order)
-    return (-1);
-  else if (((ppd_option_t *)(*c1)->option)->order > ((ppd_option_t *)(*c2)->option)->order)
-    return (1);
-  else
-    return (0);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -207,8 +207,6 @@ typedef struct			/**** Files ****/
 */

 extern void		ppdClose(ppd_file_t *ppd);
-extern int		ppdCollect(ppd_file_t *ppd, ppd_section_t section,
-			           ppd_choice_t  ***choices);
 extern int		ppdConflicts(ppd_file_t *ppd);
 extern int		ppdEmit(ppd_file_t *ppd, FILE *fp,
 			        ppd_section_t section);
@@ -50,7 +50,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <sys/stat.h>
 #if defined(WIN32) || defined(__EMX__)
 #  include <io.h>
@@ -179,15 +178,6 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
 		encode[255];		/* Encoded username:password */


-  if (http == NULL || request == NULL || resource == NULL)
-  {
-    if (request != NULL)
-      ippDelete(request);
-
-    last_error = IPP_INTERNAL_ERROR;
-    return (NULL);
-  }
-
  DEBUG_printf(("cupsDoFileRequest(%08x, %08s, \'%s\', \'%s\')\n",
                http, request, resource, filename ? filename : "(null)"));

@@ -444,12 +434,6 @@ cupsGetClasses(char ***classes)	/* O - Classes */
  char		**temp;		/* Temporary pointer */


-  if (classes == NULL)
-  {
-    last_error = IPP_INTERNAL_ERROR;
-    return (0);
-  }
-
 /*
  * Try to connect to the server...
  */
@@ -690,12 +674,6 @@ cupsGetPPD(const char *name)		/* I - Printer name */
  static char	filename[HTTP_MAX_URI];	/* Local filename */


-  if (name == NULL)
-  {
-    last_error = IPP_INTERNAL_ERROR;
-    return (NULL);
-  }
-
 /*
  * See if we can connect to the server...
  */
@@ -917,12 +895,6 @@ cupsGetPrinters(char ***printers)	/* O - Printers */
  char		**temp;		/* Temporary pointer */


-  if (printers == NULL)
-  {
-    last_error = IPP_INTERNAL_ERROR;
-    return (0);
-  }
-
 /*
  * Try to connect to the server...
  */
@@ -1359,9 +1331,7 @@ char *					/* O - Filename */
 cupsTempFile(char *filename,		/* I - Pointer to buffer */
             int  len)			/* I - Size of buffer */
 {
-  int		fd;			/* File descriptor for temp file */
  char		*tmpdir;		/* TMPDIR environment var */
-  struct timeval curtime;		/* Current time */
  static char	buf[1024] = "";		/* Buffer if you pass in NULL and 0 */


@@ -1399,45 +1369,8 @@ cupsTempFile(char *filename,		/* I - Pointer to buffer */
  * Make the temporary name using the specified directory...
  */

-  do
-  {
-   /*
-    * Get the current time of day...
-    */
-
-    gettimeofday(&curtime, NULL);
-
-   /*
-    * Format a string using the hex time values...
-    */
-
-    snprintf(filename, len, "%s/%08x%05x", tmpdir,
-             curtime.tv_sec, curtime.tv_usec);
-
-   /*
-    * Open the file in "exclusive" mode, making sure that we don't
-    * stomp on an existing file or someone's symlink crack...
-    */
-
-#ifdef O_NOFOLLOW
-    fd = open(filename, O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
-#else
-    fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0600);
-#endif /* O_NOFOLLOW */
-  }
-  while (fd < 0);
-
- /*
-  * Close the temp file - it'll be reopened later as needed...
-  */
-
-  close(fd);
-
- /*
-  * Return the temp filename...
-  */
-
-  return (filename);
+  snprintf(filename, len, "%s/XXXXXX", tmpdir);
+  return (mktemp(filename));
 }


@@ -465,7 +465,7 @@ gsave
  pageWidth 36 mul			% Center of page
  pageWidth 14 mul			% Bottom of page
  2 copy moveto				% Position text
-  (Printed Using CUPS v1.1.x) CENTER	% Show text centered
+  (Printed Using CUPS v1.1) CENTER	% Show text centered

  pageWidth 3 mul sub			% Move down...
  2 copy moveto				% Position text
@@ -500,6 +500,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: testprint.ps 1260 2000-08-01 17:52:30Z mike $".
+% End of "$Id: testprint.ps 985 2000-03-13 18:55:00Z mike $".
 %
 %%EOF
@@ -47,8 +47,7 @@ include ../Makedefs
 #

 DOCUMENTS	=	cmp.shtml idd.shtml ipp.shtml sam.shtml sdd.shtml \
-			spm.shtml sps.shtml ssr.shtml stp.shtml sum.shtml \
-			svd.shtml
+			spm.shtml ssr.shtml stp.shtml sum.shtml svd.shtml
 DOCIMAGES	=	images/cups-block-diagram.gif images/cups-large.gif \
 			images/cups-medium.gif images/cups-small.gif
 WEBPAGES	=	cups.css cupsdoc.css index.html documentation.html
@@ -102,6 +101,14 @@ all:	$(DOCUMENTS:.shtml=.pdf) $(DOCUMENTS:.shtml=.html) overview.pdf
 ps:	$(DOCUMENTS:.shtml=.ps) overview.ps


+#
+# Make manuals for printing...
+#
+
+print:	sam-7x8.pdf spm-7x8.pdf sum-7x8.pdf \
+	sam-7x8.ps spm-7x8.ps sum-7x8.ps
+
+
 #
 # Remove all generated files...
 #
@@ -29,225 +29,225 @@ Copyright 1997-2000, All Rights Reserved<BR>
 <HR>
 <H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
 <BR>
-<BR><B><A HREF="#1">1 Scope</A></B>
+<BR><B><A HREF="#1">1  Scope</A></B>
 <UL>
-<LI><A HREF="#1_1">1.1 Identification</A></LI>
-<LI><A HREF="#1_2">1.2 System Overview</A></LI>
-<LI><A HREF="#1_3">1.3 Document Overview</A></LI>
+<LI><A HREF="#1_1">1.1  Identification</A></LI>
+<LI><A HREF="#1_2">1.2  System Overview</A></LI>
+<LI><A HREF="#1_3">1.3  Document Overview</A></LI>
 </UL>
-<B><A HREF="#2">2 References</A></B>
+<B><A HREF="#2">2  References</A></B>
 <UL>
-<LI><A HREF="#2_1">2.1 CUPS Documentation</A></LI>
-<LI><A HREF="#2_2">2.2 Other Documents</A></LI>
+<LI><A HREF="#2_1">2.1  CUPS Documentation</A></LI>
+<LI><A HREF="#2_2">2.2  Other Documents</A></LI>
 </UL>
-<B><A HREF="#3">3 File Management</A></B>
+<B><A HREF="#3">3  File Management</A></B>
 <UL>
-<LI><A HREF="#3_1">3.1 Directory Structure</A></LI>
-<LI><A HREF="#3_2">3.2 Source Files</A></LI>
-<LI><A HREF="#3_3">3.3 Configuration Management</A></LI>
+<LI><A HREF="#3_1">3.1  Directory Structure</A></LI>
+<LI><A HREF="#3_2">3.2  Source Files</A></LI>
+<LI><A HREF="#3_3">3.3  Configuration Management</A></LI>
 </UL>
-<B><A HREF="#4">4 Trouble Report Processing</A></B>
+<B><A HREF="#4">4  Trouble Report Processing</A></B>
 <UL>
-<LI><A HREF="#4_1">4.1 Classification</A></LI>
-<LI><A HREF="#4_2">4.2 Identification</A></LI>
-<LI><A HREF="#4_3">4.3 Correction</A></LI>
-<LI><A HREF="#4_4">4.4 Notification</A></LI>
+<LI><A HREF="#4_1">4.1  Classification</A></LI>
+<LI><A HREF="#4_2">4.2  Identification</A></LI>
+<LI><A HREF="#4_3">4.3  Correction</A></LI>
+<LI><A HREF="#4_4">4.4  Notification</A></LI>
 </UL>
-<B><A HREF="#5">5 Software Releases</A></B>
+<B><A HREF="#5">5  Software Releases</A></B>
 <UL>
-<LI><A HREF="#5_1">5.1 Version Numbering</A></LI>
-<LI><A HREF="#5_2">5.2 Generation</A></LI>
-<LI><A HREF="#5_3">5.3 Testing</A></LI>
-<LI><A HREF="#5_4">5.4 Release</A></LI>
+<LI><A HREF="#5_1">5.1  Version Numbering</A></LI>
+<LI><A HREF="#5_2">5.2  Generation</A></LI>
+<LI><A HREF="#5_3">5.3  Testing</A></LI>
+<LI><A HREF="#5_4">5.4  Release</A></LI>
 </UL>
-<B><A HREF="#6">A Glossary</A></B>
+<B><A HREF="#6">A  Glossary</A></B>
 <UL>
-<LI><A HREF="#6_1">A.1 Terms</A></LI>
-<LI><A HREF="#6_2">A.2 Acronyms</A></LI>
+<LI><A HREF="#6_1">A.1  Terms</A></LI>
+<LI><A HREF="#6_2">A.2  Acronyms</A></LI>
 </UL>
-<B><A HREF="#7">B Coding Requirements</A></B>
+<B><A HREF="#7">B  Coding Requirements</A></B>
 <UL>
-<LI><A HREF="#7_1">B.1 Source Files</A></LI>
+<LI><A HREF="#7_1">B.1  Source Files</A></LI>
 <UL>
-<LI><A HREF="#7_1_1">B.1.1 Naming</A></LI>
-<LI><A HREF="#7_1_2">B.1.2 Documentation</A></LI>
+<LI><A HREF="#7_1_1">B.1.1  Naming</A></LI>
+<LI><A HREF="#7_1_2">B.1.2  Documentation</A></LI>
 </UL>
-<LI><A HREF="#7_2">B.2 Functions</A></LI>
+<LI><A HREF="#7_2">B.2  Functions</A></LI>
 <UL>
-<LI><A HREF="#7_2_1">B.2.1 Naming</A></LI>
-<LI><A HREF="#7_2_2">B.2.2 Documentation</A></LI>
+<LI><A HREF="#7_2_1">B.2.1  Naming</A></LI>
+<LI><A HREF="#7_2_2">B.2.2  Documentation</A></LI>
 </UL>
-<LI><A HREF="#7_3">B.3 Methods</A></LI>
+<LI><A HREF="#7_3">B.3  Methods</A></LI>
 <UL>
-<LI><A HREF="#7_3_1">B.3.1 Naming</A></LI>
-<LI><A HREF="#7_3_2">B.3.2 Documentation</A></LI>
+<LI><A HREF="#7_3_1">B.3.1  Naming</A></LI>
+<LI><A HREF="#7_3_2">B.3.2  Documentation</A></LI>
 </UL>
-<LI><A HREF="#7_4">B.4 Variables</A></LI>
+<LI><A HREF="#7_4">B.4  Variables</A></LI>
 <UL>
-<LI><A HREF="#7_4_1">B.4.1 Naming</A></LI>
-<LI><A HREF="#7_4_2">B.4.2 Documentation</A></LI>
+<LI><A HREF="#7_4_1">B.4.1  Naming</A></LI>
+<LI><A HREF="#7_4_2">B.4.2  Documentation</A></LI>
 </UL>
-<LI><A HREF="#7_5">B.5 Types</A></LI>
+<LI><A HREF="#7_5">B.5  Types</A></LI>
 <UL>
-<LI><A HREF="#7_5_1">B.5.1 Naming</A></LI>
-<LI><A HREF="#7_5_2">B.5.2 Documentation</A></LI>
+<LI><A HREF="#7_5_1">B.5.1  Naming</A></LI>
+<LI><A HREF="#7_5_2">B.5.2  Documentation</A></LI>
 </UL>
-<LI><A HREF="#7_6">B.6 Structures</A></LI>
+<LI><A HREF="#7_6">B.6  Structures</A></LI>
 <UL>
-<LI><A HREF="#7_6_1">B.6.1 Naming</A></LI>
-<LI><A HREF="#7_6_2">B.6.2 Documentation</A></LI>
+<LI><A HREF="#7_6_1">B.6.1  Naming</A></LI>
+<LI><A HREF="#7_6_2">B.6.2  Documentation</A></LI>
 </UL>
-<LI><A HREF="#7_7">B.7 Classes</A></LI>
+<LI><A HREF="#7_7">B.7  Classes</A></LI>
 <UL>
-<LI><A HREF="#7_7_1">B.7.1 Naming</A></LI>
-<LI><A HREF="#7_7_2">B.7.2 Documentation</A></LI>
+<LI><A HREF="#7_7_1">B.7.1  Naming</A></LI>
+<LI><A HREF="#7_7_2">B.7.2  Documentation</A></LI>
 </UL>
-<LI><A HREF="#7_8">B.8 Constants</A></LI>
+<LI><A HREF="#7_8">B.8  Constants</A></LI>
 <UL>
-<LI><A HREF="#7_8_1">B.8.1 Naming</A></LI>
-<LI><A HREF="#7_8_2">B.8.2 Documentation</A></LI>
+<LI><A HREF="#7_8_1">B.8.1  Naming</A></LI>
+<LI><A HREF="#7_8_2">B.8.2  Documentation</A></LI>
 </UL>
-<LI><A HREF="#7_9">B.9 Code</A></LI>
+<LI><A HREF="#7_9">B.9  Code</A></LI>
 <UL>
-<LI><A HREF="#7_9_1">B.9.1 Documentation</A></LI>
-<LI><A HREF="#7_9_2">B.9.2 Style</A></LI>
+<LI><A HREF="#7_9_1">B.9.1  Documentation</A></LI>
+<LI><A HREF="#7_9_2">B.9.2  Style</A></LI>
 </UL>
 </UL>
-<B><A HREF="#8">C Software Trouble Report Form</A></B><HR>
-<H1><A NAME="1">1 Scope</A></H1>
-<H2><A NAME="1_1">1.1 Identification</A></H2>
+<B><A HREF="#8">C  Software Trouble Report Form</A></B><HR>
+<H1><A NAME="1">1  Scope</A></H1>
+<H2><A NAME="1_1">1.1  Identification</A></H2>
 This configuration management plan document provides the guidelines 
 for development and maintenance of the Common UNIX Printing System 
 (&quot;CUPS&quot;) Version 1.1 software. 
-<H2><A NAME="1_2">1.2 System Overview</A></H2>
-<P>CUPS provides a portable printing layer for UNIX&reg;-based operating 
+<H2><A NAME="1_2">1.2  System Overview</A></H2>
+<P> CUPS provides a portable printing layer for UNIX&reg;-based operating 
 systems. It has been developed by <A HREF="http://www.easysw.com">Easy 
 Software Products</A> to promote a standard printing solution for all 
 UNIX vendors and users. CUPS provides the System V and Berkeley 
 command-line interfaces. </P>
-<P>CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
+<P> CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
 managing print jobs and queues. The Line Printer Daemon (&quot;LPD&quot;) Server 
 Message Block (&quot;SMB&quot;), and AppSocket (a.k.a. JetDirect) protocols are 
 also supported with reduced functionality. CUPS adds network printer 
 browsing and PostScript Printer Description (&quot;PPD&quot;) based printing 
 options to support real-world printing under UNIX. </P>
-<P>CUPS also includes a customized version of GNU Ghostscript 
+<P> CUPS also includes a customized version of GNU Ghostscript 
 (currently based off GNU Ghostscript 5.50) and an image file RIP that 
 are used to support non-PostScript printers. Sample drivers for HP and 
 EPSON printers are included that use these filters. </P>
-<H2><A NAME="1_3">1.3 Document Overview</A></H2>
+<H2><A NAME="1_3">1.3  Document Overview</A></H2>
 This configuration management document is organized into the following 
 sections: 
 <UL>
-<LI>1 - Scope</LI>
-<LI>2 - References</LI>
-<LI>3 - File Management</LI>
-<LI>4 - Trouble Report Processing</LI>
-<LI>5 - Software Releases</LI>
-<LI>A - Glossary</LI>
-<LI>B - Coding Requirements</LI>
+<LI> 1 - Scope</LI>
+<LI> 2 - References</LI>
+<LI> 3 - File Management</LI>
+<LI> 4 - Trouble Report Processing</LI>
+<LI> 5 - Software Releases</LI>
+<LI> A - Glossary</LI>
+<LI> B - Coding Requirements</LI>
 </UL>
-<H1><A NAME="2">2 References</A></H1>
-<H2><A NAME="2_1">2.1 CUPS Documentation</A></H2>
-<P>The following CUPS documentation is referenced by this document: </P>
+<H1><A NAME="2">2  References</A></H1>
+<H2><A NAME="2_1">2.1  CUPS Documentation</A></H2>
+<P> The following CUPS documentation is referenced by this document: </P>
 <UL>
-<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
-<LI>CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
-<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
-<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
-<LI>CUPS-SDD-1.1: CUPS Software Design Description </LI>
-<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
-<LI>CUPS-SSR-1.1: CUPS Software Security Report </LI>
-<LI>CUPS-STP-1.1: CUPS Software Test Plan </LI>
-<LI>CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
-<LI>CUPS-SVD-1.1: CUPS Software Version Description </LI>
+<LI> CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
+<LI> CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
+<LI> CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
+<LI> CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
+<LI> CUPS-SDD-1.1: CUPS Software Design Description </LI>
+<LI> CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
+<LI> CUPS-SSR-1.1: CUPS Software Security Report </LI>
+<LI> CUPS-STP-1.1: CUPS Software Test Plan </LI>
+<LI> CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
+<LI> CUPS-SVD-1.1.x: CUPS Software Version Description </LI>
 </UL>
-<H2><A NAME="2_2">2.2 Other Documents</A></H2>
-<P>The following non-CUPS documents are referenced by this document: </P>
+<H2><A NAME="2_2">2.2  Other Documents</A></H2>
+<P> The following non-CUPS documents are referenced by this document: </P>
 <UL>
 <LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
-Adobe  PostScript Printer Description File Format Specification, 
+ Adobe  PostScript Printer Description File Format Specification, 
 Version 4.3.</A></LI>
 <LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">
-Adobe  PostScript Language Reference, Third Edition.</A></LI>
-<LI>IPP: Job and Printer Set Operations </LI>
-<LI>IPP/1.1: Encoding and Transport </LI>
-<LI>IPP/1.1: Implementers Guide </LI>
-<LI>IPP/1.1: Model and Semantics </LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line 
+ Adobe  PostScript Language Reference, Third Edition.</A></LI>
+<LI> IPP: Job and Printer Set Operations </LI>
+<LI> IPP/1.1: Encoding and Transport </LI>
+<LI> IPP/1.1: Implementers Guide </LI>
+<LI> IPP/1.1: Model and Semantics </LI>
+<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt"> RFC 1179, Line 
 Printer Daemon Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt"> RFC 2567, Design 
 Goals for an Internet Printing Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt"> RFC 2568, Rationale 
 for the Structure of the Model and Protocol</A> for the Internet 
 Printing Protocol</LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt"> RFC 2569, Mapping 
 between LPD and IPP Protocols</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt"> RFC 2616, Hypertext 
 Transfer Protocol -- HTTP/1.1</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt"> RFC 2617, HTTP 
 Authentication: Basic and Digest Access</A> Authentication </LI>
 </UL>
-<H1><A NAME="3">3 File Management</A></H1>
-<H2><A NAME="3_1">3.1 Directory Structure</A></H2>
+<H1><A NAME="3">3  File Management</A></H1>
+<H2><A NAME="3_1">3.1  Directory Structure</A></H2>
 Each source file shall be placed a sub-directory corresponding to the 
 software sub-system it belongs to (&quot;scheduler&quot;, &quot;cups&quot;, etc.) To remain 
 compatible with older UNIX filesystems, directory names shall not 
 exceed 16 characters in length. 
-<H2><A NAME="3_2">3.2 Source Files</A></H2>
+<H2><A NAME="3_2">3.2  Source Files</A></H2>
 Source files shall be documented and formatted as described in 
 Appendix B, Coding Requirements. 
-<H2><A NAME="3_3">3.3 Configuration Management</A></H2>
+<H2><A NAME="3_3">3.3  Configuration Management</A></H2>
 Source files shall be placed under the control of the Concurrent 
 Versions System (&quot;CVS&quot;) software. Source files shall be &quot;checked in&quot; 
 with each change so that modifications can be tracked. 
-<P>Documentation on the CVS software is included with the whitepaper, 
+<P> Documentation on the CVS software is included with the whitepaper, 
 &quot;CVS II: Parallelizing Software Development&quot;. </P>
-<H1><A NAME="4">4 Trouble Report Processing</A></H1>
+<H1><A NAME="4">4  Trouble Report Processing</A></H1>
 A Software Trouble Report (&quot;STR&quot;) shall be submitted every time a user 
 or vendor experiences a problem with the CUPS software. Trouble reports 
 are maintained in a database with one of the following states: 
 <OL>
-<LI>STR is closed with complete resolution</LI>
-<LI>STR is closed without resolution</LI>
-<LI>STR is active</LI>
-<LI>STR is pending (new STR or additional information available)</LI>
+<LI> STR is closed with complete resolution</LI>
+<LI> STR is closed without resolution</LI>
+<LI> STR is active</LI>
+<LI> STR is pending (new STR or additional information available)</LI>
 </OL>
 Trouble reports shall be processed using the following steps. 
-<H2><A NAME="4_1">4.1 Classification</A></H2>
+<H2><A NAME="4_1">4.1  Classification</A></H2>
 When a trouble report is received it must be classified at one of the 
 following levels: 
 <OL>
-<LI>Request for enhancement</LI>
-<LI>Documentation error</LI>
-<LI>Unable to print a file</LI>
-<LI>Unable to print to a printer</LI>
-<LI>Unable to print at all</LI>
+<LI> Request for enhancement</LI>
+<LI> Documentation error</LI>
+<LI> Unable to print a file</LI>
+<LI> Unable to print to a printer</LI>
+<LI> Unable to print at all</LI>
 </OL>
 The scope of the problem should also be determined as: 
 <OL>
-<LI>Specific to a machine</LI>
-<LI>Specific to an operating system</LI>
-<LI>Applies to all machines and operating systems</LI>
+<LI> Specific to a machine</LI>
+<LI> Specific to an operating system</LI>
+<LI> Applies to all machines and operating systems</LI>
 </OL>
-<H2><A NAME="4_2">4.2 Identification</A></H2>
+<H2><A NAME="4_2">4.2  Identification</A></H2>
 Once the level and scope of the trouble report is determined the 
 software sub-system(s) involved with the problem are determined. This 
 may involve additional communication with the user or vendor to isolate 
 the problem to a specific cause. 
-<P>When the sub-system(s) involved have been identified, an engineer 
+<P> When the sub-system(s) involved have been identified, an engineer 
 will then determine the change(s) needed and estimate the time required 
 for the change(s). </P>
-<H2><A NAME="4_3">4.3 Correction</A></H2>
+<H2><A NAME="4_3">4.3  Correction</A></H2>
 Corrections are scheduled based upon the severity and complexity of 
 the problem. Once all changes have been made, documented, and tested 
 successfully a new software release snapshot is generated. Additional 
 tests are added as necessary for proper testing of the changes. 
-<H2><A NAME="4_4">4.4 Notification</A></H2>
+<H2><A NAME="4_4">4.4  Notification</A></H2>
 The user or vendor is notified when the fix is available or if the 
 problem was caused by user error. 
-<H1><A NAME="5">5 Software Releases</A></H1>
-<H2><A NAME="5_1">5.1 Version Numbering</A></H2>
+<H1><A NAME="5">5  Software Releases</A></H1>
+<H2><A NAME="5_1">5.1  Version Numbering</A></H2>
 CUPS uses a three-part version number separated by periods to 
 represent the major, minor, and patch release numbers: 
 <UL>
@@ -292,79 +292,81 @@ numbers reset to 0:
 2.0.0      Production release of 2.0.0
 </PRE>
 </UL>
-<H2><A NAME="5_2">5.2 Generation</A></H2>
+<H2><A NAME="5_2">5.2  Generation</A></H2>
 Software releases shall be generated for each successfully completed 
 software trouble report. All object and executable files shall be 
 deleted prior to performing a full build to ensure that source files 
 are recompiled. 
-<H2><A NAME="5_3">5.3 Testing</A></H2>
+<H2><A NAME="5_3">5.3  Testing</A></H2>
 Software testing shall be conducted according to the CUPS Software 
 Test Plan, CUPS-STP-1.1. Failed tests cause STRs to be generated to 
 correct the problems found. 
-<H2><A NAME="5_4">5.4 Release</A></H2>
+<H2><A NAME="5_4">5.4  Release</A></H2>
 When testing has been completed successfully a new distribution image 
 is created from the current CVS code &quot;snapshot&quot;. No production release 
 shall contain software that has not passed the appropriate software 
 tests. 
-<H1 TYPE="A" VALUE="1"><A NAME="6">A Glossary</A></H1>
-<H2><A NAME="6_1">A.1 Terms</A></H2>
+<H1 TYPE="A" VALUE="1"><A NAME="6">A  Glossary</A></H1>
+<H2><A NAME="6_1">A.1  Terms</A></H2>
 <DL>
-<DT>C </DT>
-<DD>A computer language. </DD>
-<DT>parallel </DT>
-<DD>Sending or receiving data more than 1 bit at a time. </DD>
-<DT>pipe </DT>
-<DD>A one-way communications channel between two programs. </DD>
-<DT>serial </DT>
-<DD>Sending or receiving data 1 bit at a time. </DD>
-<DT>socket </DT>
-<DD>A two-way network communications channel. </DD>
+<DT> C </DT>
+<DD> A computer language. </DD>
+<DT> parallel </DT>
+<DD> Sending or receiving data more than 1 bit at a time. </DD>
+<DT> pipe </DT>
+<DD> A one-way communications channel between two programs. </DD>
+<DT> serial </DT>
+<DD> Sending or receiving data 1 bit at a time. </DD>
+<DT> socket </DT>
+<DD> A two-way network communications channel. </DD>
 </DL>
-<H2><A NAME="6_2">A.2 Acronyms</A></H2>
+<H2><A NAME="6_2">A.2  Acronyms</A></H2>
 <DL>
-<DT>ASCII </DT>
-<DD>American Standard Code for Information Interchange </DD>
-<DT>CUPS </DT>
-<DD>Common UNIX Printing System </DD>
-<DT>ESC/P </DT>
-<DD>EPSON Standard Code for Printers </DD>
-<DT>FTP </DT>
-<DD>File Transfer Protocol </DD>
-<DT>HP-GL </DT>
-<DD>Hewlett-Packard Graphics Language </DD>
-<DT>HP-PCL </DT>
-<DD>Hewlett-Packard Page Control Language </DD>
-<DT>HP-PJL </DT>
-<DD>Hewlett-Packard Printer Job Language </DD>
-<DT>IETF </DT>
-<DD>Internet Engineering Task Force </DD>
-<DT>IPP </DT>
-<DD>Internet Printing Protocol </DD>
-<DT>ISO </DT>
-<DD>International Standards Organization </DD>
-<DT>LPD </DT>
-<DD>Line Printer Daemon </DD>
-<DT>MIME </DT>
-<DD>Multimedia Internet Mail Exchange </DD>
-<DT>PPD </DT>
-<DD>PostScript Printer Description </DD>
-<DT>SMB </DT>
-<DD>Server Message Block </DD>
-<DT>TFTP </DT>
-<DD>Trivial File Transfer Protocol </DD>
+<DT> ASCII </DT>
+<DD> American Standard Code for Information Interchange </DD>
+<DT> CUPS </DT>
+<DD> Common UNIX Printing System </DD>
+<DT> ESC/P </DT>
+<DD> EPSON Standard Code for Printers </DD>
+<DT> FTP </DT>
+<DD> File Transfer Protocol </DD>
+<DT> HP-GL </DT>
+<DD> Hewlett-Packard Graphics Language </DD>
+<DT> HP-PCL </DT>
+<DD> Hewlett-Packard Printer Control Language </DD>
+<DT> HP-PJL </DT>
+<DD> Hewlett-Packard Printer Job Language </DD>
+<DT> IETF </DT>
+<DD> Internet Engineering Task Force </DD>
+<DT> IPP </DT>
+<DD> Internet Printing Protocol </DD>
+<DT> ISO </DT>
+<DD> International Standards Organization </DD>
+<DT> LPD </DT>
+<DD> Line Printer Daemon </DD>
+<DT> MIME </DT>
+<DD> Multimedia Internet Mail Exchange </DD>
+<DT> PCL </DT>
+<DD> Page Control Language </DD>
+<DT> PPD </DT>
+<DD> PostScript Printer Description </DD>
+<DT> SMB </DT>
+<DD> Server Message Block </DD>
+<DT> TFTP </DT>
+<DD> Trivial File Transfer Protocol </DD>
 </DL>
-<H1><A NAME="7">B Coding Requirements</A></H1>
+<H1><A NAME="7">B  Coding Requirements</A></H1>
 These coding requirements provide detailed information on source file 
 formatting and documentation content. These guidelines shall be applied 
 to all C and C++ source files provided with CUPS. 
-<H2><A NAME="7_1">B.1 Source Files</A></H2>
-<H3><A NAME="7_1_1">B.1.1 Naming</A></H3>
+<H2><A NAME="7_1">B.1  Source Files</A></H2>
+<H3><A NAME="7_1_1">B.1.1  Naming</A></H3>
 All source files names shall be 16 characters or less in length to 
 ensure compatibility with older UNIX filesystems. Source files 
 containing functions shall have an extension of &quot;.c&quot; for ANSI C and 
 &quot;.cxx&quot; for C++ source files. All other &quot;include&quot; files shall have an 
 extension of &quot;.h&quot;. 
-<H3><A NAME="7_1_2">B.1.2 Documentation</A></H3>
+<H3><A NAME="7_1_2">B.1.2  Documentation</A></H3>
 The top of each source file shall contain a header giving the name of 
 the file, the purpose or nature of the source file, the copyright and 
 licensing notice, and the functions contained in the file.  The file 
@@ -372,7 +374,7 @@ name and revision information is provided by the CVS &quot;$Id$&quot; tag:
 <UL>
 <PRE>
 /*
- * &quot;$Id$&quot;
+ * &quot;36;Id$&quot;
 *
 *   Description of file contents.
 *
@@ -410,20 +412,20 @@ that code has been lost near the end of the file:
 <UL>
 <PRE>
 /*
- * End of &quot;$Id$&quot;.
+ * End of &quot;36;Id$&quot;.
 */
 </PRE>
 </UL>
-<H2><A NAME="7_2">B.2 Functions</A></H2>
-<H3><A NAME="7_2_1">B.2.1 Naming</A></H3>
+<H2><A NAME="7_2">B.2  Functions</A></H2>
+<H3><A NAME="7_2_1">B.2.1  Naming</A></H3>
 Functions with a global scope shall be capitalized (&quot;DoThis&quot;, 
 &quot;DoThat&quot;, &quot;DoSomethingElse&quot;, etc.) The only exception to this rule 
 shall be the CUPS interface library functions which may begin with a 
 prefix word in lowercase (&quot;cupsDoThis&quot;, &quot;cupsDoThat&quot;, etc.) 
-<P>Functions with a local scope shall be declared &quot;static&quot; and be 
+<P> Functions with a local scope shall be declared &quot;static&quot; and be 
 lowercase with underscores between words (&quot;do_this&quot;, &quot;do_that&quot;, 
 &quot;do_something_else&quot;, etc.) </P>
-<H3><A NAME="7_2_2">B.2.2 Documentation</A></H3>
+<H3><A NAME="7_2_2">B.2.2  Documentation</A></H3>
 Each function shall begin with a comment header describing what the 
 function does, the possible input limits (if any), and the possible 
 output values (if any), and any special information needed: 
@@ -443,11 +445,11 @@ do_this(float x) /* I - Power value (0.0 &lt;= x &lt;= 1.1) */
 }
 </PRE>
 </UL>
-<H2><A NAME="7_3">B.3 Methods</A></H2>
-<H3><A NAME="7_3_1">B.3.1 Naming</A></H3>
+<H2><A NAME="7_3">B.3  Methods</A></H2>
+<H3><A NAME="7_3_1">B.3.1  Naming</A></H3>
 Methods shall be in lowercase with underscores between words 
 (&quot;do_this&quot;, &quot;do_that&quot;, &quot;do_something_else&quot;, etc.) 
-<H3><A NAME="7_3_2">B.3.2 Documentation</A></H3>
+<H3><A NAME="7_3_2">B.3.2  Documentation</A></H3>
 Each method shall begin with a comment header describing what the 
 method does, the possible input limits (if any), and the possible 
 output values (if any), and any special information needed: 
@@ -467,19 +469,19 @@ class::do_this(float x) /* I - Power value (0.0 &lt;= x &lt;= 1.0) */
 }
 </PRE>
 </UL>
-<H2><A NAME="7_4">B.4 Variables</A></H2>
-<H3><A NAME="7_4_1">B.4.1 Naming</A></H3>
+<H2><A NAME="7_4">B.4  Variables</A></H2>
+<H3><A NAME="7_4_1">B.4.1  Naming</A></H3>
 Variables with a global scope shall be capitalized (&quot;ThisVariable&quot;, 
 &quot;ThatVariable&quot;, &quot;ThisStateVariable&quot;, etc.) The only exception to this 
 rule shall be the CUPS interface library global variables which must 
 begin with the prefix &quot;cups&quot; (&quot;cupsThisVariable&quot;, &quot;cupsThatVariable&quot;, 
 etc.) Global variables shall be replaced by function arguments whenever 
 possible. 
-<P>Variables with a local scope shall be lowercase with underscores 
+<P> Variables with a local scope shall be lowercase with underscores 
 between words (&quot;this_variable&quot;, &quot;that_variable&quot;, etc.) Any local 
 variables shared by functions within a source file shall be declared 
 &quot;static&quot;. </P>
-<H3><A NAME="7_4_2">B.4.2 Documentation</A></H3>
+<H3><A NAME="7_4_2">B.4.2  Documentation</A></H3>
 Each variable shall be declared on a separate line and shall be 
 immediately followed by a comment block describing the variable: 
 <UL>
@@ -488,12 +490,12 @@ int this_variable;   /* The current state of this */
 int that_variable;   /* The current state of that */
 </PRE>
 </UL>
-<H2><A NAME="7_5">B.5 Types</A></H2>
-<H3><A NAME="7_5_1">B.5.1 Naming</A></H3>
+<H2><A NAME="7_5">B.5  Types</A></H2>
+<H3><A NAME="7_5_1">B.5.1  Naming</A></H3>
 All type names shall be lowercase with underscores between words and 
 &quot;_t&quot; appended to the end of the name (&quot;this_type_t&quot;, &quot;that_type_t&quot;, 
 etc.) 
-<H3><A NAME="7_5_2">B.5.2 Documentation</A></H3>
+<H3><A NAME="7_5_2">B.5.2  Documentation</A></H3>
 Each type shall have a comment block immediately before the typedef: 
 <UL>
 <PRE>
@@ -503,12 +505,12 @@ etc.)
 typedef int cups_this_type_t;
 </PRE>
 </UL>
-<H2><A NAME="7_6">B.6 Structures</A></H2>
-<H3><A NAME="7_6_1">B.6.1 Naming</A></H3>
+<H2><A NAME="7_6">B.6  Structures</A></H2>
+<H3><A NAME="7_6_1">B.6.1  Naming</A></H3>
 All structure names shall be lowercase with underscores between words 
 and &quot;_str&quot; appended to the end of the name (&quot;this_struct_str&quot;, 
 &quot;that_struct_str&quot;, etc.) 
-<H3><A NAME="7_6_2">B.6.2 Documentation</A></H3>
+<H3><A NAME="7_6_2">B.6.2  Documentation</A></H3>
 Each structure shall have a comment block immediately before the 
 struct and each member shall be documented in accordance with the 
 variable naming policy above: 
@@ -524,11 +526,11 @@ struct cups_this_struct_str
 };
 </PRE>
 </UL>
-<H2><A NAME="7_7">B.7 Classes</A></H2>
-<H3><A NAME="7_7_1">B.7.1 Naming</A></H3>
+<H2><A NAME="7_7">B.7  Classes</A></H2>
+<H3><A NAME="7_7_1">B.7.1  Naming</A></H3>
 All class names shall be lowercase with underscores between words 
 (&quot;this_class&quot;, &quot;that_class&quot;, etc.) 
-<H3><A NAME="7_7_2">B.7.2 Documentation</A></H3>
+<H3><A NAME="7_7_2">B.7.2  Documentation</A></H3>
 Each class shall have a comment block immediately before the class and 
 each member shall be documented in accordance with the variable naming 
 policy above: 
@@ -544,15 +546,15 @@ class cups_this_class
 };
 </PRE>
 </UL>
-<H2><A NAME="7_8">B.8 Constants</A></H2>
-<H3><A NAME="7_8_1">B.8.1 Naming</A></H3>
+<H2><A NAME="7_8">B.8  Constants</A></H2>
+<H3><A NAME="7_8_1">B.8.1  Naming</A></H3>
 All constant names shall be uppercase with underscored between words 
 (&quot;THIS_CONSTANT&quot;, &quot;THAT_CONSTANT&quot;, etc.) Constants defined for the CUPS 
 interface library must begin with an uppercase prefix 
 (&quot;CUPS_THIS_CONSTANT&quot;, &quot;CUPS_THAT_CONSTANT&quot;, etc.) 
-<P>Typed enumerations shall be used whenever possible to allow for type 
-checking by the compiler. </P>
-<H3><A NAME="7_8_2">B.8.2 Documentation</A></H3>
+<P> Typed enumerations shall be used whenever possible to allow for 
+type checking by the compiler. </P>
+<H3><A NAME="7_8_2">B.8.2  Documentation</A></H3>
 Comment blocks shall immediately follow each constant: 
 <UL>
 <PRE>
@@ -563,8 +565,8 @@ enum
 };
 </PRE>
 </UL>
-<H2><A NAME="7_9">B.9 Code</A></H2>
-<H3><A NAME="7_9_1">B.9.1 Documentation</A></H3>
+<H2><A NAME="7_9">B.9  Code</A></H2>
+<H3><A NAME="7_9_1">B.9.1  Documentation</A></H3>
 All source code shall utilize block comments within functions to 
 describe the operations being performed by a group of statements: 
 <UL>
@@ -591,8 +593,8 @@ do
 } while (i == (sizeof(array) / sizeof(array[0])));
 </PRE>
 </UL>
-<H3><A NAME="7_9_2">B.9.2 Style</A></H3>
-<H4 TYPE="a">B.9.2.a Indentation</H4>
+<H3><A NAME="7_9_2">B.9.2  Style</A></H3>
+<H4 TYPE="a">B.9.2.a  Indentation</H4>
 All code blocks enclosed by brackets shall begin with the opening 
 brace on a new line. The code then follows starting on a new line after 
 the brace and is indented 2 spaces. The closing brace is then placed on 
@@ -632,11 +634,11 @@ switch (array[i])
 }
 </PRE>
 </UL>
-<H4>B.9.2.b Spacing</H4>
+<H4>B.9.2.b  Spacing</H4>
 A space shall follow each reserved word (&quot;if&quot;, &quot;while&quot;, etc.) Spaces 
 shall not be inserted between a function name and the arguments in 
 parenthesis. 
-<H4>B.9.2.c Return Values</H4>
+<H4>B.9.2.c  Return Values</H4>
 Parenthesis shall surround values returned from a function using 
 &quot;return&quot;: 
 <UL>
@@ -644,7 +646,7 @@ parenthesis.
 return (STATE_IDLE);
 </PRE>
 </UL>
-<H4>B.9.2.d Loops</H4>
+<H4>B.9.2.d  Loops</H4>
 Whenever convenient loops should count downward to zero to improve 
 program performance: 
 <UL>
@@ -653,20 +655,20 @@ for (i = sizeof(array) / sizeof(array[0]) - 1; i &gt;= 0; i --)
  array[i] = STATE_IDLE;
 </PRE>
 </UL>
-<H1 ALIGN="RIGHT"><A NAME="8">C Software Trouble Report Form</A></H1>
+<H1 ALIGN="RIGHT"><A NAME="8">C  Software Trouble Report Form</A></H1>
 <CENTER>
 <TABLE WIDTH="80%">
-<TR><TH ALIGN="RIGHT">Summary of Problem:</TH><TD ALIGN="LEFT">
-________________________________________</TD></TR>
-<TR><TH ALIGN="RIGHT">Problem Severity:</TH><TD ALIGN="LEFT">__1=RFE 
+<TR><TH ALIGN="RIGHT"> Summary of Problem:</TH><TD ALIGN="LEFT">
+ ________________________________________</TD></TR>
+<TR><TH ALIGN="RIGHT"> Problem Severity:</TH><TD ALIGN="LEFT"> __1=RFE 
 <BR> __2=Documentation-Error 
 <BR> __3=Unable-to-Print-a-File 
 <BR> __4=Unable-to-Print-to-a-Printer 
 <BR> __5=Unable-to-Print-at-All</TD></TR>
-<TR><TH ALIGN="RIGHT">Problem Scope:</TH><TD ALIGN="LEFT">__1=Machine 
+<TR><TH ALIGN="RIGHT"> Problem Scope:</TH><TD ALIGN="LEFT"> __1=Machine 
 __2=Operating-System __3=All</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Detailed Description of Problem:</TH><TD
-ALIGN="LEFT">________________________________________ 
+<TR><TH ALIGN="RIGHT" VALIGN="TOP"> Detailed Description of Problem:</TH><TD
+ALIGN="LEFT"> ________________________________________ 
 <BR> ________________________________________ 
 <BR> ________________________________________ 
 <BR> ________________________________________ 
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000731155313Z)/Title( CUPS Configuration Management Plan)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000705214846Z)/Title( CUPS Configuration Management Plan)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 128/Euro 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Roman/Encoding 2 0 R>>endobj
@@ -306,11 +306,9 @@ endobj
 xÚ+ä2T0BCc3JÎår
 ár
 á
-äHÉHendstream
-endobj
-156 0 obj
-31
-endobj
+äHÉHendstream
+endobj
+156 0 obj
 31
 endobj
 157 0 obj<</Type/Page/Parent 150 0 R/Contents 158 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R/Fc 9 0 R>>>>/Annots 14 0 R>>endobj
@@ -373,12 +371,11 @@ endobj
 |ý¸ÿ›œì¦öëÐŽC(íÎ|ñ‰#Í”ê–Æä#Q5®M_RÍÓÕ@5‡b€‚°¯â,&’vBYiîCj§ª Ö¦c.ž,Th¹G:Pïû	ìÜÌáVGÂ_ðÑÓt¡Üþ«Á%¨Z4Þ0^ìÊ7;æîU@ÂåZ9£%è:É†{Úåà@øÈËB1DN±ÞŠ„"ü³éˆí,‡3Ë„v�ÿˆ’!hkI©&,ù2©�ãYàL…RG)Re:äë�Çn$>° 'v~(¦M!x.}E¶Ñ2(NpØ³
 -e�ï÷ïàmŠ”(Å¯�G1^p6ÑÒ²÷Á3cÚNÄW!°W>ãÕv‘^“ˆÞ¿
 ç»röyöUDKendstream
-|ý¸ÿ›œì¦öëÐŽC(íÎ|ñ‰#Í”ê–Æä#Q5®M_RÍÓÕ@5‡b€‚°¯â,&’vBYiîCj§ª Ö¦c.ž,Th¹G:Pïû	ìÜÌáVGÂ_ðÑÓt¡Üþ«Á%¨Z4Þ0^ìÊ7;æîU@ÂåZ9£%è:É†{Úåà@øÈËB1DN±ÞŠ„"ü³éˆí,‡3Ë„v�ÿˆ’!hkI©&,ù2©�ãYàL…RG)Re:äë�Çn$>° 'v~(¦M!x.}E¶Ñ2(NpØ³
-e�ï÷ïàmŠ”(Å¯�G1^p6ÑÒ²÷Á3cÚNÄW!°W>ãÕv‘^“ˆÞ¿
-ç»röyöUDKendstream
+endobj
+171 0 obj
 540
 endobj
-540
+172 0 obj<</Type/Page/Parent 150 0 R/Contents 173 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
 173 0 obj<</Length 174 0 R/Filter/FlateDecode>>stream
 xÚ+ä2T0BCc3JÎår
 áÒw³P04TIS041Ó3V072PIÑPp
@@ -736,98 +733,98 @@ xref
 0000011309 00000 n 
 0000011357 00000 n 
 0000011405 00000 n 
-0000011309 00000 n 
-0000011357 00000 n 
-0000011405 00000 n 
-0000011453 00000 n 
-0000011502 00000 n 
-0000011551 00000 n 
-0000011600 00000 n 
-0000011649 00000 n 
-0000011698 00000 n 
-0000011747 00000 n 
-0000011796 00000 n 
-0000011845 00000 n 
-0000011894 00000 n 
-0000011943 00000 n 
-0000011992 00000 n 
-0000012041 00000 n 
-0000012090 00000 n 
-0000012139 00000 n 
-0000012188 00000 n 
-0000012237 00000 n 
-0000012286 00000 n 
-0000012335 00000 n 
-0000012384 00000 n 
-0000012433 00000 n 
-0000012482 00000 n 
-0000012531 00000 n 
-0000012580 00000 n 
-0000012629 00000 n 
-0000012678 00000 n 
-0000012727 00000 n 
-0000012776 00000 n 
-0000012825 00000 n 
-0000012874 00000 n 
-0000012923 00000 n 
-0000012972 00000 n 
-0000013021 00000 n 
-0000013070 00000 n 
-0000013119 00000 n 
-0000013168 00000 n 
-0000013217 00000 n 
-0000013266 00000 n 
-0000013315 00000 n 
-0000013364 00000 n 
-0000013413 00000 n 
-0000013462 00000 n 
-0000013511 00000 n 
-0000013560 00000 n 
-0000013609 00000 n 
-0000013658 00000 n 
-0000013707 00000 n 
-0000013756 00000 n 
-0000013805 00000 n 
-0000013854 00000 n 
-0000013903 00000 n 
-0000014164 00000 n 
-0000014316 00000 n 
-0000020676 00000 n 
-0000020698 00000 n 
-0000020793 00000 n 
-0000020895 00000 n 
-0000020915 00000 n 
-0000021069 00000 n 
-0000022130 00000 n 
-0000022151 00000 n 
-0000022264 00000 n 
-0000022452 00000 n 
-0000022473 00000 n 
-0000022627 00000 n 
-0000024028 00000 n 
-0000024050 00000 n 
-0000024163 00000 n 
-0000024356 00000 n 
-0000024377 00000 n 
-0000024508 00000 n 
-0000025119 00000 n 
-0000025140 00000 n 
-0000025253 00000 n 
-0000025443 00000 n 
-0000025464 00000 n 
-0000025595 00000 n 
-0000026596 00000 n 
-0000026617 00000 n 
-0000026730 00000 n 
-0000026932 00000 n 
-0000026953 00000 n 
-0000027093 00000 n 
-0000028111 00000 n 
-0000028132 00000 n 
-0000028245 00000 n 
-0000028444 00000 n 
+0000011453 00000 n 
+0000011502 00000 n 
+0000011551 00000 n 
+0000011600 00000 n 
+0000011649 00000 n 
+0000011698 00000 n 
+0000011747 00000 n 
+0000011796 00000 n 
+0000011845 00000 n 
+0000011894 00000 n 
+0000011943 00000 n 
+0000011992 00000 n 
+0000012041 00000 n 
+0000012090 00000 n 
+0000012139 00000 n 
+0000012188 00000 n 
+0000012237 00000 n 
+0000012286 00000 n 
+0000012335 00000 n 
+0000012384 00000 n 
+0000012433 00000 n 
+0000012482 00000 n 
+0000012531 00000 n 
+0000012580 00000 n 
+0000012629 00000 n 
+0000012678 00000 n 
+0000012727 00000 n 
+0000012776 00000 n 
+0000012825 00000 n 
+0000012874 00000 n 
+0000012923 00000 n 
+0000012972 00000 n 
+0000013021 00000 n 
+0000013070 00000 n 
+0000013119 00000 n 
+0000013168 00000 n 
+0000013217 00000 n 
+0000013266 00000 n 
+0000013315 00000 n 
+0000013364 00000 n 
+0000013413 00000 n 
+0000013462 00000 n 
+0000013511 00000 n 
+0000013560 00000 n 
+0000013609 00000 n 
+0000013658 00000 n 
+0000013707 00000 n 
+0000013756 00000 n 
+0000013805 00000 n 
+0000013854 00000 n 
+0000013903 00000 n 
+0000014164 00000 n 
+0000014316 00000 n 
+0000020676 00000 n 
+0000020698 00000 n 
+0000020793 00000 n 
+0000020895 00000 n 
+0000020915 00000 n 
+0000021069 00000 n 
+0000022130 00000 n 
+0000022151 00000 n 
+0000022264 00000 n 
+0000022452 00000 n 
+0000022473 00000 n 
+0000022627 00000 n 
+0000024028 00000 n 
+0000024050 00000 n 
+0000024163 00000 n 
+0000024356 00000 n 
+0000024377 00000 n 
+0000024508 00000 n 
+0000025119 00000 n 
+0000025140 00000 n 
+0000025253 00000 n 
+0000025443 00000 n 
+0000025464 00000 n 
+0000025595 00000 n 
+0000026596 00000 n 
+0000026617 00000 n 
+0000026730 00000 n 
+0000026932 00000 n 
+0000026953 00000 n 
+0000027093 00000 n 
+0000028111 00000 n 
+0000028132 00000 n 
+0000028245 00000 n 
+0000028444 00000 n 
+0000028465 00000 n 
+0000028605 00000 n 
+0000029278 00000 n 
 0000029299 00000 n 
-0000028605 00000 n 
+0000029412 00000 n 
 0000029605 00000 n 
-0000029293 00000 n 
+0000029626 00000 n 
 0000029766 00000 n 
@@ -56,10 +56,6 @@ The following documentation for CUPS is available on this server:
 	<A HREF="sdd.html">HTML</A> |
 	<A HREF="sdd.pdf">PDF</A> )

-	<LI>Software Performance Specification (
-	<A HREF="sps.html">HTML</A> |
-	<A HREF="sps.pdf">PDF</A> )
-
 	<LI>Software Version Description (
 	<A HREF="svd.html">HTML</A> |
 	<A HREF="svd.pdf">PDF</A> )
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000731155336Z)/Title( CUPS Software Administrators Manual)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000721160117Z)/Title( CUPS Software Administrators Manual)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 128/Euro 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Bold/Encoding 2 0 R>>endobj
@@ -3288,7 +3288,7 @@ xref
 0000070649 00000 n 
 0000070800 00000 n 
 0000071289 00000 n 
-0000071310 00000 n 
+0000071310 00000 n 
 0000071452 00000 n 
 0000072101 00000 n 
 0000072122 00000 n 
@@ -29,238 +29,239 @@ Copyright 1997-2000, All Rights Reserved<BR>
 <HR>
 <H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
 <BR>
-<BR><B><A HREF="#1">1 Scope</A></B>
+<BR><B><A HREF="#1">1  Scope</A></B>
 <UL>
-<LI><A HREF="#1_1">1.1 Identification</A></LI>
-<LI><A HREF="#1_2">1.2 System Overview</A></LI>
-<LI><A HREF="#1_3">1.3 Document Overview</A></LI>
+<LI><A HREF="#1_1">1.1  Identification</A></LI>
+<LI><A HREF="#1_2">1.2  System Overview</A></LI>
+<LI><A HREF="#1_3">1.3  Document Overview</A></LI>
 </UL>
-<B><A HREF="#2">2 References</A></B>
+<B><A HREF="#2">2  References</A></B>
 <UL>
-<LI><A HREF="#2_1">2.1 CUPS Documentation</A></LI>
-<LI><A HREF="#2_2">2.2 Other Documents</A></LI>
+<LI><A HREF="#2_1">2.1  CUPS Documentation</A></LI>
+<LI><A HREF="#2_2">2.2  Other Documents</A></LI>
 </UL>
-<B><A HREF="#3">3 Design Overview</A></B>
+<B><A HREF="#3">3  Design Overview</A></B>
 <UL>
-<LI><A HREF="#3_1">3.1 Backends</A></LI>
+<LI><A HREF="#3_1">3.1  Backends</A></LI>
 <UL>
-<LI><A HREF="#3_1_1">3.1.1 ipp</A></LI>
-<LI><A HREF="#3_1_2">3.1.2 lpd</A></LI>
-<LI><A HREF="#3_1_3">3.1.3 parallel</A></LI>
-<LI><A HREF="#3_1_4">3.1.4 serial</A></LI>
-<LI><A HREF="#3_1_5">3.1.5 socket</A></LI>
-<LI><A HREF="#3_1_6">3.1.6 usb</A></LI>
+<LI><A HREF="#3_1_1">3.1.1  ipp</A></LI>
+<LI><A HREF="#3_1_2">3.1.2  lpd</A></LI>
+<LI><A HREF="#3_1_3">3.1.3  parallel</A></LI>
+<LI><A HREF="#3_1_4">3.1.4  serial</A></LI>
+<LI><A HREF="#3_1_5">3.1.5  socket</A></LI>
+<LI><A HREF="#3_1_6">3.1.6  usb</A></LI>
 </UL>
-<LI><A HREF="#3_2">3.2 Berkeley Commands</A></LI>
+<LI><A HREF="#3_2">3.2  Berkeley Commands</A></LI>
 <UL>
-<LI><A HREF="#3_2_1">3.2.1 lpc</A></LI>
-<LI><A HREF="#3_2_2">3.2.2 lpq</A></LI>
-<LI><A HREF="#3_2_3">3.2.3 lpr</A></LI>
-<LI><A HREF="#3_2_4">3.2.4 lprm</A></LI>
+<LI><A HREF="#3_2_1">3.2.1  lpc</A></LI>
+<LI><A HREF="#3_2_2">3.2.2  lpq</A></LI>
+<LI><A HREF="#3_2_3">3.2.3  lpr</A></LI>
+<LI><A HREF="#3_2_4">3.2.4  lprm</A></LI>
 </UL>
-<LI><A HREF="#3_3">3.3 CGI</A></LI>
+<LI><A HREF="#3_3">3.3  CGI</A></LI>
 <UL>
-<LI><A HREF="#3_3_1">3.3.1 admin.cgi</A></LI>
-<LI><A HREF="#3_3_2">3.3.2 classes.cgi</A></LI>
-<LI><A HREF="#3_3_3">3.3.3 jobs.cgi</A></LI>
-<LI><A HREF="#3_3_4">3.3.4 printers.cgi</A></LI>
+<LI><A HREF="#3_3_1">3.3.1  admin.cgi</A></LI>
+<LI><A HREF="#3_3_2">3.3.2  classes.cgi</A></LI>
+<LI><A HREF="#3_3_3">3.3.3  jobs.cgi</A></LI>
+<LI><A HREF="#3_3_4">3.3.4  printers.cgi</A></LI>
 </UL>
-<LI><A HREF="#3_4">3.4 CUPS Application Programmers Interface</A></LI>
+<LI><A HREF="#3_4">3.4  CUPS Application Programmers Interface</A></LI>
 <UL>
-<LI><A HREF="#3_4_1">3.4.1 Convenience Functions</A></LI>
-<LI><A HREF="#3_4_2">3.4.2 HTTP Functions</A></LI>
-<LI><A HREF="#3_4_3">3.4.3 IPP Functions</A></LI>
-<LI><A HREF="#3_4_4">3.4.4 Language Functions</A></LI>
-<LI><A HREF="#3_4_5">3.4.5 PPD Functions</A></LI>
+<LI><A HREF="#3_4_1">3.4.1  Convenience Functions</A></LI>
+<LI><A HREF="#3_4_2">3.4.2  HTTP Functions</A></LI>
+<LI><A HREF="#3_4_3">3.4.3  IPP Functions</A></LI>
+<LI><A HREF="#3_4_4">3.4.4  Language Functions</A></LI>
+<LI><A HREF="#3_4_5">3.4.5  PPD Functions</A></LI>
 </UL>
-<LI><A HREF="#3_5">3.5 CUPS Imaging Library</A></LI>
+<LI><A HREF="#3_5">3.5  CUPS Imaging Library</A></LI>
 <UL>
-<LI><A HREF="#3_5_1">3.5.1 Colorspace Conversion Functions</A></LI>
-<LI><A HREF="#3_5_2">3.5.2 Color Management Functions</A></LI>
-<LI><A HREF="#3_5_3">3.5.3 Image Management Functions</A></LI>
-<LI><A HREF="#3_5_4">3.5.4 Scaling Functions</A></LI>
-<LI><A HREF="#3_5_5">3.5.5 Image File Functions</A></LI>
-<LI><A HREF="#3_5_6">3.5.6 Raster Functions</A></LI>
+<LI><A HREF="#3_5_1">3.5.1  Colorspace Conversion Functions</A></LI>
+<LI><A HREF="#3_5_2">3.5.2  Color Management Functions</A></LI>
+<LI><A HREF="#3_5_3">3.5.3  Image Management Functions</A></LI>
+<LI><A HREF="#3_5_4">3.5.4  Scaling Functions</A></LI>
+<LI><A HREF="#3_5_5">3.5.5  Image File Functions</A></LI>
+<LI><A HREF="#3_5_6">3.5.6  Raster Functions</A></LI>
 </UL>
-<LI><A HREF="#3_6">3.6 Daemons</A></LI>
+<LI><A HREF="#3_6">3.6  Daemons</A></LI>
 <UL>
-<LI><A HREF="#3_6_1">3.6.1 Line Printer Daemon</A></LI>
-<LI><A HREF="#3_6_2">3.6.2 Polling Daemon</A></LI>
+<LI><A HREF="#3_6_1">3.6.1  Line Printer Daemon</A></LI>
+<LI><A HREF="#3_6_2">3.6.2  Polling Daemon</A></LI>
 </UL>
-<LI><A HREF="#3_7">3.7 Filters</A></LI>
+<LI><A HREF="#3_7">3.7  Filters</A></LI>
 <UL>
-<LI><A HREF="#3_7_1">3.7.1 hpgltops</A></LI>
-<LI><A HREF="#3_7_2">3.7.2 imagetops</A></LI>
-<LI><A HREF="#3_7_3">3.7.3 imagetoraster</A></LI>
-<LI><A HREF="#3_7_4">3.7.4 pdftops</A></LI>
-<LI><A HREF="#3_7_5">3.7.5 pstops</A></LI>
-<LI><A HREF="#3_7_6">3.7.6 pstoraster</A></LI>
-<LI><A HREF="#3_7_7">3.7.7 rastertoepson</A></LI>
-<LI><A HREF="#3_7_8">3.7.8 rastertohp</A></LI>
-<LI><A HREF="#3_7_9">3.7.9 texttops</A></LI>
+<LI><A HREF="#3_7_1">3.7.1  hpgltops</A></LI>
+<LI><A HREF="#3_7_2">3.7.2  imagetops</A></LI>
+<LI><A HREF="#3_7_3">3.7.3  imagetoraster</A></LI>
+<LI><A HREF="#3_7_4">3.7.4  pdftops</A></LI>
+<LI><A HREF="#3_7_5">3.7.5  pstops</A></LI>
+<LI><A HREF="#3_7_6">3.7.6  pstoraster</A></LI>
+<LI><A HREF="#3_7_7">3.7.7  rastertoepson</A></LI>
+<LI><A HREF="#3_7_8">3.7.8  rastertohp</A></LI>
+<LI><A HREF="#3_7_9">3.7.9  texttops</A></LI>
 </UL>
-<LI><A HREF="#3_8">3.8 Scheduler</A></LI>
+<LI><A HREF="#3_8">3.8  Scheduler</A></LI>
 <UL>
-<LI><A HREF="#3_8_1">3.8.1 Authorization</A></LI>
-<LI><A HREF="#3_8_2">3.8.2 Classes</A></LI>
-<LI><A HREF="#3_8_3">3.8.3 Client</A></LI>
-<LI><A HREF="#3_8_4">3.8.4 Configuration</A></LI>
-<LI><A HREF="#3_8_5">3.8.5 Devices</A></LI>
-<LI><A HREF="#3_8_6">3.8.6 Directory Services</A></LI>
-<LI><A HREF="#3_8_7">3.8.7 IPP</A></LI>
-<LI><A HREF="#3_8_8">3.8.8 Jobs</A></LI>
-<LI><A HREF="#3_8_9">3.8.9 Logging</A></LI>
-<LI><A HREF="#3_8_10">3.8.10 Main</A></LI>
-<LI><A HREF="#3_8_11">3.8.11 MIME</A></LI>
-<LI><A HREF="#3_8_12">3.8.12 PPDs</A></LI>
-<LI><A HREF="#3_8_13">3.8.13 Printers</A></LI>
+<LI><A HREF="#3_8_1">3.8.1  Authorization</A></LI>
+<LI><A HREF="#3_8_2">3.8.2  Classes</A></LI>
+<LI><A HREF="#3_8_3">3.8.3  Client</A></LI>
+<LI><A HREF="#3_8_4">3.8.4  Configuration</A></LI>
+<LI><A HREF="#3_8_5">3.8.5  Devices</A></LI>
+<LI><A HREF="#3_8_6">3.8.6  Directory Services</A></LI>
+<LI><A HREF="#3_8_7">3.8.7  IPP</A></LI>
+<LI><A HREF="#3_8_8">3.8.8  Jobs</A></LI>
+<LI><A HREF="#3_8_9">3.8.9  Logging</A></LI>
+<LI><A HREF="#3_8_10">3.8.10  Main</A></LI>
+<LI><A HREF="#3_8_11">3.8.11  MIME</A></LI>
+<LI><A HREF="#3_8_12">3.8.12  PPDs</A></LI>
+<LI><A HREF="#3_8_13">3.8.13  Printers</A></LI>
 </UL>
-<LI><A HREF="#3_9">3.9 System V Commands</A></LI>
+<LI><A HREF="#3_9">3.9  System V Commands</A></LI>
 <UL>
-<LI><A HREF="#3_9_1">3.9.1 accept</A></LI>
-<LI><A HREF="#3_9_2">3.9.2 cancel</A></LI>
-<LI><A HREF="#3_9_3">3.9.3 disable</A></LI>
-<LI><A HREF="#3_9_4">3.9.4 enable</A></LI>
-<LI><A HREF="#3_9_5">3.9.5 lp</A></LI>
-<LI><A HREF="#3_9_6">3.9.6 lpadmin</A></LI>
-<LI><A HREF="#3_9_7">3.9.7 lpinfo</A></LI>
-<LI><A HREF="#3_9_8">3.9.8 lpmove</A></LI>
-<LI><A HREF="#3_9_9">3.9.9 lpoptions</A></LI>
-<LI><A HREF="#3_9_10">3.9.10 lpstat</A></LI>
-<LI><A HREF="#3_9_11">3.9.11 reject</A></LI>
+<LI><A HREF="#3_9_1">3.9.1  accept</A></LI>
+<LI><A HREF="#3_9_2">3.9.2  cancel</A></LI>
+<LI><A HREF="#3_9_3">3.9.3  disable</A></LI>
+<LI><A HREF="#3_9_4">3.9.4  enable</A></LI>
+<LI><A HREF="#3_9_5">3.9.5  lp</A></LI>
+<LI><A HREF="#3_9_6">3.9.6  lpadmin</A></LI>
+<LI><A HREF="#3_9_7">3.9.7  lpinfo</A></LI>
+<LI><A HREF="#3_9_8">3.9.8  lpmove</A></LI>
+<LI><A HREF="#3_9_9">3.9.9  lpoptions</A></LI>
+<LI><A HREF="#3_9_10">3.9.10  lpstat</A></LI>
+<LI><A HREF="#3_9_11">3.9.11  reject</A></LI>
 </UL>
 </UL>
-<B><A HREF="#4">A Glossary</A></B>
+<B><A HREF="#4">A  Glossary</A></B>
 <UL>
-<LI><A HREF="#4_1">A.1 Terms</A></LI>
-<LI><A HREF="#4_2">A.2 Acronyms</A></LI>
+<LI><A HREF="#4_1">A.1  Terms</A></LI>
+<LI><A HREF="#4_2">A.2  Acronyms</A></LI>
 </UL>
 <HR>
-<H1><A NAME="1">1 Scope</A></H1>
-<H2><A NAME="1_1">1.1 Identification</A></H2>
+<H1><A NAME="1">1  Scope</A></H1>
+<H2><A NAME="1_1">1.1  Identification</A></H2>
 This software design description document provides general information 
 on the architecture and coding of the Common UNIX Printing System 
 (&quot;CUPS&quot;) Version 1.1. 
-<H2><A NAME="1_2">1.2 System Overview</A></H2>
-<P>CUPS provides a portable printing layer for UNIX&reg;-based operating 
+<H2><A NAME="1_2">1.2  System Overview</A></H2>
+<P> CUPS provides a portable printing layer for UNIX&reg;-based operating 
 systems. It has been developed by <A HREF="http://www.easysw.com">Easy 
 Software Products</A> to promote a standard printing solution for all 
 UNIX vendors and users. CUPS provides the System V and Berkeley 
 command-line interfaces. </P>
-<P>CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
+<P> CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
 managing print jobs and queues. The Line Printer Daemon (&quot;LPD&quot;) Server 
 Message Block (&quot;SMB&quot;), and AppSocket (a.k.a. JetDirect) protocols are 
 also supported with reduced functionality. CUPS adds network printer 
 browsing and PostScript Printer Description (&quot;PPD&quot;) based printing 
 options to support real-world printing under UNIX. </P>
-<P>CUPS also includes a customized version of GNU Ghostscript 
+<P> CUPS also includes a customized version of GNU Ghostscript 
 (currently based off GNU Ghostscript 5.50) and an image file RIP that 
 are used to support non-PostScript printers. Sample drivers for HP and 
 EPSON printers are included that use these filters. </P>
-<H2><A NAME="1_3">1.3 Document Overview</A></H2>
+<H2><A NAME="1_3">1.3  Document Overview</A></H2>
 This software design description document is organized into the 
 following sections: 
 <UL>
-<LI>1 - Scope </LI>
-<LI>2 - References </LI>
-<LI>3 - Design Overview </LI>
-<LI>A - Glossary </LI>
+<LI> 1 - Scope </LI>
+<LI> 2 - References </LI>
+<LI> 3 - Design Overview </LI>
+<LI> A - Glossary </LI>
 </UL>
-<H1><A NAME="2">2 References</A></H1>
-<H2><A NAME="2_1">2.1 CUPS Documentation</A></H2>
-<P>The following CUPS documentation is referenced by this document: </P>
+<H1><A NAME="2">2  References</A></H1>
+<H2><A NAME="2_1">2.1  CUPS Documentation</A></H2>
+<P> The following CUPS documentation is referenced by this document: </P>
 <UL>
-<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
-<LI>CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
-<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
-<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
-<LI>CUPS-SDD-1.1: CUPS Software Design Description </LI>
-<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
-<LI>CUPS-SSR-1.1: CUPS Software Security Report </LI>
-<LI>CUPS-STP-1.1: CUPS Software Test Plan </LI>
-<LI>CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
-<LI>CUPS-SVD-1.1: CUPS Software Version Description </LI>
+<LI> CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
+<LI> CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
+<LI> CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
+<LI> CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
+<LI> CUPS-SDD-1.1: CUPS Software Design Description </LI>
+<LI> CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
+<LI> CUPS-SSR-1.1: CUPS Software Security Report </LI>
+<LI> CUPS-STP-1.1: CUPS Software Test Plan </LI>
+<LI> CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
+<LI> CUPS-SVD-1.1.x: CUPS Software Version Description </LI>
 </UL>
-<H2><A NAME="2_2">2.2 Other Documents</A></H2>
-<P>The following non-CUPS documents are referenced by this document: </P>
+<H2><A NAME="2_2">2.2  Other Documents</A></H2>
+<P> The following non-CUPS documents are referenced by this document: </P>
 <UL>
 <LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
-Adobe  PostScript Printer Description File Format Specification, 
+ Adobe  PostScript Printer Description File Format Specification, 
 Version 4.3.</A></LI>
 <LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">
-Adobe  PostScript Language Reference, Third Edition.</A></LI>
-<LI>IPP: Job and Printer Set Operations </LI>
-<LI>IPP/1.1: Encoding and Transport </LI>
-<LI>IPP/1.1: Implementers Guide </LI>
-<LI>IPP/1.1: Model and Semantics </LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line 
+ Adobe  PostScript Language Reference, Third Edition.</A></LI>
+<LI> IPP: Job and Printer Set Operations </LI>
+<LI> IPP/1.1: Encoding and Transport </LI>
+<LI> IPP/1.1: Implementers Guide </LI>
+<LI> IPP/1.1: Model and Semantics </LI>
+<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt"> RFC 1179, Line 
 Printer Daemon Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt"> RFC 2567, Design 
 Goals for an Internet Printing Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt"> RFC 2568, Rationale 
 for the Structure of the Model and Protocol</A> for the Internet 
 Printing Protocol</LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt"> RFC 2569, Mapping 
 between LPD and IPP Protocols</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt"> RFC 2616, Hypertext 
 Transfer Protocol -- HTTP/1.1</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt"> RFC 2617, HTTP 
 Authentication: Basic and Digest Access</A> Authentication </LI>
 </UL>
-<H1><A NAME="3">3 Design Overview</A></H1>
+<H1><A NAME="3">3  Design Overview</A></H1>
 CUPS is composed of 9 software sub-systems that operate together to 
 perform common printing tasks: 
 <UL>
-<LI>Backends </LI>
-<LI>Berkeley Commands </LI>
-<LI>CGI </LI>
-<LI>CUPS Application Programmers Interface </LI>
-<LI>CUPS Imaging Library </LI>
-<LI>Daemons </LI>
-<LI>Filters </LI>
-<LI>Scheduler </LI>
-<LI>System V Commands </LI>
+<LI> Backends </LI>
+<LI> Berkeley Commands </LI>
+<LI> CGI </LI>
+<LI> CUPS Application Programmers Interface </LI>
+<LI> CUPS Imaging Library </LI>
+<LI> Daemons </LI>
+<LI> Filters </LI>
+<LI> Scheduler </LI>
+<LI> System V Commands </LI>
 </UL>
-<H2><A NAME="3_1">3.1 Backends</A></H2>
+<H2><A NAME="3_1">3.1  Backends</A></H2>
 The backends implement communications over a number of different 
 interfaces. All backends are called with a common set of arguments: 
 <UL>
-<LI>Device URI - the Uniform Resource Identifier for the output device 
+<LI> Device URI - the Uniform Resource Identifier for the output device 
 (e.g. <CODE>parallel:/dev/plp</CODE>, <CODE> ipp://hostname/resource</CODE>
 ). </LI>
-<LI>Job Identifier - the job identifier for this job (integer). </LI>
-<LI>User Name - the user associated with this job (name string). </LI>
-<LI>Title - the title/job-name associated with this job (name string). </LI>
-<LI>Copies - the number of copies required (integer). </LI>
-<LI>Options - the options associated with this job (space separated 
+<LI> Job Identifier - the job identifier for this job (integer). </LI>
+<LI> User Name - the user associated with this job (name string). </LI>
+<LI> Title - the title/job-name associated with this job (name string). </LI>
+<LI> Copies - the number of copies required (integer). </LI>
+<LI> Options - the options associated with this job (space separated 
 option strings). </LI>
-<LI>Filename (optional) - the file to print; if this option is not 
+<LI> Filename (optional) - the file to print; if this option is not 
 specified, the backend must read the print file from the standard 
 input. </LI>
 </UL>
-<P>Backends are named using the scheme of the URI, so a URI of 
+<P> Backends are named using the scheme of the URI, so a URI of 
 &quot;ipp://hostname/resource&quot; would be processed by the &quot;ipp&quot; backend. </P>
-<H3><A NAME="3_1_1">3.1.1 ipp</A></H3>
-<P>The ipp backend sends the specified job to a network printer or host 
-using the Internet Printing Protocol.  The URI is as specified by the <CODE>
-printer-uri-supported</CODE> attribute from the printer or host. </P>
-<H3><A NAME="3_1_2">3.1.2 lpd</A></H3>
-<P>The lpd backend sends the specified job to a network printer or host 
-using the Line Printer Daemon protocol.  The URI is of the form: </P>
+<H3><A NAME="3_1_1">3.1.1  ipp</A></H3>
+<P> The ipp backend sends the specified job to a network printer or 
+host using the Internet Printing Protocol.  The URI is as specified by 
+the <CODE>printer-uri-supported</CODE> attribute from the printer or 
+host. </P>
+<H3><A NAME="3_1_2">3.1.2  lpd</A></H3>
+<P> The lpd backend sends the specified job to a network printer or 
+host using the Line Printer Daemon protocol.  The URI is of the form: </P>
 <UL>
 <PRE>lpd://hostname/queue
 </PRE>
 </UL>
-<H3><A NAME="3_1_3">3.1.3 parallel</A></H3>
-<P>The parallel backend sends the specified job to a local printer 
+<H3><A NAME="3_1_3">3.1.3  parallel</A></H3>
+<P> The parallel backend sends the specified job to a local printer 
 connected via the specified parallel port device.  The URI is of the 
 form: </P>
 <UL>
 <PRE>parallel:/dev/file
 </PRE>
 </UL>
-<H3><A NAME="3_1_4">3.1.4 serial</A></H3>
-<P>The serial backend sends the specified job to a local printer 
+<H3><A NAME="3_1_4">3.1.4  serial</A></H3>
+<P> The serial backend sends the specified job to a local printer 
 connected via the specified serial port device.  The URI is of the 
 form: </P>
 <UL>
@@ -269,14 +270,14 @@ form: </P>
 </UL>
 The options can be any combination of the following: 
 <UL>
-<LI><CODE>baud=<I>rate</I></CODE> - Sets the baud rate for the device. </LI>
-<LI><CODE>bits=<I>7 or 8</I></CODE> - Sets the number of data bits. </LI>
-<LI><CODE>parity=<I>even</I></CODE> - Sets even parity checking. </LI>
-<LI><CODE>parity=<I>odd</I></CODE> - Sets odd parity checking. </LI>
-<LI><CODE>parity=<I>none</I></CODE> - Turns parity checking off. </LI>
+<LI><CODE> baud=<I>rate</I></CODE> - Sets the baud rate for the device. </LI>
+<LI><CODE> bits=<I>7 or 8</I></CODE> - Sets the number of data bits. </LI>
+<LI><CODE> parity=<I>even</I></CODE> - Sets even parity checking. </LI>
+<LI><CODE> parity=<I>odd</I></CODE> - Sets odd parity checking. </LI>
+<LI><CODE> parity=<I>none</I></CODE> - Turns parity checking off. </LI>
 </UL>
-<H3><A NAME="3_1_5">3.1.5 socket</A></H3>
-<P>The socket backend sends the specified job to a network host using 
+<H3><A NAME="3_1_5">3.1.5  socket</A></H3>
+<P> The socket backend sends the specified job to a network host using 
 the AppSocket protocol commonly used by Hewlett-Packard and Tektronix 
 printers.  The URI is of the form: </P>
 <UL>
@@ -284,304 +285,306 @@ printers.  The URI is of the form: </P>
 </PRE>
 </UL>
 The default port number is 9100. 
-<H3><A NAME="3_1_6">3.1.6 usb</A></H3>
-<P>The usb backend sends the specified job to a local printer connected 
-via the specified usb port device.  The URI is of the form: </P>
+<H3><A NAME="3_1_6">3.1.6  usb</A></H3>
+<P> The usb backend sends the specified job to a local printer 
+connected via the specified usb port device.  The URI is of the form: </P>
 <UL>
 <PRE>usb:/dev/file
 </PRE>
 </UL>
-<H2><A NAME="3_2">3.2 Berkeley Commands</A></H2>
-<P>The Berkeley commands provide a simple command-line interface to 
+<H2><A NAME="3_2">3.2  Berkeley Commands</A></H2>
+<P> The Berkeley commands provide a simple command-line interface to 
 CUPS to submit and control print jobs. It is provided for compatibility 
 with existing software that is hardcoded to use the Berkeley commands. </P>
-<H3><A NAME="3_2_1">3.2.1 lpc</A></H3>
+<H3><A NAME="3_2_1">3.2.1  lpc</A></H3>
 The lpc command allows users and administrators to check the status 
 and control print queues.  The version provided with CUPS supports the 
 following commands: 
 <UL>
-<LI>quit - Quits the lpc command. </LI>
-<LI>status - Shows the status of printers and jobs in the queue. </LI>
+<LI> quit - Quits the lpc command. </LI>
+<LI> status - Shows the status of printers and jobs in the queue. </LI>
 </UL>
-<H3><A NAME="3_2_2">3.2.2 lpq</A></H3>
-<P>The lpq command shows the current queue status. </P>
-<H3><A NAME="3_2_3">3.2.3 lpr</A></H3>
-<P>The lpr command submits a job for printing.  The CUPS version of lpr 
-silently ignores the &quot;i&quot;, &quot;t&quot;, &quot;m&quot;, &quot;h&quot;, and &quot;s&quot; options. </P>
-<H3><A NAME="3_2_4">3.2.4 lprm</A></H3>
-<P>The lprm removes one or more print jobs. </P>
-<H2><A NAME="3_3">3.3 CGI</A></H2>
-<P>The Common Gateway Interface (CGI) programs provide a web-based 
+<H3><A NAME="3_2_2">3.2.2  lpq</A></H3>
+<P> The lpq command shows the current queue status. </P>
+<H3><A NAME="3_2_3">3.2.3  lpr</A></H3>
+<P> The lpr command submits a job for printing.  The CUPS version of 
+lpr silently ignores the &quot;i&quot;, &quot;t&quot;, &quot;m&quot;, &quot;h&quot;, and &quot;s&quot; options. </P>
+<H3><A NAME="3_2_4">3.2.4  lprm</A></H3>
+<P> The lprm removes one or more print jobs. </P>
+<H2><A NAME="3_3">3.3  CGI</A></H2>
+<P> The Common Gateway Interface (CGI) programs provide a web-based 
 status interface to monitor the status of printers, classes, and jobs. 
 Each of the CGIs utilize HTML template files that can be customized to 
 provide alternate appearances. </P>
-<H3><A NAME="3_3_1">3.3.1 admin.cgi</A></H3>
-<P>The admin CGI provides administration interfaces for printers and 
+<H3><A NAME="3_3_1">3.3.1  admin.cgi</A></H3>
+<P> The admin CGI provides administration interfaces for printers and 
 classes. The user can add, modify, delete, start, stop, and configure 
 printers and classes using &quot;wizard&quot; interfaces. </P>
-<H3><A NAME="3_3_2">3.3.2 classes.cgi</A></H3>
-<P>The classes CGI lists the available printer classes and any pending 
+<H3><A NAME="3_3_2">3.3.2  classes.cgi</A></H3>
+<P> The classes CGI lists the available printer classes and any pending 
 jobs for the class.  The user can click on individual classes to limit 
 the display and click on jobs to see the job status. </P>
-<H3><A NAME="3_3_3">3.3.3 jobs.cgi</A></H3>
-<P>The jobs CGI lists the queued print jobs in order of priority.  The 
+<H3><A NAME="3_3_3">3.3.3  jobs.cgi</A></H3>
+<P> The jobs CGI lists the queued print jobs in order of priority.  The 
 list can be limited by printer or job. </P>
-<H3><A NAME="3_3_4">3.3.4 printers.cgi</A></H3>
-<P>The printers CGI lists the available printer queues and any pending 
+<H3><A NAME="3_3_4">3.3.4  printers.cgi</A></H3>
+<P> The printers CGI lists the available printer queues and any pending 
 jobs for the printer.  The user can click on individual printers to 
 limit the display and click on jobs to see the job status. </P>
-<H2><A NAME="3_4">3.4 CUPS Application Programmers Interface</A></H2>
-<P>The CUPS Application Programmers Interface (&quot;API&quot;) provides common 
+<H2><A NAME="3_4">3.4  CUPS Application Programmers Interface</A></H2>
+<P> The CUPS Application Programmers Interface (&quot;API&quot;) provides common 
 convenience, HTTP, IPP, language, and PPD functions used by the CUPS 
 software. </P>
-<H3><A NAME="3_4_1">3.4.1 Convenience Functions</A></H3>
-<P>Convenience functions are provided to submit an IPP request, send a 
+<H3><A NAME="3_4_1">3.4.1  Convenience Functions</A></H3>
+<P> Convenience functions are provided to submit an IPP request, send a 
 print file, cancel a job, get a list of available printers, get a list 
 of available classes, get the default printer or class, get the default 
 server name, get the local username, and get a password string. </P>
-<H3><A NAME="3_4_2">3.4.2 HTTP Functions</A></H3>
-<P>The HTTP functions provide functions to connect to HTTP servers, 
+<H3><A NAME="3_4_2">3.4.2  HTTP Functions</A></H3>
+<P> The HTTP functions provide functions to connect to HTTP servers, 
 issue requests, read data from a server, and write data to a server. </P>
-<H3><A NAME="3_4_3">3.4.3 IPP Functions</A></H3>
-<P>The IPP function provide functions to manage IPP request data and 
+<H3><A NAME="3_4_3">3.4.3  IPP Functions</A></H3>
+<P> The IPP function provide functions to manage IPP request data and 
 attributes, read IPP responses from a server, and write IPP requests to 
 a server. </P>
-<H3><A NAME="3_4_4">3.4.4 Language Functions</A></H3>
-<P>The language functions provide a standard interface for retrieving 
+<H3><A NAME="3_4_4">3.4.4  Language Functions</A></H3>
+<P> The language functions provide a standard interface for retrieving 
 common textual messages for a particular locale and determining the 
 correct encoding (e.g. US ASCII, UTF-8, ISO-8859-1, etc.) </P>
-<H3><A NAME="3_4_5">3.4.5 PPD Functions</A></H3>
-<P>The PostScript Printer Description functions manage PPD files, 
+<H3><A NAME="3_4_5">3.4.5  PPD Functions</A></H3>
+<P> The PostScript Printer Description functions manage PPD files, 
 select options, check for option conflicts, and emit selected options 
 in the correct order. </P>
-<H2><A NAME="3_5">3.5 CUPS Imaging Library</A></H2>
-<P>The CUPS imaging library provides colorspace conversion, color 
+<H2><A NAME="3_5">3.5  CUPS Imaging Library</A></H2>
+<P> The CUPS imaging library provides colorspace conversion, color 
 management, image management, scaling, image file, and raster functions 
 used by the CUPS raster filters. </P>
-<H3><A NAME="3_5_1">3.5.1 Colorspace Conversion Functions</A></H3>
-<P>The colorspace conversion functions handle conversion of grayscale 
+<H3><A NAME="3_5_1">3.5.1  Colorspace Conversion Functions</A></H3>
+<P> The colorspace conversion functions handle conversion of grayscale 
 and RGB colors to grayscale, RGB, K, CMY, CMYK, and CMYKcm colorspaces. </P>
-<H3><A NAME="3_5_2">3.5.2 Color Management Functions</A></H3>
-<P>The color management functions handle gamut mapping and density 
+<H3><A NAME="3_5_2">3.5.2  Color Management Functions</A></H3>
+<P> The color management functions handle gamut mapping and density 
 correction. These are integrated with the colorspace conversion 
 functions so that colorspace conversion and color management are 
 processed in a single step. </P>
-<H3><A NAME="3_5_3">3.5.3 Image Management Functions</A></H3>
-<P>The image management functions manage a tiled image database that is 
-swapped to/from disk as needed. </P>
-<H3><A NAME="3_5_4">3.5.4 Scaling Functions</A></H3>
-<P>The scaling functions provide image scaling services using 
+<H3><A NAME="3_5_3">3.5.3  Image Management Functions</A></H3>
+<P> The image management functions manage a tiled image database that 
+is swapped to/from disk as needed. </P>
+<H3><A NAME="3_5_4">3.5.4  Scaling Functions</A></H3>
+<P> The scaling functions provide image scaling services using 
 nearest-neighbor sampling and bilinear interpolation as appropriate. </P>
-<H3><A NAME="3_5_5">3.5.5 Image File Functions</A></H3>
-<P>The image file functions handle loading of all image file formats. </P>
-<H3><A NAME="3_5_6">3.5.6 Raster Functions</A></H3>
-<P>The raster functions manage streams of CUPS raster data (described 
+<H3><A NAME="3_5_5">3.5.5  Image File Functions</A></H3>
+<P> The image file functions handle loading of all image file formats. </P>
+<H3><A NAME="3_5_6">3.5.6  Raster Functions</A></H3>
+<P> The raster functions manage streams of CUPS raster data (described 
 in the Interface Design Document) used by non-PostScript printer 
 drivers and raster filters. </P>
-<H2><A NAME="3_6">3.6 Daemons</A></H2>
-<P>The daemons provide additional network functions for the scheduler. 
+<H2><A NAME="3_6">3.6  Daemons</A></H2>
+<P> The daemons provide additional network functions for the scheduler. 
 Currently only two daemons are provided with CUPS. </P>
-<H3><A NAME="3_6_1">3.6.1 Line Printer Daemon</A></H3>
-<P>The line printer daemon provides remote LPD client support and is 
+<H3><A NAME="3_6_1">3.6.1  Line Printer Daemon</A></H3>
+<P> The line printer daemon provides remote LPD client support and is 
 run by the <CODE>inetd(8)</CODE> daemon as needed. </P>
-<H3><A NAME="3_6_2">3.6.2 Polling Daemon</A></H3>
-<P>The polling daemon is used to poll a remote server for a list of 
+<H3><A NAME="3_6_2">3.6.2  Polling Daemon</A></H3>
+<P> The polling daemon is used to poll a remote server for a list of 
 available printers and provide it to the scheduler for addition. A 
 separate polling daemon is run by the scheduler for every remote system 
 listed for polling in the scheduler configuration file. </P>
-<H2><A NAME="3_7">3.7 Filters</A></H2>
-<P>The filters implement file conversion services for CUPS. All filters 
-are called with a common set of arguments: </P>
+<H2><A NAME="3_7">3.7  Filters</A></H2>
+<P> The filters implement file conversion services for CUPS. All 
+filters are called with a common set of arguments: </P>
 <UL>
-<LI>Printer name - the name of the destination printer (name string). </LI>
-<LI>Job Identifier - the job identifier for this job (integer). </LI>
-<LI>User Name - the user associated with this job (name string). </LI>
-<LI>Title - the title/job-name associated with this job (name string). </LI>
-<LI>Copies - the number of copies required (integer). </LI>
-<LI>Options - the options associated with this job (space separated 
+<LI> Printer name - the name of the destination printer (name string). </LI>
+<LI> Job Identifier - the job identifier for this job (integer). </LI>
+<LI> User Name - the user associated with this job (name string). </LI>
+<LI> Title - the title/job-name associated with this job (name string). </LI>
+<LI> Copies - the number of copies required (integer). </LI>
+<LI> Options - the options associated with this job (space separated 
 option strings). </LI>
-<LI>Filename (optional) - the file to print; if this option is not 
+<LI> Filename (optional) - the file to print; if this option is not 
 specified, the filter must read the input file from the standard 
 input. </LI>
 </UL>
-<P>Filters are added to the MIME conversion data file and implement all 
-necessary conversions from one file type to another. </P>
-<H3><A NAME="3_7_1">3.7.1 hpgltops</A></H3>
-<P>The hpgltops filter converts HP-GL/2 files into PostScript. </P>
-<H3><A NAME="3_7_2">3.7.2 imagetops</A></H3>
-<P>The imagetops filter converts image files into PostScript. </P>
-<H3><A NAME="3_7_3">3.7.3 imagetoraster</A></H3>
-<P>The imagetoraster filter converts image files into CUPS raster data. </P>
-<H3><A NAME="3_7_4">3.7.4 pdftops</A></H3>
-<P>The pdftops filter converts PDF files into PostScript. </P>
-<H3><A NAME="3_7_5">3.7.5 pstops</A></H3>
-<P>The pstops filter inserts printer-specific commands from PPD files 
+<P> Filters are added to the MIME conversion data file and implement 
+all necessary conversions from one file type to another. </P>
+<H3><A NAME="3_7_1">3.7.1  hpgltops</A></H3>
+<P> The hpgltops filter converts HP-GL/2 files into PostScript. </P>
+<H3><A NAME="3_7_2">3.7.2  imagetops</A></H3>
+<P> The imagetops filter converts image files into PostScript. </P>
+<H3><A NAME="3_7_3">3.7.3  imagetoraster</A></H3>
+<P> The imagetoraster filter converts image files into CUPS raster 
+data. </P>
+<H3><A NAME="3_7_4">3.7.4  pdftops</A></H3>
+<P> The pdftops filter converts PDF files into PostScript. </P>
+<H3><A NAME="3_7_5">3.7.5  pstops</A></H3>
+<P> The pstops filter inserts printer-specific commands from PPD files 
 and performs page filtering as requested by the user. </P>
-<H3><A NAME="3_7_6">3.7.6 pstoraster</A></H3>
-<P>The pstoraster filter converts PostScript program data into CUPS 
+<H3><A NAME="3_7_6">3.7.6  pstoraster</A></H3>
+<P> The pstoraster filter converts PostScript program data into CUPS 
 raster data. </P>
-<H3><A NAME="3_7_7">3.7.7 rastertoepson</A></H3>
-<P>The rastertoepson filter handles converting CUPS raster data to 
+<H3><A NAME="3_7_7">3.7.7  rastertoepson</A></H3>
+<P> The rastertoepson filter handles converting CUPS raster data to 
 ESC/P and supports both color and black-and-white printers. </P>
-<H3><A NAME="3_7_8">3.7.8 rastertohp</A></H3>
-<P>The rastertohp filter handles converting CUPS raster data to HP-PCL 
+<H3><A NAME="3_7_8">3.7.8  rastertohp</A></H3>
+<P> The rastertohp filter handles converting CUPS raster data to HP-PCL 
 and supports both color and black-and-white printers. </P>
-<H3><A NAME="3_7_9">3.7.9 texttops</A></H3>
-<P>The texttops filter converts text files into PostScript. </P>
-<H2><A NAME="3_8">3.8 Scheduler</A></H2>
-<P>The scheduler is a fully-functional HTTP/1.1 and IPP/1.1 server that 
-manages the printers, classes, and jobs in the system.  It also handles 
-a simple broadcast-based directory service so that remote print queues 
-and classes can be accessed transparently from the local system. </P>
-<H3><A NAME="3_8_1">3.8.1 Authorization</A></H3>
-<P>The authorization module is responsible for performing access 
+<H3><A NAME="3_7_9">3.7.9  texttops</A></H3>
+<P> The texttops filter converts text files into PostScript. </P>
+<H2><A NAME="3_8">3.8  Scheduler</A></H2>
+<P> The scheduler is a fully-functional HTTP/1.1 and IPP/1.1 server 
+that manages the printers, classes, and jobs in the system.  It also 
+handles a simple broadcast-based directory service so that remote print 
+queues and classes can be accessed transparently from the local system. </P>
+<H3><A NAME="3_8_1">3.8.1  Authorization</A></H3>
+<P> The authorization module is responsible for performing access 
 control and authentication for all HTTP and IPP requests entering the 
 system. </P>
-<H3><A NAME="3_8_2">3.8.2 Classes</A></H3>
-<P>The classes module is responsible for managing printer classes in 
+<H3><A NAME="3_8_2">3.8.2  Classes</A></H3>
+<P> The classes module is responsible for managing printer classes in 
 the system. Each class is a collection of local and/or remote printers. 
 The classes module also reads and writes the classes configuration 
 file. </P>
-<H3><A NAME="3_8_3">3.8.3 Client</A></H3>
-<P>The client module is responsible for all HTTP client communications. 
- It handles listening on selected interfaces, accepting connections 
-from prospective clients, processing incoming HTTP requests, and 
-sending HTTP responses to those requests.  The client module also is 
-responsible for executing the external CGI programs as needed to 
-support web-based printer, class, and job status monitoring and 
-administration. </P>
-<P>Once authorized, all IPP requests are sent to the IPP module. </P>
-<H3><A NAME="3_8_4">3.8.4 Configuration</A></H3>
-<P>The configuration module is responsible for reading the CUPS 
+<H3><A NAME="3_8_3">3.8.3  Client</A></H3>
+<P> The client module is responsible for all HTTP client 
+communications.  It handles listening on selected interfaces, accepting 
+connections from prospective clients, processing incoming HTTP 
+requests, and sending HTTP responses to those requests.  The client 
+module also is responsible for executing the external CGI programs as 
+needed to support web-based printer, class, and job status monitoring 
+and administration. </P>
+<P> Once authorized, all IPP requests are sent to the IPP module. </P>
+<H3><A NAME="3_8_4">3.8.4  Configuration</A></H3>
+<P> The configuration module is responsible for reading the CUPS 
 configuration file and initializing the appropriate data structures and 
 values.  The configuration module also stops CUPS services before 
 reading the configuration file and restarts them after the 
 configuration file has been read. </P>
-<H3><A NAME="3_8_5">3.8.5 Devices</A></H3>
-<P>The devices module is responsible for managing the list of available 
-devices for the CUPS-Get-Devices operation. </P>
-<H3><A NAME="3_8_6">3.8.6 Directory Services</A></H3>
-<P>The directory services module sends and recieves printer state 
+<H3><A NAME="3_8_5">3.8.5  Devices</A></H3>
+<P> The devices module is responsible for managing the list of 
+available devices for the CUPS-Get-Devices operation. </P>
+<H3><A NAME="3_8_6">3.8.6  Directory Services</A></H3>
+<P> The directory services module sends and recieves printer state 
 information over a broadcast socket.  Remote printers and classes are 
 automatically added to or removed from the local printer and class 
 lists as needed. </P>
-<P>The directory services module can only recieve printer state 
+<P> The directory services module can only recieve printer state 
 information over a single UDP port, however it can broadcast to 
 multiple addresses and ports as needed. </P>
-<H3><A NAME="3_8_7">3.8.7 IPP</A></H3>
-<P>The IPP module handles IPP requests and acts accordingly.  URI 
+<H3><A NAME="3_8_7">3.8.7  IPP</A></H3>
+<P> The IPP module handles IPP requests and acts accordingly.  URI 
 validation is also performed here, as a client can post IPP data to any 
 URI on the server which might sidestep the access control or 
 authentication of the HTTP server. </P>
-<H3><A NAME="3_8_8">3.8.8 Jobs</A></H3>
-<P>The jobs module manages print jobs, starts filter and backend 
+<H3><A NAME="3_8_8">3.8.8  Jobs</A></H3>
+<P> The jobs module manages print jobs, starts filter and backend 
 processes for jobs to be printed, and monitors status messages from 
 those filters and backends. </P>
-<H3><A NAME="3_8_9">3.8.9 Logging</A></H3>
-<P>The logging module manages the access, error, and page log files 
+<H3><A NAME="3_8_9">3.8.9  Logging</A></H3>
+<P> The logging module manages the access, error, and page log files 
 that are generated by the scheduler. </P>
-<H3><A NAME="3_8_10">3.8.10 Main</A></H3>
-<P>The main module is responsible for timing out and dispatching input 
+<H3><A NAME="3_8_10">3.8.10  Main</A></H3>
+<P> The main module is responsible for timing out and dispatching input 
 and output for client connections.  It also watches for incoming <CODE>
 SIGHUP</CODE> and <CODE>SIGCHLD</CODE> signals, reloads the server 
 configuration files as needed, and handles child process errors and 
 exits. </P>
-<H3><A NAME="3_8_11">3.8.11 MIME</A></H3>
-<P>The Multimedia Internet Mail Exchange module manages a MIME type and 
-conversion database that supports file typing by extension and content 
-and least-cost file filtering from a source to a destination file type. </P>
-<H3><A NAME="3_8_12">3.8.12 PPDs</A></H3>
-<P>The PPDs module is responsible for managing the list of available 
+<H3><A NAME="3_8_11">3.8.11  MIME</A></H3>
+<P> The Multimedia Internet Mail Exchange module manages a MIME type 
+and conversion database that supports file typing by extension and 
+content and least-cost file filtering from a source to a destination 
+file type. </P>
+<H3><A NAME="3_8_12">3.8.12  PPDs</A></H3>
+<P> The PPDs module is responsible for managing the list of available 
 PPD files for the CUPS-Get-PPDs operation. </P>
-<H3><A NAME="3_8_13">3.8.13 Printers</A></H3>
-<P>The printers module is responsible for managing printers and PPD 
+<H3><A NAME="3_8_13">3.8.13  Printers</A></H3>
+<P> The printers module is responsible for managing printers and PPD 
 files in the system. The printers module also reads and writes the 
 printers configuration file. </P>
-<H2><A NAME="3_9">3.9 System V Commands</A></H2>
-<P>The System V commands provide a robust command-line interface to 
+<H2><A NAME="3_9">3.9  System V Commands</A></H2>
+<P> The System V commands provide a robust command-line interface to 
 CUPS to submit and control printers and jobs. </P>
-<H3><A NAME="3_9_1">3.9.1 accept</A></H3>
-<P>The accept command tells the scheduler to accept new jobs for 
+<H3><A NAME="3_9_1">3.9.1  accept</A></H3>
+<P> The accept command tells the scheduler to accept new jobs for 
 specific printers. </P>
-<H3><A NAME="3_9_2">3.9.2 cancel</A></H3>
-<P>The cancel command tells the scheduler to cancel one or more jobs 
+<H3><A NAME="3_9_2">3.9.2  cancel</A></H3>
+<P> The cancel command tells the scheduler to cancel one or more jobs 
 that are queued for printing. </P>
-<H3><A NAME="3_9_3">3.9.3 disable</A></H3>
-<P>The disable command tells the scheduler to stop printing jobs on the 
-specified printers. </P>
-<H3><A NAME="3_9_4">3.9.4 enable</A></H3>
-<P>The enable command tells the scheduler to start printing jobs on the 
-specified printers. </P>
-<H3><A NAME="3_9_5">3.9.5 lp</A></H3>
-<P>The lp command submits submits files for printing.  Unlike the 
+<H3><A NAME="3_9_3">3.9.3  disable</A></H3>
+<P> The disable command tells the scheduler to stop printing jobs on 
+the specified printers. </P>
+<H3><A NAME="3_9_4">3.9.4  enable</A></H3>
+<P> The enable command tells the scheduler to start printing jobs on 
+the specified printers. </P>
+<H3><A NAME="3_9_5">3.9.5  lp</A></H3>
+<P> The lp command submits submits files for printing.  Unlike the 
 standard System V lp command, a single CUPS lp command will generate a 
 separate job ID for each file that is printed. Also, the Solaris &quot;f&quot;, 
 &quot;H&quot;, &quot;P&quot;, &quot;S&quot;, and &quot;y&quot; options are silently ignored. </P>
-<H3><A NAME="3_9_6">3.9.6 lpadmin</A></H3>
-<P>The lpadmin command manages printer queues and classes.  The Solaris 
-&quot;A&quot;, &quot;F&quot;, &quot;I&quot;, &quot;M&quot;, &quot;P&quot;, &quot;Q&quot;, &quot;S&quot;, &quot;T&quot;, &quot;U&quot;, &quot;W&quot;, &quot;f&quot;, &quot;l&quot;, &quot;m&quot;, &quot;o&quot;, 
-&quot;s&quot;, &quot;t&quot;, and &quot;u&quot; options are not supported, and new options &quot;P&quot; (PPD 
-file) and &quot;E&quot; (enable and accept) are provided to configure 
+<H3><A NAME="3_9_6">3.9.6  lpadmin</A></H3>
+<P> The lpadmin command manages printer queues and classes.  The 
+Solaris &quot;A&quot;, &quot;F&quot;, &quot;I&quot;, &quot;M&quot;, &quot;P&quot;, &quot;Q&quot;, &quot;S&quot;, &quot;T&quot;, &quot;U&quot;, &quot;W&quot;, &quot;f&quot;, &quot;l&quot;, 
+&quot;m&quot;, &quot;o&quot;, &quot;s&quot;, &quot;t&quot;, and &quot;u&quot; options are not supported, and new options 
+&quot;P&quot; (PPD file) and &quot;E&quot; (enable and accept) are provided to configure 
 CUPS-specific features. </P>
-<H3><A NAME="3_9_7">3.9.7 lpinfo</A></H3>
-<P>The lpinfo command lists the available PPD files or devices as 
+<H3><A NAME="3_9_7">3.9.7  lpinfo</A></H3>
+<P> The lpinfo command lists the available PPD files or devices as 
 selected by the user. </P>
-<H3><A NAME="3_9_8">3.9.8 lpmove</A></H3>
-<P>The lpmove command moves a print job to a new destination. </P>
-<H3><A NAME="3_9_9">3.9.9 lpoptions</A></H3>
-<P>The lpoptions command manages user-defined printers and options. </P>
-<H3><A NAME="3_9_10">3.9.10 lpstat</A></H3>
-<P>The lpstat command lists printers, classes, and jobs as requested by 
-the user. </P>
-<H3><A NAME="3_9_11">3.9.11 reject</A></H3>
-<P>The reject command tells the scheduler not to accept new jobs for 
+<H3><A NAME="3_9_8">3.9.8  lpmove</A></H3>
+<P> The lpmove command moves a print job to a new destination. </P>
+<H3><A NAME="3_9_9">3.9.9  lpoptions</A></H3>
+<P> The lpoptions command manages user-defined printers and options. </P>
+<H3><A NAME="3_9_10">3.9.10  lpstat</A></H3>
+<P> The lpstat command lists printers, classes, and jobs as requested 
+by the user. </P>
+<H3><A NAME="3_9_11">3.9.11  reject</A></H3>
+<P> The reject command tells the scheduler not to accept new jobs for 
 specific printers. </P>
-<H1 TYPE="A" VALUE="1"><A NAME="4">A Glossary</A></H1>
-<H2><A NAME="4_1">A.1 Terms</A></H2>
+<H1 TYPE="A" VALUE="1"><A NAME="4">A  Glossary</A></H1>
+<H2><A NAME="4_1">A.1  Terms</A></H2>
 <DL>
-<DT>C </DT>
-<DD>A computer language. </DD>
-<DT>parallel </DT>
-<DD>Sending or receiving data more than 1 bit at a time. </DD>
-<DT>pipe </DT>
-<DD>A one-way communications channel between two programs. </DD>
-<DT>serial </DT>
-<DD>Sending or receiving data 1 bit at a time. </DD>
-<DT>socket </DT>
-<DD>A two-way network communications channel. </DD>
+<DT> C </DT>
+<DD> A computer language. </DD>
+<DT> parallel </DT>
+<DD> Sending or receiving data more than 1 bit at a time. </DD>
+<DT> pipe </DT>
+<DD> A one-way communications channel between two programs. </DD>
+<DT> serial </DT>
+<DD> Sending or receiving data 1 bit at a time. </DD>
+<DT> socket </DT>
+<DD> A two-way network communications channel. </DD>
 </DL>
-<H2><A NAME="4_2">A.2 Acronyms</A></H2>
+<H2><A NAME="4_2">A.2  Acronyms</A></H2>
 <DL>
-<DT>ASCII </DT>
-<DD>American Standard Code for Information Interchange </DD>
-<DT>CUPS </DT>
-<DD>Common UNIX Printing System </DD>
-<DT>ESC/P </DT>
-<DD>EPSON Standard Code for Printers </DD>
-<DT>FTP </DT>
-<DD>File Transfer Protocol </DD>
-<DT>HP-GL </DT>
-<DD>Hewlett-Packard Graphics Language </DD>
-<DT>HP-PCL </DT>
-<DD>Hewlett-Packard Page Control Language </DD>
-<DT>HP-PJL </DT>
-<DD>Hewlett-Packard Printer Job Language </DD>
-<DT>IETF </DT>
-<DD>Internet Engineering Task Force </DD>
-<DT>IPP </DT>
-<DD>Internet Printing Protocol </DD>
-<DT>ISO </DT>
-<DD>International Standards Organization </DD>
-<DT>LPD </DT>
-<DD>Line Printer Daemon </DD>
-<DT>MIME </DT>
-<DD>Multimedia Internet Mail Exchange </DD>
-<DT>PPD </DT>
-<DD>PostScript Printer Description </DD>
-<DT>SMB </DT>
-<DD>Server Message Block </DD>
-<DT>TFTP </DT>
-<DD>Trivial File Transfer Protocol </DD>
+<DT> ASCII </DT>
+<DD> American Standard Code for Information Interchange </DD>
+<DT> CUPS </DT>
+<DD> Common UNIX Printing System </DD>
+<DT> ESC/P </DT>
+<DD> EPSON Standard Code for Printers </DD>
+<DT> FTP </DT>
+<DD> File Transfer Protocol </DD>
+<DT> HP-GL </DT>
+<DD> Hewlett-Packard Graphics Language </DD>
+<DT> HP-PCL </DT>
+<DD> Hewlett-Packard Page Control Language </DD>
+<DT> HP-PJL </DT>
+<DD> Hewlett-Packard Printer Job Language </DD>
+<DT> IETF </DT>
+<DD> Internet Engineering Task Force </DD>
+<DT> IPP </DT>
+<DD> Internet Printing Protocol </DD>
+<DT> ISO </DT>
+<DD> International Standards Organization </DD>
+<DT> LPD </DT>
+<DD> Line Printer Daemon </DD>
+<DT> MIME </DT>
+<DD> Multimedia Internet Mail Exchange </DD>
+<DT> PPD </DT>
+<DD> PostScript Printer Description </DD>
+<DT> SMB </DT>
+<DD> Server Message Block </DD>
+<DT> TFTP </DT>
+<DD> Trivial File Transfer Protocol </DD>
 </DL>
 </BODY>
 </HTML>
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000731155354Z)/Title( CUPS Software Programmers Manual)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000721160131Z)/Title( CUPS Software Programmers Manual)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 128/Euro 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Bold/Encoding 2 0 R>>endobj
@@ -9564,7 +9564,7 @@ xref
 0000489592 00000 n 
 0000489692 00000 n 
 trailer
-<</Size 3417/Root 3416 0 R/Info 1 0 R/ID[<ec25907dac7a1e7161a8946c3dbd20dd><ec25907dac7a1e7161a8946c3dbd20dd>]>>
+<</Size 3417/Root 3416 0 R/Info 1 0 R/ID[<fa96a47ad68a03efca5b6e1516118da3><fa96a47ad68a03efca5b6e1516118da3>]>>
 startxref
 489926
 %%EOF
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE> CUPS Software Performance Specification</TITLE>
-<META NAME="AUTHOR" CONTENT="Easy Software Products">
-<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
-<META NAME="DOCNUMBER" CONTENT="CUPS-SPS-1.1">
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<STYLE>
-BODY { font-family: serif; font-size: 11.0pt }
-H1 { font-family: sans-serif; font-size: 20.0pt }
-H2 { font-family: sans-serif; font-size: 17.0pt }
-H3 { font-family: sans-serif; font-size: 14.0pt }
-H4 { font-family: sans-serif; font-size: 11.0pt }
-H5 { font-family: sans-serif; font-size: 9.0pt }
-H6 { font-family: sans-serif; font-size: 8.0pt }
-SUB { font-size: 8.0pt }
-SUP { font-size: 8.0pt }
-PRE { font-size: 9.0pt }
-</STYLE>
-</HEAD>
-<BODY>
-<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0" WIDTH="100%"><BR>
-<H1> CUPS Software Performance Specification</H1></A><BR>
-CUPS-SPS-1.1<BR>
-Easy Software Products<BR>
-Copyright 1997-2000, All Rights Reserved<BR>
-</CENTER>
-<HR>
-<H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
-<BR>
-<BR><B><A HREF="#1">1 Scope</A></B>
-<UL>
-<LI><A HREF="#1_1">1.1 Identification</A></LI>
-<LI><A HREF="#1_2">1.2 System Overview</A></LI>
-<LI><A HREF="#1_3">1.3 Document Overview</A></LI>
-</UL>
-<B><A HREF="#2">2 References</A></B>
-<UL>
-<LI><A HREF="#2_1">2.1 CUPS Documentation</A></LI>
-<LI><A HREF="#2_2">2.2 Other Documents</A></LI>
-</UL>
-<B><A HREF="#3">3 Programs</A></B>
-<BR>
-<BR><B><A HREF="#4">4 Scheduler Objects</A></B>
-<BR>
-<BR><B><A HREF="#5">A Glossary</A></B>
-<UL>
-<LI><A HREF="#5_1">A.1 Terms</A></LI>
-<LI><A HREF="#5_2">A.2 Acronyms</A></LI>
-</UL>
-<HR>
-<H1><A NAME="1">1 Scope</A></H1>
-<H2><A NAME="1_1">1.1 Identification</A></H2>
-<P>This software performance specification provides an analysis of the 
-memory, disk, and processor utilitization of each program in the Common 
-UNIX Printing System (&quot;CUPS&quot;) Version 1.1.</P>
-<P>For the purposes of comparison, all figures are for the Linux Intel 
-platform. Memory utilization on other platforms should be similar. </P>
-<H2><A NAME="1_2">1.2 System Overview</A></H2>
-<P>CUPS provides a portable printing layer for UNIX&reg;-based operating 
-systems. It has been developed by <A HREF="http://www.easysw.com">Easy 
-Software Products</A> to promote a standard printing solution for all 
-UNIX vendors and users. CUPS provides the System V and Berkeley 
-command-line interfaces. </P>
-<P>CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
-managing print jobs and queues. The Line Printer Daemon (&quot;LPD&quot;) Server 
-Message Block (&quot;SMB&quot;), and AppSocket (a.k.a. JetDirect) protocols are 
-also supported with reduced functionality. CUPS adds network printer 
-browsing and PostScript Printer Description (&quot;PPD&quot;) based printing 
-options to support real-world printing under UNIX. </P>
-<P>CUPS also includes a customized version of GNU Ghostscript 
-(currently based off GNU Ghostscript 5.50) and an image file RIP that 
-are used to support non-PostScript printers. Sample drivers for HP and 
-EPSON printers are included that use these filters. </P>
-<H2><A NAME="1_3">1.3 Document Overview</A></H2>
-<P>This software performance specification is organized into the 
-following sections:</P>
-<UL>
-<LI>1 - Scope</LI>
-<LI>2 - References</LI>
-<LI>3 - Programs</LI>
-<LI>4 - Scheduler Objects</LI>
-<LI>A - Glossary</LI>
-</UL>
-<H1><A NAME="2">2 References</A></H1>
-<H2><A NAME="2_1">2.1 CUPS Documentation</A></H2>
-<P>The following CUPS documentation is referenced by this document: </P>
-<UL>
-<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
-<LI>CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
-<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
-<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
-<LI>CUPS-SDD-1.1: CUPS Software Design Description </LI>
-<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
-<LI>CUPS-SSR-1.1: CUPS Software Security Report </LI>
-<LI>CUPS-STP-1.1: CUPS Software Test Plan </LI>
-<LI>CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
-<LI>CUPS-SVD-1.1: CUPS Software Version Description </LI>
-</UL>
-<H2><A NAME="2_2">2.2 Other Documents</A></H2>
-<P>The following non-CUPS documents are referenced by this document: </P>
-<UL>
-<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
-Adobe  PostScript Printer Description File Format Specification, 
- Version 4.3.</A></LI>
-<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">
-Adobe  PostScript Language Reference, Third Edition.</A></LI>
-<LI>IPP: Job and Printer Set Operations </LI>
-<LI>IPP/1.1: Encoding and Transport </LI>
-<LI>IPP/1.1: Implementers Guide </LI>
-<LI>IPP/1.1: Model and Semantics </LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line 
-Printer Daemon Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design 
-Goals for an Internet Printing Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale 
-for the Structure of the Model and Protocol</A> for the Internet 
-Printing Protocol</LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping 
-between LPD and IPP Protocols</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext 
-Transfer Protocol -- HTTP/1.1</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP 
-Authentication: Basic and Digest Access</A> Authentication </LI>
-</UL>
-<H1><A NAME="3">3 Programs</A></H1>
-<P>The following table describes the average memory, disk, and CPU 
-usage of each program in CUPS. </P>
-<P>The base memory column shows the initial memory requirements for 
-each program, including any shared libraries that are provided by CUPS. </P>
-<P>The max memory column shows the maximum amount of memory that will 
-be used by the program based upon the default configuration settings 
-supplied with CUPS. </P>
-<P>The temp files column indicates whether any temporary files are 
-created. </P>
-<P>The CPU usage column specifies a relative CPU usage by the program 
-under normal conditions, either low, medium, or high.  Low usage 
-indicates that the program will never use more than 33% of the 
-available CPU time. Medium usage indicates the program will use as much 
-as 66% of the available CPU time. High usage indicates the program uses 
-66% or more of the available CPU time. 
-<CENTER>
-<TABLE BORDER="1" WIDTH="80%">
-<TR><TH COLSPAN="3">Backends</TH></TR>
-<TR><TH>Program</TH><TH>Base Memory</TH><TH>Max Memory</TH><TH>Temp 
-Files</TH><TH>CPU Usage</TH></TR>
-<TR><TD>ipp</TD><TD>91k</TD><TD>256k</TD><TD>Up to size of print file</TD><TD>
-Low</TD></TR>
-<TR><TD>lpd</TD><TD>89k</TD><TD>89k</TD><TD>Up to size of print file</TD><TD>
-Low</TD></TR>
-<TR><TD>parallel</TD><TD>85k</TD><TD>85k</TD><TD>Up to size of print 
-file</TD><TD>Low</TD></TR>
-<TR><TD>serial</TD><TD>85k</TD><TD>85k</TD><TD>Up to size of print file</TD><TD>
-Low</TD></TR>
-<TR><TD>socket</TD><TD>85k</TD><TD>85k</TD><TD>Up to size of print file</TD><TD>
-Low</TD></TR>
-<TR><TD>usb</TD><TD>85k</TD><TD>85k</TD><TD>Up to size of print file</TD><TD>
-Low</TD></TR>
-<TR><TH COLSPAN="3">CGIs</TH></TR>
-<TR><TH>Program</TH><TH>Base Memory</TH><TH>Max Memory</TH><TH>Temp 
-Files</TH><TH>CPU Usage</TH></TR>
-<TR><TD>admin.cgi</TD><TD>107k</TD><TD>256k</TD><TD>Up to size of PPD 
-file</TD><TD>Medium</TD></TR>
-<TR><TD>classes.cgi</TD><TD>95k</TD><TD>Size of class objects</TD><TD>
-None</TD><TD>Medium</TD></TR>
-<TR><TD>jobs.cgi</TD><TD>93k</TD><TD>Size of job objects</TD><TD>None</TD><TD>
-Medium</TD></TR>
-<TR><TD>printers.cgi</TD><TD>95k</TD><TD>Size of printer objects</TD><TD>
-None</TD><TD>Medium</TD></TR>
-<TR><TH COLSPAN="3">Command-Line Programs</TH></TR>
-<TR><TH>Program</TH><TH>Base Memory</TH><TH>Max Memory</TH><TH>Temp 
-Files</TH><TH>CPU Usage</TH></TR>
-<TR><TD>accept</TD><TD>88k</TD><TD>128k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>cancel</TD><TD>88k</TD><TD>128k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>disable</TD><TD>88k</TD><TD>128k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>enable</TD><TD>88k</TD><TD>128k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>lp</TD><TD>90k</TD><TD>256k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>lpadmin</TD><TD>148k</TD><TD>256k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>lpc</TD><TD>86k</TD><TD>Size of job and printer objects</TD><TD>
-None</TD><TD>Medium</TD></TR>
-<TR><TD>lpinfo</TD><TD>89k</TD><TD>Size of device and PPD objects</TD><TD>
-None</TD><TD>Medium</TD></TR>
-<TR><TD>lpmove</TD><TD>88k</TD><TD>128k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>lpoptions</TD><TD>89k</TD><TD>128k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>lppasswd</TD><TD>90k</TD><TD>90k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>lpq</TD><TD>87k</TD><TD>Size of job objects</TD><TD>None</TD><TD>
-Medium</TD></TR>
-<TR><TD>lpr</TD><TD>87k</TD><TD>256k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>lprm</TD><TD>84k</TD><TD>128k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>lpstat</TD><TD>119k</TD><TD>Size of job, printer, and class 
-objects</TD><TD>None</TD><TD>Medium</TD></TR>
-<TR><TD>reject</TD><TD>88k</TD><TD>128k</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TH COLSPAN="3">Daemons</TH></TR>
-<TR><TH>Program</TH><TH>Base Memory</TH><TH>Max Memory</TH><TH>Temp 
-Files</TH><TH>CPU Usage</TH></TR>
-<TR><TD>cups-lpd</TD><TD>92k</TD><TD>256k</TD><TD>One file per control 
-or data file from client</TD><TD>Low</TD></TR>
-<TR><TD>cupsd</TD><TD>308k</TD><TD>See Scheduler Requirements</TD><TD>
-See Scheduler Requirements</TD><TD>Medium</TD></TR>
-<TR><TD>cups-polld</TD><TD>84k</TD><TD>Size of printer and class objects</TD><TD>
-None</TD><TD>Low</TD></TR>
-<TR><TH COLSPAN="3">Filters</TH></TR>
-<TR><TH>Program</TH><TH>Base Memory</TH><TH>Max Memory</TH><TH>Temp 
-Files</TH><TH>CPU Usage</TH></TR>
-<TR><TD>hpgltops</TD><TD>263k</TD><TD>320k</TD><TD>None</TD><TD>Medium</TD>
-</TR>
-<TR><TD>imagetops</TD><TD>628k</TD><TD>10M</TD><TD>Swap file for 
-uncompressed image data</TD><TD>Medium</TD></TR>
-<TR><TD>imagetoraster</TD><TD>652k</TD><TD>10M</TD><TD>Swap file for 
-uncompressed image data</TD><TD>High</TD></TR>
-<TR><TD>pstops</TD><TD>775k</TD><TD>840k</TD><TD>Up to size of print 
-file</TD><TD>Medium</TD></TR>
-<TR><TD>pstoraster</TD><TD>4M</TD><TD>14M</TD><TD>Swap file for command 
-lists</TD><TD>High</TD></TR>
-<TR><TD>rastertoepson</TD><TD>693k</TD><TD>1M</TD><TD>None</TD><TD>Low</TD>
-</TR>
-<TR><TD>rastertohp</TD><TD>690k</TD><TD>1M</TD><TD>None</TD><TD>Low</TD></TR>
-<TR><TD>texttops</TD><TD>638k</TD><TD>4*cols*rows</TD><TD>None</TD><TD>
-Low</TD></TR>
-</TABLE>
-</CENTER>
-</P>
-<H1><A NAME="4">4 Scheduler Objects</A></H1>
-<P>The <CODE>cupsd</CODE> program is the CUPS scheduler process. It 
-manages many interdependent server objects that are used to manage and 
-print files to printers. </P>
-<P>The following table provides the memory and disk cost associated 
-with each server object. 
-<CENTER>
-<TABLE BORDER="1" WIDTH="80%">
-<TR><TH>Object</TH><TH>Memory Per</TH><TH>Disk Per</TH></TR>
-<TR><TD>Browse ACL</TD><TD>1k</TD><TD>120</TD></TR>
-<TR><TD>Browse Poll</TD><TD>24</TD><TD>80</TD></TR>
-<TR><TD>Browse Relay</TD><TD>28</TD><TD>80</TD></TR>
-<TR><TD>Certificate</TD><TD>76</TD><TD>32</TD></TR>
-<TR><TD>Class</TD><TD>9k</TD><TD>200</TD></TR>
-<TR><TD>Client</TD><TD>13k</TD><TD>-</TD></TR>
-<TR><TD>Device</TD><TD>256</TD><TD>-</TD></TR>
-<TR><TD>Job</TD><TD>2k</TD><TD>1k + size of document files</TD></TR>
-<TR><TD>Location ACL</TD><TD>1k</TD><TD>120</TD></TR>
-<TR><TD>MIME Filter</TD><TD>268</TD><TD>80</TD></TR>
-<TR><TD>MIME Type</TD><TD>340</TD><TD>80</TD></TR>
-<TR><TD>PPD</TD><TD>200</TD><TD>656</TD></TR>
-<TR><TD>Printer</TD><TD>11k</TD><TD>32k</TD></TR>
-</TABLE>
-</CENTER>
-</P>
-<H1 TYPE="A" VALUE="1"><A NAME="5">A Glossary</A></H1>
-<H2><A NAME="5_1">A.1 Terms</A></H2>
-<DL>
-<DT>C </DT>
-<DD>A computer language. </DD>
-<DT>parallel </DT>
-<DD>Sending or receiving data more than 1 bit at a time. </DD>
-<DT>pipe </DT>
-<DD>A one-way communications channel between two programs. </DD>
-<DT>serial </DT>
-<DD>Sending or receiving data 1 bit at a time. </DD>
-<DT>socket </DT>
-<DD>A two-way network communications channel. </DD>
-</DL>
-<H2><A NAME="5_2">A.2 Acronyms</A></H2>
-<DL>
-<DT>ASCII </DT>
-<DD>American Standard Code for Information Interchange </DD>
-<DT>CUPS </DT>
-<DD>Common UNIX Printing System </DD>
-<DT>ESC/P </DT>
-<DD>EPSON Standard Code for Printers </DD>
-<DT>FTP </DT>
-<DD>File Transfer Protocol </DD>
-<DT>HP-GL </DT>
-<DD>Hewlett-Packard Graphics Language </DD>
-<DT>HP-PCL </DT>
-<DD>Hewlett-Packard Page Control Language </DD>
-<DT>HP-PJL </DT>
-<DD>Hewlett-Packard Printer Job Language </DD>
-<DT>IETF </DT>
-<DD>Internet Engineering Task Force </DD>
-<DT>IPP </DT>
-<DD>Internet Printing Protocol </DD>
-<DT>ISO </DT>
-<DD>International Standards Organization </DD>
-<DT>LPD </DT>
-<DD>Line Printer Daemon </DD>
-<DT>MIME </DT>
-<DD>Multimedia Internet Mail Exchange </DD>
-<DT>PPD </DT>
-<DD>PostScript Printer Description </DD>
-<DT>SMB </DT>
-<DD>Server Message Block </DD>
-<DT>TFTP </DT>
-<DD>Trivial File Transfer Protocol </DD>
-</DL>
-</BODY>
-</HTML>
@@ -1,457 +0,0 @@
-<HTML>
-<HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
-	<META NAME="DOCNUMBER" CONTENT="CUPS-SPS-1.1">
-	<META NAME="Author" CONTENT="Easy Software Products">
-	<TITLE>CUPS Software Performance Specification</TITLE>
-</HEAD>
-<BODY>
-
-<H1>Scope</H1>
-
-<H2>Identification</H2>
-
-<P>This software performance specification provides an analysis of the
-memory, disk, and processor utilitization of each program in the
-Common UNIX Printing System ("CUPS") Version 1.1.</P>
-
-<P>For the purposes of comparison, all figures are for the Linux Intel
-platform. Memory utilization on other platforms should be similar.
-
-<EMBED SRC="system-overview.shtml">
-
-<H2>Document Overview</H2>
-
-<P>This software performance specification is organized into the
-following sections:</P>
-
-<UL>
-	<LI>1 - Scope</LI>
-	<LI>2 - References</LI>
-	<LI>3 - Programs</LI>
-	<LI>4 - Scheduler Objects</LI>
-	<LI>A - Glossary</LI>
-</UL>
-
-<EMBED SRC="references.shtml">
-
-<H1>Programs</H1>
-
-<P>The following table describes the average memory, disk, and CPU usage of
-each program in CUPS.
-
-<P>The base memory column shows the initial memory requirements for each
-program, including any shared libraries that are provided by CUPS.
-
-<P>The max memory column shows the maximum amount of memory that will be
-used by the program based upon the default configuration settings supplied
-with CUPS.
-
-<P>The temp files column indicates whether any temporary files are created.
-
-<P>The CPU usage column specifies a relative CPU usage by the program under
-normal conditions, either low, medium, or high.  Low usage indicates that
-the program will never use more than 33% of the available CPU time. Medium
-usage indicates the program will use as much as 66% of the available CPU
-time. High usage indicates the program uses 66% or more of the available CPU
-time.
-
-<CENTER><TABLE WIDTH="80%" BORDER="1">
-<TR>
-	<TH COLSPAN="3">Backends</TH>
-</TR>
-<TR>
-	<TH>Program</TH>
-	<TH>Base Memory</TH>
-	<TH>Max Memory</TH>
-	<TH>Temp Files</TH>
-	<TH>CPU Usage</TH>
-</TR>
-<TR>
-	<TD>ipp</TD>
-	<TD>91k</TD>
-	<TD>256k</TD>
-	<TD>Up to size of print file</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lpd</TD>
-	<TD>89k</TD>
-	<TD>89k</TD>
-	<TD>Up to size of print file</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>parallel</TD>
-	<TD>85k</TD>
-	<TD>85k</TD>
-	<TD>Up to size of print file</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>serial</TD>
-	<TD>85k</TD>
-	<TD>85k</TD>
-	<TD>Up to size of print file</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>socket</TD>
-	<TD>85k</TD>
-	<TD>85k</TD>
-	<TD>Up to size of print file</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>usb</TD>
-	<TD>85k</TD>
-	<TD>85k</TD>
-	<TD>Up to size of print file</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TH COLSPAN="3">CGIs</TH>
-</TR>
-<TR>
-	<TH>Program</TH>
-	<TH>Base Memory</TH>
-	<TH>Max Memory</TH>
-	<TH>Temp Files</TH>
-	<TH>CPU Usage</TH>
-</TR>
-<TR>
-	<TD>admin.cgi</TD>
-	<TD>107k</TD>
-	<TD>256k</TD>
-	<TD>Up to size of PPD file</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>classes.cgi</TD>
-	<TD>95k</TD>
-	<TD>Size of class objects</TD>
-	<TD>None</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>jobs.cgi</TD>
-	<TD>93k</TD>
-	<TD>Size of job objects</TD>
-	<TD>None</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>printers.cgi</TD>
-	<TD>95k</TD>
-	<TD>Size of printer objects</TD>
-	<TD>None</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TH COLSPAN="3">Command-Line Programs</TH>
-</TR>
-<TR>
-	<TH>Program</TH>
-	<TH>Base Memory</TH>
-	<TH>Max Memory</TH>
-	<TH>Temp Files</TH>
-	<TH>CPU Usage</TH>
-</TR>
-<TR>
-	<TD>accept</TD>
-	<TD>88k</TD>
-	<TD>128k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>cancel</TD>
-	<TD>88k</TD>
-	<TD>128k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>disable</TD>
-	<TD>88k</TD>
-	<TD>128k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>enable</TD>
-	<TD>88k</TD>
-	<TD>128k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lp</TD>
-	<TD>90k</TD>
-	<TD>256k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lpadmin</TD>
-	<TD>148k</TD>
-	<TD>256k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lpc</TD>
-	<TD>86k</TD>
-	<TD>Size of job and printer objects</TD>
-	<TD>None</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>lpinfo</TD>
-	<TD>89k</TD>
-	<TD>Size of device and PPD objects</TD>
-	<TD>None</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>lpmove</TD>
-	<TD>88k</TD>
-	<TD>128k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lpoptions</TD>
-	<TD>89k</TD>
-	<TD>128k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lppasswd</TD>
-	<TD>90k</TD>
-	<TD>90k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lpq</TD>
-	<TD>87k</TD>
-	<TD>Size of job objects</TD>
-	<TD>None</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>lpr</TD>
-	<TD>87k</TD>
-	<TD>256k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lprm</TD>
-	<TD>84k</TD>
-	<TD>128k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>lpstat</TD>
-	<TD>119k</TD>
-	<TD>Size of job, printer, and class objects</TD>
-	<TD>None</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>reject</TD>
-	<TD>88k</TD>
-	<TD>128k</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TH COLSPAN="3">Daemons</TH>
-</TR>
-<TR>
-	<TH>Program</TH>
-	<TH>Base Memory</TH>
-	<TH>Max Memory</TH>
-	<TH>Temp Files</TH>
-	<TH>CPU Usage</TH>
-</TR>
-<TR>
-	<TD>cups-lpd</TD>
-	<TD>92k</TD>
-	<TD>256k</TD>
-	<TD>One file per control or data file from client</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>cupsd</TD>
-	<TD>308k</TD>
-	<TD>See Scheduler Requirements</TD>
-	<TD>See Scheduler Requirements</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>cups-polld</TD>
-	<TD>84k</TD>
-	<TD>Size of printer and class objects</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TH COLSPAN="3">Filters</TH>
-</TR>
-<TR>
-	<TH>Program</TH>
-	<TH>Base Memory</TH>
-	<TH>Max Memory</TH>
-	<TH>Temp Files</TH>
-	<TH>CPU Usage</TH>
-</TR>
-<TR>
-	<TD>hpgltops</TD>
-	<TD>263k</TD>
-	<TD>320k</TD>
-	<TD>None</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>imagetops</TD>
-	<TD>628k</TD>
-	<TD>10M</TD>
-	<TD>Swap file for uncompressed image data</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>imagetoraster</TD>
-	<TD>652k</TD>
-	<TD>10M</TD>
-	<TD>Swap file for uncompressed image data</TD>
-	<TD>High</TD>
-</TR>
-<TR>
-	<TD>pstops</TD>
-	<TD>775k</TD>
-	<TD>840k</TD>
-	<TD>Up to size of print file</TD>
-	<TD>Medium</TD>
-</TR>
-<TR>
-	<TD>pstoraster</TD>
-	<TD>4M</TD>
-	<TD>14M</TD>
-	<TD>Swap file for command lists</TD>
-	<TD>High</TD>
-</TR>
-<TR>
-	<TD>rastertoepson</TD>
-	<TD>693k</TD>
-	<TD>1M</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>rastertohp</TD>
-	<TD>690k</TD>
-	<TD>1M</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-<TR>
-	<TD>texttops</TD>
-	<TD>638k</TD>
-	<TD>4*cols*rows</TD>
-	<TD>None</TD>
-	<TD>Low</TD>
-</TR>
-</TABLE></CENTER>
-
-
-<H1>Scheduler Objects</H1>
-
-<P>The <CODE>cupsd</CODE> program is the CUPS scheduler process. It manages
-many interdependent server objects that are used to manage and print files
-to printers.
-
-<P>The following table provides the memory and disk cost associated with each
-server object.
-
-<CENTER><TABLE WIDTH="80%" BORDER="1">
-<TR>
-	<TH>Object</TH>
-	<TH>Memory Per</TH>
-	<TH>Disk Per</TH>
-</TR>
-<TR>
-	<TD>Browse ACL</TD>
-	<TD>1k</TD>
-	<TD>120</TD>
-</TR>
-<TR>
-	<TD>Browse Poll</TD>
-	<TD>24</TD>
-	<TD>80</TD>
-</TR>
-<TR>
-	<TD>Browse Relay</TD>
-	<TD>28</TD>
-	<TD>80</TD>
-</TR>
-<TR>
-	<TD>Certificate</TD>
-	<TD>76</TD>
-	<TD>32</TD>
-</TR>
-<TR>
-	<TD>Class</TD>
-	<TD>9k</TD>
-	<TD>200</TD>
-</TR>
-<TR>
-	<TD>Client</TD>
-	<TD>13k</TD>
-	<TD>-</TD>
-</TR>
-<TR>
-	<TD>Device</TD>
-	<TD>256</TD>
-	<TD>-</TD>
-</TR>
-<TR>
-	<TD>Job</TD>
-	<TD>2k</TD>
-	<TD>1k + size of document files</TD>
-</TR>
-<TR>
-	<TD>Location ACL</TD>
-	<TD>1k</TD>
-	<TD>120</TD>
-</TR>
-<TR>
-	<TD>MIME Filter</TD>
-	<TD>268</TD>
-	<TD>80</TD>
-</TR>
-<TR>
-	<TD>MIME Type</TD>
-	<TD>340</TD>
-	<TD>80</TD>
-</TR>
-<TR>
-	<TD>PPD</TD>
-	<TD>200</TD>
-	<TD>656</TD>
-</TR>
-<TR>
-	<TD>Printer</TD>
-	<TD>11k</TD>
-	<TD>32k</TD>
-</TR>
-</TABLE></CENTER>
-
-<EMBED SRC="glossary.shtml">
-
-</BODY>
-</HTML>
@@ -29,174 +29,174 @@ Copyright 1997-2000, All Rights Reserved<BR>
 <HR>
 <H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
 <BR>
-<BR><B><A HREF="#1">1 Scope</A></B>
+<BR><B><A HREF="#1">1  Scope</A></B>
 <UL>
-<LI><A HREF="#1_1">1.1 Identification</A></LI>
-<LI><A HREF="#1_2">1.2 System Overview</A></LI>
-<LI><A HREF="#1_3">1.3 Document Overview</A></LI>
+<LI><A HREF="#1_1">1.1  Identification</A></LI>
+<LI><A HREF="#1_2">1.2  System Overview</A></LI>
+<LI><A HREF="#1_3">1.3  Document Overview</A></LI>
 </UL>
-<B><A HREF="#2">2 References</A></B>
+<B><A HREF="#2">2  References</A></B>
 <UL>
-<LI><A HREF="#2_1">2.1 CUPS Documentation</A></LI>
-<LI><A HREF="#2_2">2.2 Other Documents</A></LI>
+<LI><A HREF="#2_1">2.1  CUPS Documentation</A></LI>
+<LI><A HREF="#2_2">2.2  Other Documents</A></LI>
 </UL>
-<B><A HREF="#3">3 Local Access Risks</A></B>
+<B><A HREF="#3">3  Local Access Risks</A></B>
 <UL>
-<LI><A HREF="#3_1">3.1 Security Breaches</A></LI>
+<LI><A HREF="#3_1">3.1  Security Breaches</A></LI>
 </UL>
-<B><A HREF="#4">4 Remote Access Risks</A></B>
+<B><A HREF="#4">4  Remote Access Risks</A></B>
 <UL>
-<LI><A HREF="#4_1">4.1 Denial of Service Attacks</A></LI>
-<LI><A HREF="#4_2">4.2 Security Breaches</A></LI>
+<LI><A HREF="#4_1">4.1  Denial of Service Attacks</A></LI>
+<LI><A HREF="#4_2">4.2  Security Breaches</A></LI>
 </UL>
-<B><A HREF="#5">A Glossary</A></B>
+<B><A HREF="#5">A  Glossary</A></B>
 <UL>
-<LI><A HREF="#5_1">A.1 Terms</A></LI>
-<LI><A HREF="#5_2">A.2 Acronyms</A></LI>
+<LI><A HREF="#5_1">A.1  Terms</A></LI>
+<LI><A HREF="#5_2">A.2  Acronyms</A></LI>
 </UL>
 <HR>
-<H1><A NAME="1">1 Scope</A></H1>
-<H2><A NAME="1_1">1.1 Identification</A></H2>
-<P>This software security report provides an analysis of possible 
+<H1><A NAME="1">1  Scope</A></H1>
+<H2><A NAME="1_1">1.1  Identification</A></H2>
+<P> This software security report provides an analysis of possible 
 security concerns for the Common UNIX Printing System (&quot;CUPS&quot;) Version 
 1.1.</P>
-<H2><A NAME="1_2">1.2 System Overview</A></H2>
-<P>CUPS provides a portable printing layer for UNIX&reg;-based operating 
+<H2><A NAME="1_2">1.2  System Overview</A></H2>
+<P> CUPS provides a portable printing layer for UNIX&reg;-based operating 
 systems. It has been developed by <A HREF="http://www.easysw.com">Easy 
 Software Products</A> to promote a standard printing solution for all 
 UNIX vendors and users. CUPS provides the System V and Berkeley 
 command-line interfaces. </P>
-<P>CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
+<P> CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
 managing print jobs and queues. The Line Printer Daemon (&quot;LPD&quot;) Server 
 Message Block (&quot;SMB&quot;), and AppSocket (a.k.a. JetDirect) protocols are 
 also supported with reduced functionality. CUPS adds network printer 
 browsing and PostScript Printer Description (&quot;PPD&quot;) based printing 
 options to support real-world printing under UNIX. </P>
-<P>CUPS also includes a customized version of GNU Ghostscript 
+<P> CUPS also includes a customized version of GNU Ghostscript 
 (currently based off GNU Ghostscript 5.50) and an image file RIP that 
 are used to support non-PostScript printers. Sample drivers for HP and 
 EPSON printers are included that use these filters. </P>
-<H2><A NAME="1_3">1.3 Document Overview</A></H2>
-<P>This software security report is organized into the following 
+<H2><A NAME="1_3">1.3  Document Overview</A></H2>
+<P> This software security report is organized into the following 
 sections:</P>
 <UL>
-<LI>1 - Scope</LI>
-<LI>2 - References</LI>
-<LI>3 - Local Access Risks</LI>
-<LI>4 - Remote Access Risks</LI>
-<LI>A - Glossary</LI>
+<LI> 1 - Scope</LI>
+<LI> 2 - References</LI>
+<LI> 3 - Local Access Risks</LI>
+<LI> 4 - Remote Access Risks</LI>
+<LI> A - Glossary</LI>
 </UL>
-<H1><A NAME="2">2 References</A></H1>
-<H2><A NAME="2_1">2.1 CUPS Documentation</A></H2>
-<P>The following CUPS documentation is referenced by this document: </P>
+<H1><A NAME="2">2  References</A></H1>
+<H2><A NAME="2_1">2.1  CUPS Documentation</A></H2>
+<P> The following CUPS documentation is referenced by this document: </P>
 <UL>
-<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
-<LI>CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
-<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
-<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
-<LI>CUPS-SDD-1.1: CUPS Software Design Description </LI>
-<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
-<LI>CUPS-SSR-1.1: CUPS Software Security Report </LI>
-<LI>CUPS-STP-1.1: CUPS Software Test Plan </LI>
-<LI>CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
-<LI>CUPS-SVD-1.1: CUPS Software Version Description </LI>
+<LI> CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
+<LI> CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
+<LI> CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
+<LI> CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
+<LI> CUPS-SDD-1.1: CUPS Software Design Description </LI>
+<LI> CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
+<LI> CUPS-SSR-1.1: CUPS Software Security Report </LI>
+<LI> CUPS-STP-1.1: CUPS Software Test Plan </LI>
+<LI> CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
+<LI> CUPS-SVD-1.1.x: CUPS Software Version Description </LI>
 </UL>
-<H2><A NAME="2_2">2.2 Other Documents</A></H2>
-<P>The following non-CUPS documents are referenced by this document: </P>
+<H2><A NAME="2_2">2.2  Other Documents</A></H2>
+<P> The following non-CUPS documents are referenced by this document: </P>
 <UL>
 <LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
-Adobe  PostScript Printer Description File Format Specification, 
+ Adobe  PostScript Printer Description File Format Specification, 
 Version 4.3.</A></LI>
 <LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">
-Adobe  PostScript Language Reference, Third Edition.</A></LI>
-<LI>IPP: Job and Printer Set Operations </LI>
-<LI>IPP/1.1: Encoding and Transport </LI>
-<LI>IPP/1.1: Implementers Guide </LI>
-<LI>IPP/1.1: Model and Semantics </LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line 
+ Adobe  PostScript Language Reference, Third Edition.</A></LI>
+<LI> IPP: Job and Printer Set Operations </LI>
+<LI> IPP/1.1: Encoding and Transport </LI>
+<LI> IPP/1.1: Implementers Guide </LI>
+<LI> IPP/1.1: Model and Semantics </LI>
+<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt"> RFC 1179, Line 
 Printer Daemon Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt"> RFC 2567, Design 
 Goals for an Internet Printing Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt"> RFC 2568, Rationale 
 for the Structure of the Model and Protocol</A> for the Internet 
 Printing Protocol</LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt"> RFC 2569, Mapping 
 between LPD and IPP Protocols</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt"> RFC 2616, Hypertext 
 Transfer Protocol -- HTTP/1.1</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt"> RFC 2617, HTTP 
 Authentication: Basic and Digest Access</A> Authentication </LI>
 </UL>
-<H1><A NAME="3">3 Local Access Risks</A></H1>
-<P>Local access risks are those that can be exploited only with a local 
-user account. This section does not address issues related to 
+<H1><A NAME="3">3  Local Access Risks</A></H1>
+<P> Local access risks are those that can be exploited only with a 
+local user account. This section does not address issues related to 
 dissemination of the root password or other security issues associated 
 with the UNIX operating system. </P>
-<H2><A NAME="3_1">3.1 Security Breaches</A></H2>
-<P>There is one known security vulnerability with local access: </P>
+<H2><A NAME="3_1">3.1  Security Breaches</A></H2>
+<P> There is one known security vulnerability with local access: </P>
 <OL>
-<LI>Device URIs are passed to backend filters in argv[0] and in  an 
+<LI> Device URIs are passed to backend filters in argv[0] and in  an 
 environment variable. Since device URIs can contain  usernames and 
 passwords it may be possible for a local user to  gain access to a 
 remote resource. </LI>
-<P>We recommend that any password-protected accounts used for  remote 
+<P> We recommend that any password-protected accounts used for  remote 
 printing have limited access priviledges so that the  possible damages 
 can be minimized. </P>
-<P>The device URI is &quot;sanitized&quot; (the username and password are 
+<P> The device URI is &quot;sanitized&quot; (the username and password are 
 removed) when sent to an IPP client so that a remote user  cannot 
 exploit this vulnerability. </P>
 </OL>
-<H1><A NAME="4">4 Remote Access Risks</A></H1>
-<P>Remote access risks are those that can be exploited without a local 
+<H1><A NAME="4">4  Remote Access Risks</A></H1>
+<P> Remote access risks are those that can be exploited without a local 
 user account and/or from a remote system. This section does not address 
 issues related to network or firewall security. </P>
-<H2><A NAME="4_1">4.1 Denial of Service Attacks</A></H2>
-<P>Like all Internet services, the CUPS server is vulnerable to denial 
+<H2><A NAME="4_1">4.1  Denial of Service Attacks</A></H2>
+<P> Like all Internet services, the CUPS server is vulnerable to denial 
 of service attacks, including: </P>
 <OL>
-<LI>Establishing multiple connections to the server until the server 
+<LI> Establishing multiple connections to the server until the server 
 will accept no more. </LI>
-<P>This cannot be protected against by the current software. It  is 
+<P> This cannot be protected against by the current software. It  is 
 possible that future versions of the CUPS software could be  configured 
 to limit the number of connections allowed from a  single host, however 
 that still would not prevent a distributed  attack. </P>
-<LI>Repeatedly opening and closing connections to the server as fast 
+<LI> Repeatedly opening and closing connections to the server as fast 
 as possible. </LI>
-<P>There is no easy way of protecting against this in the CUPS 
+<P> There is no easy way of protecting against this in the CUPS 
 software. If the attack is coming from outside the local  network it 
 might be possible to filter such an attack, however  once the 
 connection request has been received by the server it  must at least 
 accept the connection to find out who is  connecting. </P>
-<LI>Flooding the network with broadcast packets on port 631. </LI>
-<P>It might be possible to disable browsing if this condition  is 
+<LI> Flooding the network with broadcast packets on port 631. </LI>
+<P> It might be possible to disable browsing if this condition  is 
 detected by the CUPS software, however if there are large  numbers of 
 printers available on the network such an algorithm  might think that 
 an attack was occurring when instead a valid  update was being 
 received. </P>
-<LI>Sending partial IPP requests; specifically, sending part of an 
+<LI> Sending partial IPP requests; specifically, sending part of an 
 attribute value and then stopping transmission. </LI>
-<P>The current code is structured to read and write the IPP  request 
+<P> The current code is structured to read and write the IPP  request 
 data on-the-fly, so there is no easy way to protect  against this for 
 large attribute values. </P>
-<LI>Sending large/long print jobs to printers, preventing other users 
+<LI> Sending large/long print jobs to printers, preventing other users 
 from printing. </LI>
-<P>There are limited facilities for protecting against large print 
+<P> There are limited facilities for protecting against large print 
 jobs (the <CODE>MaxRequestSize</CODE> attribute), however this will 
 not protect printers from malicious users and print files that 
 generate hundreds or thousands of pages. In general, we recommend 
 restricting printer access to known hosts or networks, and adding 
 user-level access control as needed for expensive printers. </P>
 </OL>
-<H2><A NAME="4_2">4.2 Security Breaches</A></H2>
-<P>The current CUPS server supports Basic, Digest, and local 
+<H2><A NAME="4_2">4.2  Security Breaches</A></H2>
+<P> The current CUPS server supports Basic, Digest, and local 
 certificate authentication: </P>
 <OL>
-<LI>Basic authentication essentially places the clear text of  the 
+<LI> Basic authentication essentially places the clear text of  the 
 username and password on the network. Since CUPS uses the  UNIX 
 username and password account information, the  authentication 
 information could be used to gain access to  accounts (possibly 
 priviledged accounts) on the server. </LI>
-<LI>Digest authentication uses an MD5 checksum of the username, 
+<LI> Digest authentication uses an MD5 checksum of the username, 
 password, and domain (&quot;CUPS&quot;), so the original username and  password 
 is not sent over the network. However, the current  implementation does 
 not authenticate the entire message and  uses the client's IP address 
@@ -204,7 +204,7 @@ for the nonce value, making it  possible to launch &quot;man in the middle&quot;
 and replay attacks from  the same client.  The next minor release of 
 CUPS will support  Digest authentication of the entire message body, 
 effectively  stopping these methods of attack. </LI>
-<LI>Local certificate authentication passes 128-bit  &quot;certificates&quot; 
+<LI> Local certificate authentication passes 128-bit  &quot;certificates&quot; 
 that identify an authenticated user.  Certificates are created 
 on-the-fly from random data and stored  in files under <CODE>
 /etc/cups/certs</CODE>. They have  restricted read permissions: root + 
@@ -213,58 +213,58 @@ Because  certificates are only available on the local system, the CUPS
 server does not accept local authentication unless the client  is 
 connected to the localhost address (127.0.0.1.) </LI>
 </OL>
-<P>The default CUPS configuration disables remote administration. We do 
-not recommend that remote administration be enabled for all hosts. 
+<P> The default CUPS configuration disables remote administration. We 
+do not recommend that remote administration be enabled for all hosts. 
 However, if you have a trusted network or subnet, access can be 
 restricted accordingly.  Also, we highly recommend using Digest 
 authentication when possible. Unfortunately, most web browsers do not 
 support Digest authentication at this time. </P>
-<H1 TYPE="A" VALUE="1"><A NAME="5">A Glossary</A></H1>
-<H2><A NAME="5_1">A.1 Terms</A></H2>
+<H1 TYPE="A" VALUE="1"><A NAME="5">A  Glossary</A></H1>
+<H2><A NAME="5_1">A.1  Terms</A></H2>
 <DL>
-<DT>C </DT>
-<DD>A computer language. </DD>
-<DT>parallel </DT>
-<DD>Sending or receiving data more than 1 bit at a time. </DD>
-<DT>pipe </DT>
-<DD>A one-way communications channel between two programs. </DD>
-<DT>serial </DT>
-<DD>Sending or receiving data 1 bit at a time. </DD>
-<DT>socket </DT>
-<DD>A two-way network communications channel. </DD>
+<DT> C </DT>
+<DD> A computer language. </DD>
+<DT> parallel </DT>
+<DD> Sending or receiving data more than 1 bit at a time. </DD>
+<DT> pipe </DT>
+<DD> A one-way communications channel between two programs. </DD>
+<DT> serial </DT>
+<DD> Sending or receiving data 1 bit at a time. </DD>
+<DT> socket </DT>
+<DD> A two-way network communications channel. </DD>
 </DL>
-<H2><A NAME="5_2">A.2 Acronyms</A></H2>
+<H2><A NAME="5_2">A.2  Acronyms</A></H2>
 <DL>
-<DT>ASCII </DT>
-<DD>American Standard Code for Information Interchange </DD>
-<DT>CUPS </DT>
-<DD>Common UNIX Printing System </DD>
-<DT>ESC/P </DT>
-<DD>EPSON Standard Code for Printers </DD>
-<DT>FTP </DT>
-<DD>File Transfer Protocol </DD>
-<DT>HP-GL </DT>
-<DD>Hewlett-Packard Graphics Language </DD>
-<DT>HP-PCL </DT>
-<DD>Hewlett-Packard Page Control Language </DD>
-<DT>HP-PJL </DT>
-<DD>Hewlett-Packard Printer Job Language </DD>
-<DT>IETF </DT>
-<DD>Internet Engineering Task Force </DD>
-<DT>IPP </DT>
-<DD>Internet Printing Protocol </DD>
-<DT>ISO </DT>
-<DD>International Standards Organization </DD>
-<DT>LPD </DT>
-<DD>Line Printer Daemon </DD>
-<DT>MIME </DT>
-<DD>Multimedia Internet Mail Exchange </DD>
-<DT>PPD </DT>
-<DD>PostScript Printer Description </DD>
-<DT>SMB </DT>
-<DD>Server Message Block </DD>
-<DT>TFTP </DT>
-<DD>Trivial File Transfer Protocol </DD>
+<DT> ASCII </DT>
+<DD> American Standard Code for Information Interchange </DD>
+<DT> CUPS </DT>
+<DD> Common UNIX Printing System </DD>
+<DT> ESC/P </DT>
+<DD> EPSON Standard Code for Printers </DD>
+<DT> FTP </DT>
+<DD> File Transfer Protocol </DD>
+<DT> HP-GL </DT>
+<DD> Hewlett-Packard Graphics Language </DD>
+<DT> HP-PCL </DT>
+<DD> Hewlett-Packard Page Control Language </DD>
+<DT> HP-PJL </DT>
+<DD> Hewlett-Packard Printer Job Language </DD>
+<DT> IETF </DT>
+<DD> Internet Engineering Task Force </DD>
+<DT> IPP </DT>
+<DD> Internet Printing Protocol </DD>
+<DT> ISO </DT>
+<DD> International Standards Organization </DD>
+<DT> LPD </DT>
+<DD> Line Printer Daemon </DD>
+<DT> MIME </DT>
+<DD> Multimedia Internet Mail Exchange </DD>
+<DT> PPD </DT>
+<DD> PostScript Printer Description </DD>
+<DT> SMB </DT>
+<DD> Server Message Block </DD>
+<DT> TFTP </DT>
+<DD> Trivial File Transfer Protocol </DD>
 </DL>
 </BODY>
 </HTML>
@@ -29,146 +29,146 @@ Copyright 1997-2000, All Rights Reserved<BR>
 <HR>
 <H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
 <BR>
-<BR><B><A HREF="#1">1 Scope</A></B>
+<BR><B><A HREF="#1">1  Scope</A></B>
 <UL>
-<LI><A HREF="#1_1">1.1 Identification</A></LI>
-<LI><A HREF="#1_2">1.2 System Overview</A></LI>
-<LI><A HREF="#1_3">1.3 Document Overview</A></LI>
+<LI><A HREF="#1_1">1.1  Identification</A></LI>
+<LI><A HREF="#1_2">1.2  System Overview</A></LI>
+<LI><A HREF="#1_3">1.3  Document Overview</A></LI>
 </UL>
-<B><A HREF="#2">2 References</A></B>
+<B><A HREF="#2">2  References</A></B>
 <UL>
-<LI><A HREF="#2_1">2.1 CUPS Documentation</A></LI>
-<LI><A HREF="#2_2">2.2 Other Documents</A></LI>
+<LI><A HREF="#2_1">2.1  CUPS Documentation</A></LI>
+<LI><A HREF="#2_2">2.2  Other Documents</A></LI>
 </UL>
-<B><A HREF="#3">3 Local Tests</A></B>
+<B><A HREF="#3">3  Local Tests</A></B>
 <BR>
-<BR><B><A HREF="#4">4 Remote Tests</A></B>
+<BR><B><A HREF="#4">4  Remote Tests</A></B>
 <BR>
-<BR><B><A HREF="#5">A Glossary</A></B>
+<BR><B><A HREF="#5">A  Glossary</A></B>
 <UL>
-<LI><A HREF="#5_1">A.1 Terms</A></LI>
-<LI><A HREF="#5_2">A.2 Acronyms</A></LI>
+<LI><A HREF="#5_1">A.1  Terms</A></LI>
+<LI><A HREF="#5_2">A.2  Acronyms</A></LI>
 </UL>
 <HR>
-<H1><A NAME="1">1 Scope</A></H1>
-<H2><A NAME="1_1">1.1 Identification</A></H2>
-<P>This software test plan provides detailed tests that are used to 
+<H1><A NAME="1">1  Scope</A></H1>
+<H2><A NAME="1_1">1.1  Identification</A></H2>
+<P> This software test plan provides detailed tests that are used to 
 evaluate the stability of the Common UNIX Printing System (&quot;CUPS&quot;) 
 Version 1.1. </P>
-<H2><A NAME="1_2">1.2 System Overview</A></H2>
-<P>CUPS provides a portable printing layer for UNIX&reg;-based operating 
+<H2><A NAME="1_2">1.2  System Overview</A></H2>
+<P> CUPS provides a portable printing layer for UNIX&reg;-based operating 
 systems. It has been developed by <A HREF="http://www.easysw.com">Easy 
 Software Products</A> to promote a standard printing solution for all 
 UNIX vendors and users. CUPS provides the System V and Berkeley 
 command-line interfaces. </P>
-<P>CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
+<P> CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
 managing print jobs and queues. The Line Printer Daemon (&quot;LPD&quot;) Server 
 Message Block (&quot;SMB&quot;), and AppSocket (a.k.a. JetDirect) protocols are 
 also supported with reduced functionality. CUPS adds network printer 
 browsing and PostScript Printer Description (&quot;PPD&quot;) based printing 
 options to support real-world printing under UNIX. </P>
-<P>CUPS also includes a customized version of GNU Ghostscript 
+<P> CUPS also includes a customized version of GNU Ghostscript 
 (currently based off GNU Ghostscript 5.50) and an image file RIP that 
 are used to support non-PostScript printers. Sample drivers for HP and 
 EPSON printers are included that use these filters. </P>
-<H2><A NAME="1_3">1.3 Document Overview</A></H2>
-<P>This software test plan is organized into the following sections: </P>
+<H2><A NAME="1_3">1.3  Document Overview</A></H2>
+<P> This software test plan is organized into the following sections: </P>
 <UL>
-<LI>1 - Scope</LI>
-<LI>2 - References</LI>
-<LI>3 - Local Tests</LI>
-<LI>4 - Remote Tests</LI>
-<LI>A - Glossary</LI>
+<LI> 1 - Scope</LI>
+<LI> 2 - References</LI>
+<LI> 3 - Local Tests</LI>
+<LI> 4 - Remote Tests</LI>
+<LI> A - Glossary</LI>
 </UL>
-<H1><A NAME="2">2 References</A></H1>
-<H2><A NAME="2_1">2.1 CUPS Documentation</A></H2>
-<P>The following CUPS documentation is referenced by this document: </P>
+<H1><A NAME="2">2  References</A></H1>
+<H2><A NAME="2_1">2.1  CUPS Documentation</A></H2>
+<P> The following CUPS documentation is referenced by this document: </P>
 <UL>
-<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
-<LI>CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
-<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
-<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
-<LI>CUPS-SDD-1.1: CUPS Software Design Description </LI>
-<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
-<LI>CUPS-SSR-1.1: CUPS Software Security Report </LI>
-<LI>CUPS-STP-1.1: CUPS Software Test Plan </LI>
-<LI>CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
-<LI>CUPS-SVD-1.1: CUPS Software Version Description </LI>
+<LI> CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
+<LI> CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
+<LI> CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
+<LI> CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
+<LI> CUPS-SDD-1.1: CUPS Software Design Description </LI>
+<LI> CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
+<LI> CUPS-SSR-1.1: CUPS Software Security Report </LI>
+<LI> CUPS-STP-1.1: CUPS Software Test Plan </LI>
+<LI> CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
+<LI> CUPS-SVD-1.1.x: CUPS Software Version Description </LI>
 </UL>
-<H2><A NAME="2_2">2.2 Other Documents</A></H2>
-<P>The following non-CUPS documents are referenced by this document: </P>
+<H2><A NAME="2_2">2.2  Other Documents</A></H2>
+<P> The following non-CUPS documents are referenced by this document: </P>
 <UL>
 <LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
-Adobe  PostScript Printer Description File Format Specification, 
+ Adobe  PostScript Printer Description File Format Specification, 
 Version 4.3.</A></LI>
 <LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">
-Adobe  PostScript Language Reference, Third Edition.</A></LI>
-<LI>IPP: Job and Printer Set Operations </LI>
-<LI>IPP/1.1: Encoding and Transport </LI>
-<LI>IPP/1.1: Implementers Guide </LI>
-<LI>IPP/1.1: Model and Semantics </LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line 
+ Adobe  PostScript Language Reference, Third Edition.</A></LI>
+<LI> IPP: Job and Printer Set Operations </LI>
+<LI> IPP/1.1: Encoding and Transport </LI>
+<LI> IPP/1.1: Implementers Guide </LI>
+<LI> IPP/1.1: Model and Semantics </LI>
+<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt"> RFC 1179, Line 
 Printer Daemon Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt"> RFC 2567, Design 
 Goals for an Internet Printing Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt"> RFC 2568, Rationale 
 for the Structure of the Model and Protocol</A> for the Internet 
 Printing Protocol</LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt"> RFC 2569, Mapping 
 between LPD and IPP Protocols</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt"> RFC 2616, Hypertext 
 Transfer Protocol -- HTTP/1.1</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt"> RFC 2617, HTTP 
 Authentication: Basic and Digest Access</A> Authentication </LI>
 </UL>
-<H1><A NAME="3">3 Local Tests</A></H1>
-<H1><A NAME="4">4 Remote Tests</A></H1>
-<H1 TYPE="A" VALUE="1"><A NAME="5">A Glossary</A></H1>
-<H2><A NAME="5_1">A.1 Terms</A></H2>
+<H1><A NAME="3">3  Local Tests</A></H1>
+<H1><A NAME="4">4  Remote Tests</A></H1>
+<H1 TYPE="A" VALUE="1"><A NAME="5">A  Glossary</A></H1>
+<H2><A NAME="5_1">A.1  Terms</A></H2>
 <DL>
-<DT>C </DT>
-<DD>A computer language. </DD>
-<DT>parallel </DT>
-<DD>Sending or receiving data more than 1 bit at a time. </DD>
-<DT>pipe </DT>
-<DD>A one-way communications channel between two programs. </DD>
-<DT>serial </DT>
-<DD>Sending or receiving data 1 bit at a time. </DD>
-<DT>socket </DT>
-<DD>A two-way network communications channel. </DD>
+<DT> C </DT>
+<DD> A computer language. </DD>
+<DT> parallel </DT>
+<DD> Sending or receiving data more than 1 bit at a time. </DD>
+<DT> pipe </DT>
+<DD> A one-way communications channel between two programs. </DD>
+<DT> serial </DT>
+<DD> Sending or receiving data 1 bit at a time. </DD>
+<DT> socket </DT>
+<DD> A two-way network communications channel. </DD>
 </DL>
-<H2><A NAME="5_2">A.2 Acronyms</A></H2>
+<H2><A NAME="5_2">A.2  Acronyms</A></H2>
 <DL>
-<DT>ASCII </DT>
-<DD>American Standard Code for Information Interchange </DD>
-<DT>CUPS </DT>
-<DD>Common UNIX Printing System </DD>
-<DT>ESC/P </DT>
-<DD>EPSON Standard Code for Printers </DD>
-<DT>FTP </DT>
-<DD>File Transfer Protocol </DD>
-<DT>HP-GL </DT>
-<DD>Hewlett-Packard Graphics Language </DD>
-<DT>HP-PCL </DT>
-<DD>Hewlett-Packard Page Control Language </DD>
-<DT>HP-PJL </DT>
-<DD>Hewlett-Packard Printer Job Language </DD>
-<DT>IETF </DT>
-<DD>Internet Engineering Task Force </DD>
-<DT>IPP </DT>
-<DD>Internet Printing Protocol </DD>
-<DT>ISO </DT>
-<DD>International Standards Organization </DD>
-<DT>LPD </DT>
-<DD>Line Printer Daemon </DD>
-<DT>MIME </DT>
-<DD>Multimedia Internet Mail Exchange </DD>
-<DT>PPD </DT>
-<DD>PostScript Printer Description </DD>
-<DT>SMB </DT>
-<DD>Server Message Block </DD>
-<DT>TFTP </DT>
-<DD>Trivial File Transfer Protocol </DD>
+<DT> ASCII </DT>
+<DD> American Standard Code for Information Interchange </DD>
+<DT> CUPS </DT>
+<DD> Common UNIX Printing System </DD>
+<DT> ESC/P </DT>
+<DD> EPSON Standard Code for Printers </DD>
+<DT> FTP </DT>
+<DD> File Transfer Protocol </DD>
+<DT> HP-GL </DT>
+<DD> Hewlett-Packard Graphics Language </DD>
+<DT> HP-PCL </DT>
+<DD> Hewlett-Packard Page Control Language </DD>
+<DT> HP-PJL </DT>
+<DD> Hewlett-Packard Printer Job Language </DD>
+<DT> IETF </DT>
+<DD> Internet Engineering Task Force </DD>
+<DT> IPP </DT>
+<DD> Internet Printing Protocol </DD>
+<DT> ISO </DT>
+<DD> International Standards Organization </DD>
+<DT> LPD </DT>
+<DD> Line Printer Daemon </DD>
+<DT> MIME </DT>
+<DD> Multimedia Internet Mail Exchange </DD>
+<DT> PPD </DT>
+<DD> PostScript Printer Description </DD>
+<DT> SMB </DT>
+<DD> Server Message Block </DD>
+<DT> TFTP </DT>
+<DD> Trivial File Transfer Protocol </DD>
 </DL>
 </BODY>
 </HTML>
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000731155420Z)/Title( CUPS Software Users Manual)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000721160144Z)/Title( CUPS Software Users Manual)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 128/Euro 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Bold/Encoding 2 0 R>>endobj
@@ -1293,7 +1293,7 @@ xref
 0000025205 00000 n 
 0000025226 00000 n 
 0000025420 00000 n 
-0000026543 00000 n 
+0000026543 00000 n 
 0000026565 00000 n 
 0000026707 00000 n 
 0000027133 00000 n 
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000731155427Z)/Title( CUPS Software Version Description)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.8 Copyright 1997-2000 Easy Software Products, All Rights Reserved.)/CreationDate(D:20000721160150Z)/Title( CUPS Software Version Description)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 128/Euro 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Bold/Encoding 2 0 R>>endobj
@@ -540,7 +540,7 @@ xref
 0000018547 00000 n 
 0000018734 00000 n 
 0000018755 00000 n 
-0000018910 00000 n 
+0000018910 00000 n 
 0000020311 00000 n 
 0000020333 00000 n 
 0000020446 00000 n 
@@ -229,9 +229,9 @@ update_transform(void)
  if (FitPlot)
  {
    if (Rotation == 0 || Rotation == 180)
-      PenScaling = page_width / PlotSize[1];
+      PenScaling *= page_width / PlotSize[1];
    else
-      PenScaling = page_width / PlotSize[0];
+      PenScaling *= page_width / PlotSize[0];
  }
  else
    PenScaling = 1.0;
@@ -98,52 +98,14 @@ main(int  argc,		/* I - Number of command-line arguments */
  int		hue, sat;	/* Hue and saturation adjustment */
  int		realcopies;	/* Real copies being printed */
  float		left, top;	/* Left and top of image */
-  char		filename[1024];	/* Name of file to print */


- /*
-  * Check arguments...
-  */
-
-  if (argc < 6 || argc > 7)
+  if (argc != 7)
  {
-    fputs("ERROR: imagetops job-id user title copies options [file]\n", stderr);
+    fputs("ERROR: imagetops job-id user title copies options file\n", stderr);
    return (1);
  }

-  fprintf(stderr, "INFO: %s %s %s %s %s %s %s\n", argv[0], argv[1], argv[2],
-          argv[3], argv[4], argv[5], argv[6] ? argv[6] : "(null)");
-
- /*
-  * Copy stdin as needed...
-  */
-
-  if (argc == 6)
-  {
-    FILE	*fp;		/* File to read from */
-    char	buffer[8192];	/* Buffer to read into */
-    int		bytes;		/* # of bytes to read */
-
-
-    if ((fp = fopen(cupsTempFile(filename, sizeof(filename)), "w")) == NULL)
-    {
-      perror("ERROR: Unable to copy image file");
-      return (1);
-    }
-
-    fprintf(stderr, "DEBUG: imagetops - copying to temp print file \"%s\"\n",
-            filename);
-
-    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      fwrite(buffer, 1, bytes, fp);
-    fclose(fp);
-  }
-  else
-  {
-    strncpy(filename, argv[6], sizeof(filename) - 1);
-    filename[sizeof(filename) - 1] = '\0';
-  }
-
 /*
  * Process command-line options and write the prolog...
  */
@@ -255,12 +217,7 @@ main(int  argc,		/* I - Number of command-line arguments */

  colorspace = ColorDevice ? IMAGE_RGB : IMAGE_WHITE;

-  img = ImageOpen(filename, colorspace, IMAGE_WHITE, sat, hue, NULL);
-
-  if (argc == 6)
-    unlink(filename);
-
-  if (img == NULL)
+  if ((img = ImageOpen(argv[6], colorspace, IMAGE_WHITE, sat, hue, NULL)) == NULL)
  {
    fputs("ERROR: Unable to open image file for printing!\n", stderr);
    ppdClose(ppd);
@@ -24,8 +24,6 @@
 * Contents:
 *
 *   main()          - Main entry...
- *   exec_code()     - Execute PostScript setpagedevice commands as
- *                     appropriate.
 *   format_CMY()    - Convert image data to CMY.
 *   format_CMYK()   - Convert image data to CMYK.
 *   format_K()      - Convert image data to black.
@@ -42,6 +40,10 @@
 * Include necessary headers...
 */

+/*
+ * Include necessary headers...
+ */
+
 #include "common.h"
 #include "image.h"
 #include "raster.h"
@@ -121,7 +123,7 @@ int	Planes[] =	/* Number of planes for each colorspace */
 * Local functions...
 */
 
-static void	exec_code(cups_page_header_t *header, const char *code);
+static void	exec_choice(cups_page_header_t *header, ppd_choice_t *choice);
 static void	format_CMY(cups_page_header_t *header, unsigned char *row, int y, int z, int xsize, int ysize, int yerr0, int yerr1, ib_t *r0, ib_t *r1);
 static void	format_CMYK(cups_page_header_t *header, unsigned char *row, int y, int z, int xsize, int ysize, int yerr0, int yerr1, ib_t *r0, ib_t *r1);
 static void	format_K(cups_page_header_t *header, unsigned char *row, int y, int z, int xsize, int ysize, int yerr0, int yerr1, ib_t *r0, ib_t *r1);
@@ -164,9 +166,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  int		x0, y0,		/* Corners of the page in image coords */
 		x1, y1;
  ppd_file_t	*ppd;		/* PPD file */
-  ppd_choice_t	*choice,	/* PPD option choice */
-		**choices;	/* List of marked choices */
-  int		count;		/* Number of marked choices */
+  ppd_choice_t	*choice;	/* PPD option choice */
  char		*resolution,	/* Output resolution */
 		*media_type;	/* Media type */
  ppd_profile_t	*profile;	/* Color profile */
@@ -198,51 +198,16 @@ main(int  argc,		/* I - Number of command-line arguments */
  ib_t		lut[256];	/* Gamma/brightness LUT */
  int		plane,		/* Current color plane */
 		num_planes;	/* Number of color planes */
-  char		filename[1024];	/* Name of file to print */


- /*
-  * Check arguments...
-  */
-
-  if (argc < 6 || argc > 7)
+  if (argc != 7)
  {
-    fputs("ERROR: imagetoraster job-id user title copies options [file]\n", stderr);
+    fputs("ERROR: imagetoraster job-id user title copies options file\n", stderr);
    return (1);
  }

  fprintf(stderr, "INFO: %s %s %s %s %s %s %s\n", argv[0], argv[1], argv[2],
-          argv[3], argv[4], argv[5], argv[6] ? argv[6] : "(null)");
-
- /*
-  * Copy stdin as needed...
-  */
-
-  if (argc == 6)
-  {
-    FILE	*fp;		/* File to read from */
-    char	buffer[8192];	/* Buffer to read into */
-    int		bytes;		/* # of bytes to read */
-
-
-    if ((fp = fopen(cupsTempFile(filename, sizeof(filename)), "w")) == NULL)
-    {
-      perror("ERROR: Unable to copy image file");
-      return (1);
-    }
-
-    fprintf(stderr, "DEBUG: imagetoraster - copying to temp print file \"%s\"\n",
-            filename);
-
-    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      fwrite(buffer, 1, bytes, fp);
-    fclose(fp);
-  }
-  else
-  {
-    strncpy(filename, argv[6], sizeof(filename) - 1);
-    filename[sizeof(filename) - 1] = '\0';
-  }
+          argv[3], argv[4], argv[5], argv[6]);

 /*
  * Process command-line options and write the prolog...
@@ -360,36 +325,33 @@ main(int  argc,		/* I - Number of command-line arguments */
  header.cupsColorOrder   = CUPS_ORDER_CHUNKED;
  header.cupsColorSpace   = CUPS_CSPACE_K;

-  if (ppd->patches)
-    exec_code(&header, ppd->patches);
+  if ((choice = ppdFindMarkedChoice(ppd, "ColorModel")) != NULL)
+    exec_choice(&header, choice);

-  if ((count = ppdCollect(ppd, PPD_ORDER_DOCUMENT, &choices)) > 0)
-    for (i = 0; i < count; i ++)
-      exec_code(&header, choices[i]->code);
+  if ((choice = ppdFindMarkedChoice(ppd, "CutMedia")) != NULL)
+    exec_choice(&header, choice);

-  if ((count = ppdCollect(ppd, PPD_ORDER_ANY, &choices)) > 0)
-    for (i = 0; i < count; i ++)
-      exec_code(&header, choices[i]->code);
+  if ((choice = ppdFindMarkedChoice(ppd, "ESPFinishing")) != NULL)
+    exec_choice(&header, choice);

-  if ((count = ppdCollect(ppd, PPD_ORDER_PROLOG, &choices)) > 0)
-    for (i = 0; i < count; i ++)
-      exec_code(&header, choices[i]->code);
-
-  if ((count = ppdCollect(ppd, PPD_ORDER_PAGE, &choices)) > 0)
-    for (i = 0; i < count; i ++)
-      exec_code(&header, choices[i]->code);
-
- /*
-  * Get the media type and resolution that have been chosen...
-  */
+  if ((choice = ppdFindMarkedChoice(ppd, "InputSlot")) != NULL)
+    exec_choice(&header, choice);

  if ((choice = ppdFindMarkedChoice(ppd, "MediaType")) != NULL)
+  {
+    exec_choice(&header, choice);
+
    media_type = choice->choice;
+  }
  else
    media_type = "";

  if ((choice = ppdFindMarkedChoice(ppd, "Resolution")) != NULL)
+  {
+    exec_choice(&header, choice);
+
    resolution = choice->choice;
+  }
  else
    resolution = "";

@@ -555,12 +517,7 @@ main(int  argc,		/* I - Number of command-line arguments */

  fputs("INFO: Loading image file...\n", stderr);

-  img = ImageOpen(filename, primary, secondary, sat, hue, lut);
-
-  if (argc == 6)
-    unlink(filename);
-
-  if (img == NULL)
+  if ((img = ImageOpen(argv[6], primary, secondary, sat, hue, lut)) == NULL)
  {
    fputs("ERROR: Unable to open image file for printing!\n", stderr);
    ppdClose(ppd);
@@ -1206,19 +1163,20 @@ main(int  argc,		/* I - Number of command-line arguments */


 /*
- * 'exec_code()' - Execute PostScript setpagedevice commands as appropriate.
+ * 'exec_choice()' - Execute PostScript setpagedevice commands as appropriate.
 */

 static void
-exec_code(cups_page_header_t *header,	/* I - Page header */
-          const char         *code)	/* I - Option choice to execute */
+exec_choice(cups_page_header_t *header,	/* I - Page header */
+            ppd_choice_t       *choice)	/* I - Option choice to execute */
 {
-  char	*ptr,				/* Pointer into name/value string */
+  char	*code,				/* Pointer into code string */
+	*ptr,				/* Pointer into name/value string */
 	name[255],			/* Name of pagedevice entry */
 	value[1024];			/* Value of pagedevice entry */


-  for (; *code != '\0';)
+  for (code = choice->code; *code != '\0';)
  {
   /*
    * Search for the start of a dictionary name...
@@ -1276,7 +1234,7 @@ exec_code(cups_page_header_t *header,	/* I - Page header */
 	{
 	  code ++;
 	  if (isdigit(*code))
-	    *ptr++ = (char)strtol(code, (char **)&code, 8);
+	    *ptr++ = (char)strtol(code, &code, 8);
          else
 	    *ptr++ = *code++;
 	}
@@ -28,8 +28,7 @@ include ../Makedefs
 # PPD files...
 #

-FILES	=	deskjet.ppd epson9.ppd epson24.ppd laserjet.ppd \
-		stcolor.ppd stphoto.ppd
+FILES	=	deskjet.ppd laserjet.ppd stcolor.ppd stphoto.ppd

 #
 # Make everything...
@@ -65,13 +65,9 @@ install:
 	-$(MKDIR) $(SERVERROOT)/ppd
 	$(CHMOD) ugo+rx $(SERVERROOT)/ppd
 	-$(MKDIR) $(LOGDIR)
-	$(CHMOD) ugo+rx $(LOGDIR)
+	$(CHMOD) ugo+rx $(SERVERROOT)/interfaces
 	-$(MKDIR) $(REQUESTS)
-	$(CHMOD) u+rwx,go-a $(REQUESTS)
-	$(CHOWN) lp $(REQUESTS)
-	-$(MKDIR) $(REQUESTS)/tmp
-	$(CHMOD) u+rwx,go-a,+t $(REQUESTS)/tmp
-	$(CHOWN) lp $(REQUESTS)/tmp
+	$(CHMOD) ugo+rx $(SERVERROOT)/interfaces


 #
@@ -225,42 +225,17 @@ FindCert(const char *certificate)	/* I - Certificate */
 void
 InitCerts(void)
 {
-  FILE		*fp;			/* /dev/random file */
-  unsigned	seed;			/* Seed for random number generator */
-  struct timeval tod;			/* Time of day */
+  struct timeval	tod;	/* Time of day */


 /*
-  * Initialize the random number generator using the random device or
-  * the current time, as available...
+  * Initialize the random number generator using the current time,
+  * including milliseconds...
  */

-  if ((fp = fopen("/dev/random", "rb")) == NULL)
-  {
-   /*
-    * Get the time in usecs and use it as the initial seed...
-    */
+  gettimeofday(&tod, NULL);

-    gettimeofday(&tod, NULL);
-
-    seed = (unsigned)(tod.tv_sec + tod.tv_usec);
-  }
-  else
-  {
-   /*
-    * Read 4 random characters from the random device and use
-    * them as the seed...
-    */
-
-    seed = getc(fp);
-    seed = (seed << 8) | getc(fp);
-    seed = (seed << 8) | getc(fp);
-    seed = (seed << 8) | getc(fp);
-
-    fclose(fp);
-  }
-
-  srandom(seed);
+  srandom(tod.tv_sec + tod.tv_usec);

 /*
  * Create a root certificate and return...
@@ -359,20 +359,6 @@ ReadConfiguration(void)
  LogMessage(L_DEBUG, "ReadConfiguration() ConfigurationFile=\"%s\"",
             ConfigurationFile);

- /*
-  * Make sure the request and temporary directories have the right
-  * permissions...
-  */
-
-  chown(RequestRoot, User, Group);
-  chmod(RequestRoot, 0700);
-
-  if (strncmp(TempDir, RequestRoot, strlen(RequestRoot)) == 0)
-  {
-    chown(TempDir, User, Group);
-    chmod(TempDir, 01700);
-  }
-
 /*
  * Check the MaxClients setting, and then allocate memory for it...
  */
@@ -24,7 +24,6 @@
 * Contents:
 *
 *   main()             - Process an incoming LPD request...
- *   print_file()       - Print a file to a printer or class.
 *   recv_print_job()   - Receive a print job from the client.
 *   send_short_state() - Send the short queue state.
 *   remove_jobs()      - Cancel one or more jobs.
@@ -38,8 +37,6 @@
 #include <cups/string.h>
 #include <cups/language.h>
 #include <stdlib.h>
-#include <errno.h>
-#include <syslog.h>
 #include <ctype.h>


@@ -97,12 +94,6 @@ main(int  argc,		/* I - Number of command-line arguments */

  setbuf(stdout, NULL);

- /*
-  * Log things using the "cups-lpd" name...
-  */
-
-  openlog("cups-lpd", LOG_PID, LOG_LPR);
-
 /*
  * RFC1179 specifies that only 1 daemon command can be received for
  * every connection.
@@ -114,7 +105,6 @@ main(int  argc,		/* I - Number of command-line arguments */
    * Unable to get command from client!  Send an error status and return.
    */

-    syslog(LOG_ERR, "Unable to get command line from client!");
    putchar(1);
    return (1);
  }
@@ -139,8 +129,6 @@ main(int  argc,		/* I - Number of command-line arguments */
  switch (command)
  {
    default : /* Unknown command */
-        syslog(LOG_ERR, "Unknown LPD command 0x%02X!", command);
-        syslog(LOG_ERR, "Command line = %s", line);
 	putchar(1);

        status = 1;
@@ -187,14 +175,12 @@ main(int  argc,		/* I - Number of command-line arguments */
 	break;
  }

-  closelog();
-
  return (status);
 }


 /*
- * 'print_file()' - Print a file to a printer or class.
+ * 'prin_file()' - Print a file to a printer or class.
 */

 int					/* O - Job ID */
@@ -225,10 +211,7 @@ print_file(const char    *name,		/* I - Printer or class name */
  */

  if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
-  {
-    syslog(LOG_ERR, "Unable to connect to server: %s", strerror(errno));
    return (0);
-  }

  language = cupsLangDefault();

@@ -238,10 +221,7 @@ print_file(const char    *name,		/* I - Printer or class name */
  */

  if ((request = ippNew()) == NULL)
-  {
-    syslog(LOG_ERR, "Unable to create request: %s", strerror(errno));
    return (0);
-  }

  request->request.op.operation_id = IPP_PRINT_JOB;
  request->request.op.request_id   = 1;
@@ -461,11 +441,6 @@ recv_print_job(const char *dest)	/* I - Destination */
  num_dests = cupsGetDests(&dests);
  if ((destptr = cupsGetDest(queue, instance, num_dests, dests)) == NULL)
  {
-    if (instance)
-      syslog(LOG_ERR, "Unknown destination %s/%s!", queue, instance);
-    else
-      syslog(LOG_ERR, "Unknown destination %s!", queue);
-
    cupsFreeDests(num_dests, dests);
    return (1);
  }
@@ -494,7 +469,6 @@ recv_print_job(const char *dest)	/* I - Destination */
      case 0x02 : /* Receive control file */
          if (strlen(name) < 2)
 	  {
-	    syslog(LOG_ERR, "Bad control file name \"%s\"", name);
 	    putchar(1);
 	    status = 1;
 	    break;
@@ -505,7 +479,6 @@ recv_print_job(const char *dest)	/* I - Destination */
      case 0x03 : /* Receive data file */
          if (strlen(name) < 2)
 	  {
-	    syslog(LOG_ERR, "Bad data file name \"%s\"", name);
 	    putchar(1);
 	    status = 1;
 	    break;
@@ -532,8 +505,6 @@ recv_print_job(const char *dest)	/* I - Destination */

    if ((fp = fopen(filename, "wb")) == NULL)
    {
-      syslog(LOG_ERR, "Unable to open temporary file \"%s\" - %s",
-             filename, strerror(errno));
      putchar(1);
      status = 1;
      break;
@@ -162,7 +162,7 @@ LoadDevices(const char *d)	/* I - Directory to scan */

      alarm(30);
      count  = 0;
-      compat = strcmp(dent->d_name, "smb") == 0;
+      compat = 0;

      while (fgets(line, sizeof(line), fp) != NULL)
      {
@@ -178,10 +178,8 @@ LoadDevices(const char *d)	/* I - Directory to scan */
 	*   class URI "make model" "name"
 	*/

-        if (strncasecmp(line, "Usage", 5) == 0)
-	  compat = 1;
-        else if (sscanf(line, "%63s%1023s%*[ \t]\"%127[^\"]\"%*[ \t]\"%255[^\"]",
-	                dclass, uri, make_model, info) != 4)
+        if (sscanf(line, "%63s%1023s%*[ \t]\"%127[^\"]\"%*[ \t]\"%255[^\"]",
+	           dclass, uri, make_model, info) != 4)
        {
 	 /*
 	  * Bad format; strip trailing newline and write an error message.
@@ -3299,8 +3299,6 @@ print_job(client_t        *con,		/* I - Client connection */
        ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
 	             "document-format", NULL, mimetype);
    }
-    else
-      filetype = mimeType(MimeDatabase, super, type);
  }
  else
    filetype = mimeType(MimeDatabase, super, type);
@@ -4259,8 +4257,6 @@ send_document(client_t        *con,	/* I - Client connection */
        ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
 	             "document-format", NULL, mimetype);
    }
-    else
-      filetype = mimeType(MimeDatabase, super, type);
  }
  else
    filetype = mimeType(MimeDatabase, super, type);
@@ -4322,14 +4318,6 @@ send_document(client_t        *con,	/* I - Client connection */

    if (job->state->values[0].integer == IPP_JOB_STOPPED)
      job->state->values[0].integer = IPP_JOB_PENDING;
-    else if (job->state->values[0].integer == IPP_JOB_HELD)
-    {
-      if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
-	attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
-
-      if (attr == NULL || strcmp(attr->values[0].string.text, "no-hold") == 0)
-	job->state->values[0].integer = IPP_JOB_PENDING;
-    }

    SaveJob(job->id);
    CheckJobs();
@@ -4633,7 +4621,7 @@ set_job_attrs(client_t        *con,	/* I - Client connection */

      SetJobPriority(jobid, attr->values[0].integer);
    }
-    else if ((attr2 = ippFindAttribute(job->attrs, attr->name, IPP_TAG_ZERO)) != NULL)
+    else if ((attr2 = ippFindAttribute(job->attrs, attr->name, attr->value_tag)) != NULL)
    {
     /*
      * Some other value...
@@ -4659,13 +4647,11 @@ set_job_attrs(client_t        *con,	/* I - Client connection */
      _ipp_free_attr(attr2);
            
     /*
-      * See if the job-name or job-hold-until is being changed.
+      * See if the job-name is being changed.
      */

      if (strcmp(attr->name, "job-name") == 0)
        strncpy(job->title, attr->values[0].string.text, sizeof(job->title) - 1);
-      else if (strcmp(attr->name, "job-hold-until") == 0)
-        SetJobHoldUntil(job->id, attr->values[0].string.text);
    }
    else if (attr->value_tag == IPP_TAG_DELETEATTR)
    {
@@ -1207,20 +1207,21 @@ StartJob(int       id,		/* I - Job ID */

  envp[0]  = "PATH=/bin:/usr/bin";
  envp[1]  = "SOFTWARE=CUPS/1.1";
-  envp[2]  = "USER=root";
-  envp[3]  = charset;
-  envp[4]  = language;
-  envp[5]  = TZ;
-  envp[6]  = ppd;
-  envp[7]  = root;
-  envp[8]  = cache;
-  envp[9] = tmpdir;
-  envp[10] = content_type;
-  envp[11] = device_uri;
-  envp[12] = printer_name;
-  envp[13] = datadir;
+  envp[2]  = "TZ=GMT";
+  envp[3]  = "USER=root";
+  envp[4]  = charset;
+  envp[5]  = language;
+  envp[6]  = TZ;
+  envp[7]  = ppd;
+  envp[8]  = root;
+  envp[9]  = cache;
+  envp[10] = tmpdir;
+  envp[11] = content_type;
+  envp[12] = device_uri;
+  envp[13] = printer_name;
  envp[14] = ldpath;
-  envp[15] = NULL;
+  envp[15] = datadir;
+  envp[16] = NULL;

  DEBUG_puts(envp[0]);
  DEBUG_puts(envp[1]);
@@ -1236,7 +1237,6 @@ StartJob(int       id,		/* I - Job ID */
  DEBUG_puts(envp[11]);
  DEBUG_puts(envp[12]);
  DEBUG_puts(envp[13]);
-  DEBUG_puts(envp[14]);

  current->current_file ++;

@@ -507,16 +507,6 @@ load_convs(mime_t *mime,		/* I - MIME database */

    *temp = '\0';

-    if (strcmp(super, "*") == 0 && strcmp(type, "*") == 0)
-    {
-     /*
-      * Force * / * to be "application/octet-stream"...
-      */
-
-      strcpy(super, "application");
-      strcpy(type, "octet-stream");
-    }
-
   /*
    * Add the filter to the MIME database, supporting wildcards as needed...
    */
@@ -122,7 +122,7 @@ LoadPPDs(const char *d)		/* I - Directory to scan... */
    {
      fwrite(ppds, num_ppds, sizeof(ppd_info_t), fp);
      fclose(fp);
-      LogMessage(L_INFO, "LoadPPDs: Wrote %s (%d PPDs)...", filename, num_ppds);
+      LogMessage(L_INFO, "LoadPPDs: Wrote %s...", filename);
    }
    else
      LogMessage(L_ERROR, "LoadPPDs: Unable to write %s...", filename);
@@ -121,10 +121,9 @@ main(int  argc,		/* I - Number of command-line arguments */
            if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != NULL)
 	    {
 	      for (j = 0; j < dest->num_options; j ++)
-	        if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
-	          num_options = cupsAddOption(dest->options[j].name,
-		                              dest->options[j].value,
-					      num_options, &options);
+	        num_options = cupsAddOption(dest->options[j].name,
+		                            dest->options[j].value,
+					    num_options, &options);
 	    }
 	    break;

@@ -245,10 +244,9 @@ main(int  argc,		/* I - Number of command-line arguments */
 	printer = dests[j].name;

 	for (j = 0; j < dest->num_options; j ++)
-	  if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
-	    num_options = cupsAddOption(dest->options[j].name,
-		                        dest->options[j].value,
-					num_options, &options);
+	  num_options = cupsAddOption(dest->options[j].name,
+		                      dest->options[j].value,
+				      num_options, &options);
        break;
      }
  }
@@ -1,21 +0,0 @@
-# Get devices using CUPS-get-devices
-{
-	# The name of the test...
-	NAME "Get devices using CUPS-get-devices"
-
-	# The resource to use for the POST
-	# RESOURCE /admin
-
-	# The operation to use
-	OPERATION CUPS-get-devices
-
-	# Attributes, starting in the operation group...
-	GROUP operation
-	ATTR charset attributes-charset us-ascii
-	ATTR language attributes-natural-language en
-	ATTR uri printer-uri $uri
-
-	# What statuses are OK?
-	STATUS ok
-	STATUS ok-subst
-}
@@ -2,7 +2,39 @@
 # and cancelling it.
 {
 	# The name of the test...
-	NAME "Get job info with get-job-attributes"
+	NAME "Print test page using print-job"
+
+	# The resource to use for the POST
+	# RESOURCE /admin
+
+	# The operation to use
+	OPERATION print-job
+
+	# Attributes, starting in the operation group...
+	GROUP operation
+	ATTR charset attributes-charset us-ascii
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR mimetype document-format application/postscript
+	ATTR keyword job-hold-until indefinite
+
+	GROUP job
+	ATTR integer copies 1
+
+	FILE ../data/testprint.ps
+
+	# What statuses are OK?
+	STATUS ok
+	STATUS ok-subst
+
+	# What attributes do we expect?
+	EXPECT job-id
+	EXPECT job-uri
+}
+{
+	# The name of the test...
+	NAME "... get-job-attributes"

 	# The resource to use for the POST
 	# RESOURCE /admin
@@ -14,7 +46,8 @@
 	GROUP operation
 	ATTR charset attributes-charset us-ascii
 	ATTR language attributes-natural-language en
-	ATTR uri job-uri $uri
+	ATTR uri printer-uri $uri
+	ATTR integer job-id $job-id

 	# What statuses are OK?
 	STATUS ok
@@ -24,3 +57,24 @@
 	EXPECT job-uri
 	EXPECT job-state
 }
+{
+	# The name of the test...
+	NAME "... cancel-job"
+
+	# The resource to use for the POST
+	# RESOURCE /admin
+
+	# The operation to use
+	OPERATION cancel-job
+
+	# Attributes, starting in the operation group...
+	GROUP operation
+	ATTR charset attributes-charset us-ascii
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR integer job-id $job-id
+	ATTR name requesting-user-name $user
+
+	# What statuses are OK?
+	STATUS ok
+}
@@ -1,21 +0,0 @@
-# Get PPD files using CUPS-get-ppds
-{
-	# The name of the test...
-	NAME "Get PPD files using CUPS-get-ppds"
-
-	# The resource to use for the POST
-	# RESOURCE /admin
-
-	# The operation to use
-	OPERATION CUPS-get-ppds
-
-	# Attributes, starting in the operation group...
-	GROUP operation
-	ATTR charset attributes-charset us-ascii
-	ATTR language attributes-natural-language en
-	ATTR uri printer-uri $uri
-
-	# What statuses are OK?
-	STATUS ok
-	STATUS ok-subst
-}