From 87030afb3aa8735848c66a0526d06af69d7010c6 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 26 Apr 2019 23:10:09 -0400 Subject: [PATCH] Greatly simplify the man page handling. --- Makedefs.in | 8 - Makefile | 23 +- config-scripts/cups-dnssd.m4 | 6 +- config-scripts/cups-manpages.m4 | 51 +-- configure | 294 ++++++++---------- configure.ac | 7 - doc/Makefile | 10 - doc/help/man-backend.html | 75 +++-- doc/help/man-cancel.html | 12 +- doc/help/man-classes.conf.html | 22 +- doc/help/man-client.conf.html | 6 +- doc/help/man-cups-config.html | 13 +- doc/help/man-cups-files.conf.html | 22 +- doc/help/man-cups-lpd.html | 11 +- doc/help/man-cups-snmp.conf.html | 12 +- doc/help/man-cups-snmp.html | 14 +- doc/help/man-cups.html | 34 +- doc/help/man-cupsaccept.html | 12 +- doc/help/man-cupsctl.html | 6 +- doc/help/man-cupsd-helper.html | 26 +- doc/help/man-cupsd-logs.html | 18 +- doc/help/man-cupsd.conf.html | 38 +-- doc/help/man-cupsd.html | 26 +- doc/help/man-cupsenable.html | 12 +- doc/help/man-cupsfilter.html | 19 +- doc/help/man-cupstestppd.html | 8 +- doc/help/man-filter.html | 19 +- doc/help/man-ippevepcl.html | 4 +- doc/help/man-ippeveprinter.html | 4 +- doc/help/man-ippfind.html | 4 +- doc/help/man-ipptool.html | 6 +- doc/help/man-ipptoolfile.html | 48 +-- doc/help/man-lp.html | 22 +- doc/help/man-lpadmin.html | 31 +- doc/help/man-lpc.html | 25 +- doc/help/man-lpinfo.html | 10 +- doc/help/man-lpmove.html | 10 +- doc/help/man-lpoptions.html | 22 +- doc/help/man-lpq.html | 12 +- doc/help/man-lpr.html | 22 +- doc/help/man-lprm.html | 12 +- doc/help/man-lpstat.html | 12 +- doc/help/man-mailto.conf.html | 4 +- doc/help/man-mime.convs.html | 18 +- doc/help/man-mime.types.html | 12 +- doc/help/man-notifier.html | 8 +- doc/help/man-ppdc.html | 16 +- doc/help/man-ppdcfile.html | 20 +- doc/help/man-ppdhtml.html | 16 +- doc/help/man-ppdi.html | 16 +- doc/help/man-ppdmerge.html | 17 +- doc/help/man-ppdpo.html | 14 +- doc/help/man-printers.conf.html | 17 +- doc/help/man-subscriptions.conf.html | 23 +- man/Makefile | 156 +++++----- man/{backend.man => backend.7} | 70 +++-- man/{cancel.man => cancel.1} | 11 +- man/{classes.conf.man => classes.conf.5} | 17 +- man/{client.conf.man.in => client.conf.5} | 13 +- man/{cups-config.man => cups-config.1} | 20 +- ...ps-files.conf.man.in => cups-files.conf.5} | 6 +- man/{cups-lpd.man.in => cups-lpd.8} | 16 +- man/{cups-snmp.man.in => cups-snmp.8} | 8 +- man/{cups-snmp.conf.man => cups-snmp.conf.5} | 12 +- man/{cups.man => cups.1} | 15 +- man/{cupsaccept.man => cupsaccept.8} | 13 +- man/{cupsctl.man => cupsctl.8} | 11 +- man/{cupsd-helper.man => cupsd-helper.8} | 15 +- man/{cupsd-logs.man => cupsd-logs.5} | 8 +- man/{cupsd.man.in => cupsd.8} | 11 +- man/{cupsd.conf.man.in => cupsd.conf.5} | 6 +- man/{cupsenable.man => cupsenable.8} | 11 +- man/{cupsfilter.man => cupsfilter.8} | 15 +- man/{cupstestppd.man => cupstestppd.1} | 15 +- man/{filter.man => filter.7} | 15 +- man/{ippevepcl.man => ippevepcl.7} | 0 man/{ippeveprinter.man => ippeveprinter.1} | 0 man/{ippfind.man => ippfind.1} | 6 +- man/{ipptool.man => ipptool.1} | 9 +- man/{ipptoolfile.man => ipptoolfile.5} | 9 +- man/{lp.man => lp.1} | 6 +- man/{lpadmin.man => lpadmin.8} | 15 +- man/{lpc.man => lpc.8} | 15 +- man/{lpinfo.man => lpinfo.8} | 17 +- man/{lpmove.man => lpmove.8} | 11 +- man/{lpoptions.man.in => lpoptions.1} | 9 +- man/{lpq.man => lpq.1} | 11 +- man/{lpr.man => lpr.1} | 6 +- man/{lprm.man => lprm.1} | 11 +- man/{lpstat.man => lpstat.1} | 6 +- man/{mailto.conf.man => mailto.conf.5} | 11 +- man/{mime.convs.man => mime.convs.5} | 17 +- man/{mime.types.man => mime.types.5} | 11 +- man/{notifier.man => notifier.7} | 11 +- man/{ppdc.man => ppdc.1} | 15 +- man/{ppdcfile.man => ppdcfile.5} | 17 +- man/{ppdhtml.man => ppdhtml.1} | 15 +- man/{ppdi.man => ppdi.1} | 15 +- man/{ppdmerge.man => ppdmerge.1} | 15 +- man/{ppdpo.man => ppdpo.1} | 15 +- man/{printers.conf.man => printers.conf.5} | 7 +- ...riptions.conf.man => subscriptions.conf.5} | 18 +- 102 files changed, 1036 insertions(+), 955 deletions(-) rename man/{backend.man => backend.7} (72%) rename man/{cancel.man => cancel.1} (89%) rename man/{classes.conf.man => classes.conf.5} (60%) rename man/{client.conf.man.in => client.conf.5} (94%) rename man/{cups-config.man => cups-config.1} (84%) rename man/{cups-files.conf.man.in => cups-files.conf.5} (98%) rename man/{cups-lpd.man.in => cups-lpd.8} (91%) rename man/{cups-snmp.man.in => cups-snmp.8} (92%) rename man/{cups-snmp.conf.man => cups-snmp.conf.5} (84%) rename man/{cups.man => cups.1} (92%) rename man/{cupsaccept.man => cupsaccept.8} (87%) rename man/{cupsctl.man => cupsctl.8} (90%) rename man/{cupsd-helper.man => cupsd-helper.8} (79%) rename man/{cupsd-logs.man => cupsd-logs.5} (97%) rename man/{cupsd.man.in => cupsd.8} (91%) rename man/{cupsd.conf.man.in => cupsd.conf.5} (99%) rename man/{cupsenable.man => cupsenable.8} (91%) rename man/{cupsfilter.man => cupsfilter.8} (87%) rename man/{cupstestppd.man => cupstestppd.1} (89%) rename man/{filter.man => filter.7} (95%) rename man/{ippevepcl.man => ippevepcl.7} (100%) rename man/{ippeveprinter.man => ippeveprinter.1} (100%) rename man/{ippfind.man => ippfind.1} (98%) rename man/{ipptool.man => ipptool.1} (97%) rename man/{ipptoolfile.man => ipptoolfile.5} (99%) rename man/{lp.man => lp.1} (97%) rename man/{lpadmin.man => lpadmin.8} (94%) rename man/{lpc.man => lpc.8} (79%) rename man/{lpinfo.man => lpinfo.8} (82%) rename man/{lpmove.man => lpmove.8} (85%) rename man/{lpoptions.man.in => lpoptions.1} (94%) rename man/{lpq.man => lpq.1} (86%) rename man/{lpr.man => lpr.1} (97%) rename man/{lprm.man => lprm.1} (86%) rename man/{lpstat.man => lpstat.1} (96%) rename man/{mailto.conf.man => mailto.conf.5} (87%) rename man/{mime.convs.man => mime.convs.5} (79%) rename man/{mime.types.man => mime.types.5} (95%) rename man/{notifier.man => notifier.7} (81%) rename man/{ppdc.man => ppdc.1} (85%) rename man/{ppdcfile.man => ppdcfile.5} (89%) rename man/{ppdhtml.man => ppdhtml.1} (71%) rename man/{ppdi.man => ppdi.1} (74%) rename man/{ppdmerge.man => ppdmerge.1} (71%) rename man/{ppdpo.man => ppdpo.1} (75%) rename man/{printers.conf.man => printers.conf.5} (83%) rename man/{subscriptions.conf.man => subscriptions.conf.5} (58%) diff --git a/Makedefs.in b/Makedefs.in index 9799e20b0..e345e2fd1 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -223,7 +223,6 @@ top_srcdir = @top_srcdir@ BUILDROOT = $(DSTROOT)$(DESTDIR) -AMANDIR = $(BUILDROOT)@AMANDIR@ BINDIR = $(BUILDROOT)@bindir@ BUNDLEDIR = @CUPS_BUNDLEDIR@ CACHEDIR = $(BUILDROOT)@CUPS_CACHEDIR@ @@ -236,7 +235,6 @@ LOCALEDIR = $(BUILDROOT)@CUPS_LOCALEDIR@ LOGDIR = $(BUILDROOT)@CUPS_LOGDIR@ MANDIR = $(BUILDROOT)@mandir@ MENUDIR = @MENUDIR@ -PMANDIR = $(BUILDROOT)@PMANDIR@ PRIVATEINCLUDE = $(BUILDROOT)@PRIVATEINCLUDE@ RCLEVELS = @RCLEVELS@ RCSTART = @RCSTART@ @@ -248,12 +246,6 @@ SERVERBIN = $(BUILDROOT)@CUPS_SERVERBIN@ SERVERROOT = $(BUILDROOT)@CUPS_SERVERROOT@ STATEDIR = $(BUILDROOT)@CUPS_STATEDIR@ -MAN1EXT = @MAN1EXT@ -MAN5EXT = @MAN5EXT@ -MAN7EXT = @MAN7EXT@ -MAN8EXT = @MAN8EXT@ -MAN8DIR = @MAN8DIR@ - PAMDIR = @PAMDIR@ PAMFILE = @PAMFILE@ diff --git a/Makefile b/Makefile index 30dfa6016..15544627f 100644 --- a/Makefile +++ b/Makefile @@ -102,16 +102,14 @@ distclean: clean $(RM) Makedefs config.h config.log config.status $(RM) conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf $(RM) cups-config - $(RM) data/testprint $(RM) desktop/cups.desktop $(RM) doc/index.html - $(RM) man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man $(RM) packaging/cups.list $(RM) scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket $(RM) templates/header.tmpl -$(RM) doc/*/index.html -$(RM) templates/*/header.tmpl - -$(RM) -r autom4te*.cache clang cups/charmaps cups/locale + -$(RM) -r autom4te*.cache cups/charmaps cups/locale # @@ -125,25 +123,6 @@ depend: done -# -# Run the Clang static code analysis tool on the sources, available here: -# -# http://clang-analyzer.llvm.org -# -# At least checker-231 is required. -# -# Alternatively, use "--analyze -Xanalyzer -analyzer-output=text" for OPTIM (text -# output instead of HTML...) -# - -.PHONY: clang clang-changes -clang: - $(RM) -r clang - scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) clean all -clang-changes: - scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all - - # # Run the STACK tool on the sources, available here: # diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index daa398fd7..19832dc16 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -29,7 +29,7 @@ if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$host_os_name != xdarwin DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1)" AC_DEFINE(HAVE_AVAHI) else AC_MSG_RESULT(no) @@ -44,7 +44,7 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then AC_DEFINE(HAVE_DNSSD) DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" ;; *) # All others... @@ -62,7 +62,7 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then DNSSDLIBS="-ldns_sd" DNSSD_BACKEND="dnssd", IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" AC_MSG_RESULT(no)) LIBS="$SAVELIBS" ;; diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index b2a68a3f5..2277196ad 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -1,10 +1,11 @@ dnl dnl Manpage stuff for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. -dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. +dnl Copyright © 2007-2019 by Apple Inc. +dnl Copyright © 1997-2006 by Easy Software Products, all rights reserved. dnl -dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information. +dnl Licensed under Apache License v2.0. See the file "LICENSE" for more +dnl information. dnl dnl Fix "mandir" variable... @@ -19,54 +20,10 @@ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then darwin* | linux* | gnu* | *bsd*) # Darwin, macOS, Linux, GNU HURD, and *BSD mandir="/usr/share/man" - AMANDIR="/usr/share/man" - PMANDIR="/usr/share/man" ;; *) # All others mandir="/usr/man" - AMANDIR="/usr/man" - PMANDIR="/usr/man" ;; esac -else - AMANDIR="$mandir" - PMANDIR="$mandir" fi - -AC_SUBST(AMANDIR) -AC_SUBST(PMANDIR) - -dnl Setup manpage extensions... -case "$host_os_name" in - sunos*) - # Solaris - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=1m - MAN8DIR=1m - ;; - linux* | gnu* | darwin*) - # Linux, GNU Hurd, and macOS - MAN1EXT=1.gz - MAN5EXT=5.gz - MAN7EXT=7.gz - MAN8EXT=8.gz - MAN8DIR=8 - ;; - *) - # All others - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=8 - MAN8DIR=8 - ;; -esac - -AC_SUBST(MAN1EXT) -AC_SUBST(MAN5EXT) -AC_SUBST(MAN7EXT) -AC_SUBST(MAN8EXT) -AC_SUBST(MAN8DIR) diff --git a/configure b/configure index 109ffb5f4..a74b45053 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for CUPS 2.3b7. +# Generated by GNU Autoconf 2.69 for CUPS 2.3b7. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,21 +238,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -331,6 +359,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +547,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -695,13 +715,6 @@ LIBCUPS DSOFLAGS DSOXX DSO -MAN8DIR -MAN8EXT -MAN7EXT -MAN5EXT -MAN1EXT -PMANDIR -AMANDIR CUPS_STATEDIR CUPS_SERVERROOT INSTALL_SYSV @@ -1373,8 +1386,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1707,9 +1718,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF CUPS configure 2.3b7 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1860,7 +1871,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2171,7 +2182,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by CUPS $as_me 2.3b7, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2657,7 +2668,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CODE_SIGN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2733,7 +2744,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2781,7 +2792,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2825,7 +2836,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3269,8 +3280,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3520,7 +3530,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3564,7 +3574,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3766,7 +3776,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3806,7 +3816,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3859,7 +3869,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3899,7 +3909,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3939,7 +3949,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3979,7 +3989,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4019,7 +4029,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4059,7 +4069,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4099,7 +4109,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4139,7 +4149,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4179,7 +4189,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4219,7 +4229,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4259,7 +4269,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XDGOPEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4335,7 +4345,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4378,7 +4388,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4788,7 +4798,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4854,7 +4864,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -6469,59 +6479,16 @@ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then darwin* | linux* | gnu* | *bsd*) # Darwin, macOS, Linux, GNU HURD, and *BSD mandir="/usr/share/man" - AMANDIR="/usr/share/man" - PMANDIR="/usr/share/man" ;; *) # All others mandir="/usr/man" - AMANDIR="/usr/man" - PMANDIR="/usr/man" ;; esac -else - AMANDIR="$mandir" - PMANDIR="$mandir" fi - -case "$host_os_name" in - sunos*) - # Solaris - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=1m - MAN8DIR=1m - ;; - linux* | gnu* | darwin*) - # Linux, GNU Hurd, and macOS - MAN1EXT=1.gz - MAN5EXT=5.gz - MAN7EXT=7.gz - MAN8EXT=8.gz - MAN8DIR=8 - ;; - *) - # All others - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=8 - MAN8DIR=8 - ;; -esac - - - - - - - - - PICFLAG=1 DSOFLAGS="${DSOFLAGS:=}" @@ -7721,7 +7688,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7764,7 +7731,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8270,7 +8237,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8313,7 +8280,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8884,6 +8851,8 @@ _ACEOF esac rm -rf conftest* fi + + fi @@ -8984,7 +8953,7 @@ $as_echo "yes" >&6; } DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1)" $as_echo "#define HAVE_AVAHI 1" >>confdefs.h else @@ -9004,7 +8973,7 @@ if test "x$ac_cv_header_dns_sd_h" = xyes; then : DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" ;; *) # All others... @@ -9036,7 +9005,7 @@ $as_echo "yes" >&6; } DNSSD_BACKEND="dnssd" else IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9941,7 +9910,7 @@ fi -ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket templates/header.tmpl packaging/cups.list $LANGFILES" +ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket templates/header.tmpl packaging/cups.list $LANGFILES" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10350,16 +10319,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10419,28 +10388,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -10462,7 +10419,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by CUPS $as_me 2.3b7, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10525,10 +10482,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ CUPS config.status 2.3b7 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10617,7 +10574,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -10656,13 +10613,6 @@ do "cups-config") CONFIG_FILES="$CONFIG_FILES cups-config" ;; "desktop/cups.desktop") CONFIG_FILES="$CONFIG_FILES desktop/cups.desktop" ;; "doc/index.html") CONFIG_FILES="$CONFIG_FILES doc/index.html" ;; - "man/client.conf.man") CONFIG_FILES="$CONFIG_FILES man/client.conf.man" ;; - "man/cups-files.conf.man") CONFIG_FILES="$CONFIG_FILES man/cups-files.conf.man" ;; - "man/cups-lpd.man") CONFIG_FILES="$CONFIG_FILES man/cups-lpd.man" ;; - "man/cups-snmp.man") CONFIG_FILES="$CONFIG_FILES man/cups-snmp.man" ;; - "man/cupsd.conf.man") CONFIG_FILES="$CONFIG_FILES man/cupsd.conf.man" ;; - "man/cupsd.man") CONFIG_FILES="$CONFIG_FILES man/cupsd.man" ;; - "man/lpoptions.man") CONFIG_FILES="$CONFIG_FILES man/lpoptions.man" ;; "scheduler/cups-lpd.xinetd") CONFIG_FILES="$CONFIG_FILES scheduler/cups-lpd.xinetd" ;; "scheduler/cups.sh") CONFIG_FILES="$CONFIG_FILES scheduler/cups.sh" ;; "scheduler/cups.xml") CONFIG_FILES="$CONFIG_FILES scheduler/cups.xml" ;; diff --git a/configure.ac b/configure.ac index 9f5b41d5d..50828a05f 100644 --- a/configure.ac +++ b/configure.ac @@ -66,13 +66,6 @@ AC_OUTPUT(Makedefs cups-config desktop/cups.desktop doc/index.html - man/client.conf.man - man/cups-files.conf.man - man/cups-lpd.man - man/cups-snmp.man - man/cupsd.conf.man - man/cupsd.man - man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml diff --git a/doc/Makefile b/doc/Makefile index 7f8e70341..505701dbd 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -239,13 +239,3 @@ uninstall-languages: done install-langbundle: - - -# -# Install the docset bits locally... -# - -docset: - cp $(HELPFILES) ../org.cups.docset/Contents/Resources/Documentation/help - cp cups-printable.css ../org.cups.docset/Contents/Resources/Documentation - cp $(HELPIMAGES) ../org.cups.docset/Contents/Resources/Documentation/images diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html index c2c75ae91..953a26789 100644 --- a/doc/help/man-backend.html +++ b/doc/help/man-backend.html @@ -47,10 +47,11 @@ backend - cups backend transmission interfaces

Description

Backends are a special type of -filter(7) +filter(7) which is used to send print data to and discover different devices on the system.

Like filters, backends must be capable of reading from a filename on the command-line or from the standard input, copying the standard input to a temporary file as required by the physical interface. -

The command name (argv[0]) is set to the device URI of the destination printer. Authentication information in +

The command name (argv[0]) is set to the device URI of the destination printer. +Authentication information in argv[0] is removed, so backend developers are urged to use the DEVICE_URI @@ -66,7 +67,8 @@ function. The CUPS_SC_FD constant defines the file descriptor that should be monitored for incoming requests.

Device Discovery

-When run with no arguments, the backend should list the devices and schemes it supports or is advertising to the standard output. The output consists of zero or more lines consisting of any of the following forms: +When run with no arguments, the backend should list the devices and schemes it supports or is advertising to the standard output. +The output consists of zero or more lines consisting of any of the following forms:
 
     device-class scheme "Unknown" "device-info"
@@ -89,19 +91,24 @@ field is one of the following values:
 
The device-uri refers to a networked device and conforms to the general form for network URIs.
serial -
The device-uri refers to a serial device with configurable baud rate and other options. If the device-uri contains a baud value, it represents the maximum baud rate supported by the device. +
The device-uri refers to a serial device with configurable baud rate and other options. +If the device-uri contains a baud value, it represents the maximum baud rate supported by the device.

The scheme -field provides the URI scheme that is supported by the backend. Backends should use this form only when the backend supports any URI using that scheme. The +field provides the URI scheme that is supported by the backend. +Backends should use this form only when the backend supports any URI using that scheme. +The device-uri field specifies the full URI to use when communicating with the device.

The device-make-and-model -field specifies the make and model of the device, e.g. "Example Foojet 2000". If the make and model is not known, you must report "Unknown". +field specifies the make and model of the device, e.g. "Example Foojet 2000". +If the make and model is not known, you must report "Unknown".

The device-info -field specifies additional information about the device. Typically this includes the make and model along with the port number or network address, e.g. "Example Foojet 2000 USB #1". +field specifies additional information about the device. +Typically this includes the make and model along with the port number or network address, e.g. "Example Foojet 2000 USB #1".

The optional device-id field specifies the IEEE-1284 device ID string for the device, which is used to select a matching driver. @@ -109,7 +116,8 @@ field specifies the IEEE-1284 device ID string for the device, which is used to device-location field specifies the physical location of the device, which is often used to pre-populate the printer-location attribute when adding a printer.

Permissions

-Backends without world read and execute permissions are run as the root user. Otherwise, the backend is run using an unprivileged user account, typically "lp". +Backends without world read and execute permissions are run as the root user. +Otherwise, the backend is run using an unprivileged user account, typically "lp".

Exit Status

The following exit codes are defined for backends:
@@ -117,28 +125,35 @@ The following exit codes are defined for backends:
The print file was successfully transmitted to the device or remote server.
CUPS_BACKEND_FAILED

-The print file was not successfully transmitted to the device or remote server. The scheduler will respond to this by canceling the job, retrying the job, or stopping the queue depending on the state of the +The print file was not successfully transmitted to the device or remote server. +The scheduler will respond to this by canceling the job, retrying the job, or stopping the queue depending on the state of the printer-error-policy attribute.
CUPS_BACKEND_AUTH_REQUIRED -
The print file was not successfully transmitted because valid authentication information is required. The scheduler will respond to this by holding the job and adding the 'cups-held-for-authentication' keyword to the "job-reasons" Job Description attribute. +
The print file was not successfully transmitted because valid authentication information is required. +The scheduler will respond to this by holding the job and adding the 'cups-held-for-authentication' keyword to the "job-reasons" Job Description attribute.
CUPS_BACKEND_HOLD -
The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by holding the job. +
The print file was not successfully transmitted because it cannot be printed at this time. +The scheduler will respond to this by holding the job.
CUPS_BACKEND_STOP -
The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by stopping the queue. +
The print file was not successfully transmitted because it cannot be printed at this time. +The scheduler will respond to this by stopping the queue.
CUPS_BACKEND_CANCEL -
The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. The scheduler will respond to this by canceling the job. +
The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. +The scheduler will respond to this by canceling the job.
CUPS_BACKEND_RETRY -
The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job at a future time - other jobs may print before this one. +
The print file was not successfully transmitted because of a temporary issue. +The scheduler will retry the job at a future time - other jobs may print before this one.
CUPS_BACKEND_RETRY_CURRENT -
The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job immediately without allowing intervening jobs. +
The print file was not successfully transmitted because of a temporary issue. +The scheduler will retry the job immediately without allowing intervening jobs.

All other exit code values are reserved.

Environment

In addition to the environment variables listed in -cups(1) +cups(1) and -filter(7), +filter(7), CUPS backends can expect the following environment variable:
DEVICE_URI @@ -147,20 +162,28 @@ CUPS backends can expect the following environment variable:

Files

/etc/cups/cups-files.conf

Notes

-CUPS backends are not generally designed to be run directly by the user. Aside from the device URI issue ( +CUPS backends are not generally designed to be run directly by the user. +Aside from the device URI issue ( argv[0] and DEVICE_URI -environment variable contain the device URI), CUPS backends also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs. Backends can also be installed with restricted permissions (0500 or 0700) that tell the scheduler to run them as the "root" user instead of an unprivileged user (typically "lp") on the system. -

Unless you are a developer and know what you are doing, please do not run backends directly. Instead, use the -lp(1) +environment variable contain the device URI), CUPS backends also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs. +Backends can also be installed with restricted permissions (0500 or 0700) that tell the scheduler to run them as the "root" user instead of an unprivileged user (typically "lp") on the system. +

Unless you are a developer and know what you are doing, please do not run backends directly. +Instead, use the +lp(1) or -lpr(1) +lpr(1) programs to send print jobs or -lpinfo(8) -to query for available printers using the backend. The one exception is the SNMP backend - see -cups-snmp(8) +lpinfo(8) +to query for available printers using the backend. +The one exception is the SNMP backend - see +cups-snmp(8) for more information. +

Notes

+CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

cups(1), cups-files.conf(5), @@ -173,7 +196,7 @@ for more information.
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html index 8048ce9d3..c02f6f1ef 100644 --- a/doc/help/man-cancel.html +++ b/doc/help/man-cancel.html @@ -75,15 +75,15 @@ Cancel all jobs:

Notes

Administrators wishing to prevent unauthorized cancellation of jobs via the -u option should require authentication for Cancel-Jobs operations in -cupsd.conf(5). +cupsd.conf(5).

See Also

-cupsd.conf(5), -lp(1), -lpmove(8), -lpstat(1), +cupsd.conf(5), +lp(1), +lpmove(8), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html index d3be116c3..f30ec909e 100644 --- a/doc/help/man-classes.conf.html +++ b/doc/help/man-classes.conf.html @@ -10,21 +10,23 @@

Name

classes.conf - class configuration file for cups

Description

-The classes.conf file defines the local printer classes that are available. It is normally located in the /etc/cups directory and is maintained by the -cupsd(8) -program. This file is not intended to be edited or managed manually. +The classes.conf file defines the local printer classes that are available. +It is normally located in the /etc/cups directory and is maintained by the +cupsd(8) +program. +This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

-cupsd(8), -cupsd.conf(5), -mime.convs(5), -mime.types(5), -printers.conf(5), -subscriptions.conf(5), +cupsd(8), +cupsd.conf(5), +mime.convs(5), +mime.types(5), +printers.conf(5), +subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html index 4cf714c96..58b091fe0 100644 --- a/doc/help/man-client.conf.html +++ b/doc/help/man-client.conf.html @@ -8,7 +8,7 @@

client.conf(5)

Name

-client.conf - client configuration file for cups +client.conf - client configuration file for cups (deprecated on macos)

Description

The client.conf file configures the CUPS client and is normally located in the /etc/cups and/or ~/.cups directories. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. @@ -94,11 +94,11 @@ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption On Linux and other systems using GNU TLS, the /etc/cups/ssl/site.crl file, if present, provides a list of revoked X.509 certificates and is used when validating certificates.

See Also

-cups(1), +cups(1), default(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html index 821ade723..e8d025f73 100644 --- a/doc/help/man-cups-config.html +++ b/doc/help/man-cups-config.html @@ -61,9 +61,6 @@ The cups-config command accepts the following command-line options:
Reports the default CUPS data directory.
--help
Reports the program usage message. -
--image -
When used with --libs, adds the CUPS imaging library to the -list of libraries.
--ldflags
Reports the necessary linker options.
--libs @@ -90,11 +87,17 @@ Compile a simple one-file CUPS filter: cc `cups-config --cflags --ldflags` -o filter filter.c \ `cups-config --libs` +

Deprecated Options

+The following options are deprecated but continue to work for backwards compatibility: +
+
--image +
Formerly used to add the CUPS imaging library to the list of libraries. +

See Also

-cups(1), +cups(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index bc2900777..c567cbba7 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -11,7 +11,7 @@ cups-files.conf - file and directory configuration file for cups

Description

The cups-files.conf file configures the files and directories used by the CUPS scheduler, -cupsd(8). +cupsd(8). It is normally located in the /etc/cups directory.

Each line in the file can be a configuration directive, a blank line, or a comment. Configuration directives typically consist of a name and zero or more values separated by whitespace. @@ -19,7 +19,7 @@ The configuration directive name and values are case-insensitive. Comment lines start with the # character.

Directives

The following directives are understood by -cupsd(8): +cupsd(8):
AccessLog
AccessLog filename @@ -199,17 +199,17 @@ command, while on macOS the launchctl(8) command is used instead.

See Also

-classes.conf(5), -cups(1), -cupsd(8), -cupsd.conf(5), -mime.convs(5), -mime.types(5), -printers.conf(5), -subscriptions.conf(5), +classes.conf(5), +cups(1), +cupsd(8), +cupsd.conf(5), +mime.convs(5), +mime.types(5), +printers.conf(5), +subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html index 97ad2d34d..ad0e68ed0 100644 --- a/doc/help/man-cups-lpd.html +++ b/doc/help/man-cups-lpd.html @@ -8,7 +8,7 @@

cups-lpd(8)

Name

-cups-lpd - receive print jobs and report printer status to lpd clients +cups-lpd - receive print jobs and report printer status to lpd clients (deprecated)

Synopsis

cups-lpd [ @@ -55,6 +55,9 @@ Errors are sent to the system log. /System/Library/LaunchDaemons/org.cups.cups-lpd.plist

Notes

+The +cups-lpd +program is deprecated and will no longer be supported in a future feature release of CUPS.

Performance

cups-lpd performs well with small numbers of clients and printers. @@ -99,8 +102,8 @@ Simply enable the cups-lpd service using the corresponding control program.

See Also

-cups(1), -cupsd(8), +cups(1), +cupsd(8), inetconv(1m), inetd(8), launchd(8), @@ -108,7 +111,7 @@ service using the corresponding control program. CUPS Online Help (http://localhost:631/help), RFC 2569

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html index 72f1067c7..d61d8340f 100644 --- a/doc/help/man-cups-snmp.conf.html +++ b/doc/help/man-cups-snmp.conf.html @@ -8,14 +8,14 @@

snmp.conf(5)

Name

-snmp.conf - snmp configuration file for cups +snmp.conf - snmp configuration file for cups (deprecated)

Description

The snmp.conf file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the /etc/cups directory. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.

The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend - -cups-snmp(8). +cups-snmp(8).

Directives

The following directives are understood by the CUPS network backends:
@@ -46,11 +46,15 @@ The default is "off". network for printers. The default is 120 seconds (2 minutes).
+

Notes

+CUPS backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-cups-snmp(8), +cups-snmp(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html index fdb4721f8..c7c17f7f4 100644 --- a/doc/help/man-cups-snmp.html +++ b/doc/help/man-cups-snmp.html @@ -8,7 +8,7 @@

cups-snmp(8)

Name

-snmp - cups snmp backend +snmp - cups snmp backend (deprecated)

Synopsis

/usr/lib/cups/backend/snmp ip-address-or-hostname @@ -27,7 +27,7 @@ Additional queries are then sent to printers that respond in order to determine

In the first form, the SNMP backend is run directly by the user to look up the device URI and other information when you have an IP address or hostname. This can be used for programs that need to configure print queues where the user has supplied an address but nothing else.

In the second form, the SNMP backend is run indirectly using the -lpinfo(8) +lpinfo(8) command. The output provides all printers detected via SNMP on the configured broadcast addresses. @@ -45,13 +45,13 @@ version of CUPS.

Conforming To

The CUPS SNMP backend uses the information from the Host, Printer, and Port Monitor MIBs along with some vendor private MIBs and intelligent port probes to determine the correct device URI and make and model for each printer.

See Also

-backend(7), -cups-snmp.conf(5), -cupsd(8), -lpinfo(8), +backend(7), +cups-snmp.conf(5), +cupsd(8), +lpinfo(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html index 458980b8e..d75ddc5b0 100644 --- a/doc/help/man-cups.html +++ b/doc/help/man-cups.html @@ -35,9 +35,9 @@ The easiest way to start is by using the web interface to configure your printer

After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.

Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.

You can also use the -lpadmin(8) +lpadmin(8) and -lpinfo(8) +lpinfo(8) commands to add printers to CUPS. Additionally, your operating system may include graphical user interfaces or automatically create printer queues when you connect a printer to your computer. @@ -96,24 +96,28 @@ commands use the following environment variables to override the default locatio

Conforming To

CUPS conforms to the Internet Printing Protocol version 2.1 and implements the Berkeley and System V UNIX print commands. +

Notes

+CUPS printer drivers, backends, and PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-cancel(1), -client.conf(7), -cupsctl(8), -cupsd(8), -lp(1), -lpadmin(8), -lpinfo(8), -lpoptions(1), -lpr(1), -lprm(1), -lpq(1), -lpstat(1), +cancel(1), +client.conf(7), +cupsctl(8), +cupsd(8), +lp(1), +lpadmin(8), +lpinfo(8), +lpoptions(1), +lpr(1), +lprm(1), +lpq(1), +lpstat(1), CUPS Online Help (http://localhost:631/help), CUPS Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsaccept.html b/doc/help/man-cupsaccept.html index 89b9aec82..a8925685d 100644 --- a/doc/help/man-cupsaccept.html +++ b/doc/help/man-cupsaccept.html @@ -70,15 +70,15 @@ Unlike the System V printing system, CUPS allows printer names to contain any pr Also, printer and class names are not case-sensitive.

Finally, the CUPS versions may ask the user for an access password depending on the printing system configuration.

See Also

-cancel(1), -cupsenable(8), -lp(1), -lpadmin(8), -lpstat(1), +cancel(1), +cupsenable(8), +lp(1), +lpadmin(8), +lpstat(1),
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html index fab73129c..c52125fc7 100644 --- a/doc/help/man-cupsctl.html +++ b/doc/help/man-cupsctl.html @@ -83,12 +83,12 @@ Disable printer sharing:

Known Issues

You cannot set the Listen or Port directives using cupsctl.

See Also

-cupsd.conf(5), -cupsd(8), +cupsd.conf(5), +cupsd(8),
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html index afb16cc49..e701445d6 100644 --- a/doc/help/man-cupsd-helper.html +++ b/doc/help/man-cupsd-helper.html @@ -8,7 +8,7 @@

cupsd-helper(8)

Name

-cupsd-helper - cupsd helper programs +cupsd-helper - cupsd helper programs (deprecated)

Synopsis

cups-deviced request-id @@ -44,9 +44,9 @@ cupsd-helper - cupsd helper programs argvN

Description

The cupsd-helper programs perform long-running operations on behalf of the scheduler, -cupsd(8). +cupsd(8). The cups-deviced helper program runs each CUPS -backend(7) +backend(7) with no arguments in order to discover the available printers.

The cups-driverd helper program lists all available printer drivers, a subset of "matching" printer drivers, or a copy of a specific driver PPD file.

The cups-exec helper program runs backends, filters, and other programs. On macOS these programs are run in a secure sandbox. @@ -68,17 +68,21 @@ program or placed in compressed tar(1) archives to further reduce their size.

Driver information files must conform to the format defined in -ppdcfile(5). +ppdcfile(5). +

Notes

+CUPS printer drivers, backends, and PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-backend(7), -cups(1), -cupsd(8), -cupsd.conf(5), -filter(7), -ppdcfile(5), +backend(7), +cups(1), +cupsd(8), +cupsd.conf(5), +filter(7), +ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsd-logs.html b/doc/help/man-cupsd-logs.html index e90dd405b..11aac7a76 100644 --- a/doc/help/man-cupsd-logs.html +++ b/doc/help/man-cupsd-logs.html @@ -10,12 +10,12 @@

Name

cupsd-logs - cupsd log files (access_log, error_log, and page_log)

Description

-cupsd(8) +cupsd(8) normally maintains three log files: access_log to track requests that are submitted to the scheduler, error_log to track progress and errors, and page_log to track pages that are printed. Configuration directives in -cupsd.conf(5) +cupsd.conf(5) and -cups-files.conf(5) +cups-files.conf(5) control what information is logged and where it is stored.

Access Log File Format

The access_log file lists each HTTP resource that is accessed by a web browser or client. @@ -93,7 +93,7 @@ For POST requests the bytes field contains the number of bytes of non-IPP data t

The ipp-status field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.

Error Log File Format

The error_log file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the -cupsd.conf(5) +cupsd.conf(5) file controls which messages are logged:
 
@@ -158,7 +158,7 @@ For example the entry for a two page job called "myjob" might look like:
 
 
The PageLogFormat directive in the -cupsd.conf(5) +cupsd.conf(5) file can be used to change this information.

The printer field contains the name of the printer that printed the page. If you send a job to a printer class, this field will contain the name of the printer that was assigned the job. @@ -173,12 +173,12 @@ The format of this field is identical to the data-time field in the access_lo

The media field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.

The sides field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.

See Also

-cupsd(8), -cupsd.conf(5), -cups-files.conf(5), +cupsd(8), +cupsd.conf(5), +cups-files.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index a34be393f..29e217c12 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -13,7 +13,7 @@ cupsd.conf - server configuration file for cups The cupsd.conf file configures the CUPS scheduler, -cupsd(8). +cupsd(8). It is normally located in the /etc/cups directory. @@ -23,7 +23,7 @@ The configuration directive name and values are case-insensitive. Comment lines start with the # character.

Top-level Directives

The following top-level directives are understood by -cupsd(8): +cupsd(8):
AccessLogLevel config
AccessLogLevel actions @@ -119,7 +119,7 @@ The default service name is "http."
HostNameLookups Double
Specifies whether to do reverse lookups on connecting clients. The "Double" setting causes -cupsd(8) +cupsd(8) to verify that the hostname resolved from the address matches one of the addresses returned for that hostname. Double lookups also prevent clients with unregistered addresses from connecting to your server. The default is "Off" to avoid the potential server performance problems with hostname lookups. @@ -128,7 +128,7 @@ Only set this option to "On" or "Double" if absolutely required.
Specifies the length of time to wait before shutting down due to inactivity. The default is "60" seconds. Note: Only applicable when -cupsd(8) +cupsd(8) is run on-demand (e.g., with -l).
JobKillDelay seconds
Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job. @@ -307,7 +307,7 @@ The default is "No".

Http Method Names

The following HTTP methods are supported by -cupsd(8): +cupsd(8):
GET
Used by a client to download icons and other printer resources and to access the CUPS web interface. @@ -322,7 +322,7 @@ The following HTTP methods are supported by

Ipp Operation Names

The following IPP operations are supported by -cupsd(8): +cupsd(8):
CUPS-Accept-Jobs
Allows a printer to accept new jobs. @@ -415,7 +415,7 @@ The following IPP operations are supported by

Location Paths

The following paths are commonly used when configuring -cupsd(8): +cupsd(8):
/
The path for all get operations (get-printers, get-jobs, etc.) @@ -491,7 +491,7 @@ The default value is "IfRequested".
Require user {user-name|@group-name} ...
Specifies that an authenticated user must match one of the named users or be a member of one of the named groups. The group name "@SYSTEM" corresponds to the list of groups defined by the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file. The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job. Note: The 'root' user is not special and must be granted privileges like any other user account. @@ -514,7 +514,7 @@ The "default" access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. "@OWNER" maps to the job's owner. "@SYSTEM" maps to the groups listed for the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file.
JobPrivateValues all
JobPrivateValues default @@ -530,7 +530,7 @@ The "default" access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. "@OWNER" maps to the job's owner. "@SYSTEM" maps to the groups listed for the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file.
SubscriptionPrivateValues all
SubscriptionPrivateValues default @@ -577,7 +577,7 @@ The default is "128m".

Notes

File, directory, and user configuration directives that used to be allowed in the cupsd.conf file are now stored in the -cups-files.conf(5) +cups-files.conf(5) file instead in order to prevent certain types of privilege escalation attacks.

The scheduler MUST be restarted manually after making changes to the cupsd.conf file. On Linux this is typically done using the @@ -608,16 +608,16 @@ Require authentication for accesses from outside the 10. network: </Location>

See Also

-classes.conf(5), -cups-files.conf(5), -cupsd(8), -mime.convs(5), -mime.types(5), -printers.conf(5), -subscriptions.conf(5), +classes.conf(5), +cups-files.conf(5), +cupsd(8), +mime.convs(5), +mime.types(5), +printers.conf(5), +subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html index 90cc08374..589207103 100644 --- a/doc/help/man-cupsd.html +++ b/doc/help/man-cupsd.html @@ -101,23 +101,23 @@ in the foreground with a test configuration file called

See Also

-backend(7), -classes.conf(5), -cups(1), -cups-files.conf(5), -cups-lpd(8), -cupsd.conf(5), -cupsd-helper(8), -cupsd-logs(8), -filter(7), +backend(7), +classes.conf(5), +cups(1), +cups-files.conf(5), +cups-lpd(8), +cupsd.conf(5), +cupsd-helper(8), +cupsd-logs(8), +filter(7), launchd(8), -mime.convs(5), -mime.types(5), -printers.conf(5), +mime.convs(5), +mime.types(5), +printers.conf(5), systemd(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsenable.html b/doc/help/man-cupsenable.html index 4511b246e..04279a5fc 100644 --- a/doc/help/man-cupsenable.html +++ b/doc/help/man-cupsenable.html @@ -78,15 +78,15 @@ build-in commands of the same names.

The CUPS versions of disable and enable may ask the user for an access password depending on the printing system configuration. This differs from the System V versions which require the root user to execute these commands.

See Also

-cupsaccept(8), +cupsaccept(8), cupsreject(8), -cancel(1), -lp(1), -lpadmin(8), -lpstat(1), +cancel(1), +lp(1), +lpadmin(8), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html index cf61739b5..bce2134db 100644 --- a/doc/help/man-cupsfilter.html +++ b/doc/help/man-cupsfilter.html @@ -8,7 +8,7 @@

cupsfilter(8)

Name

-cupsfilter - convert a file to another format using cups filters +cupsfilter - convert a file to another format using cups filters (deprecated)

Synopsis

cupsfilter [ @@ -92,7 +92,7 @@ generates a PDF file. The converted file is sent to the standard output. returns a non-zero exit status on any error.

Environment

All of the standard -cups(1) +cups(1) environment variables affect the operation of cupsfilter.

Files

@@ -103,7 +103,10 @@ environment variables affect the operation of /usr/share/cups/mime/*.convs /usr/share/cups/mime/*.types

Notes

-Unlike when printing, filters run using the +CUPS printer drivers, filters, and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1). +

Unlike when printing, filters run using the cupsfilter command use the current user and security session. This may result in different output or unexpected behavior.

Example

@@ -113,14 +116,14 @@ The following command will generate a PDF preview of job 42 for a printer named cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf

See Also

-cups(1), -cupsd.conf(5), +cups(1), +cupsd.conf(5), filter(7), -mime.convs(7), -mime.types(7), +mime.convs(7), +mime.types(7), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupstestppd.html b/doc/help/man-cupstestppd.html index 7287079b4..99701c954 100644 --- a/doc/help/man-cupstestppd.html +++ b/doc/help/man-cupstestppd.html @@ -116,12 +116,16 @@ The next command tests all PPD files under the current directory and print detai find . -name \*.ppd \! -exec cupstestppd -q '{}' \; \ -exec cupstestppd -v '{}' \; +

Notes

+PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-lpadmin(8), +lpadmin(8), CUPS Online Help (http://localhost:631/help), Adobe PostScript Printer Description File Format Specification, Version 4.3.

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html index 229e29eb3..65d896b57 100644 --- a/doc/help/man-filter.html +++ b/doc/help/man-filter.html @@ -165,22 +165,25 @@ for a regular print file.

Conforming To

While the filter interface is compatible with System V interface scripts, CUPS does not support System V interface scripts.

Notes

-CUPS filters are not meant to be run directly by the user. +CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1). +

CUPS filters are not meant to be run directly by the user. Aside from the legacy System V interface issues (argv[0] is the printer name), CUPS filters also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs. Unless you are a developer and know what you are doing, please do not run filters directly. Instead, use the -cupsfilter(8) +cupsfilter(8) program to use the appropriate filters to do the conversions you need.

See Also

-backend(7), -cups(1), -cups-files.conf(5), -cupsd(8), -cupsfilter(8), +backend(7), +cups(1), +cups-files.conf(5), +cupsd(8), +cupsfilter(8),
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-ippevepcl.html b/doc/help/man-ippevepcl.html index b07b9be4d..529f6da80 100644 --- a/doc/help/man-ippevepcl.html +++ b/doc/help/man-ippevepcl.html @@ -24,7 +24,7 @@ ippevepcl/ps - pcl and postscript print commands for ippeveprinter and ippeveps are print commands for -ippeveprinter(1). +ippeveprinter(1). As with all print commands, these commands read either the filename specified on the command-line or from the standard input. Output is sent to the standard output. Status and progress messages are sent to the standard error. @@ -41,7 +41,7 @@ These program inherit the environment provided by the ippeveprinter program.

See Also

-ippeveprinter(8) +ippeveprinter(8)

Copyright

Copyright © 2019 by Apple Inc. diff --git a/doc/help/man-ippeveprinter.html b/doc/help/man-ippeveprinter.html index b0af8e245..7e4b0a94c 100644 --- a/doc/help/man-ippeveprinter.html +++ b/doc/help/man-ippeveprinter.html @@ -112,10 +112,10 @@ If "command" is not an absolute path ("/path/to/command"), ippeveprinter looks for the command in the "ippeveprinter" subdirectory of the CUPS binary directory, typically /usr/lib/cups/ippeveprinter or /usr/libexec/cups/ippeveprinter. The -cups-config(1) +cups-config(1) command can be used to discover the correct binary directory ("cups-config --serverbin"). In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the -cups(1) +cups(1) man page for more details.
-d spool-directory
Specifies the directory that will hold the print files. diff --git a/doc/help/man-ippfind.html b/doc/help/man-ippfind.html index 2e2ebb1e9..7c8529b94 100644 --- a/doc/help/man-ippfind.html +++ b/doc/help/man-ippfind.html @@ -199,9 +199,9 @@ Similarly, to send a PostScript test page to every PostScript printer, run: -f onepage-letter.ps '{}' print-job.test \;

See Also

-ipptool(1) +ipptool(1)

Copyright

-Copyright © 2013-2018 by Apple Inc. +Copyright © 2013-2019 by Apple Inc. diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html index a19d1b202..5f9b86212 100644 --- a/doc/help/man-ipptool.html +++ b/doc/help/man-ipptool.html @@ -84,7 +84,7 @@ Output is either a plain text, formatted text, CSV, or XML report on the standar The testfile format is described in -ipptoolfile(5). +ipptoolfile(5).

Options

The following options are recognized by ipptool: @@ -220,12 +220,12 @@ Get a list of completed jobs for "myprinter": ipp://localhost/printers/myprinter create-printer-subscription.test

See Also

-ipptoolfile(5), +ipptoolfile(5), IANA IPP Registry (http://www.iana.org/assignments/ipp\-registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) RFC 8011 (http://tools.ietf.org/html/rfc8011),

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html index 8f2e65177..76a57b226 100644 --- a/doc/help/man-ipptoolfile.html +++ b/doc/help/man-ipptoolfile.html @@ -11,7 +11,7 @@ ipptoolfile - ipptool file format

Description

The -ipptool(1) +ipptool(1) program accepts free-form plain text files that describe one or more IPP requests. Comments start with the "#" character and continue to the end of the line. Each request is enclosed by curly braces, for example: @@ -87,7 +87,7 @@ The following directives can be used outside of a test:
Defines a test.
DEFINE variable-name value
Defines the named variable to the given value. This is equivalent to specifying -d variable-name=value on the -ipptool(8) +ipptool(8) command-line.
DEFINE-DEFAULT variable-name value
Defines the named variable to the given value if it does not already have a value. @@ -96,22 +96,22 @@ command-line.
IGNORE-ERRORS yes
IGNORE-ERRORS no
Specifies whether, by default, -ipptool(8) +ipptool(8) will ignore errors and continue with subsequent tests.
INCLUDE "filename"
INCLUDE <filename>
Includes another test file. The first form includes a file relative to the current test file, while the second form includes a file from the -ipptool(8) +ipptool(8) include directory.
INCLUDE-IF-DEFINED name "filename"
INCLUDE-IF-DEFINED name <filename>
Includes another test file if the named variable is defined. The first form includes a file relative to the current test file, while the second form includes a file from the -ipptool(8) +ipptool(8) include directory.
INCLUDE-IF-NOT-DEFINED name "filename"
INCLUDE-IF-NOT-DEFINED name <filename>
Includes another test file if the named variable is not defined. The first form includes a file relative to the current test file, while the second form includes a file from the -ipptool(8) +ipptool(8) include directory.
SKIP-IF-DEFINED variable-name
SKIP-IF-NOT-DEFINED variable-name @@ -123,11 +123,11 @@ include directory.
Specifies that tests will, by default, use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
TRANSFER chunked
Specifies that tests will, by default, use the HTTP/1.1 "Transfer-Encoding: chunked" header. This is the default and is equivalent to specifying -c on the -ipptool(8) +ipptool(8) command-line. Support for chunked requests is required for conformance with all versions of IPP.
TRANSFER length
Specifies that tests will, by default, use the HTTP/1.0 "Content-Length:" header. This is equivalent to specifying -l on the -ipptool(8) +ipptool(8) command-line. Support for content length requests is required for conformance with all versions of IPP.
VERSION 1.0
VERSION 1.1 @@ -173,7 +173,7 @@ test report.
IGNORE-ERRORS yes
IGNORE-ERRORS no
Specifies whether -ipptool(8) +ipptool(8) will ignore errors and continue with subsequent tests.
NAME "literal string"
Specifies the human-readable name of the test. @@ -186,7 +186,7 @@ will ignore errors and continue with subsequent tests.
Specifies the request-id value to use in the request, either an integer or the word "random" to use a randomly generated value (the default).
RESOURCE path
Specifies an alternate resource path that is used for the HTTP POST request. The default is the resource from the URI provided to the -ipptool(8) +ipptool(8) program.
SKIP-IF-DEFINED variable-name
SKIP-IF-NOT-DEFINED variable-name @@ -194,7 +194,7 @@ program.
SKIP-PREVIOUS-ERROR yes
SKIP-PREVIOUS-ERROR no
Specifies whether -ipptool(8) +ipptool(8) will skip the current test if the previous test resulted in an error/failure.
STATUS status-code [ predicate ]
Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates. @@ -306,7 +306,7 @@ Specifies the maximum number of times to repeat. The default value is 1000.

Operation Codes

Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8011 and other IPP extension specifications. Here is a complete list of names supported by -ipptool(8): +ipptool(8):
 
     Activate-Printer
@@ -379,7 +379,7 @@ Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RF
 

Status Codes

Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8011 and other IPP extension specifications. Here is a complete list of the names supported by -ipptool(8): +ipptool(8):
 
     client-error-account-authorization-failed
@@ -483,7 +483,7 @@ Value and group tags correspond to the names from RFC 8011 and other IPP extensi
 

Variables

The -ipptool(8) +ipptool(8) program maintains a list of variables that can be used in any literal string or attribute value by specifying "$variable-name". Aside from variables defined using the -d option or DEFINE directive, the following pre-defined variables are available:
$$ @@ -492,15 +492,15 @@ program maintains a list of variables that can be used in any literal string or
Inserts the value of the named environment variable, or an empty string if the environment variable is not defined.
$filename
Inserts the filename provided to -ipptool(8) +ipptool(8) with the -f option.
$filetype
Inserts the MIME media type for the filename provided to -ipptool(8) +ipptool(8) with the -f option.
$hostname
Inserts the hostname from the URI provided to -ipptool(8). +ipptool(8).
$job-id
Inserts the last "job-id" attribute value returned in a test response or 0 if no "job-id" attribute has been seen.
$job-uri @@ -509,30 +509,30 @@ with the -f option.
Inserts the last "notify-subscription-id" attribute value returned in a test response or 0 if no "notify-subscription-id" attribute has been seen.
$port
Inserts the port number from the URI provided to -ipptool(8). +ipptool(8).
$resource
Inserts the resource path from the URI provided to -ipptool(8). +ipptool(8).
$scheme
Inserts the scheme from the URI provided to -ipptool(8). +ipptool(8).
$uri
Inserts the URI provided to -ipptool(8). +ipptool(8).
$uriuser
Inserts the username from the URI provided to -ipptool(8), +ipptool(8), if any.
$user
Inserts the current user's login name.

See Also

-ipptool(1), +ipptool(1), IANA IPP Registry (http://www.iana.org/assignments/ipp-registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html index b79136137..ba221270f 100644 --- a/doc/help/man-lp.html +++ b/doc/help/man-lp.html @@ -86,9 +86,9 @@ Use a filename of "-" to force printing from the standard input.

The Default Destination

CUPS provides many ways to set the default destination. The LPDEST and PRINTER environment variables are consulted first. If neither are set, the current default set using the -lpoptions(1) +lpoptions(1) command is used, followed by the default set using the -lpadmin(8) +lpadmin(8) command.

Options

The following options are recognized by lp: @@ -138,7 +138,7 @@ The page numbers refer to the output pages and not the document's original pages

Common Job Options

Aside from the printer-specific options reported by the -lpoptions(1) +lpoptions(1) command, the following generic options are available:
-o job-sheets=name @@ -188,16 +188,16 @@ Print a presentation document 2-up to a printer called "bar": lp -d bar -o number-up=2 filename

See Also

-cancel(1), -lpadmin(8), -lpoptions(1), -lpq(1), -lpr(1), -lprm(1), -lpstat(1), +cancel(1), +lpadmin(8), +lpoptions(1), +lpq(1), +lpr(1), +lprm(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html index c7658f21b..755bf2fd9 100644 --- a/doc/help/man-lpadmin.html +++ b/doc/help/man-lpadmin.html @@ -56,11 +56,11 @@ It can also be used to set the server default printer or class.

When specified before the -d, -p, or -x options, the -E option forces encryption when connecting to the server.

The first form of the command (-d) sets the default printer or class to destination. Subsequent print jobs submitted via the -lp(1) +lp(1) or -lpr(1) +lpr(1) commands will use this destination unless the user specifies otherwise with the -lpoptions(1) +lpoptions(1) command.

The second form of the command (-p) configures the named printer or class. The additional options are described below.

The third form of the command (-x) deletes the printer or class destination. @@ -74,7 +74,7 @@ If class does not exist it is created automatically.

-m model
Sets a standard PPD file for the printer from the model directory or using one of the driver interfaces. Use the -m option with the -lpinfo(8) +lpinfo(8) command to get a list of supported models. The model "raw" clears any existing PPD file and the model "everywhere" queries the printer referred to by the specified IPP device-uri. Note: Models other than "everywhere" are deprecated and will not be supported in a future version of CUPS. @@ -99,7 +99,7 @@ The value is an integer number of seconds; 86,400 seconds are in one day.
-o name=value
Sets a PPD option for the printer. PPD options can be listed using the -l option with the -lpoptions(1) +lpoptions(1) command.
-o name-default=value
Sets a default server-side option for the destination. @@ -138,16 +138,16 @@ Note: The user 'root' is not granted special access - using "-u allow:foo,bar" w
-v "device-uri"
Sets the device-uri attribute of the printer queue. Use the -v option with the -lpinfo(8) +lpinfo(8) command to get a list of supported device URIs and schemes.
-D "info"
Provides a textual description of the destination.
-E
When specified before the -d, -p, or -x options, forces the use of TLS encryption on the connection to the scheduler. Otherwise, enables the destination and accepts jobs; this is the same as running the -cupsaccept(8) +cupsaccept(8) and -cupsenable(8) +cupsenable(8) programs on the destination.
-L "location"
Provides a textual location of the destination. @@ -169,7 +169,10 @@ Also, printer and class names are not case-sensitive.

Finally, the CUPS version of lpadmin may ask the user for an access password depending on the printing system configuration. This differs from the System V version which requires the root user to execute this command.

Notes

-The CUPS version of lpadmin does not support all of the System V or Solaris printing system configuration options. +CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1). +

The CUPS version of lpadmin does not support all of the System V or Solaris printing system configuration options.

Interface scripts are not supported for security reasons.

The double meaning of the -E option is an unfortunate historical oddity.

The lpadmin command communicates with the scheduler (cupsd) to make changes to the printing system configuration. @@ -183,13 +186,13 @@ Create an IPP Everywhere print queue:

See Also

-cupsaccept(8), -cupsenable(8), -lpinfo(8), -lpoptions(1), +cupsaccept(8), +cupsenable(8), +lpinfo(8), +lpoptions(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpc.html b/doc/help/man-lpc.html index cddf8c447..f94d9258e 100644 --- a/doc/help/man-lpc.html +++ b/doc/help/man-lpc.html @@ -8,7 +8,7 @@

lpc(8)

Name

-lpc - line printer control program +lpc - line printer control program (deprecated)

Synopsis

lpc [ @@ -33,22 +33,23 @@ The lpc program accepts a subset of commands accepted by the Berkeley
Displays the status of one or more printer or class queues.

Notes

-Since lpc is geared towards the Berkeley printing system, it is impossible to use lpc to configure printer or class queues provided by CUPS. +This program is deprecated and will be removed in a future feature release of CUPS. +

Since lpc is geared towards the Berkeley printing system, it is impossible to use lpc to configure printer or class queues provided by CUPS. To configure printer or class queues you must use the -lpadmin(8) +lpadmin(8) command or another CUPS-compatible client with that functionality.

See Also

-cancel(1), -cupsaccept(8), -cupsenable(8), -lp(1), -lpadmin(8), -lpr(1), -lprm(1), -lpstat(1), +cancel(1), +cupsaccept(8), +cupsenable(8), +lp(1), +lpadmin(8), +lpr(1), +lprm(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html index 8ed50e16c..1089ec59b 100644 --- a/doc/help/man-lpinfo.html +++ b/doc/help/man-lpinfo.html @@ -8,7 +8,7 @@

lpinfo(8)

Name

-lpinfo - show available devices or drivers +lpinfo - show available devices or drivers (deprecated)

Synopsis

lpinfo [ @@ -105,11 +105,15 @@ List drivers matching "HP LaserJet": lpinfo --make-and-model "HP LaserJet" -m +

Notes

+CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-lpadmin(8), +lpadmin(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html index 228afb97d..74ad0ff2d 100644 --- a/doc/help/man-lpmove.html +++ b/doc/help/man-lpmove.html @@ -62,14 +62,14 @@ Move all jobs from "oldprinter" to "newprinter": lpmove oldprinter newprinter

See Also

-cancel(1), -lp(1), -lpr(1), -lprm(1), +cancel(1), +lp(1), +lpr(1), +lprm(1),
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html index e8213c43b..38ebeeb67 100644 --- a/doc/help/man-lpoptions.html +++ b/doc/help/man-lpoptions.html @@ -52,12 +52,12 @@ lpoptions - display or set printer options and defaults

Description

lpoptions displays or sets printer options and defaults. If no printer is specified using the -p option, the default printer is used as described in -lp(1). +lp(1).

If no -l, -o, or -r options are specified, the current options are reported on the standard output.

Options set with the lpoptions command are used by the -lp(1) +lp(1) and -lpr(1) +lpr(1) commands when submitting jobs.

When run by the root user, lpoptions gets and sets default options and instances for all users in the /etc/cups/lpoptions file. Otherwise, the per-user defaults are managed in the ~/.cups/lpoptions file. @@ -80,7 +80,7 @@ This option overrides the system default printer for the current user.

Sets the destination and instance, if specified, for any options that follow. If the named instance does not exist then it is created. Destinations can only be created using the -lpadmin(8) +lpadmin(8) program.
-r option
Removes the specified option from the named destination. @@ -88,7 +88,7 @@ program.
Removes the options for the named destination and instance, if specified. If the named instance does not exist then this does nothing. Destinations can only be removed using the -lpadmin(8) +lpadmin(8) command.

Files

@@ -98,14 +98,14 @@ command.

Conforming To

The lpoptions command is unique to CUPS.

See Also

-cancel(1), -lp(1), -lpadmin(8), -lpr(1), -lprm(1), +cancel(1), +lp(1), +lpadmin(8), +lpr(1), +lprm(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html index ecba7ee4c..064e88234 100644 --- a/doc/help/man-lpq.html +++ b/doc/help/man-lpq.html @@ -48,14 +48,14 @@ Jobs queued on the default destination will be shown if no printer or class is s
Requests a more verbose (long) reporting format.

See Also

-cancel(1), -lp(1), -lpr(1), -lprm(1), -lpstat(1), +cancel(1), +lp(1), +lpr(1), +lprm(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html index 9d1541465..c945ea9c8 100644 --- a/doc/help/man-lpr.html +++ b/doc/help/man-lpr.html @@ -56,9 +56,9 @@ If no files are listed on the command-line, lpr reads the print file from

The Default Destination

CUPS provides many ways to set the default destination. The LPDEST and PRINTER environment variables are consulted first. If neither are set, the current default set using the -lpoptions(1) +lpoptions(1) command is used, followed by the default set using the -lpadmin(8) +lpadmin(8) command.

Options

The following options are recognized by lpr: @@ -97,7 +97,7 @@ This option is equivalent to -o prettyprint and is only useful when print

Common Job Options

Aside from the printer-specific options reported by the -lpoptions(1) +lpoptions(1) command, the following generic options are available:
-o job-sheets=name @@ -145,16 +145,16 @@ Print a presentation document 2-up to a printer called "foo": lpr -P foo -o number-up=2 filename

See Also

-cancel(1), -lp(1), -lpadmin(8), -lpoptions(1), -lpq(1), -lprm(1), -lpstat(1), +cancel(1), +lp(1), +lpadmin(8), +lpoptions(1), +lpq(1), +lprm(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html index 25f801749..f370b7fef 100644 --- a/doc/help/man-lprm.html +++ b/doc/help/man-lprm.html @@ -69,14 +69,14 @@ Cancel all jobs: lprm -

See Also

-cancel(1), -lp(1), -lpq(1), -lpr(1), -lpstat(1), +cancel(1), +lp(1), +lpq(1), +lpr(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html index 876de1f2d..0fcd20c6d 100644 --- a/doc/help/man-lpstat.html +++ b/doc/help/man-lpstat.html @@ -120,14 +120,14 @@ Also, printer and class names are not case-sensitive.

The -h, -e, -E, -U, and -W options are unique to CUPS.

The Solaris -f, -P, and -S options are silently ignored.

See Also

-cancel(1), -lp(1), -lpq(1), -lpr(1), -lprm(1), +cancel(1), +lp(1), +lpq(1), +lpr(1), +lprm(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html index ddfb2753e..8f5b87cbb 100644 --- a/doc/help/man-mailto.conf.html +++ b/doc/help/man-mailto.conf.html @@ -33,10 +33,10 @@ If multiple lines are present, only the last one is used.
Specifies a prefix string for the subject line of an email notification.

See Also

-cupsd(8), +cupsd(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html index 2228aaccb..e4d8813c8 100644 --- a/doc/help/man-mime.convs.html +++ b/doc/help/man-mime.convs.html @@ -8,7 +8,7 @@

mime.convs(5)

Name

-mime.convs - mime type conversion file for cups +mime.convs - mime type conversion file for cups (deprecated)

Description

The mime.convs file defines the filters that are available for converting files from one format to another. The standard filters support text, PDF, PostScript, and many types of image files. @@ -41,15 +41,19 @@ Define a filter that converts PostScript documents to CUPS Raster format: application/vnd.cups-postscript application/vnd.cups-raster 50 pstoraster +

Notes

+CUPS filters are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-cups-files.conf(5), -cupsd.conf(5), -cupsd(8), -cupsfilter(8), -mime.types(5), +cups-files.conf(5), +cupsd.conf(5), +cupsd(8), +cupsfilter(8), +mime.types(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html index 290dfa7b0..cc4393ef8 100644 --- a/doc/help/man-mime.types.html +++ b/doc/help/man-mime.types.html @@ -84,14 +84,14 @@ Define two MIME media types for raster data, with one being a subset with higher string(4,PwgRaster<00>) priority(150)

See Also

-cups-files.conf(5), -cupsd.conf(5), -cupsd(8), -cupsfilter(8), -mime.convs(5), +cups-files.conf(5), +cupsd.conf(5), +cupsd(8), +cupsfilter(8), +mime.convs(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html index 08353d032..d8d96d36c 100644 --- a/doc/help/man-notifier.html +++ b/doc/help/man-notifier.html @@ -25,13 +25,13 @@ and functions and exit on error. Notifiers are encouraged to exit after a suitable period of inactivity, however they may exit after reading the first message or stay running until an error is seen. Notifiers inherit the environment and can use the logging mechanism documented in -filter(7). +filter(7).

See Also

-cupsd(8), -filter(7), +cupsd(8), +filter(7), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-ppdc.html b/doc/help/man-ppdc.html index 725574858..d4e178b55 100644 --- a/doc/help/man-ppdc.html +++ b/doc/help/man-ppdc.html @@ -77,15 +77,19 @@ The default is to generate uncompressed PPD files.
Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone. The default is to use the line feed character alone. +

Notes

+PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-ppdhtml(1), -ppdi(1), -ppdmerge(1), -ppdpo(1), -ppdcfile(5), +ppdhtml(1), +ppdi(1), +ppdmerge(1), +ppdpo(1), +ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-ppdcfile.html b/doc/help/man-ppdcfile.html index f6ddef6b1..a81f06a8d 100644 --- a/doc/help/man-ppdcfile.html +++ b/doc/help/man-ppdcfile.html @@ -8,10 +8,10 @@

ppdcfile(5)

Name

-ppdcfile - cups ppd compiler source file format +ppdcfile - cups ppd compiler source file format (deprecated)

Description

The CUPS PPD compiler reads meta files that contain descriptions of one or more PPD files to be generated by -ppdc(1). +ppdc(1). This man page provides a quick reference to the supported keywords and should be used in conjunction with the online help for CUPS.

The source file format is plain ASCII text that can be edited using your favorite text editor. Comments are supported using the C (/* ... */) and C++ (// ...) comment mechanisms.

Printer driver information can be grouped and shared using curly braces ({ ... }); PPD files are written when a close brace or end-of-file is seen and a PCFileName directive has been defined. @@ -81,15 +81,19 @@ This man page provides a quick reference to the supported keywords and should be

VariablePaperSize boolean-value
Version number
+

Notes

+PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-ppdc(1), -ppdhtml(1), -ppdi(1), -ppdmerge(1), -ppdpo(1), +ppdc(1), +ppdhtml(1), +ppdi(1), +ppdmerge(1), +ppdpo(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-ppdhtml.html b/doc/help/man-ppdhtml.html index aa76ff7b2..d19621a00 100644 --- a/doc/help/man-ppdhtml.html +++ b/doc/help/man-ppdhtml.html @@ -31,15 +31,19 @@ It is equivalent to using the #define directive in the source file.
Specifies an alternate include directory. Multiple -I options can be supplied to add additional directories. +

Notes

+PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-ppdc(1), -ppdcfile(5), -ppdi(1), -ppdmerge(1), -ppdpo(1), +ppdc(1), +ppdcfile(5), +ppdi(1), +ppdmerge(1), +ppdpo(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-ppdi.html b/doc/help/man-ppdi.html index 0c83f630e..192b02b8c 100644 --- a/doc/help/man-ppdi.html +++ b/doc/help/man-ppdi.html @@ -38,15 +38,19 @@ If the source file does not exist, a new source file is created. Otherwise the existing file is merged with the new PPD file(s) on the command-line. If no source file is specified, the filename ppdi.drv is used. +

Notes

+PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-ppdc(1), -ppdhtml(1), -ppdmerge(1), -ppdpo(1), -ppdcfile(5), +ppdc(1), +ppdhtml(1), +ppdmerge(1), +ppdpo(1), +ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-ppdmerge.html b/doc/help/man-ppdmerge.html index e88435c40..458fac1f5 100644 --- a/doc/help/man-ppdmerge.html +++ b/doc/help/man-ppdmerge.html @@ -33,17 +33,20 @@ If not specified, the merged PPD file is written to the standard output. If the output file already exists, it is silently overwritten.

Notes

-ppdmerge does not check whether the merged PPD files are for the same device. +PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1). +

ppdmerge does not check whether the merged PPD files are for the same device. Merging of different device PPDs will yield unpredictable results.

See Also

-ppdc(1), -ppdhtml(1), -ppdi(1), -ppdpo(1), -ppdcfile(5), +ppdc(1), +ppdhtml(1), +ppdi(1), +ppdpo(1), +ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-ppdpo.html b/doc/help/man-ppdpo.html index 034563775..61c727ad6 100644 --- a/doc/help/man-ppdpo.html +++ b/doc/help/man-ppdpo.html @@ -37,15 +37,19 @@ Multiple -I options can be supplied to add additional directories.
Specifies the output file. The supported extensions are .po or .po.gz for GNU gettext format message catalogs and .strings for macOS strings files. +

Notes

+PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +ippeveprinter(1).

See Also

-ppdc(1), -ppdhtml(1), -ppdi(1), -ppdmerge(1), +ppdc(1), +ppdhtml(1), +ppdi(1), +ppdmerge(1), ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html index 7b60a8cbe..4a3123ea5 100644 --- a/doc/help/man-printers.conf.html +++ b/doc/help/man-printers.conf.html @@ -11,20 +11,21 @@ printers.conf - printer configuration file for cups

Description

The printers.conf file defines the local printers that are available. It is normally located in the /etc/cups directory and is maintained by the -cupsd(8) +cupsd(8) program. This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

-classes.conf(5), -cupsd(8), -cupsd.conf(5), -mime.convs(5), -mime.types(5), -subscriptions.conf(5), +classes.conf(5), +cups-files.conf(5), +cupsd(8), +cupsd.conf(5), +mime.convs(5), +mime.types(5), +subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html index ea4af7c55..325f2cd28 100644 --- a/doc/help/man-subscriptions.conf.html +++ b/doc/help/man-subscriptions.conf.html @@ -10,21 +10,24 @@

Name

subscriptions.conf - subscription configuration file for cups

Description

-The subscriptions.conf file defines the local event notification subscriptions that are active. It is normally located in the /etc/cups directory and is maintained by the -cupsd(8) -program. This file is not intended to be edited or managed manually. +The subscriptions.conf file defines the local event notification subscriptions that are active. +It is normally located in the /etc/cups directory and is maintained by the +cupsd(8) +program. +This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

-classes.conf(5), -cupsd(8), -cupsd.conf(5), -mime.convs(5), -mime.types(5), -printers.conf(5), +classes.conf(5), +cups-files.conf(5), +cupsd(8), +cupsd.conf(5), +mime.convs(5), +mime.types(5), +printers.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2018 by Apple Inc. +Copyright © 2007-2019 by Apple Inc. diff --git a/man/Makefile b/man/Makefile index f04a1a020..304d72c97 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,10 +1,11 @@ # # Man page makefile for CUPS. # -# Copyright 2007-2019 by Apple Inc. -# Copyright 1993-2006 by Easy Software Products. +# Copyright © 2007-2019 by Apple Inc. +# Copyright © 1993-2006 by Easy Software Products. # -# Licensed under Apache License v2.0. See the file "LICENSE" for more information. +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. # include ../Makedefs @@ -14,53 +15,53 @@ include ../Makedefs # Man pages... # -MAN1 = cancel.$(MAN1EXT) \ - cups.$(MAN1EXT) \ - cups-config.$(MAN1EXT) \ - cupstestppd.$(MAN1EXT) \ - ippeveprinter.$(MAN1EXT) \ +MAN1 = cancel.1 \ + cups.1 \ + cups-config.1 \ + cupstestppd.1 \ + ippeveprinter.1 \ $(IPPFIND_MAN) \ - ipptool.$(MAN1EXT) \ - lp.$(MAN1EXT) \ - lpoptions.$(MAN1EXT) \ - lpq.$(MAN1EXT) \ - lprm.$(MAN1EXT) \ - lpr.$(MAN1EXT) \ - lpstat.$(MAN1EXT) \ - ppdc.$(MAN1EXT) \ - ppdhtml.$(MAN1EXT) \ - ppdi.$(MAN1EXT) \ - ppdmerge.$(MAN1EXT) \ - ppdpo.$(MAN1EXT) -MAN5 = classes.conf.$(MAN5EXT) \ - client.conf.$(MAN5EXT) \ - cups-files.conf.$(MAN5EXT) \ - cups-snmp.conf.$(MAN5EXT) \ - cupsd.conf.$(MAN5EXT) \ - cupsd-logs.$(MAN5EXT) \ - ipptoolfile.$(MAN5EXT) \ - mailto.conf.$(MAN5EXT) \ - mime.convs.$(MAN5EXT) \ - mime.types.$(MAN5EXT) \ - ppdcfile.$(MAN5EXT) \ - printers.conf.$(MAN5EXT) \ - subscriptions.conf.$(MAN5EXT) -MAN7 = backend.$(MAN7EXT) \ - filter.$(MAN7EXT) \ - ippevepcl.$(MAN7EXT) \ - notifier.$(MAN7EXT) -MAN8 = cupsaccept.$(MAN8EXT) \ - cupsctl.$(MAN8EXT) \ - cupsfilter.$(MAN8EXT) \ - cups-lpd.$(MAN8EXT) \ - cups-snmp.$(MAN8EXT) \ - cupsd.$(MAN8EXT) \ - cupsd-helper.$(MAN8EXT) \ - cupsenable.$(MAN8EXT) \ - lpadmin.$(MAN8EXT) \ - lpinfo.$(MAN8EXT) \ - lpmove.$(MAN8EXT) \ - lpc.$(MAN8EXT) + ipptool.1 \ + lp.1 \ + lpoptions.1 \ + lpq.1 \ + lprm.1 \ + lpr.1 \ + lpstat.1 \ + ppdc.1 \ + ppdhtml.1 \ + ppdi.1 \ + ppdmerge.1 \ + ppdpo.1 +MAN5 = classes.conf.5 \ + client.conf.5 \ + cups-files.conf.5 \ + cups-snmp.conf.5 \ + cupsd.conf.5 \ + cupsd-logs.5 \ + ipptoolfile.5 \ + mailto.conf.5 \ + mime.convs.5 \ + mime.types.5 \ + ppdcfile.5 \ + printers.conf.5 \ + subscriptions.conf.5 +MAN7 = backend.7 \ + filter.7 \ + ippevepcl.7 \ + notifier.7 +MAN8 = cupsaccept.8 \ + cupsctl.8 \ + cupsfilter.8 \ + cups-lpd.8 \ + cups-snmp.8 \ + cupsd.8 \ + cupsd-helper.8 \ + cupsenable.8 \ + lpadmin.8 \ + lpinfo.8 \ + lpmove.8 \ + lpc.8 # @@ -90,7 +91,6 @@ unittests: clean: $(RM) mantohtml mantohtml.o - $(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8) # @@ -112,37 +112,35 @@ install: all install-data install-headers install-libs install-exec # install-data: all + echo Installing man pages in $(MANDIR)/man1... $(INSTALL_DIR) -m 755 $(MANDIR)/man1 for file in $(MAN1); do \ - echo Installing $$file in $(MANDIR)/man1...; \ $(INSTALL_MAN) $$file $(MANDIR)/man1; \ done + echo Installing man pages in $(MANDIR)/man5... $(INSTALL_DIR) -m 755 $(MANDIR)/man5 for file in $(MAN5); do \ - echo Installing $$file in $(MANDIR)/man5...; \ $(INSTALL_MAN) $$file $(MANDIR)/man5; \ done + echo Installing man pages in $(MANDIR)/man7... $(INSTALL_DIR) -m 755 $(MANDIR)/man7 for file in $(MAN7); do \ - echo Installing $$file in $(MANDIR)/man7...; \ $(INSTALL_MAN) $$file $(MANDIR)/man7; \ done - $(RM) $(MANDIR)/man7/ippeveps.$(MAN7EXT) - $(LN) ippevepcl.$(MAN7EXT) $(MANDIR)/man7/ippeveps.$(MAN7EXT) - $(INSTALL_DIR) -m 755 $(AMANDIR)/man$(MAN8DIR) + $(RM) $(MANDIR)/man7/ippeveps.7 + $(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7 + echo Installing man pages in $(MANDIR)/man8... + $(INSTALL_DIR) -m 755 $(MANDIR)/man8 for file in $(MAN8); do \ - echo Installing $$file in $(AMANDIR)/man$(MAN8DIR)...; \ - $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8DIR); \ + $(INSTALL_MAN) $$file $(MANDIR)/man8; \ done - for file in accept cupsreject reject; do \ - $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ - $(LN) cupsaccept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ - done - $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) - $(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) - for file in cups-deviced cups-driverd cups-exec; do \ - $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ - $(LN) cupsd-helper.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ + $(RM) $(MANDIR)/man8/cupsenable.8 + $(LN) cupsdisable.8 $(MANDIR)/man8/cupsenable.8 + $(RM) $(MANDIR)/man8/cupsreject.8 + $(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8 + for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \ + $(RM) $(MANDIR)/man8/$$file; \ + $(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \ done @@ -172,26 +170,26 @@ install-libs: # uninstall: + echo Uninstalling man pages from $(MANDIR)/man1... for file in $(MAN1); do \ $(RM) $(MANDIR)/man1/$$file; \ done -$(RMDIR) $(MANDIR)/man1 + echo Uninstalling man pages from $(MANDIR)/man5... for file in $(MAN5); do \ $(RM) $(MANDIR)/man5/$$file; \ done -$(RMDIR) $(MANDIR)/man5 - for file in $(MAN7); do \ + echo Uninstalling man pages from $(MANDIR)/man7... + for file in $(MAN7) ippeveps.7; do \ $(RM) $(MANDIR)/man7/$$file; \ done -$(RMDIR) $(MANDIR)/man7 - for file in $(MAN8); do \ - $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file; \ + echo Uninstalling man pages from $(MANDIR)/man8... + for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \ + $(RM) $(MANDIR)/man8/$$file; \ done - $(RM) $(AMANDIR)/man$(MAN8DIR)/accept.$(MAN8EXT) - $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsreject.$(MAN8EXT) - $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) - $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) - -$(RMDIR) $(AMANDIR)/man$(MAN8DIR) + -$(RMDIR) $(MANDIR)/man8 # @@ -209,19 +207,19 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml echo Converting man pages to HTML... for file in $(MAN1); do \ echo " $$file..."; \ - ./mantohtml `basename $$file .$(MAN1EXT)`.man >../doc/help/man-`basename $$file .$(MAN1EXT)`.html; \ + ./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \ done for file in $(MAN5); do \ echo " $$file..."; \ - ./mantohtml `basename $$file .$(MAN5EXT)`.man >../doc/help/man-`basename $$file .$(MAN5EXT)`.html; \ + ./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \ done for file in $(MAN7); do \ echo " $$file..."; \ - ./mantohtml `basename $$file .$(MAN7EXT)`.man >../doc/help/man-`basename $$file .$(MAN7EXT)`.html; \ + ./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \ done for file in $(MAN8); do \ echo " $$file..."; \ - ./mantohtml `basename $$file .$(MAN8EXT)`.man >../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \ + ./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \ done mantohtml: mantohtml.o ../cups/$(LIBCUPSSTATIC) diff --git a/man/backend.man b/man/backend.7 similarity index 72% rename from man/backend.man rename to man/backend.7 index 184e3aaa6..5a7032650 100644 --- a/man/backend.man +++ b/man/backend.7 @@ -1,12 +1,13 @@ .\" .\" Backend man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH backend 7 "CUPS" "4 April 2014" "Apple Inc." +.TH backend 7 "CUPS" "26 April 2019" "Apple Inc." .SH NAME backend \- cups backend transmission interfaces .SH SYNOPSIS @@ -52,7 +53,8 @@ which is used to send print data to and discover different devices on the system .LP Like filters, backends must be capable of reading from a filename on the command-line or from the standard input, copying the standard input to a temporary file as required by the physical interface. .LP -The command name (\fIargv[0]\fR) is set to the device URI of the destination printer. Authentication information in +The command name (\fIargv[0]\fR) is set to the device URI of the destination printer. +Authentication information in .I argv[0] is removed, so backend developers are urged to use the .B DEVICE_URI @@ -70,7 +72,8 @@ function. The .B CUPS_SC_FD constant defines the file descriptor that should be monitored for incoming requests. .SS DEVICE DISCOVERY -When run with no arguments, the backend should list the devices and schemes it supports or is advertising to the standard output. The output consists of zero or more lines consisting of any of the following forms: +When run with no arguments, the backend should list the devices and schemes it supports or is advertising to the standard output. +The output consists of zero or more lines consisting of any of the following forms: .nf device-class scheme "Unknown" "device-info" @@ -98,21 +101,26 @@ The device-uri refers to a networked device and conforms to the general form for network URIs. .TP 5 .B serial -The device-uri refers to a serial device with configurable baud rate and other options. If the device-uri contains a baud value, it represents the maximum baud rate supported by the device. +The device-uri refers to a serial device with configurable baud rate and other options. +If the device-uri contains a baud value, it represents the maximum baud rate supported by the device. .LP The .I scheme -field provides the URI scheme that is supported by the backend. Backends should use this form only when the backend supports any URI using that scheme. The +field provides the URI scheme that is supported by the backend. +Backends should use this form only when the backend supports any URI using that scheme. +The .I device-uri field specifies the full URI to use when communicating with the device. .LP The .I device-make-and-model -field specifies the make and model of the device, e.g. "Example Foojet 2000". If the make and model is not known, you must report "Unknown". +field specifies the make and model of the device, e.g. "Example Foojet 2000". +If the make and model is not known, you must report "Unknown". .LP The .I device-info -field specifies additional information about the device. Typically this includes the make and model along with the port number or network address, e.g. "Example Foojet 2000 USB #1". +field specifies additional information about the device. +Typically this includes the make and model along with the port number or network address, e.g. "Example Foojet 2000 USB #1". .LP The optional .I device-id @@ -122,7 +130,8 @@ The optional .I device-location field specifies the physical location of the device, which is often used to pre-populate the printer-location attribute when adding a printer. .SS PERMISSIONS -Backends without world read and execute permissions are run as the root user. Otherwise, the backend is run using an unprivileged user account, typically "lp". +Backends without world read and execute permissions are run as the root user. +Otherwise, the backend is run using an unprivileged user account, typically "lp". .SH EXIT STATUS The following exit codes are defined for backends: .TP 5 @@ -131,27 +140,34 @@ The print file was successfully transmitted to the device or remote server. .TP 5 .B CUPS_BACKEND_FAILED .br -The print file was not successfully transmitted to the device or remote server. The scheduler will respond to this by canceling the job, retrying the job, or stopping the queue depending on the state of the +The print file was not successfully transmitted to the device or remote server. +The scheduler will respond to this by canceling the job, retrying the job, or stopping the queue depending on the state of the .I printer-error-policy attribute. .TP 5 .B CUPS_BACKEND_AUTH_REQUIRED -The print file was not successfully transmitted because valid authentication information is required. The scheduler will respond to this by holding the job and adding the 'cups-held-for-authentication' keyword to the "job-reasons" Job Description attribute. +The print file was not successfully transmitted because valid authentication information is required. +The scheduler will respond to this by holding the job and adding the 'cups-held-for-authentication' keyword to the "job-reasons" Job Description attribute. .TP 5 .B CUPS_BACKEND_HOLD -The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by holding the job. +The print file was not successfully transmitted because it cannot be printed at this time. +The scheduler will respond to this by holding the job. .TP 5 .B CUPS_BACKEND_STOP -The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by stopping the queue. +The print file was not successfully transmitted because it cannot be printed at this time. +The scheduler will respond to this by stopping the queue. .TP 5 .B CUPS_BACKEND_CANCEL -The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. The scheduler will respond to this by canceling the job. +The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. +The scheduler will respond to this by canceling the job. .TP 5 .B CUPS_BACKEND_RETRY -The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job at a future time - other jobs may print before this one. +The print file was not successfully transmitted because of a temporary issue. +The scheduler will retry the job at a future time - other jobs may print before this one. .TP 5 .B CUPS_BACKEND_RETRY_CURRENT -The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job immediately without allowing intervening jobs. +The print file was not successfully transmitted because of a temporary issue. +The scheduler will retry the job immediately without allowing intervening jobs. .PP All other exit code values are reserved. .SH ENVIRONMENT @@ -166,21 +182,29 @@ The device URI associated with the printer. .SH FILES .I /etc/cups/cups-files.conf .SH NOTES -CUPS backends are not generally designed to be run directly by the user. Aside from the device URI issue ( +CUPS backends are not generally designed to be run directly by the user. +Aside from the device URI issue ( .I argv[0] and .B DEVICE_URI -environment variable contain the device URI), CUPS backends also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs. Backends can also be installed with restricted permissions (0500 or 0700) that tell the scheduler to run them as the "root" user instead of an unprivileged user (typically "lp") on the system. +environment variable contain the device URI), CUPS backends also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs. +Backends can also be installed with restricted permissions (0500 or 0700) that tell the scheduler to run them as the "root" user instead of an unprivileged user (typically "lp") on the system. .LP -Unless you are a developer and know what you are doing, please do not run backends directly. Instead, use the +Unless you are a developer and know what you are doing, please do not run backends directly. +Instead, use the .BR lp (1) or .BR lpr (1) programs to send print jobs or .BR lpinfo (8) -to query for available printers using the backend. The one exception is the SNMP backend - see +to query for available printers using the backend. +The one exception is the SNMP backend - see .BR cups-snmp (8) for more information. +.SH NOTES +CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .IR cups (1), .IR cups-files.conf (5), @@ -193,4 +217,4 @@ for more information. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cancel.man b/man/cancel.1 similarity index 89% rename from man/cancel.man rename to man/cancel.1 index 388640fb6..28e089704 100644 --- a/man/cancel.man +++ b/man/cancel.1 @@ -1,12 +1,13 @@ .\" .\" cancel man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cancel 1 "CUPS" "15 April 2014" "Apple Inc." +.TH cancel 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cancel \- cancel jobs .SH SYNOPSIS @@ -87,4 +88,4 @@ Administrators wishing to prevent unauthorized cancellation of jobs via the \fI\ .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/classes.conf.man b/man/classes.conf.5 similarity index 60% rename from man/classes.conf.man rename to man/classes.conf.5 index e2579792f..62b7b731e 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.5 @@ -1,18 +1,21 @@ .\" .\" classes.conf man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH classes.conf 5 "CUPS" "15 April 2014" "Apple Inc." +.TH classes.conf 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME classes.conf \- class configuration file for cups .SH DESCRIPTION -The \fBclasses.conf\fR file defines the local printer classes that are available. It is normally located in the \fI/etc/cups\fR directory and is maintained by the +The \fBclasses.conf\fR file defines the local printer classes that are available. +It is normally located in the \fI/etc/cups\fR directory and is maintained by the .BR cupsd (8) -program. This file is not intended to be edited or managed manually. +program. +This file is not intended to be edited or managed manually. .SH NOTES The name, location, and format of this file are an implementation detail that will change in future releases of CUPS. .SH SEE ALSO @@ -24,4 +27,4 @@ The name, location, and format of this file are an implementation detail that wi .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/client.conf.man.in b/man/client.conf.5 similarity index 94% rename from man/client.conf.man.in rename to man/client.conf.5 index f30f0a7fe..8805561db 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.5 @@ -1,14 +1,15 @@ .\" .\" client.conf man page for CUPS. .\" -.\" Copyright 2007-2018 by Apple Inc. -.\" Copyright 2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH client.conf 5 "CUPS" "15 April 2019" "Apple Inc." +.TH client.conf 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -client.conf \- client configuration file for cups +client.conf \- client configuration file for cups (deprecated on macos) .SH DESCRIPTION The \fBclient.conf\fR file configures the CUPS client and is normally located in the \fI/etc/cups\fR and/or \fI~/.cups\fR directories. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. @@ -123,4 +124,4 @@ On Linux and other systems using GNU TLS, the \fI/etc/cups/ssl/site.crl\fR file, .BR default (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cups-config.man b/man/cups-config.1 similarity index 84% rename from man/cups-config.man rename to man/cups-config.1 index a4c5f67b5..0671f89e4 100644 --- a/man/cups-config.man +++ b/man/cups-config.1 @@ -1,12 +1,13 @@ .\" .\" cups-config man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cups-config 1 "CUPS" "15 April 2014" "Apple Inc." +.TH cups-config 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cups\-config \- get cups api, compiler, directory, and link information. .SH SYNOPSIS @@ -66,10 +67,6 @@ Reports the default CUPS data directory. .B \-\-help Reports the program usage message. .TP 5 -.B \-\-image -When used with \fI\-\-libs\fR, adds the CUPS imaging library to the -list of libraries. -.TP 5 .B \-\-ldflags Reports the necessary linker options. .TP 5 @@ -100,8 +97,13 @@ Compile a simple one-file CUPS filter: cc `cups\-config \-\-cflags \-\-ldflags` \-o filter filter.c \\ `cups\-config \-\-libs` .fi +.SH DEPRECATED OPTIONS +The following options are deprecated but continue to work for backwards compatibility: +.TP 5 +.B \-\-image +Formerly used to add the CUPS imaging library to the list of libraries. .SH SEE ALSO .BR cups (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.5 similarity index 98% rename from man/cups-files.conf.man.in rename to man/cups-files.conf.5 index 839cde96f..b451e2f92 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.5 @@ -1,13 +1,13 @@ .\" .\" cups-files.conf man page for CUPS. .\" -.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 2007-2019 by Apple Inc. .\" Copyright © 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH cups-files.conf 5 "CUPS" "8 November 2018" "Apple Inc." +.TH cups-files.conf 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cups\-files.conf \- file and directory configuration file for cups .SH DESCRIPTION @@ -288,4 +288,4 @@ command is used instead. .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cups-lpd.man.in b/man/cups-lpd.8 similarity index 91% rename from man/cups-lpd.man.in rename to man/cups-lpd.8 index ac7c682e6..e8ce3251f 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.8 @@ -1,14 +1,15 @@ .\" .\" cups-lpd man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cups-lpd 8 "CUPS" "3 June 2014" "Apple Inc." +.TH cups-lpd 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -cups-lpd \- receive print jobs and report printer status to lpd clients +cups-lpd \- receive print jobs and report printer status to lpd clients (deprecated) .SH SYNOPSIS .B cups-lpd [ @@ -57,6 +58,9 @@ Errors are sent to the system log. .I /System/Library/LaunchDaemons/org.cups.cups-lpd.plist .fi .SH NOTES +The +.B cups-lpd +program is deprecated and will no longer be supported in a future feature release of CUPS. .SS PERFORMANCE .B cups-lpd performs well with small numbers of clients and printers. @@ -114,4 +118,4 @@ service using the corresponding control program. CUPS Online Help (http://localhost:631/help), RFC 2569 .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cups-snmp.man.in b/man/cups-snmp.8 similarity index 92% rename from man/cups-snmp.man.in rename to man/cups-snmp.8 index b875bbf83..19bda2697 100644 --- a/man/cups-snmp.man.in +++ b/man/cups-snmp.8 @@ -1,14 +1,14 @@ .\" .\" SNMP backend man page for CUPS. .\" -.\" Copyright © 2012-2018 by Apple Inc. +.\" Copyright © 2012-2019 by Apple Inc. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH cups-snmp 8 "CUPS" "8 November 2018" "Apple Inc." +.TH cups-snmp 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -snmp \- cups snmp backend +snmp \- cups snmp backend (deprecated) .SH SYNOPSIS .B /usr/lib/cups/backend/snmp .I ip-address-or-hostname @@ -53,4 +53,4 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni .BR lpinfo (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.5 similarity index 84% rename from man/cups-snmp.conf.man rename to man/cups-snmp.conf.5 index 8cc273c5c..4ca20f24f 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.5 @@ -1,15 +1,15 @@ .\" .\" snmp.conf man page for CUPS. .\" -.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 2007-2019 by Apple Inc. .\" Copyright © 2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH snmp.conf 5 "CUPS" "8 November 2018" "Apple Inc." +.TH snmp.conf 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -snmp.conf \- snmp configuration file for cups +snmp.conf \- snmp configuration file for cups (deprecated) .SH DESCRIPTION The .B snmp.conf @@ -55,8 +55,12 @@ The default is "off". Specifies the maximum number of seconds that the SNMP backend will scan the network for printers. The default is 120 seconds (2 minutes). +.SH NOTES +CUPS backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR cups-snmp (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cups.man b/man/cups.1 similarity index 92% rename from man/cups.man rename to man/cups.1 index 49ca183fc..706620d7c 100644 --- a/man/cups.man +++ b/man/cups.1 @@ -1,12 +1,13 @@ .\" .\" cups (intro) man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cups 1 "CUPS" "16 April 2014" "Apple Inc." +.TH cups 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cups \- a standards-based, open source printing system .SH DESCRIPTION @@ -118,6 +119,10 @@ Specifies the location of temporary files. .SH CONFORMING TO .B CUPS conforms to the Internet Printing Protocol version 2.1 and implements the Berkeley and System V UNIX print commands. +.SH NOTES +CUPS printer drivers, backends, and PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR cancel (1), .BR client.conf (7), @@ -135,4 +140,4 @@ CUPS Online Help (http://localhost:631/help), CUPS Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupsaccept.man b/man/cupsaccept.8 similarity index 87% rename from man/cupsaccept.man rename to man/cupsaccept.8 index 3f859c92a..c855d823d 100644 --- a/man/cupsaccept.man +++ b/man/cupsaccept.8 @@ -1,12 +1,13 @@ .\" -.\" accept/reject man page for CUPS. +.\" cupsaccept/reject man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cupsaccept 8 "CUPS" "10 June 2014" "Apple Inc." +.TH cupsaccept 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cupsaccept/cupsreject \- accept/reject jobs sent to a destination .SH SYNOPSIS @@ -82,4 +83,4 @@ Finally, the CUPS versions may ask the user for an access password depending on .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupsctl.man b/man/cupsctl.8 similarity index 90% rename from man/cupsctl.man rename to man/cupsctl.8 index 6fab9036d..791954c19 100644 --- a/man/cupsctl.man +++ b/man/cupsctl.8 @@ -1,12 +1,13 @@ .\" .\" cupsctl man page for CUPS. .\" -.\" Copyright 2007-2016 by Apple Inc. -.\" Copyright 2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cupsctl 8 "CUPS" "30 May 2016" "Apple Inc." +.TH cupsctl 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cupsctl \- configure cupsd.conf options .SH SYNOPSIS @@ -94,4 +95,4 @@ You cannot set the Listen or Port directives using \fBcupsctl\fR. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupsd-helper.man b/man/cupsd-helper.8 similarity index 79% rename from man/cupsd-helper.man rename to man/cupsd-helper.8 index d866780fb..bfd2e456e 100644 --- a/man/cupsd-helper.man +++ b/man/cupsd-helper.8 @@ -1,14 +1,15 @@ .\" .\" cupsd-helper man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. +.\" Copyright 2007-2019 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cupsd-helper 8 "CUPS" "15 April 2014" "Apple Inc." +.TH cupsd-helper 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -cupsd\-helper \- cupsd helper programs +cupsd\-helper \- cupsd helper programs (deprecated) .SH SYNOPSIS .B cups\-deviced .I request-id @@ -73,6 +74,10 @@ archives to further reduce their size. .LP Driver information files must conform to the format defined in .BR ppdcfile (5). +.SH NOTES +CUPS printer drivers, backends, and PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR backend (7), .BR cups (1), @@ -82,4 +87,4 @@ Driver information files must conform to the format defined in .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupsd-logs.man b/man/cupsd-logs.5 similarity index 97% rename from man/cupsd-logs.man rename to man/cupsd-logs.5 index f7e43a928..2070be9a5 100644 --- a/man/cupsd-logs.man +++ b/man/cupsd-logs.5 @@ -1,13 +1,13 @@ .\" .\" cupsd-logs man page for CUPS. .\" -.\" Copyright 2007-2018 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH cupsd-logs 5 "CUPS" "8 November 2017" "Apple Inc." +.TH cupsd-logs 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cupsd\-logs \- cupsd log files (access_log, error_log, and page_log) .SH DESCRIPTION @@ -219,4 +219,4 @@ The \fIsides\fR field contains a copy of the sides attribute provided with the I .BR cups-files.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupsd.man.in b/man/cupsd.8 similarity index 91% rename from man/cupsd.man.in rename to man/cupsd.8 index 3df6f408e..e671ae328 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.8 @@ -1,12 +1,13 @@ .\" .\" cupsd man page for CUPS. .\" -.\" Copyright 2007-2016 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cupsd 8 "CUPS" "12 February 2016" "Apple Inc." +.TH cupsd 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cupsd \- cups scheduler .SH SYNOPSIS @@ -122,4 +123,4 @@ in the foreground with a test configuration file called .BR systemd (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.5 similarity index 99% rename from man/cupsd.conf.man.in rename to man/cupsd.conf.5 index cea1cbdbe..242543e10 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.5 @@ -1,13 +1,13 @@ .\" .\" cupsd.conf man page for CUPS. .\" -.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 2007-2019 by Apple Inc. .\" Copyright © 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH cupsd.conf 5 "CUPS" "15 April 2019" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -894,4 +894,4 @@ Require authentication for accesses from outside the 10. network: .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupsenable.man b/man/cupsenable.8 similarity index 91% rename from man/cupsenable.man rename to man/cupsenable.8 index b6eb632a5..aa4ec4e79 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.8 @@ -1,12 +1,13 @@ .\" .\" cupsenable/cupsdisable man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cupsenable 8 "CUPS" "11 June 2014" "Apple Inc." +.TH cupsenable 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cupsdisable, cupsenable \- stop/start printers and classes .SH SYNOPSIS @@ -93,4 +94,4 @@ This differs from the System V versions which require the root user to execute t .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupsfilter.man b/man/cupsfilter.8 similarity index 87% rename from man/cupsfilter.man rename to man/cupsfilter.8 index e1aa836f2..c655c21c0 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.8 @@ -1,13 +1,14 @@ .\" .\" cupsfilter man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. +.\" Copyright 2007-2019 by Apple Inc. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cupsfilter 8 "CUPS" "11 June 2014" "Apple Inc." +.TH cupsfilter 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -cupsfilter \- convert a file to another format using cups filters +cupsfilter \- convert a file to another format using cups filters (deprecated) .SH SYNOPSIS .B cupsfilter [ @@ -114,6 +115,10 @@ environment variables affect the operation of /usr/share/cups/mime/*.convs /usr/share/cups/mime/*.types .SH NOTES +CUPS printer drivers, filters, and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). +.LP Unlike when printing, filters run using the .B cupsfilter command use the current user and security session. This may result in different output or unexpected behavior. @@ -131,4 +136,4 @@ The following command will generate a PDF preview of job 42 for a printer named .BR mime.types (7), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/cupstestppd.man b/man/cupstestppd.1 similarity index 89% rename from man/cupstestppd.man rename to man/cupstestppd.1 index e1070f510..f91be167a 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.1 @@ -1,12 +1,13 @@ .\" .\" cupstestppd man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH cupstestppd 1 "CUPS" "11 June 2014" "Apple Inc." +.TH cupstestppd 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME cupstestppd \- test conformance of ppd files .SH SYNOPSIS @@ -134,9 +135,13 @@ The next command tests all PPD files under the current directory and print detai find . \-name \\*.ppd \\! \-exec cupstestppd \-q '{}' \\; \\ \-exec cupstestppd \-v '{}' \\; .fi +.SH NOTES +PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR lpadmin (8), CUPS Online Help (http://localhost:631/help), Adobe PostScript Printer Description File Format Specification, Version 4.3. .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/filter.man b/man/filter.7 similarity index 95% rename from man/filter.man rename to man/filter.7 index 9bbc49770..dbc3150c8 100644 --- a/man/filter.man +++ b/man/filter.7 @@ -1,12 +1,13 @@ .\" .\" filter man page for CUPS. .\" -.\" Copyright 2007-2015 by Apple Inc. -.\" Copyright 1997-2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH filter 7 "CUPS" "19 October 2015" "Apple Inc." +.TH filter 7 "CUPS" "26 April 2019" "Apple Inc." .SH NAME filter \- cups file conversion filter interface .SH SYNOPSIS @@ -198,6 +199,10 @@ The user executing the filter, typically "lp" or "root"; consult the \fIcups-fil .SH CONFORMING TO While the filter interface is compatible with System V interface scripts, CUPS does not support System V interface scripts. .SH NOTES +CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). +.LP CUPS filters are not meant to be run directly by the user. Aside from the legacy System V interface issues (\fIargv[0]\fR is the printer name), CUPS filters also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs. Unless you are a developer and know what you are doing, please do not run filters directly. @@ -213,4 +218,4 @@ program to use the appropriate filters to do the conversions you need. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/ippevepcl.man b/man/ippevepcl.7 similarity index 100% rename from man/ippevepcl.man rename to man/ippevepcl.7 diff --git a/man/ippeveprinter.man b/man/ippeveprinter.1 similarity index 100% rename from man/ippeveprinter.man rename to man/ippeveprinter.1 diff --git a/man/ippfind.man b/man/ippfind.1 similarity index 98% rename from man/ippfind.man rename to man/ippfind.1 index 65f7c8ea3..32f2e6f8b 100644 --- a/man/ippfind.man +++ b/man/ippfind.1 @@ -1,12 +1,12 @@ .\" .\" ippfind man page. .\" -.\" Copyright © 2013-2018 by Apple Inc. +.\" Copyright © 2013-2019 by Apple Inc. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH ippfind 1 "ippsample" "14 February 2018" "Apple Inc." +.TH ippfind 1 "ippsample" "26 April 2019" "Apple Inc." .SH NAME ippfind \- find internet printing protocol printers .SH SYNOPSIS @@ -255,4 +255,4 @@ Similarly, to send a PostScript test page to every PostScript printer, run: .SH SEE ALSO .BR ipptool (1) .SH COPYRIGHT -Copyright \[co] 2013-2018 by Apple Inc. +Copyright \[co] 2013-2019 by Apple Inc. diff --git a/man/ipptool.man b/man/ipptool.1 similarity index 97% rename from man/ipptool.man rename to man/ipptool.1 index a5a8f44ed..ce858da59 100644 --- a/man/ipptool.man +++ b/man/ipptool.1 @@ -1,11 +1,12 @@ .\" .\" ipptool man page. .\" -.\" Copyright 2010-2018 by Apple Inc. +.\" Copyright © 2010-2019 by Apple Inc. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH ipptool 1 "CUPS" "1 November 2017" "Apple Inc." +.TH ipptool 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME ipptool \- perform internet printing protocol requests .SH SYNOPSIS @@ -248,4 +249,4 @@ IANA IPP Registry (http://www.iana.org/assignments/ipp\-registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) RFC 8011 (http://tools.ietf.org/html/rfc8011), .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/ipptoolfile.man b/man/ipptoolfile.5 similarity index 99% rename from man/ipptoolfile.man rename to man/ipptoolfile.5 index b50fd6d14..fd2aec332 100644 --- a/man/ipptoolfile.man +++ b/man/ipptoolfile.5 @@ -1,11 +1,12 @@ .\" .\" ipptoolfile man page. .\" -.\" Copyright 2010-2018 by Apple Inc. +.\" Copyright © 2010-2019 by Apple Inc. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH ipptoolfile 5 "CUPS" "15 June 2017" "Apple Inc." +.TH ipptoolfile 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME ipptoolfile \- ipptool file format .SH DESCRIPTION @@ -645,4 +646,4 @@ IANA IPP Registry (http://www.iana.org/assignments/ipp-registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lp.man b/man/lp.1 similarity index 97% rename from man/lp.man rename to man/lp.1 index 9cde2c5ee..cbea3b840 100644 --- a/man/lp.man +++ b/man/lp.1 @@ -1,13 +1,13 @@ .\" .\" lp man page for CUPS. .\" -.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 2007-2019 by Apple Inc. .\" Copyright © 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH lp 1 "CUPS" "6 December 2018" "Apple Inc." +.TH lp 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME lp \- print files .SH SYNOPSIS @@ -226,4 +226,4 @@ Print a presentation document 2-up to a printer called "bar": .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lpadmin.man b/man/lpadmin.8 similarity index 94% rename from man/lpadmin.man rename to man/lpadmin.8 index 61d903379..1b8c91ba4 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.8 @@ -1,12 +1,13 @@ .\" .\" lpadmin man page for CUPS. .\" -.\" Copyright 2007-2018 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH lpadmin 8 "CUPS" "8 November 2018" "Apple Inc." +.TH lpadmin 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME lpadmin \- configure cups printers and classes .SH SYNOPSIS @@ -200,6 +201,10 @@ Also, printer and class names are \fInot\fR case-sensitive. Finally, the CUPS version of \fBlpadmin\fR may ask the user for an access password depending on the printing system configuration. This differs from the System V version which requires the root user to execute this command. .SH NOTES +CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). +.LP The CUPS version of \fBlpadmin\fR does not support all of the System V or Solaris printing system configuration options. .PP Interface scripts are not supported for security reasons. @@ -223,4 +228,4 @@ Create an IPP Everywhere print queue: .BR lpoptions (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lpc.man b/man/lpc.8 similarity index 79% rename from man/lpc.man rename to man/lpc.8 index 67cef3ead..6fd6ff5b8 100644 --- a/man/lpc.man +++ b/man/lpc.8 @@ -1,14 +1,15 @@ .\" .\" lpc man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH lpc 8 "CUPS" "11 June 2014" "Apple Inc." +.TH lpc 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -lpc \- line printer control program +lpc \- line printer control program (deprecated) .SH SYNOPSIS .B lpc [ @@ -37,6 +38,8 @@ Exits the command interpreter. \fBstatus \fR[\fIqueue\fR] Displays the status of one or more printer or class queues. .SH NOTES +This program is deprecated and will be removed in a future feature release of CUPS. +.LP Since \fBlpc\fR is geared towards the Berkeley printing system, it is impossible to use \fBlpc\fR to configure printer or class queues provided by CUPS. To configure printer or class queues you must use the .BR lpadmin (8) @@ -52,4 +55,4 @@ command or another CUPS-compatible client with that functionality. .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lpinfo.man b/man/lpinfo.8 similarity index 82% rename from man/lpinfo.man rename to man/lpinfo.8 index 0f2c97997..ce42cc36e 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.8 @@ -1,14 +1,15 @@ .\" .\" lpinfo man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH lpinfo 8 "CUPS" "12 June 2014" "Apple Inc." +.TH lpinfo 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -lpinfo \- show available devices or drivers +lpinfo \- show available devices or drivers (deprecated) .SH SYNOPSIS .B lpinfo [ @@ -113,8 +114,12 @@ List drivers matching "HP LaserJet": lpinfo \-\-make\-and\-model "HP LaserJet" \-m .fi +.SH NOTES +CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR lpadmin (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lpmove.man b/man/lpmove.8 similarity index 85% rename from man/lpmove.man rename to man/lpmove.8 index 8d5134f05..3f587e262 100644 --- a/man/lpmove.man +++ b/man/lpmove.8 @@ -1,12 +1,13 @@ .\" .\" lpmove man page for CUPS. .\" -.\" Copyright 2007-2016 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH lpmove 8 "CUPS" "26 May 2016" "Apple Inc." +.TH lpmove 8 "CUPS" "26 April 2019" "Apple Inc." .SH NAME lpmove \- move a job or all jobs to a new destination .SH SYNOPSIS @@ -70,4 +71,4 @@ Move all jobs from "oldprinter" to "newprinter": .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lpoptions.man.in b/man/lpoptions.1 similarity index 94% rename from man/lpoptions.man.in rename to man/lpoptions.1 index b5d4a9daa..a34fd01dc 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.1 @@ -1,12 +1,13 @@ .\" .\" lpoptions man page for CUPS. .\" -.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 2007-2019 by Apple Inc. .\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH lpoptions 1 "CUPS" "10 April 2018" "Apple Inc." +.TH lpoptions 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME lpoptions \- display or set printer options and defaults .SH SYNOPSIS @@ -114,4 +115,4 @@ The \fBlpoptions\fR command is unique to CUPS. .BR lprm (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lpq.man b/man/lpq.1 similarity index 86% rename from man/lpq.man rename to man/lpq.1 index 0c7821a02..09582d798 100644 --- a/man/lpq.man +++ b/man/lpq.1 @@ -1,12 +1,13 @@ .\" .\" lpq man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH lpq 1 "CUPS" "12 June 2014" "Apple Inc." +.TH lpq 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME lpq \- show printer queue status .SH SYNOPSIS @@ -60,4 +61,4 @@ Requests a more verbose (long) reporting format. .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lpr.man b/man/lpr.1 similarity index 97% rename from man/lpr.man rename to man/lpr.1 index cae4ac041..f367cd97c 100644 --- a/man/lpr.man +++ b/man/lpr.1 @@ -1,13 +1,13 @@ .\" .\" lpr man page for CUPS. .\" -.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 2007-2019 by Apple Inc. .\" Copyright © 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH lpr 1 "CUPS" "6 December 2018" "Apple Inc." +.TH lpr 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME lpr \- print files .SH SYNOPSIS @@ -178,4 +178,4 @@ Print a presentation document 2-up to a printer called "foo": .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lprm.man b/man/lprm.1 similarity index 86% rename from man/lprm.man rename to man/lprm.1 index d2ab6c266..8c2bf9c2e 100644 --- a/man/lprm.man +++ b/man/lprm.1 @@ -1,12 +1,13 @@ .\" .\" lprm man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH lprm 1 "CUPS" "22 May 2014" "Apple Inc." +.TH lprm 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME lprm \- cancel print jobs .SH SYNOPSIS @@ -78,4 +79,4 @@ Cancel all jobs: .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/lpstat.man b/man/lpstat.1 similarity index 96% rename from man/lpstat.man rename to man/lpstat.1 index 78707a0c3..0b5c00b37 100644 --- a/man/lpstat.man +++ b/man/lpstat.1 @@ -1,12 +1,12 @@ .\" .\" lpstat man page for CUPS. .\" -.\" Copyright 2007-2018 by Apple Inc. +.\" Copyright 2007-2019 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. .\" -.TH lpstat 1 "CUPS" "26 May 2017" "Apple Inc." +.TH lpstat 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME lpstat \- print cups status information .SH SYNOPSIS @@ -145,4 +145,4 @@ The Solaris \fI\-f\fR, \fI\-P\fR, and \fI\-S\fR options are silently ignored. .BR lprm (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/mailto.conf.man b/man/mailto.conf.5 similarity index 87% rename from man/mailto.conf.man rename to man/mailto.conf.5 index da9b53ea6..c879222c2 100644 --- a/man/mailto.conf.man +++ b/man/mailto.conf.5 @@ -1,12 +1,13 @@ .\" .\" mailto.conf man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH mailto.conf 5 "CUPS" "12 June 2014" "Apple Inc." +.TH mailto.conf 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME mailto.conf \- configuration file for cups email notifier .SH DESCRIPTION @@ -40,4 +41,4 @@ Specifies a prefix string for the subject line of an email notification. .BR cupsd (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/mime.convs.man b/man/mime.convs.5 similarity index 79% rename from man/mime.convs.man rename to man/mime.convs.5 index 83be3bcf4..25a6f7653 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.5 @@ -1,14 +1,15 @@ .\" .\" mime.convs man page for CUPS. .\" -.\" Copyright 2007-2015 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH mime.convs 5 "CUPS" "26 August 2015" "Apple Inc." +.TH mime.convs 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -mime.convs \- mime type conversion file for cups +mime.convs \- mime type conversion file for cups (deprecated) .SH DESCRIPTION The \fBmime.convs\fR file defines the filters that are available for converting files from one format to another. The standard filters support text, PDF, PostScript, and many types of image files. @@ -46,6 +47,10 @@ Define a filter that converts PostScript documents to CUPS Raster format: application/vnd.cups\-postscript application/vnd.cups\-raster 50 pstoraster .fi +.SH NOTES +CUPS filters are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR cups-files.conf (5), .BR cupsd.conf (5), @@ -54,4 +59,4 @@ Define a filter that converts PostScript documents to CUPS Raster format: .BR mime.types (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/mime.types.man b/man/mime.types.5 similarity index 95% rename from man/mime.types.man rename to man/mime.types.5 index 77b0c913e..7e83de16a 100644 --- a/man/mime.types.man +++ b/man/mime.types.5 @@ -1,12 +1,13 @@ .\" .\" mime.types man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH mime.types 5 "CUPS" "12 June 2014" "Apple Inc." +.TH mime.types 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME mime.types \- mime type description file for cups .SH DESCRIPTION @@ -104,4 +105,4 @@ Define two MIME media types for raster data, with one being a subset with higher .BR mime.convs (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/notifier.man b/man/notifier.7 similarity index 81% rename from man/notifier.man rename to man/notifier.7 index dedbb2689..1ab226c40 100644 --- a/man/notifier.man +++ b/man/notifier.7 @@ -1,12 +1,13 @@ .\" .\" notifier man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH notifier 7 "CUPS" "12 June 2014" "Apple Inc." +.TH notifier 7 "CUPS" "26 April 2019" "Apple Inc." .SH NAME notifier \- cups notification interface .SH SYNOPSIS @@ -32,4 +33,4 @@ Notifiers inherit the environment and can use the logging mechanism documented i .BR filter (7), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/ppdc.man b/man/ppdc.1 similarity index 85% rename from man/ppdc.man rename to man/ppdc.1 index c59c3e940..44e9d2448 100644 --- a/man/ppdc.man +++ b/man/ppdc.1 @@ -1,12 +1,13 @@ .\" .\" ppdc man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH ppdc 1 "CUPS" "12 June 2014" "Apple Inc." +.TH ppdc 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME ppdc \- cups ppd compiler (deprecated) .SH SYNOPSIS @@ -86,6 +87,10 @@ The default is to generate uncompressed PPD files. \fB\-\-lf\fR Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone. The default is to use the line feed character alone. +.SH NOTES +PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR ppdhtml (1), .BR ppdi (1), @@ -94,4 +99,4 @@ The default is to use the line feed character alone. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/ppdcfile.man b/man/ppdcfile.5 similarity index 89% rename from man/ppdcfile.man rename to man/ppdcfile.5 index a95edf38b..9165ee6f6 100644 --- a/man/ppdcfile.man +++ b/man/ppdcfile.5 @@ -1,14 +1,15 @@ .\" .\" ppdcfile man page for CUPS. .\" -.\" Copyright 2007-2016 by Apple Inc. -.\" Copyright 1997-2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH ppdcfile 5 "CUPS" "5 March 2016" "Apple Inc." +.TH ppdcfile 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME -ppdcfile \- cups ppd compiler source file format +ppdcfile \- cups ppd compiler source file format (deprecated) .SH DESCRIPTION The CUPS PPD compiler reads meta files that contain descriptions of one or more PPD files to be generated by .BR ppdc (1). @@ -145,6 +146,10 @@ Directives may be placed anywhere on a line and are followed by one or more valu \fBVariablePaperSize \fIboolean-value\fR .TP 5 \fBVersion \fInumber\fR +.SH NOTES +PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR ppdc (1), .BR ppdhtml (1), @@ -153,4 +158,4 @@ Directives may be placed anywhere on a line and are followed by one or more valu .BR ppdpo (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/ppdhtml.man b/man/ppdhtml.1 similarity index 71% rename from man/ppdhtml.man rename to man/ppdhtml.1 index c3811b7ec..8399ecab4 100644 --- a/man/ppdhtml.man +++ b/man/ppdhtml.1 @@ -1,12 +1,13 @@ .\" .\" ppdhtml man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH ppdhtml 1 "CUPS" "12 June 2014" "Apple Inc." +.TH ppdhtml 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME ppdhtml \- cups html summary generator (deprecated) .SH SYNOPSIS @@ -31,6 +32,10 @@ It is equivalent to using the \fI#define\fR directive in the source file. \fB\-I \fIinclude-directory\fR Specifies an alternate include directory. Multiple \fI-I\fR options can be supplied to add additional directories. +.SH NOTES +PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR ppdc (1), .BR ppdcfile (5), @@ -39,4 +44,4 @@ Multiple \fI-I\fR options can be supplied to add additional directories. .BR ppdpo (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/ppdi.man b/man/ppdi.1 similarity index 74% rename from man/ppdi.man rename to man/ppdi.1 index 0ce29fb55..a57bae9b1 100644 --- a/man/ppdi.man +++ b/man/ppdi.1 @@ -1,12 +1,13 @@ .\" .\" ppdi man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH ppdi 1 "CUPS" "12 June 2014" "Apple Inc." +.TH ppdi 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME ppdi \- import ppd files (deprecated) .SH SYNOPSIS @@ -38,6 +39,10 @@ Specifies the PPD source file to update. If the source file does not exist, a new source file is created. Otherwise the existing file is merged with the new PPD file(s) on the command-line. If no source file is specified, the filename \fIppdi.drv\fR is used. +.SH NOTES +PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR ppdc (1), .BR ppdhtml (1), @@ -46,4 +51,4 @@ If no source file is specified, the filename \fIppdi.drv\fR is used. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/ppdmerge.man b/man/ppdmerge.1 similarity index 71% rename from man/ppdmerge.man rename to man/ppdmerge.1 index 33037d001..eb23dad34 100644 --- a/man/ppdmerge.man +++ b/man/ppdmerge.1 @@ -1,12 +1,13 @@ .\" .\" ppdmerge man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH ppdmerge 1 "CUPS" "12 June 2014" "Apple Inc." +.TH ppdmerge 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME ppdmerge \- merge ppd files (deprecated) .SH SYNOPSIS @@ -32,6 +33,10 @@ Specifies the PPD file to create. If not specified, the merged PPD file is written to the standard output. If the output file already exists, it is silently overwritten. .SH NOTES +PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). +.LP \fBppdmerge\fR does not check whether the merged PPD files are for the same device. Merging of different device PPDs will yield unpredictable results. .SH SEE ALSO @@ -42,4 +47,4 @@ Merging of different device PPDs will yield unpredictable results. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/ppdpo.man b/man/ppdpo.1 similarity index 75% rename from man/ppdpo.man rename to man/ppdpo.1 index e212ac0ea..3d1ea56dd 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.1 @@ -1,12 +1,13 @@ .\" .\" ppdpo man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2007 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2007 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH ppdpo 1 "CUPS" "12 June 2014" "Apple Inc." +.TH ppdpo 1 "CUPS" "26 April 2019" "Apple Inc." .SH NAME ppdpo \- ppd message catalog generator (deprecated) .SH SYNOPSIS @@ -38,6 +39,10 @@ Multiple \fI-I\fR options can be supplied to add additional directories. \fB\-o \fIoutput-file\fR Specifies the output file. The supported extensions are \fI.po\fR or \fI.po.gz\fR for GNU gettext format message catalogs and \fI.strings\fR for macOS strings files. +.SH NOTES +PPD files are deprecated and will no longer be supported in a future feature release of CUPS. +Printers that do not support IPP can be supported using applications such as +.BR ippeveprinter (1). .SH SEE ALSO .BR ppdc (1), .BR ppdhtml (1), @@ -46,4 +51,4 @@ The supported extensions are \fI.po\fR or \fI.po.gz\fR for GNU gettext format me .BR ppdcfile(5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/printers.conf.man b/man/printers.conf.5 similarity index 83% rename from man/printers.conf.man rename to man/printers.conf.5 index 18f1b43d4..c628024fe 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.5 @@ -1,12 +1,12 @@ .\" .\" printers.conf man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. +.\" Copyright 2007-2019 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. .\" -.TH printers.conf 5 "CUPS" "15 April 2014" "Apple Inc." +.TH printers.conf 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME printers.conf \- printer configuration file for cups .SH DESCRIPTION @@ -17,6 +17,7 @@ program. This file is not intended to be edited or managed manually. The name, location, and format of this file are an implementation detail that will change in future releases of CUPS. .SH SEE ALSO .BR classes.conf (5), +.BR cups-files.conf (5), .BR cupsd (8), .BR cupsd.conf (5), .BR mime.convs (5), @@ -24,4 +25,4 @@ The name, location, and format of this file are an implementation detail that wi .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.5 similarity index 58% rename from man/subscriptions.conf.man rename to man/subscriptions.conf.5 index 39f2a16a8..1791a3e2c 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.5 @@ -1,22 +1,26 @@ .\" .\" subscriptions.conf man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" Licensed under Apache License v2.0. See the file "LICENSE" for more +.\" information. .\" -.TH subscriptions.conf 5 "CUPS" "15 April 2014" "Apple Inc." +.TH subscriptions.conf 5 "CUPS" "26 April 2019" "Apple Inc." .SH NAME subscriptions.conf \- subscription configuration file for cups .SH DESCRIPTION -The \fBsubscriptions.conf\fR file defines the local event notification subscriptions that are active. It is normally located in the \fI/etc/cups\fR directory and is maintained by the +The \fBsubscriptions.conf\fR file defines the local event notification subscriptions that are active. +It is normally located in the \fI/etc/cups\fR directory and is maintained by the .BR cupsd (8) -program. This file is not intended to be edited or managed manually. +program. +This file is not intended to be edited or managed manually. .SH NOTES The name, location, and format of this file are an implementation detail that will change in future releases of CUPS. .SH SEE ALSO .BR classes.conf (5), +.BR cups-files.conf (5), .BR cupsd (8), .BR cupsd.conf (5), .BR mime.convs (5), @@ -24,4 +28,4 @@ The name, location, and format of this file are an implementation detail that wi .BR printers.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2018 by Apple Inc. +Copyright \[co] 2007-2019 by Apple Inc. -- 2.39.2