diff options
157 files changed, 1721 insertions, 2220 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 0453362e3..ad68a78cb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -38,7 +38,7 @@ CHANGES IN CUPS V2.2b1 - Added support for disc media sizes (<rdar://problem/20219536>) - The httpAddrConnect and httpConnect* APIs now try connecting to multiple addresses in parallel (<rdar://problem/20643153>) - - The cupsd domain socket is no longer world-accessible on OS X + - The cupsd domain socket is no longer world-accessible on macOS (<rdar://problem/7542560>) - Interface scripts are no longer supported for security reasons (<rdar://problem/23135640>) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32e36ae1f..c2426277a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -131,7 +131,7 @@ columns. > Note: > > The ".cxx" extension is used because it is the only common C++ extension -> between Linux, OS X, UNIX, and Windows. +> between Linux, macOS, UNIX, and Windows. The top of each source file contains a header giving the purpose or nature of the source file and the copyright and licensing notice: @@ -613,8 +613,8 @@ target rule is used to create the automatic dependencies: depend: TAB $(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies -We regenerate the automatic dependencies on an OS X system and express any -non-OS X dependencies statically in the makefile. +We regenerate the automatic dependencies on an macOS system and express any +non-macOS dependencies statically in the makefile. ### INSTALL/UNINSTALL SUPPORT diff --git a/INSTALL.txt b/INSTALL.txt index 60dc5776e..e1f378326 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -38,7 +38,7 @@ BEFORE YOU BEGIN Also, please note that CUPS does not include print filters to support PDF or raster printing. You *must* download GPL Ghostscript and/or the Open Printing CUPS filters package separately to print on operating systems - other than OS X. + other than macOS. COMPILING THE SUBVERSION REPOSITORY CODE @@ -98,7 +98,7 @@ CONFIGURATION and diagnose a variety of common problems - use the "--enable-unit-tests" configure option to run them at build time. - On OS X, use the "--with-archflags" option to build with the correct set of + On macOS, use the "--with-archflags" option to build with the correct set of architectures: ./configure --with-archflags="-arch i386 -arch x86_64" ... diff --git a/LICENSE.txt b/LICENSE.txt index 658ea1e46..51d42e2f1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ CUPS License Agreement - Copyright 2007-2013 by Apple Inc. + Copyright 2007-2016 by Apple Inc. 1 Infinite Loop Cupertino, CA 95014 USA @@ -70,8 +70,8 @@ the following special exception: b. An Apple Operating System means any operating system software developed and/or marketed by Apple Inc., including but not limited to all existing releases and - versions of Apple's Darwin, OS X, and OS X Server - products and all follow-on releases and future + versions of Apple's Darwin, iOS, macOS, macOS Server, and + tvOS products and all follow-on releases and future versions thereof. c. This exception is only available for Apple @@ -314,22 +314,15 @@ sloc: EPMFLAGS = -v --output-dir dist $(EPMARCH) -bsd deb pkg slackware: +bsd deb epm pkg rpm slackware: epm $(EPMFLAGS) -f $@ cups packaging/cups.list -epm: - epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list - -rpm: - epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list - .PHONEY: dist dist: all $(RM) -r dist $(MAKE) $(MFLAGS) epm case `uname` in \ *BSD*) $(MAKE) $(MFLAGS) bsd;; \ - Darwin*) $(MAKE) $(MFLAGS) osx;; \ Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \ SunOS*) $(MAKE) $(MFLAGS) pkg;; \ esac diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 7c2080a04..4471e3c7c 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -22,8 +22,8 @@ AC_ARG_WITH(languages, [ --with-languages set installed languages, defau esac]) AC_SUBST(LANGUAGES) -dnl OS X bundle-based localization support -AC_ARG_WITH(bundledir, [ --with-bundledir set OS X localization bundle directory ], +dnl macOS bundle-based localization support +AC_ARG_WITH(bundledir, [ --with-bundledir set macOS localization bundle directory ], CUPS_BUNDLEDIR="$withval", if test "x$uname" = xDarwin -a $uversion -ge 100; then CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A" @@ -382,7 +382,7 @@ AC_SUBST(DEFAULT_IPP_PORT) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT) dnl Web interface... -AC_ARG_ENABLE(webif, [ --enable-webif enable the web interface by default, default=no for OS X]) +AC_ARG_ENABLE(webif, [ --enable-webif enable the web interface by default, default=no for macOS]) case "x$enable_webif" in xno) CUPS_WEBIF=No diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index a9dc67b50..e13ee439a 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -267,7 +267,7 @@ AC_SUBST(CUPS_REQUESTS) # Server executables... case "$uname" in *BSD* | Darwin*) - # *BSD and Darwin (MacOS X) + # *BSD and Darwin (MacmacOS) INSTALL_SYSV="" CUPS_SERVERBIN="$exec_prefix/libexec/cups" ;; @@ -291,7 +291,7 @@ AC_SUBST(CUPS_SERVERROOT) AC_ARG_WITH(rundir, [ --with-rundir set transient run-time state directory],CUPS_STATEDIR="$withval",[ case "$uname" in Darwin*) - # Darwin (OS X) + # Darwin (macOS) CUPS_STATEDIR="$CUPS_SERVERROOT" ;; *) diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 86a8de088..6af8baa20 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -43,7 +43,7 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then AC_CHECK_HEADER(dns_sd.h, [ case "$uname" in Darwin*) - # Darwin and MacOS X... + # Darwin and MacmacOS... AC_DEFINE(HAVE_DNSSD) DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration" DNSSD_BACKEND="dnssd" diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 548898495..e540bfcce 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -24,7 +24,7 @@ if test x$enable_gssapi != xno; then if test "x$KRB5CONFIG" != x; then case "$uname" in Darwin) - # OS X weak-links to the Kerberos framework... + # macOS weak-links to the Kerberos framework... LIBGSSAPI="-weak_framework Kerberos" AC_MSG_CHECKING(for GSS framework) if test -d /System/Library/Frameworks/GSS.framework; then diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 4224addef..a0c0c05fd 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -21,7 +21,7 @@ fi if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then case "$uname" in Darwin* | Linux | GNU | *BSD*) - # Darwin, MacOS X, Linux, GNU HURD, and *BSD + # Darwin, MacmacOS, Linux, GNU HURD, and *BSD mandir="/usr/share/man" AMANDIR="/usr/share/man" PMANDIR="/usr/share/man" @@ -52,7 +52,7 @@ case "$uname" in MAN8DIR=1m ;; Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and OS X + # Linux, GNU Hurd, and macOS MAN1EXT=1.gz MAN5EXT=5.gz MAN7EXT=7.gz diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 1c2604a73..dd2749d22 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -47,7 +47,7 @@ if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then if test "x$default_domainsocket" = x; then case "$uname" in Darwin*) - # Darwin and MaxOS X do their own thing... + # Darwin and MaxmacOS do their own thing... CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" ;; *) diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index 549b27a21..3cf6fb113 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -20,7 +20,7 @@ case "$uname" in Darwin*) uname="Darwin" if test $uversion -lt 120; then - AC_MSG_ERROR([Sorry, this version of CUPS requires OS X 10.8 or higher.]) + AC_MSG_ERROR([Sorry, this version of CUPS requires macOS 10.8 or higher.]) fi ;; diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index de9c476be..e3c6aa6e8 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -54,7 +54,7 @@ if test x$enable_pam != xno; then case "$uname" in Darwin*) - # Darwin/OS X + # Darwin/macOS if test "x$with_pam_module" != x; then PAMFILE="pam.$with_pam_module" elif test -f /usr/lib/pam/pam_opendirectory.so.2; then diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index bbd6b891d..4410a10ef 100644 --- a/config-scripts/cups-startup.m4 +++ b/config-scripts/cups-startup.m4 @@ -16,7 +16,7 @@ ONDEMANDLIBS="" AC_SUBST(ONDEMANDFLAGS) AC_SUBST(ONDEMANDLIBS) -dnl Launchd is used on OS X/Darwin... +dnl Launchd is used on macOS/Darwin... AC_ARG_ENABLE(launchd, [ --disable-launchd disable launchd support]) LAUNCHD_DIR="" AC_SUBST(LAUNCHD_DIR) @@ -32,7 +32,7 @@ if test x$enable_launchd != xno; then case "$uname" in Darwin*) - # Darwin, MacOS X + # Darwin, MacmacOS LAUNCHD_DIR="/System/Library/LaunchDaemons" # liblaunch is already part of libSystem ;; diff --git a/config.h.in b/config.h.in index 37cfc4cd1..fea79cbb3 100644 --- a/config.h.in +++ b/config.h.in @@ -537,10 +537,10 @@ */ #undef HAVE_GETGROUPLIST - + /* - * Do we have OS X 10.4's mbr_XXX functions? + * Do we have macOS 10.4's mbr_XXX functions? */ #undef HAVE_MEMBERSHIP_H @@ -686,7 +686,7 @@ /* - * Location of OS X localization bundle, if any. + * Location of macOS localization bundle, if any. */ #undef CUPS_BUNDLEDIR @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.2b1. +# Generated by GNU Autoconf 2.68 for CUPS 2.2b1. # # Report bugs to <https://github.com/apple/cups/issues>. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ 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 @@ -192,8 +169,7 @@ 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 / || exit 1" +test x\$exitcode = x0 || 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'\" && @@ -238,25 +214,21 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - 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 + # 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+"$@"} fi if test x$as_have_required = xno; then : @@ -359,14 +331,6 @@ $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 @@ -488,10 +452,6 @@ 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). @@ -526,16 +486,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 -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -547,8 +507,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +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 # 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'" @@ -1380,6 +1360,8 @@ 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 @@ -1565,7 +1547,7 @@ Optional Features: --disable-default-shared disable DefaultShared by default --disable-raw-printing do not allow raw printing by default - --enable-webif enable the web interface by default, default=no for OS X + --enable-webif enable the web interface by default, default=no for macOS Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1603,7 +1585,7 @@ Optional Packages: --with-rcstop set stop number for rc scripts --with-xinetd set path for xinetd config files --with-languages set installed languages, default=all - --with-bundledir set OS X localization bundle directory + --with-bundledir set macOS localization bundle directory --with-config-file-perm set default ConfigFilePerm value, default=0640 --with-cupsd-file-perm set default cupsd permissions, default=0500 --with-log-file-perm set default LogFilePerm value, default=0644 @@ -1706,9 +1688,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF CUPS configure 2.2b1 -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1859,7 +1841,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -2170,7 +2152,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.2b1, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2527,7 +2509,7 @@ case "$uname" in Darwin*) uname="Darwin" if test $uversion -lt 120; then - as_fn_error $? "Sorry, this version of CUPS requires OS X 10.8 or higher." "$LINENO" 5 + as_fn_error $? "Sorry, this version of CUPS requires macOS 10.8 or higher." "$LINENO" 5 fi ;; @@ -2589,7 +2571,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -2637,7 +2619,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -2681,7 +2663,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3125,7 +3107,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -struct stat; +#include <sys/types.h> +#include <sys/stat.h> /* 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); @@ -3375,7 +3358,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3419,7 +3402,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3621,7 +3604,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3661,7 +3644,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3714,7 +3697,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3754,7 +3737,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3794,7 +3777,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3834,7 +3817,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3874,7 +3857,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3914,7 +3897,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3954,7 +3937,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3994,7 +3977,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4034,7 +4017,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4074,7 +4057,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4150,7 +4133,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4193,7 +4176,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4603,7 +4586,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" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$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 @@ -4669,7 +4652,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" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$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 @@ -6294,7 +6277,7 @@ _ACEOF # Server executables... case "$uname" in *BSD* | Darwin*) - # *BSD and Darwin (MacOS X) + # *BSD and Darwin (MacmacOS) INSTALL_SYSV="" CUPS_SERVERBIN="$exec_prefix/libexec/cups" ;; @@ -6329,7 +6312,7 @@ else case "$uname" in Darwin*) - # Darwin (OS X) + # Darwin (macOS) CUPS_STATEDIR="$CUPS_SERVERROOT" ;; *) @@ -6355,7 +6338,7 @@ fi if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then case "$uname" in Darwin* | Linux | GNU | *BSD*) - # Darwin, MacOS X, Linux, GNU HURD, and *BSD + # Darwin, MacmacOS, Linux, GNU HURD, and *BSD mandir="/usr/share/man" AMANDIR="/usr/share/man" PMANDIR="/usr/share/man" @@ -6385,7 +6368,7 @@ case "$uname" in MAN8DIR=1m ;; Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and OS X + # Linux, GNU Hurd, and macOS MAN1EXT=1.gz MAN5EXT=5.gz MAN7EXT=7.gz @@ -7563,7 +7546,7 @@ if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then if test "x$default_domainsocket" = x; then case "$uname" in Darwin*) - # Darwin and MaxOS X do their own thing... + # Darwin and MaxmacOS do their own thing... CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" ;; *) @@ -7638,7 +7621,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -7681,7 +7664,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -7720,7 +7703,7 @@ fi if test "x$KRB5CONFIG" != x; then case "$uname" in Darwin) - # OS X weak-links to the Kerberos framework... + # macOS weak-links to the Kerberos framework... LIBGSSAPI="-weak_framework Kerberos" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS framework" >&5 $as_echo_n "checking for GSS framework... " >&6; } @@ -8233,7 +8216,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -8276,7 +8259,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -8331,7 +8314,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGCRYPTCONFIG="$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 @@ -8374,7 +8357,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGCRYPTCONFIG="$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 @@ -8700,7 +8683,7 @@ fi case "$uname" in Darwin*) - # Darwin/OS X + # Darwin/macOS if test "x$with_pam_module" != x; then PAMFILE="pam.$with_pam_module" elif test -f /usr/lib/pam/pam_opendirectory.so.2; then @@ -8933,8 +8916,6 @@ _ACEOF esac rm -rf conftest* fi - - fi @@ -9050,7 +9031,7 @@ if test "x$ac_cv_header_dns_sd_h" = xyes; then : case "$uname" in Darwin*) - # Darwin and MacOS X... + # Darwin and MacmacOS... $as_echo "#define HAVE_DNSSD 1" >>confdefs.h DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration" @@ -9149,7 +9130,7 @@ fi case "$uname" in Darwin*) - # Darwin, MacOS X + # Darwin, MacmacOS LAUNCHD_DIR="/System/Library/LaunchDaemons" # liblaunch is already part of libSystem ;; @@ -9949,7 +9930,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVA="$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 @@ -10012,7 +9993,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$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 @@ -10075,7 +10056,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHPCGI="$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 @@ -10116,7 +10097,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHP="$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 @@ -10184,7 +10165,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$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 @@ -10652,16 +10633,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 -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10721,16 +10702,28 @@ else as_mkdir_p=false fi - -# 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 +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 # 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'" @@ -10752,7 +10745,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by CUPS $as_me 2.2b1, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10815,10 +10808,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.2b1 -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10907,7 +10900,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' diff --git a/cups/adminutil.c b/cups/adminutil.c index ec660d8cc..6a3caeb81 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -831,7 +831,7 @@ cupsAdminExportSamba( * The returned settings should be freed with cupsFreeOptions() when * you are done with them. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ @@ -1147,7 +1147,7 @@ cupsAdminGetServerSettings( /* * 'cupsAdminSetServerSettings()' - Set settings on the server. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ diff --git a/cups/adminutil.h b/cups/adminutil.h index ea9d6a0e0..cc119fc5b 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -54,7 +54,7 @@ typedef void (*cups_device_cb_t)(const char *device_class, const char *device_uri, const char *device_location, void *user_data); /* Device callback - * @since CUPS 1.4/OS X 10.6@ */ + * @since CUPS 1.4/macOS 10.6@ */ /* diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml index ed2460408..1b8f6f3cf 100644 --- a/cups/api-filter.shtml +++ b/cups/api-filter.shtml @@ -79,7 +79,7 @@ directory to write to.</p> <p>In addition, some operating systems provide additional security mechanisms that further limit file system access, even for backends running as root. On -OS X, for example, no backend may write to a user's home directory. See the <a href="#SANDBOXING">Sandboxing on OS X</a> section for more information.</p> +macOS, for example, no backend may write to a user's home directory. See the <a href="#SANDBOXING">Sandboxing on macOS</a> section for more information.</p> </blockquote> <h3><a name="SIGNALS">Canceled Jobs and Signal Handling</a></h3> @@ -151,7 +151,7 @@ when running print filters and backends:</p> <dt>APPLE_LANGUAGE</dt> <dd>The Apple language identifier associated with the job - (OS X only).</dd> + (macOS only).</dd> <dt>CHARSET</dt> <dd>The job character set, typically "utf-8".</dd> @@ -561,7 +561,7 @@ sub-state and not an issue that applies when a job is not printing.</p> <blockquote><b>Note:</b> <p>"STATE:" messages often provide visible alerts to the user. For example, -on OS X setting a printer-state-reason value with an "-error" or +on macOS setting a printer-state-reason value with an "-error" or "-warning" suffix will cause the printer's dock item to bounce if the corresponding reason is localized with a cupsIPPReason keyword in the printer's PPD file.</p> @@ -851,9 +851,9 @@ void *my_data; <a href="#cupsSideChannelSNMPWalk">cupsSNMPSideChannelWalk</a>(".1.3.6.1.2.1.43", 5.0, my_callback, my_data); </pre> -<h2><a name="SANDBOXING">Sandboxing on OS X</a></h2> +<h2><a name="SANDBOXING">Sandboxing on macOS</a></h2> -<p>Starting with OS X 10.6, filters and backends are run inside a security "sandbox" which further limits (beyond the normal UNIX user/group permissions) what a filter or backend can do. This helps to both secure the printing system from malicious software and enforce the functional separation of components in the CUPS filter chain. What follows is a list of actions that are explicitly allowed for all filters and backends:</p> +<p>Starting with macOS 10.6, filters and backends are run inside a security "sandbox" which further limits (beyond the normal UNIX user/group permissions) what a filter or backend can do. This helps to both secure the printing system from malicious software and enforce the functional separation of components in the CUPS filter chain. What follows is a list of actions that are explicitly allowed for all filters and backends:</p> <ol> diff --git a/cups/api-ppd.header b/cups/api-ppd.header index 6c0551f5f..2f7a4cdc3 100644 --- a/cups/api-ppd.header +++ b/cups/api-ppd.header @@ -12,7 +12,7 @@ <h1 class='title'>PPD API (DEPRECATED)</h1> -<blockquote>The PPD API is deprecated starting in CUPS 1.6/OS X 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote> +<blockquote>The PPD API is deprecated starting in CUPS 1.6/macOS 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote> <div class='summary'><table summary='General Information'> <thead> diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml index 381035380..50c485005 100644 --- a/cups/api-ppd.shtml +++ b/cups/api-ppd.shtml @@ -13,7 +13,7 @@ <h2 class='title'><a name='OVERVIEW'>Overview</a></h2> -<blockquote>The PPD API is deprecated starting in CUPS 1.6/OS X 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote> +<blockquote>The PPD API is deprecated starting in CUPS 1.6/macOS 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote> <p>The CUPS PPD API provides read-only access the data in PostScript Printer Description ("PPD") files which are used for all printers with a driver. With diff --git a/cups/array.c b/cups/array.c index fa54cc8d3..b8bec274d 100644 --- a/cups/array.c +++ b/cups/array.c @@ -77,7 +77,7 @@ static int cups_array_find(cups_array_t *a, void *e, int prev, int *rdiff); * appended at the end of the run of identical elements. For unsorted arrays, * the element is appended to the end of the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ @@ -207,7 +207,7 @@ _cupsArrayAddStrings(cups_array_t *a, /* I - Array */ * The caller is responsible for freeing the memory used by the * elements themselves. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -249,7 +249,7 @@ cupsArrayClear(cups_array_t *a) /* I - Array */ /* * 'cupsArrayCount()' - Get the number of elements in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Number of elements */ @@ -276,7 +276,7 @@ cupsArrayCount(cups_array_t *a) /* I - Array */ * The current element is undefined until you call @link cupsArrayFind@, * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Element */ @@ -306,7 +306,7 @@ cupsArrayCurrent(cups_array_t *a) /* I - Array */ * The caller is responsible for freeing the memory used by the * elements themselves. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -350,7 +350,7 @@ cupsArrayDelete(cups_array_t *a) /* I - Array */ /* * 'cupsArrayDup()' - Duplicate the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_array_t * /* O - Duplicate array */ @@ -435,7 +435,7 @@ cupsArrayDup(cups_array_t *a) /* I - Array */ /* * 'cupsArrayFind()' - Find an element in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Element found or @code NULL@ */ @@ -530,7 +530,7 @@ cupsArrayFind(cups_array_t *a, /* I - Array */ /* * 'cupsArrayFirst()' - Get the first element in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - First element or @code NULL@ if the array is empty */ @@ -559,7 +559,7 @@ cupsArrayFirst(cups_array_t *a) /* I - Array */ * The current element is undefined until you call @link cupsArrayFind@, * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - Index of the current element, starting at 0 */ @@ -575,7 +575,7 @@ cupsArrayGetIndex(cups_array_t *a) /* I - Array */ /* * 'cupsArrayGetInsert()' - Get the index of the last inserted element. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - Index of the last inserted element, starting at 0 */ @@ -591,7 +591,7 @@ cupsArrayGetInsert(cups_array_t *a) /* I - Array */ /* * 'cupsArrayIndex()' - Get the N-th element in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - N-th element or @code NULL@ */ @@ -614,7 +614,7 @@ cupsArrayIndex(cups_array_t *a, /* I - Array */ * inserted at the beginning of the run of identical elements. For unsorted * arrays, the element is inserted at the beginning of the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on failure, 1 on success */ @@ -644,7 +644,7 @@ cupsArrayInsert(cups_array_t *a, /* I - Array */ /* * 'cupsArrayLast()' - Get the last element in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Last element or @code NULL@ if the array is empty */ @@ -675,7 +675,7 @@ cupsArrayLast(cups_array_t *a) /* I - Array */ * data pointer argument can safely be omitted when not required so functions * like @code strcmp@ can be used for sorted string arrays. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_array_t * /* O - Array */ @@ -697,7 +697,7 @@ cupsArrayNew(cups_array_func_t f, /* I - Comparison function or @code NULL@ for * The hash function ("h") is used to implement cached lookups with the * specified hash size ("hsize"). * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ cups_array_t * /* O - Array */ @@ -727,7 +727,7 @@ cupsArrayNew2(cups_array_func_t f, /* I - Comparison function or @code NULL@ fo * The free function ("cf") is used to automatically free/release elements when * removed or the array is deleted. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ cups_array_t * /* O - Array */ @@ -811,7 +811,7 @@ _cupsArrayNewStrings(const char *s, /* I - Delimited strings or NULL */ * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@ * to set the current element. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Next element or @code NULL@ */ @@ -844,7 +844,7 @@ cupsArrayNext(cups_array_t *a) /* I - Array */ * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@ * to set the current element. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Previous element or @code NULL@ */ @@ -877,7 +877,7 @@ cupsArrayPrev(cups_array_t *a) /* I - Array */ * The caller is responsible for freeing the memory used by the * removed element. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ @@ -942,7 +942,7 @@ cupsArrayRemove(cups_array_t *a, /* I - Array */ /* * 'cupsArrayRestore()' - Reset the current element to the last @link cupsArraySave@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - New current element */ @@ -973,7 +973,7 @@ cupsArrayRestore(cups_array_t *a) /* I - Array */ * * The save/restore stack is guaranteed to be at least 32 elements deep. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ @@ -995,7 +995,7 @@ cupsArraySave(cups_array_t *a) /* I - Array */ /* * 'cupsArrayUserData()' - Return the user data for an array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - User data */ @@ -1011,7 +1011,7 @@ cupsArrayUserData(cups_array_t *a) /* I - Array */ /* * 'cups_array_add()' - Insert or append an element to the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ static int /* O - 1 on success, 0 on failure */ diff --git a/cups/auth.c b/cups/auth.c index f9e9f98ba..f9187ffa8 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -102,7 +102,7 @@ static int cups_local_auth(http_t *http); * This function should be called in response to a @code HTTP_STATUS_UNAUTHORIZED@ * status, prior to resubmitting your request. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ int /* O - 0 on success, -1 on error */ diff --git a/cups/backchannel.c b/cups/backchannel.c index c4c96acbe..13a956027 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -42,7 +42,7 @@ static void cups_setup(fd_set *set, struct timeval *tval, * parameter controls how many seconds to wait for the data - use 0.0 to * return immediately if there is no data, -1.0 to wait for data indefinitely. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Bytes read or -1 on error */ @@ -93,7 +93,7 @@ cupsBackChannelRead(char *buffer, /* I - Buffer to read into */ * 0.0 to return immediately if the data cannot be written, -1.0 to wait * indefinitely. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Bytes written or -1 on error */ diff --git a/cups/backend.c b/cups/backend.c index b84ea5ca3..a21ee387a 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -37,7 +37,7 @@ static void quote_string(const char *s); * variable or the device URI passed in argv[0], whichever is found * first. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Device URI or @code NULL@ */ @@ -85,7 +85,7 @@ cupsBackendDeviceURI(char **argv) /* I - Command-line arguments */ * It handles quoting of special characters in the device-make-and-model, * device-info, device-id, and device-location strings. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ void diff --git a/cups/cups.h b/cups/cups.h index 5a197fcb2..f45116606 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -225,20 +225,20 @@ enum cups_ptype_e /* Printer type/capability bit CUPS_PRINTER_FAX = 0x40000, /* Fax queue */ CUPS_PRINTER_REJECTING = 0x80000, /* Printer is rejecting jobs */ CUPS_PRINTER_DELETE = 0x100000, /* Delete printer - * @since CUPS 1.2/OS X 10.5@ */ + * @since CUPS 1.2/macOS 10.5@ */ CUPS_PRINTER_NOT_SHARED = 0x200000, /* Printer is not shared - * @since CUPS 1.2/OS X 10.5@ */ + * @since CUPS 1.2/macOS 10.5@ */ CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication - * @since CUPS 1.2/OS X 10.5@ */ + * @since CUPS 1.2/macOS 10.5@ */ CUPS_PRINTER_COMMANDS = 0x800000, /* Printer supports maintenance commands - * @since CUPS 1.2/OS X 10.5@ */ + * @since CUPS 1.2/macOS 10.5@ */ CUPS_PRINTER_DISCOVERED = 0x1000000, /* Printer was automatically discovered * and added @private@ * @since Deprecated@ */ CUPS_PRINTER_SCANNER = 0x2000000, /* Scanner-only device - * @since CUPS 1.4/OS X 10.6@ */ + * @since CUPS 1.4/macOS 10.6@ */ CUPS_PRINTER_MFP = 0x4000000, /* Printer with scanning capabilities - * @since CUPS 1.4/OS X 10.6@ */ + * @since CUPS 1.4/macOS 10.6@ */ CUPS_PRINTER_3D = 0x8000000, /* Printer with 3D capabilities @since CUPS 2.1@ */ CUPS_PRINTER_OPTIONS = 0x6fffc /* ~(CLASS | REMOTE | IMPLICIT | * DEFAULT | FAX | REJECTING | DELETE | @@ -263,7 +263,7 @@ typedef struct cups_dest_s /**** Destination ****/ typedef struct _cups_dinfo_s cups_dinfo_t; /* Destination capability and status - * information @since CUPS 1.6/OS X 10.8@ */ + * information @since CUPS 1.6/macOS 10.8@ */ typedef struct cups_job_s /**** Job ****/ { @@ -280,7 +280,7 @@ typedef struct cups_job_s /**** Job ****/ time_t processing_time; /* Time the job was processed */ } cups_job_t; -typedef struct cups_size_s /**** Media Size @since CUPS 1.6/OS X 10.8@ ****/ +typedef struct cups_size_s /**** Media Size @since CUPS 1.6/macOS 10.8@ ****/ { char media[128]; /* Media name to use */ int width, /* Width in hundredths of millimeters */ @@ -300,17 +300,17 @@ typedef int (*cups_client_cert_cb_t)(http_t *http, void *tls, cups_array_t *distinguished_names, void *user_data); /* Client credentials callback - * @since CUPS 1.5/OS X 10.7@ */ + * @since CUPS 1.5/macOS 10.7@ */ typedef int (*cups_dest_cb_t)(void *user_data, unsigned flags, cups_dest_t *dest); /* Destination enumeration callback - * @since CUPS 1.6/OS X 10.8@ */ + * @since CUPS 1.6/macOS 10.8@ */ # ifdef __BLOCKS__ typedef int (^cups_dest_block_t)(unsigned flags, cups_dest_t *dest); /* Destination enumeration block - * @since CUPS 1.6/OS X 10.8@ */ + * @since CUPS 1.6/macOS 10.8@ */ # endif /* __BLOCKS__ */ typedef const char *(*cups_password_cb_t)(const char *prompt); @@ -321,12 +321,12 @@ typedef const char *(*cups_password_cb2_t)(const char *prompt, http_t *http, const char *resource, void *user_data); /* New password callback - * @since CUPS 1.4/OS X 10.6@ */ + * @since CUPS 1.4/macOS 10.6@ */ typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls, cups_array_t *certs, void *user_data); /* Server credentials callback - * @since CUPS 1.5/OS X 10.7@ */ + * @since CUPS 1.5/macOS 10.7@ */ /* @@ -414,7 +414,7 @@ extern int cupsPrintFiles2(http_t *http, const char *name, extern int cupsSetDests2(http_t *http, int num_dests, cups_dest_t *dests) _CUPS_API_1_1_21; -/**** New in CUPS 1.2/OS X 10.5 ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ extern ssize_t cupsBackChannelRead(char *buffer, size_t bytes, double timeout) _CUPS_API_1_2; extern ssize_t cupsBackChannelWrite(const char *buffer, size_t bytes, @@ -431,7 +431,7 @@ extern int cupsRemoveOption(const char *name, int num_options, cups_option_t **options) _CUPS_API_1_2; extern cups_file_t *cupsTempFile2(char *filename, int len) _CUPS_API_1_2; -/**** New in CUPS 1.3/OS X 10.5 ****/ +/**** New in CUPS 1.3/macOS 10.5 ****/ extern ipp_t *cupsDoIORequest(http_t *http, ipp_t *request, const char *resource, int infile, int outfile) _CUPS_API_1_3; @@ -444,7 +444,7 @@ extern void cupsSetDefaultDest(const char *name, int num_dests, cups_dest_t *dests) _CUPS_API_1_3; -/**** New in CUPS 1.4/OS X 10.6 ****/ +/**** New in CUPS 1.4/macOS 10.6 ****/ extern ipp_status_t cupsCancelJob2(http_t *http, const char *name, int job_id, int purge) _CUPS_API_1_4; extern int cupsCreateJob(http_t *http, const char *name, @@ -473,14 +473,14 @@ extern http_status_t cupsStartDocument(http_t *http, const char *name, extern http_status_t cupsWriteRequestData(http_t *http, const char *buffer, size_t length) _CUPS_API_1_4; -/**** New in CUPS 1.5/OS X 10.7 ****/ +/**** New in CUPS 1.5/macOS 10.7 ****/ extern void cupsSetClientCertCB(cups_client_cert_cb_t cb, void *user_data) _CUPS_API_1_5; extern int cupsSetCredentials(cups_array_t *certs) _CUPS_API_1_5; extern void cupsSetServerCertCB(cups_server_cert_cb_t cb, void *user_data) _CUPS_API_1_5; -/**** New in CUPS 1.6/OS X 10.8 ****/ +/**** New in CUPS 1.6/macOS 10.8 ****/ extern ipp_status_t cupsCancelDestJob(http_t *http, cups_dest_t *dest, int job_id) _CUPS_API_1_6; extern int cupsCheckDestSupported(http_t *http, cups_dest_t *dest, @@ -592,7 +592,7 @@ extern int cupsGetDestMediaDefault(http_t *http, cups_dest_t *dest, extern void cupsSetUserAgent(const char *user_agent) _CUPS_API_1_7; extern const char *cupsUserAgent(void) _CUPS_API_1_7; -/* New in CUPS 2.0/OS X 10.10 */ +/* New in CUPS 2.0/macOS 10.10 */ extern cups_dest_t *cupsGetDestWithURI(const char *name, const char *uri) _CUPS_API_2_0; extern const char *cupsLocalizeDestMedia(http_t *http, cups_dest_t *dest, cups_dinfo_t *info, unsigned flags, cups_size_t *size) _CUPS_API_2_0; extern int cupsMakeServerCredentials(const char *path, const char *common_name, int num_alt_names, const char **alt_names, time_t expiration_date) _CUPS_API_2_0; diff --git a/cups/dest-job.c b/cups/dest-job.c index 6b7a9e2c1..146887eea 100644 --- a/cups/dest-job.c +++ b/cups/dest-job.c @@ -28,7 +28,7 @@ * @code IPP_STATUS_ERRPR_NOT_AUTHORIZED@ or * @code IPP_STATUS_ERROR_FORBIDDEN@ on failure. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t @@ -66,7 +66,7 @@ cupsCancelDestJob(http_t *http, /* I - Connection to destination */ * "job_id" is the job ID returned by cupsCreateDestJob. Returns @code IPP_STATUS_OK@ * on success. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t /* O - IPP status code */ @@ -150,7 +150,7 @@ cupsCloseDestJob( * Returns @code IPP_STATUS_OK@ or @code IPP_STATUS_OK_SUBST@ on success, saving the job ID * in the variable pointed to by "job_id". * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t /* O - IPP status code */ @@ -240,7 +240,7 @@ cupsCreateDestJob( * * Returns @code IPP_STATUS_OK@ or @code IPP_STATUS_OK_SUBST@ on success. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t /* O - Status of document submission */ @@ -285,7 +285,7 @@ cupsFinishDestDocument( * if this is the last document to be submitted in the job. Returns * @code HTTP_CONTINUE@ on success. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ http_status_t /* O - Status of document creation */ diff --git a/cups/dest-localization.c b/cups/dest-localization.c index 195869e60..6358b6dbb 100644 --- a/cups/dest-localization.c +++ b/cups/dest-localization.c @@ -36,7 +36,7 @@ static char *cups_scan_strings(char *buffer); * The returned string is stored in the destination information and will become * invalid if the destination information is deleted. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ const char * /* O - Localized string */ @@ -200,7 +200,7 @@ cupsLocalizeDestMedia( * The returned string is stored in the destination information and will become * invalid if the destination information is deleted. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const char * /* O - Localized string */ @@ -239,7 +239,7 @@ cupsLocalizeDestOption( * The returned string is stored in the destination information and will become * invalid if the destination information is deleted. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const char * /* O - Localized string */ diff --git a/cups/dest-options.c b/cups/dest-options.c index 438e6f681..fc3fd3573 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -64,7 +64,7 @@ static void cups_update_ready(http_t *http, cups_dinfo_t *dinfo); * * Returns 1 if supported, 0 otherwise. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 if supported, 0 otherwise */ @@ -261,7 +261,7 @@ cupsCheckDestSupported( * If cupsCopyDestConflicts returns 1 but "num_resolved" and "resolved" are set * to 0 and @code NULL@, respectively, then the conflict cannot be resolved. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 if there is a conflict, 0 if none, -1 on error */ @@ -546,7 +546,7 @@ cupsCopyDestConflicts( * The caller is responsible for calling @link cupsFreeDestInfo@ on the return * value. @code NULL@ is returned on error. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ cups_dinfo_t * /* O - Destination information */ @@ -672,7 +672,7 @@ cupsCopyDestInfo( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -713,7 +713,7 @@ cupsFindDestDefault( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -756,7 +756,7 @@ cupsFindDestReady( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -835,7 +835,7 @@ cupsFreeDestInfo(cups_dinfo_t *dinfo) /* I - Destination information */ * example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will get the Nth * borderless size supported by the printer. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -924,7 +924,7 @@ cupsGetDestMediaByIndex( * * Returns 1 when there is a match and 0 if there is not a match. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on match, 0 on failure */ @@ -989,7 +989,7 @@ cupsGetDestMediaByName( * * Returns 1 when there is a match and 0 if there is not a match. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on match, 0 on failure */ @@ -1048,7 +1048,7 @@ cupsGetDestMediaBySize( * counted. For example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will return * the number of borderless sizes. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - Number of sizes */ @@ -1089,7 +1089,7 @@ cupsGetDestMediaCount( * example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will return the default * borderless size, typically US Letter or A4, but sometimes 4x6 photo media. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ diff --git a/cups/dest.c b/cups/dest.c index 1e3060338..018d03ade 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -557,7 +557,7 @@ _cupsAppleSetUseLastPrinter( * to by "cancel" is non-zero, or the callback function (or block) returns 0, * The caller is responsible for calling httpClose() on the returned object. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ http_t * /* O - Connection to server or @code NULL@ */ @@ -733,7 +733,7 @@ cupsConnectDest( * to by "cancel" is non-zero, or the callback function (or block) returns 0, * The caller is responsible for calling httpClose() on the returned object. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ http_t * /* O - Connection to server or @code NULL@ */ @@ -759,7 +759,7 @@ cupsConnectDestBlock( * copy) - for use with the cupsEnumDests* functions. The caller is responsible * for calling cupsFreeDests() on the returned object(s). * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int @@ -915,7 +915,7 @@ _cupsCreateDest(const char *name, /* I - Printer name */ * Enumeration happens on the current thread and does not return until all * destinations have been enumerated or the callback function returns 0. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -1250,7 +1250,7 @@ cupsEnumDests( * Enumeration happens on the current thread and does not return until all * destinations have been enumerated or the block returns 0. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -1420,7 +1420,7 @@ _cupsGetDestResource( * * "uri" is the "ipp" or "ipps" URI for the printer. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ cups_dest_t * /* O - Destination or @code NULL@ */ @@ -1524,7 +1524,7 @@ cupsGetDestWithURI(const char *name, /* I - Desired printer name or @code NULL@ * Free the memory used by the destination array using the @link cupsFreeDests@ * function. * - * Note: On OS X this function also gets the default paper from the system + * Note: On macOS this function also gets the default paper from the system * preferences (~/L/P/org.cups.PrintingPrefs.plist) and includes it in the * options array for each destination that supports it. */ @@ -1817,7 +1817,7 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */ * Use the @link cupsFreeDests@ function to free the destination list and * the @link cupsGetDest@ function to find a particular destination. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - Number of destinations */ @@ -1994,7 +1994,7 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ * The returned destination must be freed using @link cupsFreeDests@ with a * "num_dests" value of 1. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ cups_dest_t * /* O - Destination or @code NULL@ */ @@ -2108,7 +2108,7 @@ cupsGetNamedDest(http_t *http, /* I - Connection to server or @code CUPS_HTT * @link cupsSetDests@ or @link cupsSetDests2@ functions to save the new * options for the user. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - New number of destinations */ @@ -2154,7 +2154,7 @@ cupsRemoveDest(const char *name, /* I - Destination name */ /* * 'cupsSetDefaultDest()' - Set the default destination. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ void @@ -2209,7 +2209,7 @@ cupsSetDests(int num_dests, /* I - Number of destinations */ * This function saves the destinations to /etc/cups/lpoptions when run * as root and ~/.cups/lpoptions when run as a normal user. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - 0 on success, -1 on error */ @@ -2435,7 +2435,7 @@ cupsSetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ #ifdef HAVE_NOTIFY_POST /* - * Send a notification so that MacOS X applications can know about the + * Send a notification so that MacmacOS applications can know about the * change, too. */ diff --git a/cups/dir.c b/cups/dir.c index 7abe39be8..074e65942 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -65,7 +65,7 @@ _cups_dir_time(FILETIME ft) /* I - File time */ /* * 'cupsDirClose()' - Close a directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -96,7 +96,7 @@ cupsDirClose(cups_dir_t *dp) /* I - Directory pointer */ /* * 'cupsDirOpen()' - Open a directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_dir_t * /* O - Directory pointer or @code NULL@ if the directory could not be opened. */ @@ -139,7 +139,7 @@ cupsDirOpen(const char *directory) /* I - Directory name */ /* * 'cupsDirRead()' - Read the next directory entry. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_dentry_t * /* O - Directory entry or @code NULL@ if there are no more */ @@ -199,7 +199,7 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */ /* * 'cupsDirRewind()' - Rewind to the start of the directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -249,7 +249,7 @@ struct _cups_dir_s /**** Directory data structure ****/ /* * 'cupsDirClose()' - Close a directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -276,7 +276,7 @@ cupsDirClose(cups_dir_t *dp) /* I - Directory pointer */ /* * 'cupsDirOpen()' - Open a directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_dir_t * /* O - Directory pointer or @code NULL@ if the directory could not be opened. */ @@ -330,7 +330,7 @@ cupsDirOpen(const char *directory) /* I - Directory name */ /* * 'cupsDirRead()' - Read the next directory entry. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_dentry_t * /* O - Directory entry or @code NULL@ when there are no more */ @@ -428,7 +428,7 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */ /* * 'cupsDirRewind()' - Rewind to the start of the directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void diff --git a/cups/encode.c b/cups/encode.c index 6416cd524..d26d86d36 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -357,7 +357,7 @@ cupsEncodeOptions(ipp_t *ipp, /* I - Request to add to */ * function multiple times for each group, or use cupsEncodeOptions() * to add the standard groups. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void diff --git a/cups/file.c b/cups/file.c index 03d0f33e4..b81bfe88a 100644 --- a/cups/file.c +++ b/cups/file.c @@ -312,7 +312,7 @@ _cupsFileCheckFilter( /* * 'cupsFileClose()' - Close a CUPS file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -444,7 +444,7 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileCompression()' - Return whether a file is compressed. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - @code CUPS_FILE_NONE@ or @code CUPS_FILE_GZIP@ */ @@ -457,7 +457,7 @@ cupsFileCompression(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileEOF()' - Return the end-of-file status. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 on end of file, 0 otherwise */ @@ -476,7 +476,7 @@ cupsFileEOF(cups_file_t *fp) /* I - CUPS file */ * the supplied paths, @code NULL@ is returned. A @code NULL@ path only * matches the current directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Full path to file or @code NULL@ if not found */ @@ -577,7 +577,7 @@ cupsFileFind(const char *filename, /* I - File to find */ /* * 'cupsFileFlush()' - Flush pending output. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -625,7 +625,7 @@ cupsFileFlush(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileGetChar()' - Get a single character from a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Character or -1 on end of file */ @@ -673,7 +673,7 @@ cupsFileGetChar(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileGetConf()' - Get a line from a configuration file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Line read or @code NULL@ on end of file or error */ @@ -816,7 +816,7 @@ cupsFileGetConf(cups_file_t *fp, /* I - CUPS file */ * nul-terminated, however you should use the returned length to determine * the number of bytes on the line. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ size_t /* O - Number of bytes on line or 0 on end of file */ @@ -890,7 +890,7 @@ cupsFileGetLine(cups_file_t *fp, /* I - File to read from */ /* * 'cupsFileGets()' - Get a CR and/or LF-terminated line. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Line read or @code NULL@ on end of file or error */ @@ -971,7 +971,7 @@ cupsFileGets(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFileLock()' - Temporarily lock access to a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -1000,7 +1000,7 @@ cupsFileLock(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFileNumber()' - Return the file descriptor associated with a CUPS file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - File descriptor */ @@ -1029,7 +1029,7 @@ cupsFileNumber(cups_file_t *fp) /* I - CUPS file */ * connection as needed, generally preferring IPv6 connections when there is * a choice. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file or @code NULL@ if the file or socket cannot be opened */ @@ -1151,7 +1151,7 @@ cupsFileOpen(const char *filename, /* I - Name of file */ * supplied which enables Flate compression of the file. Compression is * not supported for the "a" (append) mode. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file or @code NULL@ if the file could not be opened */ @@ -1263,7 +1263,7 @@ cupsFileOpenFd(int fd, /* I - File descriptor */ /* * 'cupsFilePeekChar()' - Peek at the next character from a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Character or -1 on end of file */ @@ -1295,7 +1295,7 @@ cupsFilePeekChar(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFilePrintf()' - Write a formatted string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Number of bytes written or -1 on error */ @@ -1392,7 +1392,7 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFilePutChar()' - Write a character. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -1446,7 +1446,7 @@ cupsFilePutChar(cups_file_t *fp, /* I - CUPS file */ * * This function handles any comment escaping of the value. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ssize_t /* O - Number of bytes written or -1 on error */ @@ -1507,7 +1507,7 @@ cupsFilePutConf(cups_file_t *fp, /* I - CUPS file */ * * Like the @code fputs@ function, no newline is appended to the string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Number of bytes written or -1 on error */ @@ -1571,7 +1571,7 @@ cupsFilePuts(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFileRead()' - Read from a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Number of bytes read or -1 on error */ @@ -1647,7 +1647,7 @@ cupsFileRead(cups_file_t *fp, /* I - CUPS file */ * 'cupsFileRewind()' - Set the current file position to the beginning of the * file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ off_t /* O - New file position or -1 on error */ @@ -1719,7 +1719,7 @@ cupsFileRewind(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileSeek()' - Seek in a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ off_t /* O - New file position or -1 on error */ @@ -1871,7 +1871,7 @@ cupsFileSeek(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFileStderr()' - Return a CUPS file associated with stderr. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file */ @@ -1907,7 +1907,7 @@ cupsFileStderr(void) /* * 'cupsFileStdin()' - Return a CUPS file associated with stdin. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file */ @@ -1937,7 +1937,7 @@ cupsFileStdin(void) /* * 'cupsFileStdout()' - Return a CUPS file associated with stdout. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file */ @@ -1973,7 +1973,7 @@ cupsFileStdout(void) /* * 'cupsFileTell()' - Return the current file position. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ off_t /* O - File position */ @@ -1989,7 +1989,7 @@ cupsFileTell(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileUnlock()' - Unlock access to a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -2019,7 +2019,7 @@ cupsFileUnlock(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileWrite()' - Write to a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Number of bytes written or -1 on error */ diff --git a/cups/getdevices.c b/cups/getdevices.c index 35df489a2..13bebd2ff 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -29,7 +29,7 @@ * parameters provide comma-delimited lists of backends to include or omit from * the request respectively. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_status_t /* O - Request status - @code IPP_OK@ on success. */ diff --git a/cups/getputfile.c b/cups/getputfile.c index d71d52797..76a309361 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -32,7 +32,7 @@ * * This function returns @code HTTP_STATUS_OK@ when the file is successfully retrieved. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ http_status_t /* O - HTTP status */ @@ -187,7 +187,7 @@ cupsGetFd(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFA * * This function returns @code HTTP_STATUS_OK@ when the file is successfully retrieved. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ http_status_t /* O - HTTP status */ @@ -255,7 +255,7 @@ cupsGetFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE * This function returns @code HTTP_STATUS_CREATED@ when the file is stored * successfully. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ http_status_t /* O - HTTP status */ @@ -455,7 +455,7 @@ cupsPutFd(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFA * This function returns @code HTTP_CREATED@ when the file is stored * successfully. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ http_status_t /* O - HTTP status */ diff --git a/cups/http-addr.c b/cups/http-addr.c index ad202c1f2..dd61d4a09 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -31,7 +31,7 @@ /* * 'httpAddrAny()' - Check for the "any" address. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 if "any", 0 otherwise */ @@ -88,7 +88,7 @@ httpAddrClose(http_addr_t *addr, /* I - Listen address or @code NULL@ */ /* * 'httpAddrEqual()' - Compare two addresses. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 if equal, 0 if not */ @@ -121,7 +121,7 @@ httpAddrEqual(const http_addr_t *addr1, /* I - First address */ /* * 'httpAddrLength()' - Return the length of the address in bytes. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Length in bytes */ @@ -152,7 +152,7 @@ httpAddrLength(const http_addr_t *addr) /* I - Address */ * 'httpAddrListen()' - Create a listening socket bound to the specified * address and port. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - Socket or -1 on error */ @@ -278,7 +278,7 @@ httpAddrListen(http_addr_t *addr, /* I - Address to bind to */ /* * 'httpAddrLocalhost()' - Check for the local loopback address. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 if local host, 0 otherwise */ @@ -310,7 +310,7 @@ httpAddrLocalhost( /* * 'httpAddrLookup()' - Lookup the hostname associated with the address. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Host name */ @@ -449,7 +449,7 @@ httpAddrFamily(http_addr_t *addr) /* I - Address */ /* * 'httpAddrPort()' - Get the port number associated with an address. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - Port number */ @@ -492,7 +492,7 @@ _httpAddrSetPort(http_addr_t *addr, /* I - Address */ /* * 'httpAddrString()' - Convert an address to a numeric string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Numeric address string */ @@ -781,7 +781,7 @@ httpGetHostByName(const char *name) /* I - Hostname or IP address */ * Otherwise, return the FQDN for the local system using both gethostname() * and gethostbyname() to get the local hostname with domain. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - FQDN for connection or system */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index f74d9ed7a..a8237eb03 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -32,7 +32,7 @@ /* * 'httpAddrConnect()' - Connect to any of the addresses in the list. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_addrlist_t * /* O - Connected address or NULL on failure */ @@ -50,7 +50,7 @@ httpAddrConnect( * 'httpAddrConnect2()' - Connect to any of the addresses in the list with a * timeout and optional cancel. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_addrlist_t * /* O - Connected address or NULL on failure */ @@ -344,7 +344,7 @@ httpAddrConnect2( /* * 'httpAddrCopyList()' - Copy an address list. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_addrlist_t * /* O - New address list or @code NULL@ on error */ @@ -393,7 +393,7 @@ httpAddrCopyList( /* * 'httpAddrFreeList()' - Free an address list. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -421,7 +421,7 @@ httpAddrFreeList( /* * 'httpAddrGetList()' - Get a list of addresses for a hostname. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_addrlist_t * /* O - List of addresses or NULL */ diff --git a/cups/http-private.h b/cups/http-private.h index 89e61d459..7ab000827 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -60,7 +60,7 @@ # if defined(__APPLE__) && !defined(_SOCKLEN_T) /* - * MacOS X 10.2.x does not define socklen_t, and in fact uses an int instead of + * MacmacOS 10.2.x does not define socklen_t, and in fact uses an int instead of * unsigned type for length values... */ diff --git a/cups/http-support.c b/cups/http-support.c index 29e9f254d..2af48148e 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -150,7 +150,7 @@ static void http_resolve_cb(AvahiServiceResolver *resolver, * place of traditional string functions whenever you need to create a * URI string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - URI status */ @@ -430,7 +430,7 @@ httpAssembleURI( * this function in place of traditional string functions whenever * you need to create a URI string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - URI status */ @@ -490,7 +490,7 @@ httpAssembleURIf( * * The buffer needs to be at least 46 bytes in size. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ char * /* I - UUID string */ @@ -566,7 +566,7 @@ httpDecode64(char *out, /* I - String to write to */ /* * 'httpDecode64_2()' - Base64-decode a string. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ char * /* O - Decoded string */ @@ -685,7 +685,7 @@ httpEncode64(char *out, /* I - String to write to */ /* * 'httpEncode64_2()' - Base64-encode a string. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ char * /* O - Encoded string */ @@ -794,7 +794,7 @@ httpGetDateString(time_t t) /* I - UNIX time */ /* * 'httpGetDateString2()' - Get a formatted date/time string from a time value. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Date/time string */ @@ -911,7 +911,7 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */ * * This function is deprecated; use the httpSeparateURI() function instead. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ * @deprecated@ */ @@ -936,7 +936,7 @@ httpSeparate2(const char *uri, /* I - Universal Resource Identifier */ * 'httpSeparateURI()' - Separate a Universal Resource Identifier into its * components. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - Result of separation */ diff --git a/cups/http.c b/cups/http.c index 565306ddb..b3abbe73e 100644 --- a/cups/http.c +++ b/cups/http.c @@ -113,7 +113,7 @@ static const char * const http_fields[] = * 'httpAcceptConnection()' - Accept a new HTTP client connection from the * specified listening socket. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_t * /* O - HTTP connection or @code NULL@ */ @@ -203,7 +203,7 @@ httpAcceptConnection(int fd, /* I - Listen socket file descriptor */ * * Use @code cupsArrayNew(NULL, NULL)@ to create a credentials array. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - 0 on success, -1 on error */ @@ -263,7 +263,7 @@ httpCheck(http_t *http) /* I - HTTP connection */ /* * 'httpClearCookie()' - Clear the cookie value(s). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ void @@ -432,7 +432,7 @@ httpConnect(const char *host, /* I - Host to connect to */ /* * 'httpConnect2()' - Connect to a HTTP server. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_t * /* O - New HTTP connection */ @@ -681,7 +681,7 @@ httpFlush(http_t *http) /* I - HTTP connection */ /* * 'httpFlushWrite()' - Flush data in write buffer. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Bytes written or -1 on error */ @@ -771,7 +771,7 @@ httpGetActivity(http_t *http) /* I - HTTP connection */ * string to use with httpSetField() for the HTTP_FIELD_AUTHORIZATION * value. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ char * /* O - Authorization string */ @@ -787,7 +787,7 @@ httpGetAuthString(http_t *http) /* I - HTTP connection */ /* * 'httpGetBlocking()' - Get the blocking/non-block state of a connection. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 if blocking, 0 if non-blocking */ @@ -806,7 +806,7 @@ httpGetBlocking(http_t *http) /* I - HTTP connection */ * client. The value returned can be use in subsequent requests (for clients) * or in the response (for servers) in order to compress the content stream. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ const char * /* O - Content-Coding value or @@ -888,7 +888,7 @@ httpGetContentEncoding(http_t *http) /* I - HTTP connection */ /* * 'httpGetCookie()' - Get any cookie data from the response. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ const char * /* O - Cookie data or NULL */ @@ -921,7 +921,7 @@ httpGetEncryption(http_t *http) /* I - HTTP connection */ * Returns @code HTTP_STATUS_NONE@ if there is no Expect header, otherwise * returns the expected HTTP status code, typically @code HTTP_STATUS_CONTINUE@. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_status_t /* O - Expect: status, if any */ @@ -937,7 +937,7 @@ httpGetExpect(http_t *http) /* I - HTTP connection */ /* * 'httpGetFd()' - Get the file descriptor associated with a connection. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - File descriptor or -1 if none */ @@ -1034,7 +1034,7 @@ httpGetLength(http_t *http) /* I - HTTP connection */ * This function returns the complete content length, even for * content larger than 2^31 - 1. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ off_t /* O - Content length */ @@ -1333,7 +1333,7 @@ httpGetState(http_t *http) /* I - HTTP connection */ /* * 'httpGetStatus()' - Get the status of the last HTTP request. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_status_t /* O - HTTP status */ @@ -1362,7 +1362,7 @@ httpGetSubField(http_t *http, /* I - HTTP connection */ /* * 'httpGetSubField2()' - Get a sub-field value. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Value or NULL */ @@ -1620,7 +1620,7 @@ httpOptions(http_t *http, /* I - HTTP connection */ * * For non-blocking connections the usual timeouts apply. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ssize_t /* O - Number of bytes copied */ @@ -1954,7 +1954,7 @@ httpRead(http_t *http, /* I - HTTP connection */ /* * 'httpRead2()' - Read data from a HTTP connection. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Number of bytes read */ @@ -2161,7 +2161,7 @@ httpRead2(http_t *http, /* I - HTTP connection */ /* * 'httpReadRequest()' - Read a HTTP request from a connection. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_state_t /* O - New state of connection */ @@ -2471,7 +2471,7 @@ httpReconnect2(http_t *http, /* I - HTTP connection */ * HTTP_FIELD_AUTHORIZATION prior to issuing a HTTP request using httpGet(), * httpHead(), httpOptions(), httpPost, or httpPut(). * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ void @@ -2528,7 +2528,7 @@ httpSetAuthString(http_t *http, /* I - HTTP connection */ * 'httpSetCredentials()' - Set the credentials associated with an encrypted * connection. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ @@ -2551,7 +2551,7 @@ httpSetCredentials(http_t *http, /* I - HTTP connection */ /* * 'httpSetCookie()' - Set the cookie value(s). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ void @@ -2577,7 +2577,7 @@ httpSetCookie(http_t *http, /* I - Connection */ * Currently only @code HTTP_FIELD_ACCEPT_ENCODING@, @code HTTP_FIELD_SERVER@, * and @code HTTP_FIELD_USER_AGENT@ can be set. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ void @@ -2626,7 +2626,7 @@ httpSetDefaultField(http_t *http, /* I - HTTP connection */ * Currently only @code HTTP_STATUS_CONTINUE@ is supported for the "expect" * argument. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -2779,7 +2779,7 @@ httpSetKeepAlive( /* * 'httpSetLength()' - Set the content-length and content-encoding. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -2812,7 +2812,7 @@ httpSetLength(http_t *http, /* I - HTTP connection */ * The optional timeout callback receives both the HTTP connection and a user * data pointer and must return 1 to continue or 0 to error (time) out. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ void @@ -3203,7 +3203,7 @@ _httpWait(http_t *http, /* I - HTTP connection */ /* * 'httpWait()' - Wait for data available on a connection. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ int /* O - 1 if data is available, 0 otherwise */ @@ -3274,7 +3274,7 @@ httpWrite(http_t *http, /* I - HTTP connection */ /* * 'httpWrite2()' - Write data to a HTTP connection. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Number of bytes written */ @@ -3465,7 +3465,7 @@ httpWrite2(http_t *http, /* I - HTTP connection */ /* * 'httpWriteResponse()' - Write a HTTP response to a client connection. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 0 on success, -1 on error */ diff --git a/cups/http.h b/cups/http.h index 03906393a..00039ee51 100644 --- a/cups/http.h +++ b/cups/http.h @@ -117,7 +117,7 @@ typedef enum http_auth_e /**** HTTP authentication types ****/ HTTP_AUTH_MD5_SESS, /* MD5-session authentication in use */ HTTP_AUTH_MD5_INT, /* Digest authentication in use for body */ HTTP_AUTH_MD5_SESS_INT, /* MD5-session authentication in use for body */ - HTTP_AUTH_NEGOTIATE /* GSSAPI authentication in use @since CUPS 1.3/OS X 10.5@ */ + HTTP_AUTH_NEGOTIATE /* GSSAPI authentication in use @since CUPS 1.3/macOS 10.5@ */ } http_auth_t; typedef enum http_encoding_e /**** HTTP transfer encoding values ****/ @@ -178,9 +178,9 @@ typedef enum http_field_e /**** HTTP field names ****/ HTTP_FIELD_UPGRADE, /* Upgrade field */ HTTP_FIELD_USER_AGENT, /* User-Agent field */ HTTP_FIELD_WWW_AUTHENTICATE, /* WWW-Authenticate field */ - HTTP_FIELD_ACCEPT_ENCODING, /* Accepting-Encoding field @since CUPS 1.7/OS X 10.9@ */ - HTTP_FIELD_ALLOW, /* Allow field @since CUPS 1.7/OS X 10.9@ */ - HTTP_FIELD_SERVER, /* Server field @since CUPS 1.7/OS X 10.9@ */ + HTTP_FIELD_ACCEPT_ENCODING, /* Accepting-Encoding field @since CUPS 1.7/macOS 10.9@ */ + HTTP_FIELD_ALLOW, /* Allow field @since CUPS 1.7/macOS 10.9@ */ + HTTP_FIELD_SERVER, /* Server field @since CUPS 1.7/macOS 10.9@ */ HTTP_FIELD_MAX /* Maximum field index */ } http_field_t; @@ -209,8 +209,8 @@ typedef enum http_state_e /**** HTTP state values; states HTTP_STATE_TRACE, /* TRACE command, waiting for blank line */ HTTP_STATE_CONNECT, /* CONNECT command, waiting for blank line */ HTTP_STATE_STATUS, /* Command complete, sending status */ - HTTP_STATE_UNKNOWN_METHOD, /* Unknown request method, waiting for blank line @since CUPS 1.7/OS X 10.9@ */ - HTTP_STATE_UNKNOWN_VERSION /* Unknown request method, waiting for blank line @since CUPS 1.7/OS X 10.9@ */ + HTTP_STATE_UNKNOWN_METHOD, /* Unknown request method, waiting for blank line @since CUPS 1.7/macOS 10.9@ */ + HTTP_STATE_UNKNOWN_VERSION /* Unknown request method, waiting for blank line @since CUPS 1.7/macOS 10.9@ */ # ifndef _CUPS_NO_DEPRECATED # define HTTP_WAITING HTTP_STATE_WAITING @@ -233,7 +233,7 @@ typedef enum http_state_e /**** HTTP state values; states typedef enum http_status_e /**** HTTP status codes ****/ { HTTP_STATUS_ERROR = -1, /* An error response from httpXxxx() */ - HTTP_STATUS_NONE = 0, /* No Expect value @since CUPS 1.7/OS X 10.9@ */ + HTTP_STATUS_NONE = 0, /* No Expect value @since CUPS 1.7/macOS 10.9@ */ HTTP_STATUS_CONTINUE = 100, /* Everything OK, keep going... */ HTTP_STATUS_SWITCHING_PROTOCOLS, /* HTTP upgrade to TLS/SSL */ @@ -282,7 +282,7 @@ typedef enum http_status_e /**** HTTP status codes ****/ HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED = 1000, /* User canceled authorization @since CUPS 1.4@ */ - HTTP_STATUS_CUPS_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5/OS X 10.7@ */ + HTTP_STATUS_CUPS_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5/macOS 10.7@ */ HTTP_STATUS_CUPS_WEBIF_DISABLED /* Web interface is disabled @private@ */ # ifndef _CUPS_NO_DEPRECATED @@ -409,7 +409,7 @@ typedef enum http_version_e /**** HTTP version numbers ****/ typedef union _http_addr_u /**** Socket address union, which **** makes using IPv6 and other **** address types easier and - **** more portable. @since CUPS 1.2/OS X 10.5@ + **** more portable. @since CUPS 1.2/macOS 10.5@ ****/ { struct sockaddr addr; /* Base structure for family value */ @@ -426,7 +426,7 @@ typedef union _http_addr_u /**** Socket address union, which typedef struct http_addrlist_s /**** Socket address list, which is **** used to enumerate all of the **** addresses that are associated - **** with a hostname. @since CUPS 1.2/OS X 10.5@ + **** with a hostname. @since CUPS 1.2/macOS 10.5@ ****/ { struct http_addrlist_s *next; /* Pointer to next address in list */ @@ -435,14 +435,14 @@ typedef struct http_addrlist_s /**** Socket address list, which is typedef struct _http_s http_t; /**** HTTP connection type ****/ -typedef struct http_credential_s /**** HTTP credential data @since CUPS 1.5/OS X 10.7@ ****/ +typedef struct http_credential_s /**** HTTP credential data @since CUPS 1.5/macOS 10.7@ ****/ { void *data; /* Pointer to credential data */ size_t datalen; /* Credential length */ } http_credential_t; typedef int (*http_timeout_cb_t)(http_t *http, void *user_data); - /**** HTTP timeout callback @since CUPS 1.5/OS X 10.7@ ****/ + /**** HTTP timeout callback @since CUPS 1.5/macOS 10.7@ ****/ @@ -514,7 +514,7 @@ extern void httpSeparate2(const char *uri, char *host, int hostlen, int *port, char *resource, int resourcelen) _CUPS_DEPRECATED_MSG("Use httpSeparateURI instead."); -/**** New in CUPS 1.2/OS X 10.5 ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ extern int httpAddrAny(const http_addr_t *addr) _CUPS_API_1_2; extern http_addrlist_t *httpAddrConnect(http_addrlist_t *addrlist, int *sock) _CUPS_API_1_2; extern int httpAddrEqual(const http_addr_t *addr1, @@ -562,12 +562,12 @@ extern void httpSetLength(http_t *http, size_t length) _CUPS_API_1_2; extern ssize_t httpWrite2(http_t *http, const char *buffer, size_t length) _CUPS_API_1_2; -/**** New in CUPS 1.3/OS X 10.5 ****/ +/**** New in CUPS 1.3/macOS 10.5 ****/ extern char *httpGetAuthString(http_t *http) _CUPS_API_1_3; extern void httpSetAuthString(http_t *http, const char *scheme, const char *data) _CUPS_API_1_3; -/**** New in CUPS 1.5/OS X 10.7 ****/ +/**** New in CUPS 1.5/macOS 10.7 ****/ extern int httpAddCredential(cups_array_t *credentials, const void *data, size_t datalen) _CUPS_API_1_5; @@ -581,7 +581,7 @@ extern void httpSetTimeout(http_t *http, double timeout, http_timeout_cb_t cb, void *user_data) _CUPS_API_1_5; -/**** New in CUPS 1.6/OS X 10.8 ****/ +/**** New in CUPS 1.6/macOS 10.8 ****/ extern http_addrlist_t *httpAddrConnect2(http_addrlist_t *addrlist, int *sock, int msec, int *cancel) _CUPS_API_1_6; @@ -591,7 +591,7 @@ extern int httpReconnect2(http_t *http, int msec, int *cancel) _CUPS_API_1_6; -/**** New in CUPS 1.7/OS X 10.9 ****/ +/**** New in CUPS 1.7/macOS 10.9 ****/ extern http_t *httpAcceptConnection(int fd, int blocking) _CUPS_API_1_7; extern http_addrlist_t *httpAddrCopyList(http_addrlist_t *src) _CUPS_API_1_7; @@ -618,7 +618,7 @@ extern void httpSetDefaultField(http_t *http, http_field_t field, extern http_state_t httpWriteResponse(http_t *http, http_status_t status) _CUPS_API_1_7; -/* New in CUPS 2.0/OS X 10.10 */ +/* New in CUPS 2.0/macOS 10.10 */ extern int httpAddrClose(http_addr_t *addr, int fd) _CUPS_API_2_0; extern int httpAddrFamily(http_addr_t *addr) _CUPS_API_2_0; extern int httpCompareCredentials(cups_array_t *cred1, cups_array_t *cred2) _CUPS_API_2_0; diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 7847a35f0..46a44fbfd 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -608,7 +608,7 @@ static size_t ipp_col_string(ipp_t *col, char *buffer, size_t bufsize); * trailing nul. The buffer pointer can be NULL to get the required length, * just like (v)snprintf. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ size_t /* O - Number of bytes less nul */ @@ -839,7 +839,7 @@ ippAttributeString( * "attribute-name")@ will return a non-NULL pointer. The array must be freed * using the @code cupsArrayDelete@ function. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ cups_array_t * /* O - CUPS array or @code NULL@ if all */ @@ -1988,7 +1988,7 @@ ippErrorString(ipp_status_t error) /* I - Error status */ /* * 'ippErrorValue()' - Return a status code for the given name. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_status_t /* O - IPP status code */ @@ -2030,7 +2030,7 @@ ippErrorValue(const char *name) /* I - Name */ /* * 'ippOpString()' - Return a name for the given operation id. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Name */ @@ -2065,7 +2065,7 @@ ippOpString(ipp_op_t op) /* I - Operation ID */ /* * 'ippOpValue()' - Return an operation id for the given name. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_op_t /* O - Operation ID */ @@ -2163,7 +2163,7 @@ ippStateString(ipp_state_t state) /* I - State value */ * * The returned names are defined in RFC 2911 and 3382. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ const char * /* O - Tag name */ @@ -2183,7 +2183,7 @@ ippTagString(ipp_tag_t tag) /* I - Tag value */ * * The tag names are defined in RFC 2911 and 3382. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_tag_t /* O - Tag value */ diff --git a/cups/ipp.c b/cups/ipp.c index 4e1e8c8d4..1964962ce 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -215,7 +215,7 @@ ippAddBooleans(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_OPERATION@), printer (@code IPP_TAG_PRINTER@), subscription * (@code IPP_TAG_SUBSCRIPTION@), or unsupported (@code IPP_TAG_UNSUPPORTED_GROUP@). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ipp_attribute_t * /* O - New attribute */ @@ -265,7 +265,7 @@ ippAddCollection(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_OPERATION@), printer (@code IPP_TAG_PRINTER@), subscription * (@code IPP_TAG_SUBSCRIPTION@), or unsupported (@code IPP_TAG_UNSUPPORTED_GROUP@). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ipp_attribute_t * /* O - New attribute */ @@ -507,7 +507,7 @@ ippAddIntegers(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_OPERATION@), printer (@code IPP_TAG_PRINTER@), subscription * (@code IPP_TAG_SUBSCRIPTION@), or unsupported (@code IPP_TAG_UNSUPPORTED_GROUP@). * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_attribute_t * /* O - New attribute */ @@ -571,7 +571,7 @@ ippAddOctetString(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_NOTSETTABLE@), delete-attribute (@code IPP_TAG_DELETEATTR@), and * admin-define (@code IPP_TAG_ADMINDEFINE@). * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_attribute_t * /* O - New attribute */ @@ -999,7 +999,7 @@ ippAddString(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - New attribute */ @@ -1052,7 +1052,7 @@ ippAddStringf(ipp_t *ipp, /* I - IPP message */ * stdarg pointer @code ap@. The formatted string is truncated as needed to the * maximum length of the corresponding value type. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - New attribute */ @@ -1331,7 +1331,7 @@ ippAddStrings( * enum value, or the value falls within one of the rangeOfInteger values for * the attribute. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on a match, 0 on no match */ @@ -1382,7 +1382,7 @@ ippContainsInteger( * Returns non-zero when the attribute contains a matching charset, keyword, * language, mimeMediaType, name, text, URI, or URI scheme value. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on a match, 0 on no match */ @@ -1458,7 +1458,7 @@ ippContainsString( * created - this should only be done as long as the original source IPP message will * not be freed for the life of the destination. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ @@ -1708,7 +1708,7 @@ ippCopyAttribute( * 0 to skip it. The function may also choose to do a partial copy of the source attribute * itself. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on error */ @@ -1835,7 +1835,7 @@ ippDelete(ipp_t *ipp) /* I - IPP message */ /* * 'ippDeleteAttribute()' - Delete a single attribute in an IPP message. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ void @@ -1909,7 +1909,7 @@ ippDeleteAttribute( * * Deleting all values in an attribute deletes the attribute. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -2113,7 +2113,7 @@ ippFindNextAttribute(ipp_t *ipp, /* I - IPP message */ /* * 'ippFirstAttribute()' - Return the first attribute in the message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_attribute_t * /* O - First attribute or @code NULL@ if none */ @@ -2140,7 +2140,7 @@ ippFirstAttribute(ipp_t *ipp) /* I - IPP message */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Boolean value or 0 on error */ @@ -2169,7 +2169,7 @@ ippGetBoolean(ipp_attribute_t *attr, /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_t * /* O - Collection value or @code NULL@ on error */ @@ -2196,7 +2196,7 @@ ippGetCollection( /* * 'ippGetCount()' - Get the number of values in an attribute. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Number of values or 0 on error */ @@ -2223,7 +2223,7 @@ ippGetCount(ipp_attribute_t *attr) /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const ipp_uchar_t * /* O - Date value or @code NULL@ */ @@ -2249,7 +2249,7 @@ ippGetDate(ipp_attribute_t *attr, /* I - IPP attribute */ /* * 'ippGetGroupTag()' - Get the group associated with an attribute. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_tag_t /* O - Group tag or @code IPP_TAG_ZERO@ on error */ @@ -2276,7 +2276,7 @@ ippGetGroupTag(ipp_attribute_t *attr) /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Value or 0 on error */ @@ -2302,7 +2302,7 @@ ippGetInteger(ipp_attribute_t *attr, /* I - IPP attribute */ /* * 'ippGetName()' - Get the attribute name. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const char * /* O - Attribute name or @code NULL@ for separators */ @@ -2329,7 +2329,7 @@ ippGetName(ipp_attribute_t *attr) /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ void * /* O - Pointer to octetString data */ @@ -2365,7 +2365,7 @@ ippGetOctetString( /* * 'ippGetOperation()' - Get the operation ID in an IPP message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_op_t /* O - Operation ID or 0 on error */ @@ -2392,7 +2392,7 @@ ippGetOperation(ipp_t *ipp) /* I - IPP request message */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Lower value of range or 0 */ @@ -2427,7 +2427,7 @@ ippGetRange(ipp_attribute_t *attr, /* I - IPP attribute */ /* * 'ippGetRequestId()' - Get the request ID from an IPP message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Request ID or 0 on error */ @@ -2454,7 +2454,7 @@ ippGetRequestId(ipp_t *ipp) /* I - IPP message */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Horizontal/cross feed resolution or 0 */ @@ -2497,7 +2497,7 @@ ippGetResolution( /* * 'ippGetState()' - Get the IPP message state. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_state_t /* O - IPP message state value */ @@ -2521,7 +2521,7 @@ ippGetState(ipp_t *ipp) /* I - IPP message */ /* * 'ippGetStatusCode()' - Get the status code from an IPP response or event message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t /* O - Status code in IPP message */ @@ -2548,7 +2548,7 @@ ippGetStatusCode(ipp_t *ipp) /* I - IPP response or event message */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const char * @@ -2579,7 +2579,7 @@ ippGetString(ipp_attribute_t *attr, /* I - IPP attribute */ /* * 'ippGetValueTag()' - Get the value tag for an attribute. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_tag_t /* O - Value tag or @code IPP_TAG_ZERO@ on error */ @@ -2603,7 +2603,7 @@ ippGetValueTag(ipp_attribute_t *attr) /* I - IPP attribute */ /* * 'ippGetVersion()' - Get the major and minor version number from an IPP message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Major version number or 0 on error */ @@ -2647,7 +2647,7 @@ ippLength(ipp_t *ipp) /* I - IPP message */ /* * 'ippNextAttribute()' - Return the next attribute in the message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_attribute_t * /* O - Next attribute or @code NULL@ if none */ @@ -2709,7 +2709,7 @@ ippNew(void) * attributes-natural-language attributes added. The * attributes-natural-language value is derived from the current locale. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_t * /* O - IPP request message */ @@ -2776,7 +2776,7 @@ ippNewRequest(ipp_op_t op) /* I - Operation code */ * "utf-8" and a value derived from the current locale are substituted, * respectively. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_t * /* O - IPP response message */ @@ -2897,7 +2897,7 @@ ippRead(http_t *http, /* I - HTTP connection */ /* * 'ippReadFile()' - Read data for an IPP message from a file. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ipp_state_t /* O - Current state */ @@ -2913,7 +2913,7 @@ ippReadFile(int fd, /* I - HTTP data */ /* * 'ippReadIO()' - Read data for an IPP message. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_state_t /* O - Current state */ @@ -3691,7 +3691,7 @@ ippReadIO(void *src, /* I - Data source */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3733,7 +3733,7 @@ ippSetBoolean(ipp_t *ipp, /* I - IPP message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3782,7 +3782,7 @@ ippSetCollection( * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3827,7 +3827,7 @@ ippSetDate(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_OPERATION@), printer (@code IPP_TAG_PRINTER@), subscription * (@code IPP_TAG_SUBSCRIPTION@), or unsupported (@code IPP_TAG_UNSUPPORTED_GROUP@). * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3866,7 +3866,7 @@ ippSetGroupTag( * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3906,7 +3906,7 @@ ippSetInteger(ipp_t *ipp, /* I - IPP message */ * * The @code attr@ parameter may be modified as a result of setting the value. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3951,7 +3951,7 @@ ippSetName(ipp_t *ipp, /* I - IPP message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4034,7 +4034,7 @@ ippSetOctetString( * The @code ipp@ parameter refers to an IPP message previously created using * the @link ippNew@, @link ippNewRequest@, or @link ippNewResponse@ functions. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4069,7 +4069,7 @@ ippSetOperation(ipp_t *ipp, /* I - IPP request message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4112,7 +4112,7 @@ ippSetRange(ipp_t *ipp, /* I - IPP message */ * * The @code request_id@ parameter must be greater than 0. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4149,7 +4149,7 @@ ippSetRequestId(ipp_t *ipp, /* I - IPP message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4191,7 +4191,7 @@ ippSetResolution( /* * 'ippSetState()' - Set the current state of the IPP message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4222,7 +4222,7 @@ ippSetState(ipp_t *ipp, /* I - IPP message */ * The @code ipp@ parameter refers to an IPP message previously created using * the @link ippNew@, @link ippNewRequest@, or @link ippNewResponse@ functions. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4257,7 +4257,7 @@ ippSetStatusCode(ipp_t *ipp, /* I - IPP response or event message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4324,7 +4324,7 @@ ippSetString(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4362,7 +4362,7 @@ ippSetStringf(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4514,7 +4514,7 @@ ippSetStringfv(ipp_t *ipp, /* I - IPP message */ * code in the "attributes-natural-language" attribute or, if not present, the language * code for the current locale. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4671,7 +4671,7 @@ ippSetValueTag( * * The valid version numbers are currently 1.0, 1.1, 2.0, 2.1, and 2.2. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4752,7 +4752,7 @@ ippTimeToDate(time_t t) /* I - UNIX time value */ * value tag. 1 is returned if the attribute is valid, 0 otherwise. On * failure, cupsLastErrorString() is set to a human-readable message. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 if valid, 0 otherwise */ @@ -5391,7 +5391,7 @@ ippValidateAttribute( * attribute. Like @link ippValidateAttribute@, cupsLastErrorString() is set * to a human-readable message on failure. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 if valid, 0 otherwise */ @@ -5431,7 +5431,7 @@ ippWrite(http_t *http, /* I - HTTP connection */ /* * 'ippWriteFile()' - Write data for an IPP message to a file. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ipp_state_t /* O - Current state */ @@ -5449,7 +5449,7 @@ ippWriteFile(int fd, /* I - HTTP data */ /* * 'ippWriteIO()' - Write data for an IPP message. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_state_t /* O - Current state */ diff --git a/cups/ipp.h b/cups/ipp.h index de509bc7d..01c961c00 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -262,13 +262,13 @@ typedef enum ipp_op_e /**** IPP operations ****/ IPP_OP_SET_PRINTER_ATTRIBUTES, /* Set printer attributes */ IPP_OP_SET_JOB_ATTRIBUTES, /* Set job attributes */ IPP_OP_GET_PRINTER_SUPPORTED_VALUES, /* Get supported attribute values */ - IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS, /* Create one or more printer subscriptions @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_CREATE_JOB_SUBSCRIPTIONS, /* Create one of more job subscriptions @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES, /* Get subscription attributes @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_GET_SUBSCRIPTIONS, /* Get list of subscriptions @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_RENEW_SUBSCRIPTION, /* Renew a printer subscription @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_CANCEL_SUBSCRIPTION, /* Cancel a subscription @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_GET_NOTIFICATIONS, /* Get notification events @since CUPS 1.2/OS X 10.5@ */ + IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS, /* Create one or more printer subscriptions @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_CREATE_JOB_SUBSCRIPTIONS, /* Create one of more job subscriptions @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES, /* Get subscription attributes @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_GET_SUBSCRIPTIONS, /* Get list of subscriptions @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_RENEW_SUBSCRIPTION, /* Renew a printer subscription @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_CANCEL_SUBSCRIPTION, /* Cancel a subscription @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_GET_NOTIFICATIONS, /* Get notification events @since CUPS 1.2/macOS 10.5@ */ IPP_OP_SEND_NOTIFICATIONS, /* Send notification events @private@ */ IPP_OP_GET_RESOURCE_ATTRIBUTES, /* Get resource attributes @private@ */ IPP_OP_GET_RESOURCE_DATA, /* Get resource data @private@ */ @@ -331,9 +331,9 @@ typedef enum ipp_op_e /**** IPP operations ****/ IPP_OP_CUPS_GET_DEVICES, /* Get a list of supported devices @deprecated@ */ IPP_OP_CUPS_GET_PPDS, /* Get a list of supported drivers @deprecated@ */ IPP_OP_CUPS_MOVE_JOB, /* Move a job to a different printer */ - IPP_OP_CUPS_AUTHENTICATE_JOB, /* Authenticate a job @since CUPS 1.2/OS X 10.5@ */ + IPP_OP_CUPS_AUTHENTICATE_JOB, /* Authenticate a job @since CUPS 1.2/macOS 10.5@ */ IPP_OP_CUPS_GET_PPD, /* Get a PPD file @deprecated@ */ - IPP_OP_CUPS_GET_DOCUMENT = 0x4027, /* Get a document file @since CUPS 1.4/OS X 10.6@ */ + IPP_OP_CUPS_GET_DOCUMENT = 0x4027, /* Get a document file @since CUPS 1.4/macOS 10.6@ */ IPP_OP_CUPS_CREATE_LOCAL_PRINTER /* Create a local (temporary) printer @since CUPS 2.2 */ # ifndef _CUPS_NO_DEPRECATED @@ -566,8 +566,8 @@ typedef enum ipp_status_e /**** IPP status codes ****/ /* These are internal and never sent over the wire... */ IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED = 0x1000, - /* cups-authentication-canceled - Authentication canceled by user @since CUPS 1.5/OS X 10.7@ */ - IPP_STATUS_ERROR_CUPS_PKI, /* cups-pki-error - Error negotiating a secure connection @since CUPS 1.5/OS X 10.7@ */ + /* cups-authentication-canceled - Authentication canceled by user @since CUPS 1.5/macOS 10.7@ */ + IPP_STATUS_ERROR_CUPS_PKI, /* cups-pki-error - Error negotiating a secure connection @since CUPS 1.5/macOS 10.7@ */ IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED/* cups-upgrade-required - TLS upgrade required */ # ifndef _CUPS_NO_DEPRECATED @@ -687,21 +687,21 @@ typedef struct _ipp_s ipp_t; /**** IPP request/response data ****/ typedef struct _ipp_attribute_s ipp_attribute_t; /**** IPP attribute ****/ -/**** New in CUPS 1.2/OS X 10.5 ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ typedef ssize_t (*ipp_iocb_t)(void *context, ipp_uchar_t *buffer, size_t bytes); - /**** IPP IO Callback Function @since CUPS 1.2/OS X 10.5@ ****/ + /**** IPP IO Callback Function @since CUPS 1.2/macOS 10.5@ ****/ -/**** New in CUPS 1.6/OS X 10.8 ****/ +/**** New in CUPS 1.6/macOS 10.8 ****/ typedef int (*ipp_copycb_t)(void *context, ipp_t *dst, ipp_attribute_t *attr); /* - * The following structures are PRIVATE starting with CUPS 1.6/OS X 10.8. + * The following structures are PRIVATE starting with CUPS 1.6/macOS 10.8. * Please use the new accessor functions available in CUPS 1.6 and later, as * these definitions will be moved to a private header file in a future release. * * Define _IPP_PRIVATE_STRUCTURES to 1 to cause the private IPP structures to be - * exposed in CUPS 1.6. This happens automatically on OS X when compiling for + * exposed in CUPS 1.6. This happens automatically on macOS when compiling for * a deployment target of 10.7 or earlier. * * Define _IPP_PRIVATE_STRUCTURES to 0 to prevent the private IPP structures @@ -751,7 +751,7 @@ typedef union _ipp_request_u /**** Request Header ****/ } status; /**** New in CUPS 1.1.19 ****/ - struct /* Event Header @since CUPS 1.1.19/OS X 10.3@ */ + struct /* Event Header @since CUPS 1.1.19/macOS 10.3@ */ { ipp_uchar_t version[2]; /* Protocol version number */ ipp_status_t status_code; /* Status code */ @@ -795,7 +795,7 @@ typedef union _ipp_value_u /**** Attribute Value ****/ } unknown; /* Unknown attribute type */ /**** New in CUPS 1.1.19 ****/ - ipp_t *collection; /* Collection value @since CUPS 1.1.19/OS X 10.3@ */ + ipp_t *collection; /* Collection value @since CUPS 1.1.19/macOS 10.3@ */ } _ipp_value_t; typedef _ipp_value_t ipp_value_t; /**** Convenience typedef that will be removed @private@ ****/ @@ -819,10 +819,10 @@ struct _ipp_s /**** IPP Request/Response/Notification ****/ ipp_tag_t curtag; /* Current attribute group tag */ /**** New in CUPS 1.2 ****/ - ipp_attribute_t *prev; /* Previous attribute (for read) @since CUPS 1.2/OS X 10.5@ */ + ipp_attribute_t *prev; /* Previous attribute (for read) @since CUPS 1.2/macOS 10.5@ */ /**** New in CUPS 1.4.4 ****/ - int use; /* Use count @since CUPS 1.4.4/OS X 10.6.?@ */ + int use; /* Use count @since CUPS 1.4.4/macOS 10.6.?@ */ /**** New in CUPS 2.0 ****/ int atend, /* At end of list? */ curindex; /* Current attribute index for hierarchical search */ @@ -892,7 +892,7 @@ extern void ippDeleteAttribute(ipp_t *ipp, ipp_attribute_t *attr) _CUPS_API_1_1 extern ipp_state_t ippReadFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19; extern ipp_state_t ippWriteFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19; -/**** New in CUPS 1.2/OS X 10.5 ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ extern ipp_attribute_t *ippAddOctetString(ipp_t *ipp, ipp_tag_t group, const char *name, const void *data, int datalen) _CUPS_API_1_2; @@ -905,11 +905,11 @@ extern ipp_state_t ippReadIO(void *src, ipp_iocb_t cb, int blocking, extern ipp_state_t ippWriteIO(void *dst, ipp_iocb_t cb, int blocking, ipp_t *parent, ipp_t *ipp) _CUPS_API_1_2; -/**** New in CUPS 1.4/OS X 10.6 ****/ +/**** New in CUPS 1.4/macOS 10.6 ****/ extern const char *ippTagString(ipp_tag_t tag) _CUPS_API_1_4; extern ipp_tag_t ippTagValue(const char *name) _CUPS_API_1_4; -/**** New in CUPS 1.6/OS X 10.8 ****/ +/**** New in CUPS 1.6/macOS 10.8 ****/ extern ipp_attribute_t *ippAddOutOfBand(ipp_t *ipp, ipp_tag_t group, ipp_tag_t value_tag, const char *name) _CUPS_API_1_6; diff --git a/cups/notify.c b/cups/notify.c index cb005497d..5f6e7fd54 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -25,7 +25,7 @@ * * The returned string must be freed by the caller using @code free@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Subject string or @code NULL@ */ @@ -156,7 +156,7 @@ cupsNotifySubject(cups_lang_t *lang, /* I - Language data */ * * The returned string must be freed by the caller using @code free@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Message text or @code NULL@ */ diff --git a/cups/options.c b/cups/options.c index 986ae1ca2..a3f57cfc0 100644 --- a/cups/options.c +++ b/cups/options.c @@ -419,7 +419,7 @@ cupsParseOptions( /* * 'cupsRemoveOption()' - Remove an option from an option array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - New number of options */ diff --git a/cups/ppd-attr.c b/cups/ppd-attr.c index 4a57d09ff..6324e6e15 100644 --- a/cups/ppd-attr.c +++ b/cups/ppd-attr.c @@ -22,7 +22,7 @@ /* * 'ppdFindAttr()' - Find the first matching attribute. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ppd_attr_t * /* O - Attribute or @code NULL@ if not found */ @@ -79,7 +79,7 @@ ppdFindAttr(ppd_file_t *ppd, /* I - PPD file data */ /* * 'ppdFindNextAttr()' - Find the next matching attribute. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ppd_attr_t * /* O - Attribute or @code NULL@ if not found */ diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c index 26e104e92..68e03b4dc 100644 --- a/cups/ppd-conflicts.c +++ b/cups/ppd-conflicts.c @@ -63,7 +63,7 @@ static cups_array_t *ppd_test_constraints(ppd_file_t *ppd, * the conflicting options. The returned option array must be freed using * @link cupsFreeOptions@. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - Number of conflicting options */ @@ -162,7 +162,7 @@ cupsGetConflicts( * choice for the conflicting option, then iterating over all possible choices * until a non-conflicting option choice is found. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - 1 on success, 0 on failure */ @@ -634,7 +634,7 @@ ppdConflicts(ppd_file_t *ppd) /* I - PPD to check */ * This function tests whether a particular option choice is available based * on constraints against options in the "InstallableOptions" group. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - 1 if conflicting, 0 if not conflicting */ diff --git a/cups/ppd-custom.c b/cups/ppd-custom.c index 25516b607..6e4d3bd6e 100644 --- a/cups/ppd-custom.c +++ b/cups/ppd-custom.c @@ -33,7 +33,7 @@ /* * 'ppdFindCustomOption()' - Find a custom option. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_coption_t * /* O - Custom option or NULL */ @@ -54,7 +54,7 @@ ppdFindCustomOption(ppd_file_t *ppd, /* I - PPD file */ /* * 'ppdFindCustomParam()' - Find a parameter for a custom option. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_cparam_t * /* O - Custom parameter or NULL */ @@ -80,7 +80,7 @@ ppdFindCustomParam(ppd_coption_t *opt, /* I - Custom option */ /* * 'ppdFirstCustomParam()' - Return the first parameter for a custom option. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_cparam_t * /* O - Custom parameter or NULL */ @@ -96,7 +96,7 @@ ppdFirstCustomParam(ppd_coption_t *opt) /* I - Custom option */ /* * 'ppdNextCustomParam()' - Return the next parameter for a custom option. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_cparam_t * /* O - Custom parameter or NULL */ diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c index 1c3d32005..0b4f1c995 100644 --- a/cups/ppd-emit.c +++ b/cups/ppd-emit.c @@ -69,7 +69,7 @@ ppdCollect(ppd_file_t *ppd, /* I - PPD file data */ * The choices array should be freed using @code free@ when you are * finished with it. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Number of options marked */ @@ -242,7 +242,7 @@ ppdEmit(ppd_file_t *ppd, /* I - PPD file record */ * * When "limit" is zero, this function is identical to ppdEmit(). * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on failure */ @@ -536,7 +536,7 @@ ppdEmitJCL(ppd_file_t *ppd, /* I - PPD file record */ /* * 'ppdEmitJCLEnd()' - Emit JCLEnd code to a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on failure */ @@ -595,7 +595,7 @@ ppdEmitJCLEnd(ppd_file_t *ppd, /* I - PPD file record */ * The return string is allocated on the heap and should be freed using * @code free@ when you are done with it. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - String containing option code or @code NULL@ if there is no option code */ diff --git a/cups/ppd-localize.c b/cups/ppd-localize.c index c20dbf937..db9317090 100644 --- a/cups/ppd-localize.c +++ b/cups/ppd-localize.c @@ -44,7 +44,7 @@ static cups_lang_t *ppd_ll_CC(char *ll_CC, size_t ll_CC_size); * descriptions, printer presets, and custom option parameters. Each * localized string uses the UTF-8 character encoding. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -229,7 +229,7 @@ ppdLocalizeAttr(ppd_file_t *ppd, /* I - PPD file */ * * If no value of the requested scheme can be found, NULL is returned. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ const char * /* O - Value or NULL if not found */ @@ -482,7 +482,7 @@ ppdLocalizeIPPReason( * text from the attribute value. If no localized text for the requested * name can be found, @code NULL@ is returned. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ const char * /* O - Value or @code NULL@ if not found */ @@ -620,7 +620,7 @@ _ppdGetLanguages(ppd_file_t *ppd) /* I - PPD file */ /* * '_ppdHashName()' - Generate a hash value for a device or profile name. * - * This function is primarily used on OS X, but is generally accessible + * This function is primarily used on macOS, but is generally accessible * since cupstestppd needs to check for profile name collisions in PPD files... */ diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c index 3b0c51306..6faf62789 100644 --- a/cups/ppd-mark.c +++ b/cups/ppd-mark.c @@ -113,7 +113,7 @@ cupsMarkOptions( * InputSlot, etc.) is not also set. * * For PageSize, we also check for an empty option value since some versions - * of MacOS X use it to specify auto-selection of the media based solely on + * of MacmacOS use it to specify auto-selection of the media based solely on * the size. */ @@ -561,7 +561,7 @@ ppdMarkOption(ppd_file_t *ppd, /* I - PPD file record */ * * Options are returned from all groups in ascending alphanumeric order. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_option_t * /* O - First option or @code NULL@ */ @@ -579,7 +579,7 @@ ppdFirstOption(ppd_file_t *ppd) /* I - PPD file */ * * Options are returned from all groups in ascending alphanumeric order. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_option_t * /* O - Next option or @code NULL@ */ @@ -770,7 +770,7 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ ppd, option, choice)); /* - * AP_D_InputSlot is the "default input slot" on MacOS X, and setting + * AP_D_InputSlot is the "default input slot" on MacmacOS, and setting * it clears the regular InputSlot choices... */ diff --git a/cups/ppd-page.c b/cups/ppd-page.c index 246907017..f18e68d0d 100644 --- a/cups/ppd-page.c +++ b/cups/ppd-page.c @@ -189,7 +189,7 @@ ppdPageSize(ppd_file_t *ppd, /* I - PPD file record */ * If the specified PPD file does not support custom page sizes, both * "minimum" and "maximum" are filled with zeroes. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - 1 if custom sizes are supported, 0 otherwise */ diff --git a/cups/ppd-util.c b/cups/ppd-util.c index 527549164..af5bd2004 100644 --- a/cups/ppd-util.c +++ b/cups/ppd-util.c @@ -80,7 +80,7 @@ cupsGetPPD(const char *name) /* I - Destination name */ * each call to @link cupsGetPPD@ or @code cupsGetPPD2@. The caller "owns" the * file that is created and must @code unlink@ the returned filename. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ const char * /* O - Filename for PPD file */ @@ -121,7 +121,7 @@ cupsGetPPD2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE * For classes, @code cupsGetPPD3@ returns the PPD file for the first printer * in the class. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ http_status_t /* O - HTTP status */ @@ -429,7 +429,7 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL * overwritten on the next call to @link cupsGetPPD@, @link cupsGetPPD2@, * or @link cupsGetServerPPD@. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ char * /* O - Name of PPD file or @code NULL@ on error */ diff --git a/cups/ppd.c b/cups/ppd.c index 7721b74fa..44a22c5cb 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -302,7 +302,7 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ /* * 'ppdErrorString()' - Returns the text associated with a status. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ const char * /* O - Status string */ @@ -412,7 +412,7 @@ _ppdGlobals(void) /* * 'ppdLastError()' - Return the status from the last ppdOpen*(). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ppd_status_t /* O - Status code */ @@ -432,7 +432,7 @@ ppdLastError(int *line) /* O - Line number */ /* * '_ppdOpen()' - Read a PPD file into memory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_file_t * /* O - PPD file record or @code NULL@ if the PPD file could not be opened. */ @@ -2128,7 +2128,7 @@ ppdOpen(FILE *fp) /* I - File to read from */ /* * 'ppdOpen2()' - Read a PPD file into memory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_file_t * /* O - PPD file record or @code NULL@ if the PPD file could not be opened. */ @@ -2253,7 +2253,7 @@ ppdOpenFile(const char *filename) /* I - File to read from */ /* * 'ppdSetConformance()' - Set the conformance level for PPD files. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ void @@ -3122,7 +3122,7 @@ ppd_read(cups_file_t *fp, /* I - File to read from */ DEBUG_printf(("9ppd_read: LINE=\"%s\"", line->buffer)); /* - * The dynamically created PPDs for older style OS X + * The dynamically created PPDs for older style macOS * drivers include a large blob of data inserted as comments * at the end of the file. As an optimization we can stop * reading the PPD when we get to the start of this data. diff --git a/cups/ppd.h b/cups/ppd.h index a95dac17f..eb9ab382b 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -106,7 +106,7 @@ typedef enum ppd_cs_e /**** Colorspaces ****/ PPD_CS_N /* DeviceN colorspace */ } ppd_cs_t; -typedef enum ppd_status_e /**** Status Codes @since CUPS 1.1.19/OS X 10.3@ ****/ +typedef enum ppd_status_e /**** Status Codes @since CUPS 1.1.19/macOS 10.3@ ****/ { PPD_OK = 0, /* OK */ PPD_FILE_OPEN_ERROR, /* Unable to open PPD file */ @@ -135,16 +135,16 @@ typedef enum ppd_status_e /**** Status Codes @since CUPS 1.1.19/OS X 10.3@ **** PPD_MAX_STATUS /* @private@ */ } ppd_status_t; -enum ppd_conform_e /**** Conformance Levels @since CUPS 1.1.19/OS X 10.3@ ****/ +enum ppd_conform_e /**** Conformance Levels @since CUPS 1.1.19/macOS 10.3@ ****/ { PPD_CONFORM_RELAXED, /* Relax whitespace and control char */ PPD_CONFORM_STRICT /* Require strict conformance */ }; typedef enum ppd_conform_e ppd_conform_t; - /**** Conformance Levels @since CUPS 1.1.19/OS X 10.3@ ****/ + /**** Conformance Levels @since CUPS 1.1.19/macOS 10.3@ ****/ -typedef struct ppd_attr_s /**** PPD Attribute Structure @since CUPS 1.1.19/OS X 10.3@ ****/ +typedef struct ppd_attr_s /**** PPD Attribute Structure @since CUPS 1.1.19/macOS 10.3@ ****/ { char name[PPD_MAX_NAME]; /* Name of attribute (cupsXYZ) */ char spec[PPD_MAX_NAME]; /* Specifier string, if any */ @@ -185,7 +185,7 @@ typedef struct ppd_group_s /**** Groups ****/ ****/ char text[PPD_MAX_TEXT - PPD_MAX_NAME]; /* Human-readable group name */ - char name[PPD_MAX_NAME]; /* Group name @since CUPS 1.1.18/OS X 10.3@ */ + char name[PPD_MAX_NAME]; /* Group name @since CUPS 1.1.18/macOS 10.3@ */ int num_options; /* Number of options */ ppd_option_t *options; /* Options */ int num_subgroups; /* Number of sub-groups */ @@ -230,8 +230,8 @@ typedef struct ppd_profile_s /**** sRGB Color Profiles ****/ float matrix[3][3]; /* Transform matrix */ } ppd_profile_t; -/**** New in CUPS 1.2/OS X 10.5 ****/ -typedef enum ppd_cptype_e /**** Custom Parameter Type @since CUPS 1.2/OS X 10.5@ ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ +typedef enum ppd_cptype_e /**** Custom Parameter Type @since CUPS 1.2/macOS 10.5@ ****/ { PPD_CUSTOM_CURVE, /* Curve value for f(x) = x^value */ PPD_CUSTOM_INT, /* Integer number value */ @@ -243,7 +243,7 @@ typedef enum ppd_cptype_e /**** Custom Parameter Type @since CUPS 1.2/OS X 10.5 PPD_CUSTOM_STRING /* String of characters */ } ppd_cptype_t; -typedef union ppd_cplimit_u /**** Custom Parameter Limit @since CUPS 1.2/OS X 10.5@ ****/ +typedef union ppd_cplimit_u /**** Custom Parameter Limit @since CUPS 1.2/macOS 10.5@ ****/ { float custom_curve; /* Gamma value */ int custom_int; /* Integer value */ @@ -255,7 +255,7 @@ typedef union ppd_cplimit_u /**** Custom Parameter Limit @since CUPS 1.2/OS X 1 int custom_string; /* String length */ } ppd_cplimit_t; -typedef union ppd_cpvalue_u /**** Custom Parameter Value @since CUPS 1.2/OS X 10.5@ ****/ +typedef union ppd_cpvalue_u /**** Custom Parameter Value @since CUPS 1.2/macOS 10.5@ ****/ { float custom_curve; /* Gamma value */ int custom_int; /* Integer value */ @@ -267,7 +267,7 @@ typedef union ppd_cpvalue_u /**** Custom Parameter Value @since CUPS 1.2/OS X 1 char *custom_string; /* String value */ } ppd_cpvalue_t; -typedef struct ppd_cparam_s /**** Custom Parameter @since CUPS 1.2/OS X 10.5@ ****/ +typedef struct ppd_cparam_s /**** Custom Parameter @since CUPS 1.2/macOS 10.5@ ****/ { char name[PPD_MAX_NAME]; /* Parameter name */ char text[PPD_MAX_TEXT]; /* Human-readable text */ @@ -278,7 +278,7 @@ typedef struct ppd_cparam_s /**** Custom Parameter @since CUPS 1.2/OS X 10.5@ * ppd_cpvalue_t current; /* Current value */ } ppd_cparam_t; -typedef struct ppd_coption_s /**** Custom Option @since CUPS 1.2/OS X 10.5@ ****/ +typedef struct ppd_coption_s /**** Custom Option @since CUPS 1.2/macOS 10.5@ ****/ { char keyword[PPD_MAX_NAME]; /* Name of option that is being extended... */ ppd_option_t *option; /* Option that is being extended... */ @@ -287,7 +287,7 @@ typedef struct ppd_coption_s /**** Custom Option @since CUPS 1.2/OS X 10.5@ *** } ppd_coption_t; typedef struct _ppd_cache_s _ppd_cache_t; - /**** PPD cache and mapping data @since CUPS 1.5/OS X 10.7@ @private@ ****/ + /**** PPD cache and mapping data @since CUPS 1.5/macOS 10.7@ @private@ ****/ typedef struct ppd_file_s /**** PPD File ****/ { @@ -335,25 +335,25 @@ typedef struct ppd_file_s /**** PPD File ****/ int flip_duplex; /* 1 = Flip page for back sides @deprecated@ */ /**** New in CUPS 1.1.19 ****/ - char *protocols; /* Protocols (BCP, TBCP) string @since CUPS 1.1.19/OS X 10.3@ */ - char *pcfilename; /* PCFileName string @since CUPS 1.1.19/OS X 10.3@ */ - int num_attrs; /* Number of attributes @since CUPS 1.1.19/OS X 10.3@ @private@ */ - int cur_attr; /* Current attribute @since CUPS 1.1.19/OS X 10.3@ @private@ */ - ppd_attr_t **attrs; /* Attributes @since CUPS 1.1.19/OS X 10.3@ @private@ */ + char *protocols; /* Protocols (BCP, TBCP) string @since CUPS 1.1.19/macOS 10.3@ */ + char *pcfilename; /* PCFileName string @since CUPS 1.1.19/macOS 10.3@ */ + int num_attrs; /* Number of attributes @since CUPS 1.1.19/macOS 10.3@ @private@ */ + int cur_attr; /* Current attribute @since CUPS 1.1.19/macOS 10.3@ @private@ */ + ppd_attr_t **attrs; /* Attributes @since CUPS 1.1.19/macOS 10.3@ @private@ */ - /**** New in CUPS 1.2/OS X 10.5 ****/ - cups_array_t *sorted_attrs; /* Attribute lookup array @since CUPS 1.2/OS X 10.5@ @private@ */ - cups_array_t *options; /* Option lookup array @since CUPS 1.2/OS X 10.5@ @private@ */ - cups_array_t *coptions; /* Custom options array @since CUPS 1.2/OS X 10.5@ @private@ */ + /**** New in CUPS 1.2/macOS 10.5 ****/ + cups_array_t *sorted_attrs; /* Attribute lookup array @since CUPS 1.2/macOS 10.5@ @private@ */ + cups_array_t *options; /* Option lookup array @since CUPS 1.2/macOS 10.5@ @private@ */ + cups_array_t *coptions; /* Custom options array @since CUPS 1.2/macOS 10.5@ @private@ */ - /**** New in CUPS 1.3/OS X 10.5 ****/ - cups_array_t *marked; /* Marked choices @since CUPS 1.3/OS X 10.5@ @private@ */ + /**** New in CUPS 1.3/macOS 10.5 ****/ + cups_array_t *marked; /* Marked choices @since CUPS 1.3/macOS 10.5@ @private@ */ - /**** New in CUPS 1.4/OS X 10.6 ****/ - cups_array_t *cups_uiconstraints; /* cupsUIConstraints @since CUPS 1.4/OS X 10.6@ @private@ */ + /**** New in CUPS 1.4/macOS 10.6 ****/ + cups_array_t *cups_uiconstraints; /* cupsUIConstraints @since CUPS 1.4/macOS 10.6@ @private@ */ /**** New in CUPS 1.5 ****/ - _ppd_cache_t *cache; /* PPD cache and mapping data @since CUPS 1.5/OS X 10.7@ @private@ */ + _ppd_cache_t *cache; /* PPD cache and mapping data @since CUPS 1.5/macOS 10.7@ @private@ */ } ppd_file_t; @@ -440,14 +440,14 @@ extern ppd_option_t *ppdNextOption(ppd_file_t *ppd) _PPD_DEPRECATED; extern int ppdLocalize(ppd_file_t *ppd) _PPD_DEPRECATED; extern ppd_file_t *ppdOpen2(cups_file_t *fp) _PPD_DEPRECATED; -/**** New in CUPS 1.3/OS X 10.5 ****/ +/**** New in CUPS 1.3/macOS 10.5 ****/ extern const char *ppdLocalizeIPPReason(ppd_file_t *ppd, const char *reason, const char *scheme, char *buffer, size_t bufsize) _PPD_DEPRECATED; -/**** New in CUPS 1.4/OS X 10.6 ****/ +/**** New in CUPS 1.4/macOS 10.6 ****/ extern int cupsGetConflicts(ppd_file_t *ppd, const char *option, const char *choice, cups_option_t **options) diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 1f3961efa..6a206877e 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -258,7 +258,7 @@ static pwg_media_t const cups_pwg_media[] = * units string is @code NULL@, otherwise inches ("in") or millimeters ("mm") * are used. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -378,7 +378,7 @@ pwgFormatSizeName(char *keyword, /* I - Keyword buffer */ return (1); } -/* For OS X 10.8 and earlier... */ +/* For macOS 10.8 and earlier... */ void _pwgGenerateSize(char *keyword, size_t keysize, const char *prefix, const char *name, int width, int length) { pwgFormatSizeName(keyword, keysize, prefix, name, width, length, NULL); } @@ -396,7 +396,7 @@ void _pwgGenerateSize(char *keyword, size_t keysize, const char *prefix, * member attribute was specified in the "media-col" Job Template attribute, * otherwise it is initialized to 0. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 if size was initialized, 0 otherwise */ @@ -560,7 +560,7 @@ pwgInitSize(pwg_size_t *size, /* I - Size to initialize */ return (1); } -/* For OS X 10.8 and earlier */ +/* For macOS 10.8 and earlier */ int _pwgInitSize(pwg_size_t *size, ipp_t *job, int *margins_set) { return (pwgInitSize(size, job, margins_set)); } @@ -571,7 +571,7 @@ int _pwgInitSize(pwg_size_t *size, ipp_t *job, int *margins_set) * The "name" argument specifies the legacy ISO media size name, for example * "iso-a4" or "na-letter". * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -629,7 +629,7 @@ pwgMediaForLegacy(const char *legacy) /* I - Legacy size name */ * thread. Custom names can be of the form "Custom.WIDTHxLENGTH[units]" or * "WIDTHxLENGTH[units]". * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -797,7 +797,7 @@ pwgMediaForPPD(const char *ppd) /* I - PPD size name */ * thread-local storage and is overwritten by each call to the function in the * thread. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -896,7 +896,7 @@ pwgMediaForPWG(const char *pwg) /* I - PWG size name */ * thread-local storage and is overwritten by each call to the function in the * thread. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ pwg_media_t * /* O - PWG media name */ diff --git a/cups/raster.h b/cups/raster.h index cfd5be729..4a853448c 100644 --- a/cups/raster.h +++ b/cups/raster.h @@ -132,28 +132,28 @@ typedef enum cups_cspace_e /**** cupsColorSpace attribute values ****/ CUPS_CSPACE_GOLD = 13, /* Gold foil @deprecated@ */ CUPS_CSPACE_SILVER = 14, /* Silver foil @deprecated@ */ - CUPS_CSPACE_CIEXYZ = 15, /* CIE XYZ @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_CIELab = 16, /* CIE Lab @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_RGBW = 17, /* Red, green, blue, white (DeviceRGB, sRGB by default) @since CUPS 1.2/OS X 10.5@ */ + CUPS_CSPACE_CIEXYZ = 15, /* CIE XYZ @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_CIELab = 16, /* CIE Lab @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_RGBW = 17, /* Red, green, blue, white (DeviceRGB, sRGB by default) @since CUPS 1.2/macOS 10.5@ */ CUPS_CSPACE_SW = 18, /* Luminance (gamma 2.2) @since CUPS 1.4.5@ */ CUPS_CSPACE_SRGB = 19, /* Red, green, blue (sRGB) @since CUPS 1.4.5@ */ CUPS_CSPACE_ADOBERGB = 20, /* Red, green, blue (Adobe RGB) @since CUPS 1.4.5@ */ - CUPS_CSPACE_ICC1 = 32, /* ICC-based, 1 color @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC2 = 33, /* ICC-based, 2 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC3 = 34, /* ICC-based, 3 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC4 = 35, /* ICC-based, 4 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC5 = 36, /* ICC-based, 5 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC6 = 37, /* ICC-based, 6 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC7 = 38, /* ICC-based, 7 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC8 = 39, /* ICC-based, 8 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC9 = 40, /* ICC-based, 9 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCA = 41, /* ICC-based, 10 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCB = 42, /* ICC-based, 11 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCC = 43, /* ICC-based, 12 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCD = 44, /* ICC-based, 13 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCE = 45, /* ICC-based, 14 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCF = 46, /* ICC-based, 15 colors @since CUPS 1.1.19/OS X 10.3@ */ + CUPS_CSPACE_ICC1 = 32, /* ICC-based, 1 color @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC2 = 33, /* ICC-based, 2 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC3 = 34, /* ICC-based, 3 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC4 = 35, /* ICC-based, 4 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC5 = 36, /* ICC-based, 5 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC6 = 37, /* ICC-based, 6 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC7 = 38, /* ICC-based, 7 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC8 = 39, /* ICC-based, 8 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC9 = 40, /* ICC-based, 9 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCA = 41, /* ICC-based, 10 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCB = 42, /* ICC-based, 11 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCC = 43, /* ICC-based, 12 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCD = 44, /* ICC-based, 13 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCE = 45, /* ICC-based, 14 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCF = 46, /* ICC-based, 15 colors @since CUPS 1.1.19/macOS 10.3@ */ CUPS_CSPACE_DEVICE1 = 48, /* DeviceN, 1 color @since CUPS 1.4.5@ */ CUPS_CSPACE_DEVICE2 = 49, /* DeviceN, 2 colors @since CUPS 1.4.5@ */ @@ -201,8 +201,8 @@ enum cups_mode_e /**** cupsRasterOpen modes ****/ { CUPS_RASTER_READ = 0, /* Open stream for reading */ CUPS_RASTER_WRITE = 1, /* Open stream for writing */ - CUPS_RASTER_WRITE_COMPRESSED = 2, /* Open stream for compressed writing @since CUPS 1.3/OS X 10.5@ */ - CUPS_RASTER_WRITE_PWG = 3 /* Open stream for compressed writing in PWG mode @since CUPS 1.5/OS X 10.7@ */ + CUPS_RASTER_WRITE_COMPRESSED = 2, /* Open stream for compressed writing @since CUPS 1.3/macOS 10.5@ */ + CUPS_RASTER_WRITE_PWG = 3 /* Open stream for compressed writing in PWG mode @since CUPS 1.5/macOS 10.7@ */ }; typedef enum cups_mode_e cups_mode_t; /**** cupsRasterOpen modes ****/ @@ -281,7 +281,7 @@ typedef struct cups_page_header_s /**** Version 1 page header @deprecated@ ****/ } cups_page_header_t; /**** New in CUPS 1.2 ****/ -typedef struct cups_page_header2_s /**** Version 2 page header @since CUPS 1.2/OS X 10.5@ ****/ +typedef struct cups_page_header2_s /**** Version 2 page header @since CUPS 1.2/macOS 10.5@ ****/ { /**** Standard Page Device Dictionary String Values ****/ char MediaClass[64]; /* MediaClass string */ @@ -329,20 +329,20 @@ typedef struct cups_page_header2_s /**** Version 2 page header @since CUPS 1.2/O unsigned cupsRowStep; /* Spacing between lines */ /**** Version 2 Dictionary Values ****/ - unsigned cupsNumColors; /* Number of color compoents @since CUPS 1.2/OS X 10.5@ */ + unsigned cupsNumColors; /* Number of color compoents @since CUPS 1.2/macOS 10.5@ */ float cupsBorderlessScalingFactor; - /* Scaling that was applied to page data @since CUPS 1.2/OS X 10.5@ */ + /* Scaling that was applied to page data @since CUPS 1.2/macOS 10.5@ */ float cupsPageSize[2]; /* Floating point PageSize (scaling * - * factor not applied) @since CUPS 1.2/OS X 10.5@ */ + * factor not applied) @since CUPS 1.2/macOS 10.5@ */ float cupsImagingBBox[4]; /* Floating point ImagingBoundingBox * (scaling factor not applied, left, - * bottom, right, top) @since CUPS 1.2/OS X 10.5@ */ - unsigned cupsInteger[16]; /* User-defined integer values @since CUPS 1.2/OS X 10.5@ */ - float cupsReal[16]; /* User-defined floating-point values @since CUPS 1.2/OS X 10.5@ */ - char cupsString[16][64]; /* User-defined string values @since CUPS 1.2/OS X 10.5@ */ - char cupsMarkerType[64]; /* Ink/toner type @since CUPS 1.2/OS X 10.5@ */ - char cupsRenderingIntent[64];/* Color rendering intent @since CUPS 1.2/OS X 10.5@ */ - char cupsPageSizeName[64]; /* PageSize name @since CUPS 1.2/OS X 10.5@ */ + * bottom, right, top) @since CUPS 1.2/macOS 10.5@ */ + unsigned cupsInteger[16]; /* User-defined integer values @since CUPS 1.2/macOS 10.5@ */ + float cupsReal[16]; /* User-defined floating-point values @since CUPS 1.2/macOS 10.5@ */ + char cupsString[16][64]; /* User-defined string values @since CUPS 1.2/macOS 10.5@ */ + char cupsMarkerType[64]; /* Ink/toner type @since CUPS 1.2/macOS 10.5@ */ + char cupsRenderingIntent[64];/* Color rendering intent @since CUPS 1.2/macOS 10.5@ */ + char cupsPageSizeName[64]; /* PageSize name @since CUPS 1.2/macOS 10.5@ */ } cups_page_header2_t; typedef struct _cups_raster_s cups_raster_t; diff --git a/cups/request.c b/cups/request.c index 8d6d95c0c..8de44f7ed 100644 --- a/cups/request.c +++ b/cups/request.c @@ -94,7 +94,7 @@ cupsDoFileRequest(http_t *http, /* I - Connection to server or @code CUPS_HT * If "outfile" is a valid file descriptor, @code cupsDoIORequest@ copies * all of the data after the IPP response message to the file. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ ipp_t * /* O - Response data */ @@ -310,7 +310,7 @@ cupsDoRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ * @link cupsReadResponseData@ after getting a successful response, * otherwise call @link httpFlush@ to complete the response processing. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_t * /* O - Response or @code NULL@ on HTTP error */ @@ -486,7 +486,7 @@ cupsLastError(void) * 'cupsLastErrorString()' - Return the last IPP status-message received on the * current thread. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - status-message text from last request */ @@ -533,7 +533,7 @@ _cupsNextDelay(int current, /* I - Current delay value or 0 */ * files from @code CUPS_GET_PPD@ and @code CUPS_GET_DOCUMENT@ requests, * respectively. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ssize_t /* O - Bytes read, 0 on EOF, -1 on error */ @@ -583,7 +583,7 @@ cupsReadResponseData( * Note: Unlike @link cupsDoFileRequest@, @link cupsDoIORequest@, and * @link cupsDoRequest@, the request is NOT freed with @link ippDelete@. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ http_status_t /* O - Initial HTTP status */ @@ -889,7 +889,7 @@ cupsSendRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP * This function is used after @link cupsSendRequest@ to provide a PPD and * after @link cupsStartDocument@ to provide a document file. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ http_status_t /* O - @code HTTP_STATUS_CONTINUE@ if OK or HTTP status on error */ diff --git a/cups/sidechannel.c b/cups/sidechannel.c index beabef33a..8070ea742 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -54,7 +54,7 @@ * pointed to by the "data" parameter. cupsSideChannelDoRequest() will * update the value to contain the number of data bytes in the buffer. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ cups_sc_status_t /* O - Status of command */ @@ -93,7 +93,7 @@ cupsSideChannelDoRequest( * pointed to by the "data" parameter. cupsSideChannelDoRequest() will * update the value to contain the number of data bytes in the buffer. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -293,7 +293,7 @@ cupsSideChannelRead( * support SNMP queries. @code CUPS_SC_STATUS_NO_RESPONSE@ is returned when * the printer does not respond to the SNMP query. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ cups_sc_status_t /* O - Query status */ @@ -399,7 +399,7 @@ cupsSideChannelSNMPGet( * support SNMP queries. @code CUPS_SC_STATUS_NO_RESPONSE@ is returned when * the printer does not respond to the first SNMP query. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ cups_sc_status_t /* O - Status of first query of @code CUPS_SC_STATUS_OK@ on success */ @@ -518,7 +518,7 @@ cupsSideChannelSNMPWalk( * This function is normally only called by backend programs to send * responses to a filter, driver, or port monitor program. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index 3512fa32e..3de45420a 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -59,9 +59,9 @@ enum cups_sc_command_e /**** Request command codes ****/ CUPS_SC_CMD_GET_BIDI = 3, /* Return bidirectional capabilities */ CUPS_SC_CMD_GET_DEVICE_ID = 4, /* Return the IEEE-1284 device ID */ CUPS_SC_CMD_GET_STATE = 5, /* Return the device state */ - CUPS_SC_CMD_SNMP_GET = 6, /* Query an SNMP OID @since CUPS 1.4/OS X 10.6@ */ - CUPS_SC_CMD_SNMP_GET_NEXT = 7, /* Query the next SNMP OID @since CUPS 1.4/OS X 10.6@ */ - CUPS_SC_CMD_GET_CONNECTED = 8, /* Return whether the backend is "connected" to the printer @since CUPS 1.5/OS X 10.7@ */ + CUPS_SC_CMD_SNMP_GET = 6, /* Query an SNMP OID @since CUPS 1.4/macOS 10.6@ */ + CUPS_SC_CMD_SNMP_GET_NEXT = 7, /* Query the next SNMP OID @since CUPS 1.4/macOS 10.6@ */ + CUPS_SC_CMD_GET_CONNECTED = 8, /* Return whether the backend is "connected" to the printer @since CUPS 1.5/macOS 10.7@ */ CUPS_SC_CMD_MAX /* End of valid values @private@ */ }; typedef enum cups_sc_command_e cups_sc_command_t; diff --git a/cups/tempfile.c b/cups/tempfile.c index 77c025594..d96ee7db1 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -168,7 +168,7 @@ cupsTempFile(char *filename, /* I - Pointer to buffer */ * The temporary filename is returned in the filename buffer. * The temporary file is opened for writing. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file or @code NULL@ on error */ diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c index ab9fedc6a..0dfe73a95 100644 --- a/cups/tls-darwin.c +++ b/cups/tls-darwin.c @@ -1,5 +1,5 @@ /* - * TLS support code for CUPS on OS X. + * TLS support code for CUPS on macOS. * * Copyright 2007-2016 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. @@ -342,7 +342,7 @@ cleanup: * Note: The server credentials are used by all threads in the running process. * This function is threadsafe. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ int /* O - 1 on success, 0 on failure */ @@ -417,7 +417,7 @@ cupsSetServerCredentials( * 'httpCopyCredentials()' - Copy the credentials associated with the peer in * an encrypted connection. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ @@ -520,7 +520,7 @@ _httpCreateCredentials( /* * 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ int /* O - 1 if valid, 0 otherwise */ @@ -583,7 +583,7 @@ httpCredentialsAreValidForName( /* * 'httpCredentialsGetTrust()' - Return the trust of credentials. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ http_trust_t /* O - Level of trust */ @@ -679,7 +679,7 @@ httpCredentialsGetTrust( /* * 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ time_t /* O - Expiration date of credentials */ @@ -704,7 +704,7 @@ httpCredentialsGetExpiration( /* * 'httpCredentialsString()' - Return a string representing the credentials. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ size_t /* O - Total size of credentials string */ diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c index 504068b5e..fae13a749 100644 --- a/cups/tls-gnutls.c +++ b/cups/tls-gnutls.c @@ -291,7 +291,7 @@ cupsSetServerCredentials( * 'httpCopyCredentials()' - Copy the credentials associated with the peer in * an encrypted connection. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c index 0b41cf3d6..8d88faf7c 100644 --- a/cups/tls-sspi.c +++ b/cups/tls-sspi.c @@ -134,7 +134,7 @@ cupsSetServerCredentials( * 'httpCopyCredentials()' - Copy the credentials associated with the peer in * an encrypted connection. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ diff --git a/cups/usersys.c b/cups/usersys.c index bf7d789cc..9a23d7480 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -156,7 +156,7 @@ cupsGetPassword(const char *prompt) /* I - Prompt string */ * the @link cupsSetPasswordCB@ or @link cupsSetPasswordCB2@ functions need to * do so in each thread for the same function to be used. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ const char * /* O - Password */ @@ -214,7 +214,7 @@ cupsServer(void) * in a program. Multi-threaded programs that override the callback need to do * so in each thread for the same callback to be used. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ void @@ -238,7 +238,7 @@ cupsSetClientCertCB( * program. Multi-threaded programs that override the setting need to do so in * each thread for the same setting to be used. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ @@ -326,7 +326,7 @@ cupsSetPasswordCB(cups_password_cb_t cb)/* I - Callback function */ * in a program. Multi-threaded programs that override the callback need to do * so in each thread for the same callback to be used. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ void @@ -431,7 +431,7 @@ cupsSetServer(const char *server) /* I - Server name */ * in a program. Multi-threaded programs that override the callback need to do * so in each thread for the same callback to be used. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ void @@ -476,7 +476,7 @@ cupsSetUser(const char *user) /* I - User name */ * Setting the string to NULL forces the default value containing the CUPS * version, IPP version, and operating system version and architecture. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ void @@ -551,7 +551,7 @@ cupsUser(void) /* * 'cupsUserAgent()' - Return the default HTTP User-Agent string. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ const char * /* O - User-Agent string */ @@ -1221,7 +1221,7 @@ cups_read_client_conf( cups_set_encryption(cc, value); #ifndef __APPLE__ /* - * The ServerName directive is not supported on OS X due to app + * The ServerName directive is not supported on macOS due to app * sandboxing restrictions, i.e. not all apps request network access. */ else if (!_cups_strcasecmp(line, "ServerName") && value) diff --git a/cups/util.c b/cups/util.c index d67df61b9..abfb8d47a 100644 --- a/cups/util.c +++ b/cups/util.c @@ -58,7 +58,7 @@ cupsCancelJob(const char *name, /* I - Name of printer or class */ * Use the @link cupsLastError@ and @link cupsLastErrorString@ functions to get * the cause of any failure. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_status_t /* O - IPP status */ @@ -146,7 +146,7 @@ cupsCancelJob2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ * print, use the @link cupsPrintFile2@ or @link cupsPrintFiles2@ function * instead. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - Job ID or 0 on error */ @@ -226,7 +226,7 @@ cupsCreateJob( * * The document must have been started using @link cupsStartDocument@. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_status_t /* O - Status of document submission */ @@ -322,7 +322,7 @@ cupsGetDefault(void) * functions to get the user-defined default printer, as this function does * not support the lpoptions-defined default printer. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ const char * /* O - Default printer or @code NULL@ */ @@ -413,7 +413,7 @@ cupsGetJobs(cups_job_t **jobs, /* O - Job data */ * pending, processing, or held and @code CUPS_WHICHJOBS_COMPLETED@ returns * jobs that are stopped, canceled, aborted, or completed. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - Number of jobs */ @@ -718,7 +718,7 @@ cupsPrintFile(const char *name, /* I - Destination name */ * 'cupsPrintFile2()' - Print a file to a printer or class on the specified * server. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - Job ID or 0 on error */ @@ -766,7 +766,7 @@ cupsPrintFiles( * 'cupsPrintFiles2()' - Print one or more files to a printer or class on the * specified server. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - Job ID or 0 on error */ @@ -896,7 +896,7 @@ cupsPrintFiles2( * @code CUPS_FORMAT_TEXT@ are provided for the "format" argument, although * any supported MIME type string can be supplied. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ http_status_t /* O - HTTP status of request */ diff --git a/cups/versioning.h b/cups/versioning.h index 90a2b42b9..8d8691bc7 100644 --- a/cups/versioning.h +++ b/cups/versioning.h @@ -23,7 +23,7 @@ * _CUPS_API_2_0 - which add compiler-specific attributes that flag functions * that are deprecated, added in particular releases, or internal to CUPS. * - * On OS X, the _CUPS_API_* constants are defined based on the values of + * On macOS, the _CUPS_API_* constants are defined based on the values of * the MAC_OS_X_VERSION_MIN_ALLOWED and MAC_OS_X_VERSION_MAX_ALLOWED constants * provided by the compiler. */ diff --git a/doc/de/index.html.in b/doc/de/index.html.in index 307bb690c..e9170086a 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -24,7 +24,7 @@ <div class="body"> <div class="row"> <h1>CUPS @CUPS_VERSION@</h1> - <p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a href="http://www.apple.com/">Apple Inc.</a> für OS X<sup>®</sup> und andere UNIX<sup>®</sup>-artige Betriebssysteme.</p> + <p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a href="http://www.apple.com/">Apple Inc.</a> für macOS<sup>®</sup> und andere UNIX<sup>®</sup>-artige Betriebssysteme.</p> </div> <div class="row"> <div class="thirds"> diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 62bed1671..7cc446da1 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -24,7 +24,7 @@ <div class="body"> <div class="row"> <h1>CUPS @CUPS_VERSION@</h1> - <p>CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por <a href="http://www.apple.com/">Apple Inc.</a> para OS X<sup>®</sup> y otros sistemas operativos tipo UNIX<sup>®</sup>.</p> + <p>CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por <a href="http://www.apple.com/">Apple Inc.</a> para macOS<sup>®</sup> y otros sistemas operativos tipo UNIX<sup>®</sup>.</p> </div> <div class="row"> <div class="thirds"> diff --git a/doc/help/api-admin.html b/doc/help/api-admin.html index b69b19d6d..5ca409614 100644 --- a/doc/help/api-admin.html +++ b/doc/help/api-admin.html @@ -5,7 +5,7 @@ <title>Administration APIs </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -551,7 +551,7 @@ int cupsAdminExportSamba (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">1 on success, 0 on failure</p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsAdminGetServerSettings">cupsAdminGetServerSettings</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsAdminGetServerSettings">cupsAdminGetServerSettings</a></h3> <p class="description">Get settings from the server.</p> <p class="code"> int cupsAdminGetServerSettings (<br> @@ -575,7 +575,7 @@ int cupsAdminGetServerSettings (<br> you are done with them. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsAdminSetServerSettings">cupsAdminSetServerSettings</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsAdminSetServerSettings">cupsAdminSetServerSettings</a></h3> <p class="description">Set settings on the server.</p> <p class="code"> int cupsAdminSetServerSettings (<br> @@ -594,7 +594,7 @@ int cupsAdminSetServerSettings (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">1 on success, 0 on failure</p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsGetDevices">cupsGetDevices</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsGetDevices">cupsGetDevices</a></h3> <p class="description">Get available printer devices.</p> <p class="code"> ipp_status_t cupsGetDevices (<br> @@ -631,7 +631,7 @@ the request respectively. </p> <h2 class="title"><a name="TYPES">Data Types</a></h2> -<h3 class="typedef"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cups_device_cb_t">cups_device_cb_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cups_device_cb_t">cups_device_cb_t</a></h3> <p class="description">Device callback </p> <p class="code"> diff --git a/doc/help/api-array.html b/doc/help/api-array.html index 1c1decb90..51b8039ed 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -5,7 +5,7 @@ <title>Array API </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -617,7 +617,7 @@ for (s = (char *)<a href='#cupsArrayFirst'>cupsArrayFirst</a>(array); s != NULL; puts(s); </pre> <h2 class="title"><a name="FUNCTIONS">Functions</a></h2> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayAdd">cupsArrayAdd</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayAdd">cupsArrayAdd</a></h3> <p class="description">Add an element to the array.</p> <p class="code"> int cupsArrayAdd (<br> @@ -639,7 +639,7 @@ appended at the end of the run of identical elements. For unsorted arrays, the element is appended to the end of the array. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayClear">cupsArrayClear</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayClear">cupsArrayClear</a></h3> <p class="description">Clear the array.</p> <p class="code"> void cupsArrayClear (<br> @@ -656,7 +656,7 @@ The caller is responsible for freeing the memory used by the elements themselves. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayCount">cupsArrayCount</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayCount">cupsArrayCount</a></h3> <p class="description">Get the number of elements in the array.</p> <p class="code"> int cupsArrayCount (<br> @@ -669,7 +669,7 @@ int cupsArrayCount (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of elements</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayCurrent">cupsArrayCurrent</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayCurrent">cupsArrayCurrent</a></h3> <p class="description">Return the current element in the array.</p> <p class="code"> void *cupsArrayCurrent (<br> @@ -687,7 +687,7 @@ void *cupsArrayCurrent (<br> <a href="#cupsArrayFirst"><code>cupsArrayFirst</code></a>, or <a href="#cupsArrayIndex"><code>cupsArrayIndex</code></a>, or <a href="#cupsArrayLast"><code>cupsArrayLast</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayDelete">cupsArrayDelete</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayDelete">cupsArrayDelete</a></h3> <p class="description">Free all memory used by the array.</p> <p class="code"> void cupsArrayDelete (<br> @@ -703,7 +703,7 @@ void cupsArrayDelete (<br> elements themselves. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayDup">cupsArrayDup</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayDup">cupsArrayDup</a></h3> <p class="description">Duplicate the array.</p> <p class="code"> <a href="#cups_array_t">cups_array_t</a> *cupsArrayDup (<br> @@ -716,7 +716,7 @@ elements themselves. </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Duplicate array</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayFind">cupsArrayFind</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayFind">cupsArrayFind</a></h3> <p class="description">Find an element in the array.</p> <p class="code"> void *cupsArrayFind (<br> @@ -732,7 +732,7 @@ void *cupsArrayFind (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Element found or <code>NULL</code></p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayFirst">cupsArrayFirst</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayFirst">cupsArrayFirst</a></h3> <p class="description">Get the first element in the array.</p> <p class="code"> void *cupsArrayFirst (<br> @@ -745,7 +745,7 @@ void *cupsArrayFirst (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">First element or <code>NULL</code> if the array is empty</p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsArrayGetIndex">cupsArrayGetIndex</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsArrayGetIndex">cupsArrayGetIndex</a></h3> <p class="description">Get the index of the current element.</p> <p class="code"> int cupsArrayGetIndex (<br> @@ -763,7 +763,7 @@ int cupsArrayGetIndex (<br> <a href="#cupsArrayFirst"><code>cupsArrayFirst</code></a>, or <a href="#cupsArrayIndex"><code>cupsArrayIndex</code></a>, or <a href="#cupsArrayLast"><code>cupsArrayLast</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsArrayGetInsert">cupsArrayGetInsert</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsArrayGetInsert">cupsArrayGetInsert</a></h3> <p class="description">Get the index of the last inserted element.</p> <p class="code"> int cupsArrayGetInsert (<br> @@ -776,7 +776,7 @@ int cupsArrayGetInsert (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Index of the last inserted element, starting at 0</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayIndex">cupsArrayIndex</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayIndex">cupsArrayIndex</a></h3> <p class="description">Get the N-th element in the array.</p> <p class="code"> void *cupsArrayIndex (<br> @@ -792,7 +792,7 @@ void *cupsArrayIndex (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">N-th element or <code>NULL</code></p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayInsert">cupsArrayInsert</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayInsert">cupsArrayInsert</a></h3> <p class="description">Insert an element in the array.</p> <p class="code"> int cupsArrayInsert (<br> @@ -814,7 +814,7 @@ inserted at the beginning of the run of identical elements. For unsorted arrays, the element is inserted at the beginning of the array. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayLast">cupsArrayLast</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayLast">cupsArrayLast</a></h3> <p class="description">Get the last element in the array.</p> <p class="code"> void *cupsArrayLast (<br> @@ -827,7 +827,7 @@ void *cupsArrayLast (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Last element or <code>NULL</code> if the array is empty</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayNew">cupsArrayNew</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayNew">cupsArrayNew</a></h3> <p class="description">Create a new array.</p> <p class="code"> <a href="#cups_array_t">cups_array_t</a> *cupsArrayNew (<br> @@ -850,7 +850,7 @@ data pointer argument can safely be omitted when not required so functions like <code>strcmp</code> can be used for sorted string arrays. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsArrayNew2">cupsArrayNew2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsArrayNew2">cupsArrayNew2</a></h3> <p class="description">Create a new array with hash.</p> <p class="code"> <a href="#cups_array_t">cups_array_t</a> *cupsArrayNew2 (<br> @@ -882,7 +882,7 @@ The hash function ("h") is used to implement cached lookups with the specified hash size ("hsize"). </p> -<h3 class="function"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="cupsArrayNew3">cupsArrayNew3</a></h3> +<h3 class="function"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="cupsArrayNew3">cupsArrayNew3</a></h3> <p class="description">Create a new array with hash and/or free function.</p> <p class="code"> <a href="#cups_array_t">cups_array_t</a> *cupsArrayNew3 (<br> @@ -926,7 +926,7 @@ The free function ("cf") is used to automatically free/release element removed or the array is deleted. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayNext">cupsArrayNext</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayNext">cupsArrayNext</a></h3> <p class="description">Get the next element in the array.</p> <p class="code"> void *cupsArrayNext (<br> @@ -947,7 +947,7 @@ The next element is undefined until you call <a href="#cupsArrayFind"><code>cups to set the current element. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayPrev">cupsArrayPrev</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayPrev">cupsArrayPrev</a></h3> <p class="description">Get the previous element in the array.</p> <p class="code"> void *cupsArrayPrev (<br> @@ -968,7 +968,7 @@ The previous element is undefined until you call <a href="#cupsArrayFind"><code> to set the current element. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayRemove">cupsArrayRemove</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayRemove">cupsArrayRemove</a></h3> <p class="description">Remove an element from the array.</p> <p class="code"> int cupsArrayRemove (<br> @@ -992,7 +992,7 @@ The caller is responsible for freeing the memory used by the removed element. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayRestore">cupsArrayRestore</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayRestore">cupsArrayRestore</a></h3> <p class="description">Reset the current element to the last <a href="#cupsArraySave"><code>cupsArraySave</code></a>.</p> <p class="code"> void *cupsArrayRestore (<br> @@ -1005,7 +1005,7 @@ void *cupsArrayRestore (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">New current element</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArraySave">cupsArraySave</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArraySave">cupsArraySave</a></h3> <p class="description">Mark the current element for a later <a href="#cupsArrayRestore"><code>cupsArrayRestore</code></a>.</p> <p class="code"> int cupsArraySave (<br> @@ -1026,7 +1026,7 @@ to set the current element.<br> The save/restore stack is guaranteed to be at least 32 elements deep. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsArrayUserData">cupsArrayUserData</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsArrayUserData">cupsArrayUserData</a></h3> <p class="description">Return the user data for an array.</p> <p class="code"> void *cupsArrayUserData (<br> diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html index 3e685a3ce..1a29d1845 100644 --- a/doc/help/api-cups.html +++ b/doc/help/api-cups.html @@ -5,7 +5,7 @@ <title>CUPS API </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -1102,7 +1102,7 @@ int cupsAdminExportSamba (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">1 on success, 0 on failure</p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsAdminGetServerSettings">cupsAdminGetServerSettings</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsAdminGetServerSettings">cupsAdminGetServerSettings</a></h3> <p class="description">Get settings from the server.</p> <p class="code"> int cupsAdminGetServerSettings (<br> @@ -1126,7 +1126,7 @@ int cupsAdminGetServerSettings (<br> you are done with them. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsAdminSetServerSettings">cupsAdminSetServerSettings</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsAdminSetServerSettings">cupsAdminSetServerSettings</a></h3> <p class="description">Set settings on the server.</p> <p class="code"> int cupsAdminSetServerSettings (<br> @@ -1193,7 +1193,7 @@ to cancel the current job on the named destination.<br> <br> Use the <a href="#cupsLastError"><code>cupsLastError</code></a> and <a href="#cupsLastErrorString"><code>cupsLastErrorString</code></a> functions to get the cause of any failure.</p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsCancelJob2">cupsCancelJob2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsCancelJob2">cupsCancelJob2</a></h3> <p class="description">Cancel or purge a print job.</p> <p class="code"> ipp_status_t cupsCancelJob2 (<br> @@ -1226,7 +1226,7 @@ Use the <a href="#cupsLastError"><code>cupsLastError</code></a> and <a href="#cu the cause of any failure. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsCheckDestSupported">cupsCheckDestSupported</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsCheckDestSupported">cupsCheckDestSupported</a></h3> <p class="description">Check that the option and value are supported by the destination.</p> <p class="code"> @@ -1256,7 +1256,7 @@ int cupsCheckDestSupported (<br> <p class="discussion">Returns 1 if supported, 0 otherwise. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsCloseDestJob">cupsCloseDestJob</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsCloseDestJob">cupsCloseDestJob</a></h3> <p class="description">Close a job and start printing.</p> <p class="code"> ipp_status_t cupsCloseDestJob (<br> @@ -1284,7 +1284,7 @@ ipp_status_t cupsCloseDestJob (<br> on success. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsConnectDest">cupsConnectDest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsConnectDest">cupsConnectDest</a></h3> <p class="description">Connect to the server for a destination.</p> <p class="code"> http_t *cupsConnectDest (<br> @@ -1326,7 +1326,7 @@ to by "cancel" is non-zero, or the callback function (or block) return The caller is responsible for calling httpClose() on the returned object. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsConnectDestBlock">cupsConnectDestBlock</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsConnectDestBlock">cupsConnectDestBlock</a></h3> <p class="description">Connect to the server for a destination.</p> <p class="code"> http_t *cupsConnectDestBlock (<br> @@ -1386,7 +1386,7 @@ copy) - for use with the cupsEnumDests* functions. The caller is responsible for calling cupsFreeDests() on the returned object(s). </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsCopyDestConflicts">cupsCopyDestConflicts</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsCopyDestConflicts">cupsCopyDestConflicts</a></h3> <p class="description">Get conflicts and resolutions for a new option/value pair.</p> <p class="code"> @@ -1447,7 +1447,7 @@ If cupsCopyDestConflicts returns 1 but "num_resolved" and "resolv to 0 and <code>NULL</code>, respectively, then the conflict cannot be resolved. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsCopyDestInfo">cupsCopyDestInfo</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsCopyDestInfo">cupsCopyDestInfo</a></h3> <p class="description">Get the supported values/capabilities for the destination.</p> <p class="code"> @@ -1469,7 +1469,7 @@ destination.</p> value. <code>NULL</code> is returned on error. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsCreateDestJob">cupsCreateDestJob</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsCreateDestJob">cupsCreateDestJob</a></h3> <p class="description">Create a job on a destination.</p> <p class="code"> ipp_status_t cupsCreateDestJob (<br> @@ -1505,7 +1505,7 @@ ipp_status_t cupsCreateDestJob (<br> in the variable pointed to by "job_id". </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsCreateJob">cupsCreateJob</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsCreateJob">cupsCreateJob</a></h3> <p class="description">Create an empty job for streaming.</p> <p class="code"> int cupsCreateJob (<br> @@ -1554,7 +1554,7 @@ Note: The current encryption setting is tracked separately for each thread in a program. Multi-threaded programs that override the setting via the <a href="#cupsSetEncryption"><code>cupsSetEncryption</code></a> function need to do so in each thread for the same setting to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsEnumDests">cupsEnumDests</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsEnumDests">cupsEnumDests</a></h3> <p class="description">Enumerate available destinations with a callback function.</p> <p class="code"> int cupsEnumDests (<br> @@ -1596,7 +1596,7 @@ Enumeration happens on the current thread and does not return until all destinations have been enumerated or the callback function returns 0. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsEnumDestsBlock">cupsEnumDestsBlock</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsEnumDestsBlock">cupsEnumDestsBlock</a></h3> <p class="description">Enumerate available destinations with a block.</p> <p class="code"> int cupsEnumDestsBlock (<br> @@ -1634,7 +1634,7 @@ Enumeration happens on the current thread and does not return until all destinations have been enumerated or the block returns 0. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsFindDestDefault">cupsFindDestDefault</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="cupsFindDestDefault">cupsFindDestDefault</a></h3> <p class="description">Find the default value(s) for the given option.</p> <p class="code"> ipp_attribute_t *cupsFindDestDefault (<br> @@ -1664,7 +1664,7 @@ ipp_attribute_t *cupsFindDestDefault (<br> functions to inspect the default value(s) as needed. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsFindDestReady">cupsFindDestReady</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="cupsFindDestReady">cupsFindDestReady</a></h3> <p class="description">Find the default value(s) for the given option.</p> <p class="code"> ipp_attribute_t *cupsFindDestReady (<br> @@ -1694,7 +1694,7 @@ ipp_attribute_t *cupsFindDestReady (<br> functions to inspect the default value(s) as needed. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsFindDestSupported">cupsFindDestSupported</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="cupsFindDestSupported">cupsFindDestSupported</a></h3> <p class="description">Find the default value(s) for the given option.</p> <p class="code"> ipp_attribute_t *cupsFindDestSupported (<br> @@ -1724,7 +1724,7 @@ ipp_attribute_t *cupsFindDestSupported (<br> functions to inspect the default value(s) as needed. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsFinishDestDocument">cupsFinishDestDocument</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsFinishDestDocument">cupsFinishDestDocument</a></h3> <p class="description">Finish the current document.</p> <p class="code"> ipp_status_t cupsFinishDestDocument (<br> @@ -1747,7 +1747,7 @@ ipp_status_t cupsFinishDestDocument (<br> <p class="discussion">Returns <code>IPP_STATUS_OK</code> or <code>IPP_STATUS_OK_SUBST</code> on success. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsFinishDocument">cupsFinishDocument</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsFinishDocument">cupsFinishDocument</a></h3> <p class="description">Finish sending a document.</p> <p class="code"> ipp_status_t cupsFinishDocument (<br> @@ -1852,7 +1852,7 @@ variables are not set, the server default destination is returned. Applications should use the <a href="#cupsGetDests"><code>cupsGetDests</code></a> and <a href="#cupsGetDest"><code>cupsGetDest</code></a> functions to get the user-defined default printer, as this function does not support the lpoptions-defined default printer.</p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="cupsGetDefault2">cupsGetDefault2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="cupsGetDefault2">cupsGetDefault2</a></h3> <p class="description">Get the default printer or class for the specified server.</p> <p class="code"> const char *cupsGetDefault2 (<br> @@ -1899,7 +1899,7 @@ not support the lpoptions-defined default printer. <h4 class="discussion">Discussion</h4> <p class="discussion">Use the <a href="#cupsGetDests"><code>cupsGetDests</code></a> or <a href="#cupsGetDests2"><code>cupsGetDests2</code></a> functions to get a list of supported destinations for the current user.</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsGetDestMediaByIndex">cupsGetDestMediaByIndex</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="cupsGetDestMediaByIndex">cupsGetDestMediaByIndex</a></h3> <p class="description">Get a media name, dimension, and margins for a specific size.</p> <p class="code"> @@ -1934,7 +1934,7 @@ example, passing <code>CUPS_MEDIA_FLAGS_BORDERLESS</code> will get the Nth borderless size supported by the printer. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsGetDestMediaByName">cupsGetDestMediaByName</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsGetDestMediaByName">cupsGetDestMediaByName</a></h3> <p class="description">Get media names, dimensions, and margins.</p> <p class="code"> int cupsGetDestMediaByName (<br> @@ -1978,7 +1978,7 @@ The matching result (if any) is returned in the "cups_size_t" structur Returns 1 when there is a match and 0 if there is not a match. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsGetDestMediaBySize">cupsGetDestMediaBySize</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsGetDestMediaBySize">cupsGetDestMediaBySize</a></h3> <p class="description">Get media names, dimensions, and margins.</p> <p class="code"> int cupsGetDestMediaBySize (<br> @@ -2027,7 +2027,7 @@ The matching result (if any) is returned in the "cups_size_t" structur Returns 1 when there is a match and 0 if there is not a match. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsGetDestMediaCount">cupsGetDestMediaCount</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="cupsGetDestMediaCount">cupsGetDestMediaCount</a></h3> <p class="description">Get the number of sizes supported by a destination.</p> <p class="code"> @@ -2056,7 +2056,7 @@ counted. For example, passing <code>CUPS_MEDIA_FLAGS_BORDERLESS</code> will ret the number of borderless sizes. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsGetDestMediaDefault">cupsGetDestMediaDefault</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="cupsGetDestMediaDefault">cupsGetDestMediaDefault</a></h3> <p class="description">Get the default size for a destination.</p> <p class="code"> int cupsGetDestMediaDefault (<br> @@ -2087,7 +2087,7 @@ example, passing <code>CUPS_MEDIA_FLAGS_BORDERLESS</code> will return the defaul borderless size, typically US Letter or A4, but sometimes 4x6 photo media. </p> -<h3 class="function"><span class="info"> CUPS 2.0/OS X 10.10 </span><a name="cupsGetDestWithURI">cupsGetDestWithURI</a></h3> +<h3 class="function"><span class="info"> CUPS 2.0/macOS 10.10 </span><a name="cupsGetDestWithURI">cupsGetDestWithURI</a></h3> <p class="description">Get a destination associated with a URI.</p> <p class="code"> <a href="#cups_dest_t">cups_dest_t</a> *cupsGetDestWithURI (<br> @@ -2134,7 +2134,7 @@ marker-types, and printer-commands attributes as well.<br> <br> Use the <a href="#cupsFreeDests"><code>cupsFreeDests</code></a> function to free the destination list and the <a href="#cupsGetDest"><code>cupsGetDest</code></a> function to find a particular destination.</p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="cupsGetDests2">cupsGetDests2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="cupsGetDests2">cupsGetDests2</a></h3> <p class="description">Get the list of destinations from the specified server.</p> <p class="code"> int cupsGetDests2 (<br> @@ -2190,7 +2190,7 @@ int cupsGetJobs (<br> of state, while <code>CUPS_WHICHJOBS_ACTIVE</code> returns jobs that are pending, processing, or held and <code>CUPS_WHICHJOBS_COMPLETED</code> returns jobs that are stopped, canceled, aborted, or completed.</p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="cupsGetJobs2">cupsGetJobs2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="cupsGetJobs2">cupsGetJobs2</a></h3> <p class="description">Get the jobs from the specified server.</p> <p class="code"> int cupsGetJobs2 (<br> @@ -2222,7 +2222,7 @@ pending, processing, or held and <code>CUPS_WHICHJOBS_COMPLETED</code> returns jobs that are stopped, canceled, aborted, or completed. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsGetNamedDest">cupsGetNamedDest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsGetNamedDest">cupsGetNamedDest</a></h3> <p class="description">Get options for the named destination.</p> <p class="code"> <a href="#cups_dest_t">cups_dest_t</a> *cupsGetNamedDest (<br> @@ -2298,7 +2298,7 @@ Note: The current password callback function is tracked separately for each thread in a program. Multi-threaded programs that override the setting via the <a href="#cupsSetPasswordCB"><code>cupsSetPasswordCB</code></a> or <a href="#cupsSetPasswordCB2"><code>cupsSetPasswordCB2</code></a> functions need to do so in each thread for the same function to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsGetPassword2">cupsGetPassword2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsGetPassword2">cupsGetPassword2</a></h3> <p class="description">Get a password from the user using the advanced password callback.</p> <p class="code"> @@ -2399,7 +2399,7 @@ cups_lang_t *cupsLangGet (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Language data</p> -<h3 class="function"><span class="info"> CUPS 2.0/OS X 10.10 </span><a name="cupsLocalizeDestMedia">cupsLocalizeDestMedia</a></h3> +<h3 class="function"><span class="info"> CUPS 2.0/macOS 10.10 </span><a name="cupsLocalizeDestMedia">cupsLocalizeDestMedia</a></h3> <p class="description">Get the localized string for a destination media size.</p> <p class="code"> @@ -2430,7 +2430,7 @@ const char *cupsLocalizeDestMedia (<br> invalid if the destination information is deleted. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsLocalizeDestOption">cupsLocalizeDestOption</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsLocalizeDestOption">cupsLocalizeDestOption</a></h3> <p class="description">Get the localized string for a destination option.</p> <p class="code"> @@ -2458,7 +2458,7 @@ const char *cupsLocalizeDestOption (<br> invalid if the destination information is deleted. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsLocalizeDestValue">cupsLocalizeDestValue</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsLocalizeDestValue">cupsLocalizeDestValue</a></h3> <p class="description">Get the localized string for a destination option+value pair.</p> <p class="code"> @@ -2489,7 +2489,7 @@ const char *cupsLocalizeDestValue (<br> invalid if the destination information is deleted. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsNotifySubject">cupsNotifySubject</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsNotifySubject">cupsNotifySubject</a></h3> <p class="description">Return the subject for the given notification message.</p> <p class="code"> char *cupsNotifySubject (<br> @@ -2509,7 +2509,7 @@ char *cupsNotifySubject (<br> <p class="discussion">The returned string must be freed by the caller using <code>free</code>. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsNotifyText">cupsNotifyText</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsNotifyText">cupsNotifyText</a></h3> <p class="description">Return the text for the given notification message.</p> <p class="code"> char *cupsNotifyText (<br> @@ -2579,7 +2579,7 @@ int cupsPrintFile (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Job ID or 0 on error</p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="cupsPrintFile2">cupsPrintFile2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="cupsPrintFile2">cupsPrintFile2</a></h3> <p class="description">Print a file to a printer or class on the specified server.</p> <p class="code"> @@ -2637,7 +2637,7 @@ int cupsPrintFiles (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Job ID or 0 on error</p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="cupsPrintFiles2">cupsPrintFiles2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="cupsPrintFiles2">cupsPrintFiles2</a></h3> <p class="description">Print one or more files to a printer or class on the specified server.</p> <p class="code"> @@ -2669,7 +2669,7 @@ int cupsPrintFiles2 (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Job ID or 0 on error</p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsRemoveDest">cupsRemoveDest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsRemoveDest">cupsRemoveDest</a></h3> <p class="description">Remove a destination from the destination list.</p> <p class="code"> int cupsRemoveDest (<br> @@ -2698,7 +2698,7 @@ queue, merely the lpoptions for that destination/instance. Use the options for the user. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsRemoveOption">cupsRemoveOption</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsRemoveOption">cupsRemoveOption</a></h3> <p class="description">Remove an option from an option array.</p> <p class="code"> int cupsRemoveOption (<br> @@ -2736,7 +2736,7 @@ Note: The current server is tracked separately for each thread in a program. Multi-threaded programs that override the server via the <a href="#cupsSetServer"><code>cupsSetServer</code></a> function need to do so in each thread for the same server to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="cupsSetClientCertCB">cupsSetClientCertCB</a></h3> +<h3 class="function"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="cupsSetClientCertCB">cupsSetClientCertCB</a></h3> <p class="description">Set the client certificate callback.</p> <p class="code"> void cupsSetClientCertCB (<br> @@ -2758,7 +2758,7 @@ in a program. Multi-threaded programs that override the callback need to do so in each thread for the same callback to be used. </p> -<h3 class="function"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="cupsSetCredentials">cupsSetCredentials</a></h3> +<h3 class="function"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="cupsSetCredentials">cupsSetCredentials</a></h3> <p class="description">Set the default credentials to be used for SSL/TLS connections.</p> <p class="code"> @@ -2778,7 +2778,7 @@ program. Multi-threaded programs that override the setting need to do so in each thread for the same setting to be used. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsSetDefaultDest">cupsSetDefaultDest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsSetDefaultDest">cupsSetDefaultDest</a></h3> <p class="description">Set the default destination.</p> <p class="code"> void cupsSetDefaultDest (<br> @@ -2815,7 +2815,7 @@ void cupsSetDests (<br> <h4 class="discussion">Discussion</h4> <p class="discussion">This function saves the destinations to /etc/cups/lpoptions when run as root and ~/.cups/lpoptions when run as a normal user.</p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="cupsSetDests2">cupsSetDests2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="cupsSetDests2">cupsSetDests2</a></h3> <p class="description">Save the list of destinations for the specified server.</p> <p class="code"> int cupsSetDests2 (<br> @@ -2879,7 +2879,7 @@ by a program per thread.<br> Note: The current password callback is tracked separately for each thread in a program. Multi-threaded programs that override the callback need to do so in each thread for the same callback to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsSetPasswordCB2">cupsSetPasswordCB2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsSetPasswordCB2">cupsSetPasswordCB2</a></h3> <p class="description">Set the advanced password callback for CUPS.</p> <p class="code"> void cupsSetPasswordCB2 (<br> @@ -2925,7 +2925,7 @@ default server name and port.<br> Note: The current server is tracked separately for each thread in a program. Multi-threaded programs that override the server need to do so in each thread for the same server to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="cupsSetServerCertCB">cupsSetServerCertCB</a></h3> +<h3 class="function"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="cupsSetServerCertCB">cupsSetServerCertCB</a></h3> <p class="description">Set the server certificate callback.</p> <p class="code"> void cupsSetServerCertCB (<br> @@ -2964,7 +2964,7 @@ void cupsSetUser (<br> Note: The current user name is tracked separately for each thread in a program. Multi-threaded programs that override the user name need to do so in each thread for the same user name to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsSetUserAgent">cupsSetUserAgent</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="cupsSetUserAgent">cupsSetUserAgent</a></h3> <p class="description">Set the default HTTP User-Agent string.</p> <p class="code"> void cupsSetUserAgent (<br> @@ -2980,7 +2980,7 @@ void cupsSetUserAgent (<br> version, IPP version, and operating system version and architecture. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsStartDestDocument">cupsStartDestDocument</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cupsStartDestDocument">cupsStartDestDocument</a></h3> <p class="description">Start a new document.</p> <p class="code"> http_status_t cupsStartDestDocument (<br> @@ -3026,7 +3026,7 @@ if this is the last document to be submitted in the job. Returns <code>HTTP_CONTINUE</code> on success. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsStartDocument">cupsStartDocument</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsStartDocument">cupsStartDocument</a></h3> <p class="description">Add a document to a job created with cupsCreateJob().</p> <p class="code"> http_status_t cupsStartDocument (<br> @@ -3105,7 +3105,7 @@ This function is deprecated and will no longer generate a temporary filename - use <a href="#cupsTempFd"><code>cupsTempFd</code></a> or <a href="#cupsTempFile2"><code>cupsTempFile2</code></a> instead. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsTempFile2">cupsTempFile2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsTempFile2">cupsTempFile2</a></h3> <p class="description">Creates a temporary CUPS file.</p> <p class="code"> cups_file_t *cupsTempFile2 (<br> @@ -3137,13 +3137,13 @@ const char *cupsUser (void);</p> program. Multi-threaded programs that override the user name with the <a href="#cupsSetUser"><code>cupsSetUser</code></a> function need to do so in each thread for the same user name to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsUserAgent">cupsUserAgent</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="cupsUserAgent">cupsUserAgent</a></h3> <p class="description">Return the default HTTP User-Agent string.</p> <p class="code"> const char *cupsUserAgent (void);</p> <h4 class="returnvalue">Return Value</h4> <p class="description">User-Agent string</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgFormatSizeName">pwgFormatSizeName</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="pwgFormatSizeName">pwgFormatSizeName</a></h3> <p class="description">Generate a PWG self-describing media size name.</p> <p class="code"> int pwgFormatSizeName (<br> @@ -3191,7 +3191,7 @@ units string is <code>NULL</code>, otherwise inches ("in") or millimet are used. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgInitSize">pwgInitSize</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="pwgInitSize">pwgInitSize</a></h3> <p class="description">Initialize a pwg_size_t structure using IPP Job Template attributes.</p> <p class="code"> @@ -3221,7 +3221,7 @@ member attribute was specified in the "media-col" Job Template attribu otherwise it is initialized to 0. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgMediaForLegacy">pwgMediaForLegacy</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="pwgMediaForLegacy">pwgMediaForLegacy</a></h3> <p class="description">Find a PWG media size by ISO/IPP legacy name.</p> <p class="code"> <a href="#pwg_media_t">pwg_media_t</a> *pwgMediaForLegacy (<br> @@ -3239,7 +3239,7 @@ otherwise it is initialized to 0. "iso-a4" or "na-letter". </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgMediaForPPD">pwgMediaForPPD</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="pwgMediaForPPD">pwgMediaForPPD</a></h3> <p class="description">Find a PWG media size by Adobe PPD name.</p> <p class="code"> <a href="#pwg_media_t">pwg_media_t</a> *pwgMediaForPPD (<br> @@ -3263,7 +3263,7 @@ thread. Custom names can be of the form "Custom.WIDTHxLENGTH[units]" "WIDTHxLENGTH[units]". </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgMediaForPWG">pwgMediaForPWG</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="pwgMediaForPWG">pwgMediaForPWG</a></h3> <p class="description">Find a PWG media size by 5101.1 self-describing name.</p> <p class="code"> <a href="#pwg_media_t">pwg_media_t</a> *pwgMediaForPWG (<br> @@ -3285,7 +3285,7 @@ thread-local storage and is overwritten by each call to the function in the thread. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgMediaForSize">pwgMediaForSize</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="pwgMediaForSize">pwgMediaForSize</a></h3> <p class="description">Get the PWG media size for the given dimensions.</p> <p class="code"> <a href="#pwg_media_t">pwg_media_t</a> *pwgMediaForSize (<br> @@ -3311,19 +3311,19 @@ thread. </p> <h2 class="title"><a name="TYPES">Data Types</a></h2> -<h3 class="typedef"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="cups_client_cert_cb_t">cups_client_cert_cb_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="cups_client_cert_cb_t">cups_client_cert_cb_t</a></h3> <p class="description">Client credentials callback </p> <p class="code"> typedef int (*cups_client_cert_cb_t)(http_t *http, void *tls, cups_array_t *distinguished_names, void *user_data); </p> -<h3 class="typedef"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cups_dest_block_t">cups_dest_block_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cups_dest_block_t">cups_dest_block_t</a></h3> <p class="description">Destination enumeration block </p> <p class="code"> typedef int (*cups_dest_block_t(unsigned flags, <a href="#cups_dest_t">cups_dest_t</a> *dest); </p> -<h3 class="typedef"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cups_dest_cb_t">cups_dest_cb_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cups_dest_cb_t">cups_dest_cb_t</a></h3> <p class="description">Destination enumeration callback </p> <p class="code"> @@ -3334,7 +3334,7 @@ typedef int (*cups_dest_cb_t)(void *user_data, unsigned flags, <a href="#cups_de <p class="code"> typedef struct <a href="#cups_dest_s">cups_dest_s</a> cups_dest_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cups_dinfo_t">cups_dinfo_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cups_dinfo_t">cups_dinfo_t</a></h3> <p class="description">Destination capability and status information </p> <p class="code"> @@ -3350,7 +3350,7 @@ typedef struct <a href="#cups_job_s">cups_job_s</a> cups_job_t; <p class="code"> typedef struct <a href="#cups_option_s">cups_option_s</a> cups_option_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cups_password_cb2_t">cups_password_cb2_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cups_password_cb2_t">cups_password_cb2_t</a></h3> <p class="description">New password callback </p> <p class="code"> @@ -3366,13 +3366,13 @@ typedef const char *(*cups_password_cb_t)(const char *prompt); <p class="code"> typedef unsigned cups_ptype_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="cups_server_cert_cb_t">cups_server_cert_cb_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="cups_server_cert_cb_t">cups_server_cert_cb_t</a></h3> <p class="description">Server credentials callback </p> <p class="code"> typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls, cups_array_t *certs, void *user_data); </p> -<h3 class="typedef"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cups_size_t">cups_size_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cups_size_t">cups_size_t</a></h3> <p class="description">Media Size </p> <p class="code"> typedef struct <a href="#cups_size_s">cups_size_s</a> cups_size_t; @@ -3465,7 +3465,7 @@ typedef struct <a href="#pwg_size_s">pwg_size_s</a> pwg_size_t; <dt>value </dt> <dd class="description">Value of option</dd> </dl> -<h3 class="struct"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cups_size_s">cups_size_s</a></h3> +<h3 class="struct"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="cups_size_s">cups_size_s</a></h3> <p class="description">Media Size </p> <p class="code">struct cups_size_s {<br> char media[128];<br> @@ -3545,7 +3545,7 @@ constants</p> <dl> <dt>CUPS_PRINTER_3D <span class="info"> CUPS 2.1 </span></dt> <dd class="description">Printer with 3D capabilities </dd> -<dt>CUPS_PRINTER_AUTHENTICATED <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>CUPS_PRINTER_AUTHENTICATED <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Printer requires authentication </dd> <dt>CUPS_PRINTER_BIND </dt> @@ -3558,7 +3558,7 @@ constants</p> <dd class="description">Can collage copies</dd> <dt>CUPS_PRINTER_COLOR </dt> <dd class="description">Can do color printing</dd> -<dt>CUPS_PRINTER_COMMANDS <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>CUPS_PRINTER_COMMANDS <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Printer supports maintenance commands </dd> <dt>CUPS_PRINTER_COPIES </dt> @@ -3567,7 +3567,7 @@ constants</p> <dd class="description">Can cover output</dd> <dt>CUPS_PRINTER_DEFAULT </dt> <dd class="description">Default printer on network</dd> -<dt>CUPS_PRINTER_DELETE <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>CUPS_PRINTER_DELETE <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Delete printer </dd> <dt>CUPS_PRINTER_DUPLEX </dt> @@ -3580,10 +3580,10 @@ constants</p> <dd class="description">Local printer or class</dd> <dt>CUPS_PRINTER_MEDIUM </dt> <dd class="description">Can do Tabloid/B/C/A3/A2</dd> -<dt>CUPS_PRINTER_MFP <span class="info"> CUPS 1.4/OS X 10.6 </span></dt> +<dt>CUPS_PRINTER_MFP <span class="info"> CUPS 1.4/macOS 10.6 </span></dt> <dd class="description">Printer with scanning capabilities </dd> -<dt>CUPS_PRINTER_NOT_SHARED <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>CUPS_PRINTER_NOT_SHARED <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Printer is not shared </dd> <dt>CUPS_PRINTER_PUNCH </dt> @@ -3592,7 +3592,7 @@ constants</p> <dd class="description">Printer is rejecting jobs</dd> <dt>CUPS_PRINTER_REMOTE </dt> <dd class="description">Remote printer or class</dd> -<dt>CUPS_PRINTER_SCANNER <span class="info"> CUPS 1.4/OS X 10.6 </span></dt> +<dt>CUPS_PRINTER_SCANNER <span class="info"> CUPS 1.4/macOS 10.6 </span></dt> <dd class="description">Scanner-only device </dd> <dt>CUPS_PRINTER_SMALL </dt> diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html index fcc2cdf82..d193729fb 100644 --- a/doc/help/api-filedir.html +++ b/doc/help/api-filedir.html @@ -5,7 +5,7 @@ <title>File and Directory APIs </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -463,7 +463,7 @@ details of directory access/listing and provide a convenient way to get both a list of files and the information (permissions, size, timestamp, etc.) for each of those files.</p> <h2 class="title"><a name="FUNCTIONS">Functions</a></h2> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsDirClose">cupsDirClose</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsDirClose">cupsDirClose</a></h3> <p class="description">Close a directory.</p> <p class="code"> void cupsDirClose (<br> @@ -474,7 +474,7 @@ void cupsDirClose (<br> <dt>dp</dt> <dd class="description">Directory pointer</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsDirOpen">cupsDirOpen</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsDirOpen">cupsDirOpen</a></h3> <p class="description">Open a directory.</p> <p class="code"> <a href="#cups_dir_t">cups_dir_t</a> *cupsDirOpen (<br> @@ -487,7 +487,7 @@ void cupsDirClose (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Directory pointer or <code>NULL</code> if the directory could not be opened.</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsDirRead">cupsDirRead</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsDirRead">cupsDirRead</a></h3> <p class="description">Read the next directory entry.</p> <p class="code"> <a href="#cups_dentry_t">cups_dentry_t</a> *cupsDirRead (<br> @@ -500,7 +500,7 @@ void cupsDirClose (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Directory entry or <code>NULL</code> when there are no more</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsDirRewind">cupsDirRewind</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsDirRewind">cupsDirRewind</a></h3> <p class="description">Rewind to the start of the directory.</p> <p class="code"> void cupsDirRewind (<br> @@ -511,7 +511,7 @@ void cupsDirRewind (<br> <dt>dp</dt> <dd class="description">Directory pointer</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileClose">cupsFileClose</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileClose">cupsFileClose</a></h3> <p class="description">Close a CUPS file.</p> <p class="code"> int cupsFileClose (<br> @@ -524,7 +524,7 @@ int cupsFileClose (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 on success, -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileCompression">cupsFileCompression</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileCompression">cupsFileCompression</a></h3> <p class="description">Return whether a file is compressed.</p> <p class="code"> int cupsFileCompression (<br> @@ -537,7 +537,7 @@ int cupsFileCompression (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description"><code>CUPS_FILE_NONE</code> or <code>CUPS_FILE_GZIP</code></p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileEOF">cupsFileEOF</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileEOF">cupsFileEOF</a></h3> <p class="description">Return the end-of-file status.</p> <p class="code"> int cupsFileEOF (<br> @@ -550,7 +550,7 @@ int cupsFileEOF (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">1 on end of file, 0 otherwise</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileFind">cupsFileFind</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileFind">cupsFileFind</a></h3> <p class="description">Find a file using the specified path.</p> <p class="code"> const char *cupsFileFind (<br> @@ -583,7 +583,7 @@ the supplied paths, <code>NULL</code> is returned. A <code>NULL</code> path only matches the current directory. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileFlush">cupsFileFlush</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileFlush">cupsFileFlush</a></h3> <p class="description">Flush pending output.</p> <p class="code"> int cupsFileFlush (<br> @@ -596,7 +596,7 @@ int cupsFileFlush (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 on success, -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileGetChar">cupsFileGetChar</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileGetChar">cupsFileGetChar</a></h3> <p class="description">Get a single character from a file.</p> <p class="code"> int cupsFileGetChar (<br> @@ -609,7 +609,7 @@ int cupsFileGetChar (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Character or -1 on end of file</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileGetConf">cupsFileGetConf</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileGetConf">cupsFileGetConf</a></h3> <p class="description">Get a line from a configuration file.</p> <p class="code"> char *cupsFileGetConf (<br> @@ -634,7 +634,7 @@ char *cupsFileGetConf (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Line read or <code>NULL</code> on end of file or error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileGetLine">cupsFileGetLine</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileGetLine">cupsFileGetLine</a></h3> <p class="description">Get a CR and/or LF-terminated line that may contain binary data.</p> <p class="code"> @@ -661,7 +661,7 @@ nul-terminated, however you should use the returned length to determine the number of bytes on the line. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileGets">cupsFileGets</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileGets">cupsFileGets</a></h3> <p class="description">Get a CR and/or LF-terminated line.</p> <p class="code"> char *cupsFileGets (<br> @@ -680,7 +680,7 @@ char *cupsFileGets (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Line read or <code>NULL</code> on end of file or error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileLock">cupsFileLock</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileLock">cupsFileLock</a></h3> <p class="description">Temporarily lock access to a file.</p> <p class="code"> int cupsFileLock (<br> @@ -696,7 +696,7 @@ int cupsFileLock (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 on success, -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileNumber">cupsFileNumber</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileNumber">cupsFileNumber</a></h3> <p class="description">Return the file descriptor associated with a CUPS file.</p> <p class="code"> int cupsFileNumber (<br> @@ -709,7 +709,7 @@ int cupsFileNumber (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">File descriptor</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileOpen">cupsFileOpen</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileOpen">cupsFileOpen</a></h3> <p class="description">Open a CUPS file.</p> <p class="code"> <a href="#cups_file_t">cups_file_t</a> *cupsFileOpen (<br> @@ -740,7 +740,7 @@ connection as needed, generally preferring IPv6 connections when there is a choice. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileOpenFd">cupsFileOpenFd</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileOpenFd">cupsFileOpenFd</a></h3> <p class="description">Open a CUPS file using a file descriptor.</p> <p class="code"> <a href="#cups_file_t">cups_file_t</a> *cupsFileOpenFd (<br> @@ -765,7 +765,7 @@ supplied which enables Flate compression of the file. Compression is not supported for the "a" (append) mode. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFilePeekChar">cupsFilePeekChar</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFilePeekChar">cupsFilePeekChar</a></h3> <p class="description">Peek at the next character from a file.</p> <p class="code"> int cupsFilePeekChar (<br> @@ -778,7 +778,7 @@ int cupsFilePeekChar (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Character or -1 on end of file</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFilePrintf">cupsFilePrintf</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFilePrintf">cupsFilePrintf</a></h3> <p class="description">Write a formatted string.</p> <p class="code"> int cupsFilePrintf (<br> @@ -797,7 +797,7 @@ int cupsFilePrintf (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of bytes written or -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFilePutChar">cupsFilePutChar</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFilePutChar">cupsFilePutChar</a></h3> <p class="description">Write a character.</p> <p class="code"> int cupsFilePutChar (<br> @@ -813,7 +813,7 @@ int cupsFilePutChar (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 on success, -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsFilePutConf">cupsFilePutConf</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsFilePutConf">cupsFilePutConf</a></h3> <p class="description">Write a configuration line.</p> <p class="code"> ssize_t cupsFilePutConf (<br> @@ -836,7 +836,7 @@ ssize_t cupsFilePutConf (<br> <p class="discussion">This function handles any comment escaping of the value. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFilePuts">cupsFilePuts</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFilePuts">cupsFilePuts</a></h3> <p class="description">Write a string.</p> <p class="code"> int cupsFilePuts (<br> @@ -856,7 +856,7 @@ int cupsFilePuts (<br> <p class="discussion">Like the <code>fputs</code> function, no newline is appended to the string. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileRead">cupsFileRead</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileRead">cupsFileRead</a></h3> <p class="description">Read from a file.</p> <p class="code"> ssize_t cupsFileRead (<br> @@ -875,7 +875,7 @@ ssize_t cupsFileRead (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of bytes read or -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileRewind">cupsFileRewind</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileRewind">cupsFileRewind</a></h3> <p class="description">Set the current file position to the beginning of the file.</p> <p class="code"> @@ -889,7 +889,7 @@ off_t cupsFileRewind (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">New file position or -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileSeek">cupsFileSeek</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileSeek">cupsFileSeek</a></h3> <p class="description">Seek in a file.</p> <p class="code"> off_t cupsFileSeek (<br> @@ -905,25 +905,25 @@ off_t cupsFileSeek (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">New file position or -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileStderr">cupsFileStderr</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileStderr">cupsFileStderr</a></h3> <p class="description">Return a CUPS file associated with stderr.</p> <p class="code"> <a href="#cups_file_t">cups_file_t</a> *cupsFileStderr (void);</p> <h4 class="returnvalue">Return Value</h4> <p class="description">CUPS file</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileStdin">cupsFileStdin</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileStdin">cupsFileStdin</a></h3> <p class="description">Return a CUPS file associated with stdin.</p> <p class="code"> <a href="#cups_file_t">cups_file_t</a> *cupsFileStdin (void);</p> <h4 class="returnvalue">Return Value</h4> <p class="description">CUPS file</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileStdout">cupsFileStdout</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileStdout">cupsFileStdout</a></h3> <p class="description">Return a CUPS file associated with stdout.</p> <p class="code"> <a href="#cups_file_t">cups_file_t</a> *cupsFileStdout (void);</p> <h4 class="returnvalue">Return Value</h4> <p class="description">CUPS file</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileTell">cupsFileTell</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileTell">cupsFileTell</a></h3> <p class="description">Return the current file position.</p> <p class="code"> off_t cupsFileTell (<br> @@ -936,7 +936,7 @@ off_t cupsFileTell (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">File position</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileUnlock">cupsFileUnlock</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileUnlock">cupsFileUnlock</a></h3> <p class="description">Unlock access to a file.</p> <p class="code"> int cupsFileUnlock (<br> @@ -949,7 +949,7 @@ int cupsFileUnlock (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 on success, -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsFileWrite">cupsFileWrite</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsFileWrite">cupsFileWrite</a></h3> <p class="description">Write to a file.</p> <p class="code"> ssize_t cupsFileWrite (<br> diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html index 22ea732c2..d159656de 100644 --- a/doc/help/api-filter.html +++ b/doc/help/api-filter.html @@ -5,7 +5,7 @@ <title>Filter and Backend Programming </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -407,7 +407,7 @@ div.contents ul.subcontents li { <li><a href="#COMMUNICATING_FILTER">Communicating with Filters</a></li> <li><a href="#SNMP">Doing SNMP Queries with Network Printers</a></li> </ul></li> -<li><a href="#SANDBOXING">Sandboxing on OS X</a></li> +<li><a href="#SANDBOXING">Sandboxing on macOS</a></li> <li><a href="#FUNCTIONS">Functions</a><ul class="code"> <li><a href="#cupsBackChannelRead" title="Read data from the backchannel.">cupsBackChannelRead</a></li> <li><a href="#cupsBackChannelWrite" title="Write data to the backchannel.">cupsBackChannelWrite</a></li> @@ -518,7 +518,7 @@ directory to write to.</p> <p>In addition, some operating systems provide additional security mechanisms that further limit file system access, even for backends running as root. On -OS X, for example, no backend may write to a user's home directory. See the <a href="#SANDBOXING">Sandboxing on OS X</a> section for more information.</p> +macOS, for example, no backend may write to a user's home directory. See the <a href="#SANDBOXING">Sandboxing on macOS</a> section for more information.</p> </blockquote> <h3><a name="SIGNALS">Canceled Jobs and Signal Handling</a></h3> @@ -590,7 +590,7 @@ when running print filters and backends:</p> <dt>APPLE_LANGUAGE</dt> <dd>The Apple language identifier associated with the job - (OS X only).</dd> + (macOS only).</dd> <dt>CHARSET</dt> <dd>The job character set, typically "utf-8".</dd> @@ -1000,7 +1000,7 @@ sub-state and not an issue that applies when a job is not printing.</p> <blockquote><b>Note:</b> <p>"STATE:" messages often provide visible alerts to the user. For example, -on OS X setting a printer-state-reason value with an "-error" or +on macOS setting a printer-state-reason value with an "-error" or "-warning" suffix will cause the printer's dock item to bounce if the corresponding reason is localized with a cupsIPPReason keyword in the printer's PPD file.</p> @@ -1290,9 +1290,9 @@ void *my_data; <a href="#cupsSideChannelSNMPWalk">cupsSNMPSideChannelWalk</a>(".1.3.6.1.2.1.43", 5.0, my_callback, my_data); </pre> -<h2><a name="SANDBOXING">Sandboxing on OS X</a></h2> +<h2><a name="SANDBOXING">Sandboxing on macOS</a></h2> -<p>Starting with OS X 10.6, filters and backends are run inside a security "sandbox" which further limits (beyond the normal UNIX user/group permissions) what a filter or backend can do. This helps to both secure the printing system from malicious software and enforce the functional separation of components in the CUPS filter chain. What follows is a list of actions that are explicitly allowed for all filters and backends:</p> +<p>Starting with macOS 10.6, filters and backends are run inside a security "sandbox" which further limits (beyond the normal UNIX user/group permissions) what a filter or backend can do. This helps to both secure the printing system from malicious software and enforce the functional separation of components in the CUPS filter chain. What follows is a list of actions that are explicitly allowed for all filters and backends:</p> <ol> @@ -1312,7 +1312,7 @@ void *my_data; <blockquote><b>Note:</b> The sandbox profile used in CUPS 2.0 still allows some actions that are not listed above - these privileges will be removed over time until the profile matches the list above.</blockquote> <h2 class="title"><a name="FUNCTIONS">Functions</a></h2> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsBackChannelRead">cupsBackChannelRead</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsBackChannelRead">cupsBackChannelRead</a></h3> <p class="description">Read data from the backchannel.</p> <p class="code"> ssize_t cupsBackChannelRead (<br> @@ -1337,7 +1337,7 @@ parameter controls how many seconds to wait for the data - use 0.0 to return immediately if there is no data, -1.0 to wait for data indefinitely. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsBackChannelWrite">cupsBackChannelWrite</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsBackChannelWrite">cupsBackChannelWrite</a></h3> <p class="description">Write data to the backchannel.</p> <p class="code"> ssize_t cupsBackChannelWrite (<br> @@ -1363,7 +1363,7 @@ controls how many seconds to wait for the data to be written - use indefinitely. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsBackendDeviceURI">cupsBackendDeviceURI</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsBackendDeviceURI">cupsBackendDeviceURI</a></h3> <p class="description">Get the device URI for a backend.</p> <p class="code"> const char *cupsBackendDeviceURI (<br> @@ -1383,7 +1383,7 @@ variable or the device URI passed in argv[0], whichever is found first. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsBackendReport">cupsBackendReport</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsBackendReport">cupsBackendReport</a></h3> <p class="description">Write a device line from a backend.</p> <p class="code"> void cupsBackendReport (<br> @@ -1415,7 +1415,7 @@ It handles quoting of special characters in the device-make-and-model, device-info, device-id, and device-location strings. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsSideChannelDoRequest">cupsSideChannelDoRequest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsSideChannelDoRequest">cupsSideChannelDoRequest</a></h3> <p class="description">Send a side-channel command to a backend and wait for a response.</p> <p class="code"> <a href="#cups_sc_status_t">cups_sc_status_t</a> cupsSideChannelDoRequest (<br> @@ -1449,7 +1449,7 @@ pointed to by the "data" parameter. cupsSideChannelDoRequest() will update the value to contain the number of data bytes in the buffer. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsSideChannelRead">cupsSideChannelRead</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsSideChannelRead">cupsSideChannelRead</a></h3> <p class="description">Read a side-channel message.</p> <p class="code"> int cupsSideChannelRead (<br> @@ -1485,7 +1485,7 @@ pointed to by the "data" parameter. cupsSideChannelDoRequest() will update the value to contain the number of data bytes in the buffer. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsSideChannelSNMPGet">cupsSideChannelSNMPGet</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsSideChannelSNMPGet">cupsSideChannelSNMPGet</a></h3> <p class="description">Query a SNMP OID's value.</p> <p class="code"> <a href="#cups_sc_status_t">cups_sc_status_t</a> cupsSideChannelSNMPGet (<br> @@ -1526,7 +1526,7 @@ support SNMP queries. <code>CUPS_SC_STATUS_NO_RESPONSE</code> is returned when the printer does not respond to the SNMP query. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsSideChannelSNMPWalk">cupsSideChannelSNMPWalk</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsSideChannelSNMPWalk">cupsSideChannelSNMPWalk</a></h3> <p class="description">Query multiple SNMP OID values.</p> <p class="code"> <a href="#cups_sc_status_t">cups_sc_status_t</a> cupsSideChannelSNMPWalk (<br> @@ -1572,7 +1572,7 @@ support SNMP queries. <code>CUPS_SC_STATUS_NO_RESPONSE</code> is returned when the printer does not respond to the first SNMP query. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsSideChannelWrite">cupsSideChannelWrite</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsSideChannelWrite">cupsSideChannelWrite</a></h3> <p class="description">Write a side-channel message.</p> <p class="code"> int cupsSideChannelWrite (<br> @@ -1677,15 +1677,15 @@ typedef void (*cups_sc_walk_func_t)(const char *oid, const char *data, int datal <dd class="description">Drain all pending output</dd> <dt>CUPS_SC_CMD_GET_BIDI </dt> <dd class="description">Return bidirectional capabilities</dd> -<dt>CUPS_SC_CMD_GET_CONNECTED <span class="info"> CUPS 1.5/OS X 10.7 </span></dt> +<dt>CUPS_SC_CMD_GET_CONNECTED <span class="info"> CUPS 1.5/macOS 10.7 </span></dt> <dd class="description">Return whether the backend is "connected" to the printer </dd> <dt>CUPS_SC_CMD_GET_DEVICE_ID </dt> <dd class="description">Return the IEEE-1284 device ID</dd> <dt>CUPS_SC_CMD_GET_STATE </dt> <dd class="description">Return the device state</dd> -<dt>CUPS_SC_CMD_SNMP_GET <span class="info"> CUPS 1.4/OS X 10.6 </span></dt> +<dt>CUPS_SC_CMD_SNMP_GET <span class="info"> CUPS 1.4/macOS 10.6 </span></dt> <dd class="description">Query an SNMP OID </dd> -<dt>CUPS_SC_CMD_SNMP_GET_NEXT <span class="info"> CUPS 1.4/OS X 10.6 </span></dt> +<dt>CUPS_SC_CMD_SNMP_GET_NEXT <span class="info"> CUPS 1.4/macOS 10.6 </span></dt> <dd class="description">Query the next SNMP OID </dd> <dt>CUPS_SC_CMD_SOFT_RESET </dt> <dd class="description">Do a soft reset</dd> diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html index 8aba40dc8..f16e1ddf3 100644 --- a/doc/help/api-httpipp.html +++ b/doc/help/api-httpipp.html @@ -5,7 +5,7 @@ <title>HTTP and IPP APIs </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -659,7 +659,7 @@ are server-oriented...">http_state_t</a></li> <li><a href="#http_uri_status_t" title="URI separation status ">http_uri_status_t</a></li> <li><a href="#http_version_t" title="HTTP version numbers">http_version_t</a></li> <li><a href="#ipp_attribute_t" title="IPP attribute">ipp_attribute_t</a></li> - <li><a href="#ipp_copycb_t" title="The following structures are PRIVATE starting with CUPS 1.6/OS X 10.8. + <li><a href="#ipp_copycb_t" title="The following structures are PRIVATE starting with CUPS 1.6/macOS 10.8. Please use the new accessor functions available in CUPS 1.6 and later, as these definitions will be moved to a private header file in a future release.">ipp_copycb_t</a></li> <li><a href="#ipp_dstate_t" title="Document states">ipp_dstate_t</a></li> @@ -1026,7 +1026,7 @@ if (status == HTTP_CONTINUE) <a href='#ippDelete'>ippDelete</a>(request); </pre> <h2 class="title"><a name="FUNCTIONS">Functions</a></h2> -<h3 class="function"><span class="info"> CUPS 1.1.20/OS X 10.4 </span><a name="cupsDoAuthentication">cupsDoAuthentication</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.20/macOS 10.4 </span><a name="cupsDoAuthentication">cupsDoAuthentication</a></h3> <p class="description">Authenticate a request.</p> <p class="code"> int cupsDoAuthentication (<br> @@ -1076,7 +1076,7 @@ status, prior to resubmitting your request. <p class="discussion">This function sends the IPP request and attached file to the specified server, retrying and authenticating as necessary. The request is freed with <a href="#ippDelete"><code>ippDelete</code></a>.</p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsDoIORequest">cupsDoIORequest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsDoIORequest">cupsDoIORequest</a></h3> <p class="description">Do an IPP request with file descriptors.</p> <p class="code"> <a href="#ipp_t">ipp_t</a> *cupsDoIORequest (<br> @@ -1156,7 +1156,7 @@ void cupsEncodeOptions (<br> <p class="discussion">This function adds operation, job, and then subscription attributes, in that order. Use the cupsEncodeOptions2() function to add attributes for a single group.</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsEncodeOptions2">cupsEncodeOptions2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsEncodeOptions2">cupsEncodeOptions2</a></h3> <p class="description">Encode printer options into IPP attributes for a group.</p> <p class="code"> void cupsEncodeOptions2 (<br> @@ -1182,7 +1182,7 @@ function multiple times for each group, or use cupsEncodeOptions() to add the standard groups. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsGetDevices">cupsGetDevices</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsGetDevices">cupsGetDevices</a></h3> <p class="description">Get available printer devices.</p> <p class="code"> ipp_status_t cupsGetDevices (<br> @@ -1218,7 +1218,7 @@ parameters provide comma-delimited lists of backends to include or omit from the request respectively. </p> -<h3 class="function"><span class="info"> CUPS 1.1.20/OS X 10.4 </span><a name="cupsGetFd">cupsGetFd</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.20/macOS 10.4 </span><a name="cupsGetFd">cupsGetFd</a></h3> <p class="description">Get a file from the server.</p> <p class="code"> http_status_t cupsGetFd (<br> @@ -1241,7 +1241,7 @@ http_status_t cupsGetFd (<br> <p class="discussion">This function returns <code>HTTP_STATUS_OK</code> when the file is successfully retrieved. </p> -<h3 class="function"><span class="info"> CUPS 1.1.20/OS X 10.4 </span><a name="cupsGetFile">cupsGetFile</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.20/macOS 10.4 </span><a name="cupsGetFile">cupsGetFile</a></h3> <p class="description">Get a file from the server.</p> <p class="code"> http_status_t cupsGetFile (<br> @@ -1264,7 +1264,7 @@ http_status_t cupsGetFile (<br> <p class="discussion">This function returns <code>HTTP_STATUS_OK</code> when the file is successfully retrieved. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsGetResponse">cupsGetResponse</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsGetResponse">cupsGetResponse</a></h3> <p class="description">Get a response to an IPP request.</p> <p class="code"> <a href="#ipp_t">ipp_t</a> *cupsGetResponse (<br> @@ -1294,14 +1294,14 @@ thread.</p> ipp_status_t cupsLastError (void);</p> <h4 class="returnvalue">Return Value</h4> <p class="description">IPP status code from last request</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsLastErrorString">cupsLastErrorString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsLastErrorString">cupsLastErrorString</a></h3> <p class="description">Return the last IPP status-message received on the current thread.</p> <p class="code"> const char *cupsLastErrorString (void);</p> <h4 class="returnvalue">Return Value</h4> <p class="description">status-message text from last request</p> -<h3 class="function"><span class="info"> CUPS 1.1.20/OS X 10.4 </span><a name="cupsPutFd">cupsPutFd</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.20/macOS 10.4 </span><a name="cupsPutFd">cupsPutFd</a></h3> <p class="description">Put a file on the server.</p> <p class="code"> http_status_t cupsPutFd (<br> @@ -1325,7 +1325,7 @@ http_status_t cupsPutFd (<br> successfully. </p> -<h3 class="function"><span class="info"> CUPS 1.1.20/OS X 10.4 </span><a name="cupsPutFile">cupsPutFile</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.20/macOS 10.4 </span><a name="cupsPutFile">cupsPutFile</a></h3> <p class="description">Put a file on the server.</p> <p class="code"> http_status_t cupsPutFile (<br> @@ -1349,7 +1349,7 @@ http_status_t cupsPutFile (<br> successfully. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsReadResponseData">cupsReadResponseData</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsReadResponseData">cupsReadResponseData</a></h3> <p class="description">Read additional data after the IPP response.</p> <p class="code"> ssize_t cupsReadResponseData (<br> @@ -1374,7 +1374,7 @@ files from <code>CUPS_GET_PPD</code> and <code>CUPS_GET_DOCUMENT</code> requests respectively. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsSendRequest">cupsSendRequest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsSendRequest">cupsSendRequest</a></h3> <p class="description">Send an IPP request.</p> <p class="code"> http_status_t cupsSendRequest (<br> @@ -1410,7 +1410,7 @@ Note: Unlike <a href="#cupsDoFileRequest"><code>cupsDoFileRequest</code></a>, <a <a href="#cupsDoRequest"><code>cupsDoRequest</code></a>, the request is NOT freed with <a href="#ippDelete"><code>ippDelete</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsWriteRequestData">cupsWriteRequestData</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsWriteRequestData">cupsWriteRequestData</a></h3> <p class="description">Write additional data after an IPP request.</p> <p class="code"> http_status_t cupsWriteRequestData (<br> @@ -1434,7 +1434,7 @@ http_status_t cupsWriteRequestData (<br> after <a href="#cupsStartDocument"><code>cupsStartDocument</code></a> to provide a document file. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpAcceptConnection">httpAcceptConnection</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpAcceptConnection">httpAcceptConnection</a></h3> <p class="description">Accept a new HTTP client connection from the specified listening socket.</p> <p class="code"> @@ -1452,7 +1452,7 @@ blocking, 0 otherwise</dd> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">HTTP connection or <code>NULL</code></p> -<h3 class="function"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="httpAddCredential">httpAddCredential</a></h3> +<h3 class="function"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="httpAddCredential">httpAddCredential</a></h3> <p class="description">Allocates and adds a single credential to an array.</p> <p class="code"> int httpAddCredential (<br> @@ -1475,7 +1475,7 @@ int httpAddCredential (<br> <p class="discussion">Use <code>cupsArrayNew(NULL, NULL)</code> to create a credentials array. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpAddrAny">httpAddrAny</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpAddrAny">httpAddrAny</a></h3> <p class="description">Check for the "any" address.</p> <p class="code"> int httpAddrAny (<br> @@ -1511,7 +1511,7 @@ listen address for sockets created with <a href="#httpAddrListen"><code>httpAddr ensure that domain sockets are removed when closed. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpAddrEqual">httpAddrEqual</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpAddrEqual">httpAddrEqual</a></h3> <p class="description">Compare two addresses.</p> <p class="code"> int httpAddrEqual (<br> @@ -1540,7 +1540,7 @@ int httpAddrFamily (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Address family</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpAddrLength">httpAddrLength</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpAddrLength">httpAddrLength</a></h3> <p class="description">Return the length of the address in bytes.</p> <p class="code"> int httpAddrLength (<br> @@ -1553,7 +1553,7 @@ int httpAddrLength (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Length in bytes</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpAddrListen">httpAddrListen</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpAddrListen">httpAddrListen</a></h3> <p class="description">Create a listening socket bound to the specified address and port.</p> <p class="code"> @@ -1570,7 +1570,7 @@ int httpAddrListen (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Socket or -1 on error</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpAddrLocalhost">httpAddrLocalhost</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpAddrLocalhost">httpAddrLocalhost</a></h3> <p class="description">Check for the local loopback address.</p> <p class="code"> int httpAddrLocalhost (<br> @@ -1583,7 +1583,7 @@ int httpAddrLocalhost (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">1 if local host, 0 otherwise</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpAddrLookup">httpAddrLookup</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpAddrLookup">httpAddrLookup</a></h3> <p class="description">Lookup the hostname associated with the address.</p> <p class="code"> char *httpAddrLookup (<br> @@ -1602,7 +1602,7 @@ char *httpAddrLookup (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Host name</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpAddrPort">httpAddrPort</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpAddrPort">httpAddrPort</a></h3> <p class="description">Get the port number associated with an address.</p> <p class="code"> int httpAddrPort (<br> @@ -1615,7 +1615,7 @@ int httpAddrPort (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Port number</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpAddrString">httpAddrString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpAddrString">httpAddrString</a></h3> <p class="description">Convert an address to a numeric string.</p> <p class="code"> char *httpAddrString (<br> @@ -1634,7 +1634,7 @@ char *httpAddrString (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Numeric address string</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpAssembleURI">httpAssembleURI</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpAssembleURI">httpAssembleURI</a></h3> <p class="description">Assemble a uniform resource identifier from its components.</p> <p class="code"> @@ -1676,7 +1676,7 @@ place of traditional string functions whenever you need to create a URI string. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpAssembleURIf">httpAssembleURIf</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpAssembleURIf">httpAssembleURIf</a></h3> <p class="description">Assemble a uniform resource identifier from its components with a formatted resource.</p> <p class="code"> @@ -1722,7 +1722,7 @@ this function in place of traditional string functions whenever you need to create a URI string. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpAssembleUUID">httpAssembleUUID</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpAssembleUUID">httpAssembleUUID</a></h3> <p class="description">Assemble a name-based UUID URN conforming to RFC 4122.</p> <p class="code"> char *httpAssembleUUID (<br> @@ -1785,7 +1785,7 @@ int httpCheck (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 = no data, 1 = data available</p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="httpClearCookie">httpClearCookie</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="httpClearCookie">httpClearCookie</a></h3> <p class="description">Clear the cookie value(s).</p> <p class="code"> void httpClearCookie (<br> @@ -1854,7 +1854,7 @@ int httpCompareCredentials (<br> <p class="discussion">This function is deprecated - use <a href="#httpConnect2"><code>httpConnect2</code></a> instead. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpConnect2">httpConnect2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpConnect2">httpConnect2</a></h3> <p class="description">Connect to a HTTP server.</p> <p class="code"> <a href="#http_t">http_t</a> *httpConnect2 (<br> @@ -1933,7 +1933,7 @@ char *httpDecode64 (<br> which provides buffer length arguments. </p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="httpDecode64_2">httpDecode64_2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="httpDecode64_2">httpDecode64_2</a></h3> <p class="description">Base64-decode a string.</p> <p class="code"> char *httpDecode64_2 (<br> @@ -1989,7 +1989,7 @@ char *httpEncode64 (<br> which provides buffer length arguments. </p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="httpEncode64_2">httpEncode64_2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="httpEncode64_2">httpEncode64_2</a></h3> <p class="description">Base64-encode a string.</p> <p class="code"> char *httpEncode64_2 (<br> @@ -2065,7 +2065,7 @@ void httpFlush (<br> <dt>http</dt> <dd class="description">HTTP connection</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpFlushWrite">httpFlushWrite</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpFlushWrite">httpFlushWrite</a></h3> <p class="description">Flush data in write buffer.</p> <p class="code"> int httpFlushWrite (<br> @@ -2139,7 +2139,7 @@ time_t httpGetActivity (<br> <p class="discussion">Returns <code>NULL</code> if the socket is currently unconnected. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="httpGetAuthString">httpGetAuthString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="httpGetAuthString">httpGetAuthString</a></h3> <p class="description">Get the current authorization string.</p> <p class="code"> char *httpGetAuthString (<br> @@ -2159,7 +2159,7 @@ string to use with httpSetField() for the HTTP_FIELD_AUTHORIZATION value. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpGetBlocking">httpGetBlocking</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpGetBlocking">httpGetBlocking</a></h3> <p class="description">Get the blocking/non-block state of a connection.</p> <p class="code"> int httpGetBlocking (<br> @@ -2172,7 +2172,7 @@ int httpGetBlocking (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">1 if blocking, 0 if non-blocking</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpGetContentEncoding">httpGetContentEncoding</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpGetContentEncoding">httpGetContentEncoding</a></h3> <p class="description">Get a common content encoding, if any, between the client and server.</p> <p class="code"> @@ -2195,7 +2195,7 @@ client. The value returned can be use in subsequent requests (for clients) or in the response (for servers) in order to compress the content stream. </p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="httpGetCookie">httpGetCookie</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="httpGetCookie">httpGetCookie</a></h3> <p class="description">Get any cookie data from the response.</p> <p class="code"> const char *httpGetCookie (<br> @@ -2221,7 +2221,7 @@ const char *httpGetDateString (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Date/time string</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpGetDateString2">httpGetDateString2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpGetDateString2">httpGetDateString2</a></h3> <p class="description">Get a formatted date/time string from a time value.</p> <p class="code"> const char *httpGetDateString2 (<br> @@ -2272,7 +2272,7 @@ time_t httpGetDateTime (<br> been established. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpGetExpect">httpGetExpect</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpGetExpect">httpGetExpect</a></h3> <p class="description">Get the value of the Expect header, if any.</p> <p class="code"> http_status_t httpGetExpect (<br> @@ -2290,7 +2290,7 @@ http_status_t httpGetExpect (<br> returns the expected HTTP status code, typically <code>HTTP_STATUS_CONTINUE</code>. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpGetFd">httpGetFd</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpGetFd">httpGetFd</a></h3> <p class="description">Get the file descriptor associated with a connection.</p> <p class="code"> int httpGetFd (<br> @@ -2333,7 +2333,7 @@ struct hostent *httpGetHostByName (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Host entry</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpGetHostname">httpGetHostname</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpGetHostname">httpGetHostname</a></h3> <p class="description">Get the FQDN for the connection or local system.</p> <p class="code"> const char *httpGetHostname (<br> @@ -2392,7 +2392,7 @@ int httpGetLength (<br> 2^31 - 1; use httpGetLength2() instead. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpGetLength2">httpGetLength2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpGetLength2">httpGetLength2</a></h3> <p class="description">Get the amount of data remaining from the content-length or transfer-encoding fields.</p> <p class="code"> @@ -2469,7 +2469,7 @@ message body is chunked or fixed-length. </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">HTTP state</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpGetStatus">httpGetStatus</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpGetStatus">httpGetStatus</a></h3> <p class="description">Get the status of the last HTTP request.</p> <p class="code"> http_status_t httpGetStatus (<br> @@ -2504,7 +2504,7 @@ char *httpGetSubField (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Value or NULL</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpGetSubField2">httpGetSubField2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpGetSubField2">httpGetSubField2</a></h3> <p class="description">Get a sub-field value.</p> <p class="code"> char *httpGetSubField2 (<br> @@ -2695,7 +2695,7 @@ int httpOptions (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Status of call (0 = success)</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpPeek">httpPeek</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpPeek">httpPeek</a></h3> <p class="description">Peek at data from a HTTP connection.</p> <p class="code"> ssize_t httpPeek (<br> @@ -2778,7 +2778,7 @@ int httpRead (<br> read more than 2GB of data. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpRead2">httpRead2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpRead2">httpRead2</a></h3> <p class="description">Read data from a HTTP connection.</p> <p class="code"> ssize_t httpRead2 (<br> @@ -2797,7 +2797,7 @@ ssize_t httpRead2 (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of bytes read</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpReadRequest">httpReadRequest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpReadRequest">httpReadRequest</a></h3> <p class="description">Read a HTTP request from a connection.</p> <p class="code"> <a href="#http_state_t">http_state_t</a> httpReadRequest (<br> @@ -2905,7 +2905,7 @@ void httpSeparate (<br> <p class="discussion">This function is deprecated; use the httpSeparateURI() function instead. </p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="httpSeparate2">httpSeparate2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="httpSeparate2">httpSeparate2</a></h3> <p class="description">Separate a Universal Resource Identifier into its components.</p> <p class="code"> @@ -2949,7 +2949,7 @@ void httpSeparate2 (<br> </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpSeparateURI">httpSeparateURI</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpSeparateURI">httpSeparateURI</a></h3> <p class="description">Separate a Universal Resource Identifier into its components.</p> <p class="code"> @@ -2993,7 +2993,7 @@ components.</p> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Result of separation</p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="httpSetAuthString">httpSetAuthString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="httpSetAuthString">httpSetAuthString</a></h3> <p class="description">Set the current authorization string.</p> <p class="code"> void httpSetAuthString (<br> @@ -3017,7 +3017,7 @@ HTTP_FIELD_AUTHORIZATION prior to issuing a HTTP request using httpGet(), httpHead(), httpOptions(), httpPost, or httpPut(). </p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="httpSetCookie">httpSetCookie</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="httpSetCookie">httpSetCookie</a></h3> <p class="description">Set the cookie value(s).</p> <p class="code"> void httpSetCookie (<br> @@ -3031,7 +3031,7 @@ void httpSetCookie (<br> <dt>cookie</dt> <dd class="description">Cookie string</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="httpSetCredentials">httpSetCredentials</a></h3> +<h3 class="function"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="httpSetCredentials">httpSetCredentials</a></h3> <p class="description">Set the credentials associated with an encrypted connection.</p> <p class="code"> @@ -3048,7 +3048,7 @@ int httpSetCredentials (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Status of call (0 = success)</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpSetDefaultField">httpSetDefaultField</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpSetDefaultField">httpSetDefaultField</a></h3> <p class="description">Set the default value of an HTTP header.</p> <p class="code"> void httpSetDefaultField (<br> @@ -3070,7 +3070,7 @@ void httpSetDefaultField (<br> and <code>HTTP_FIELD_USER_AGENT</code> can be set. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpSetExpect">httpSetExpect</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpSetExpect">httpSetExpect</a></h3> <p class="description">Set the Expect: header in a request.</p> <p class="code"> void httpSetExpect (<br> @@ -3121,7 +3121,7 @@ void httpSetKeepAlive (<br> <dt>keep_alive</dt> <dd class="description">New Keep-Alive value</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpSetLength">httpSetLength</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpSetLength">httpSetLength</a></h3> <p class="description">Set the content-length and content-encoding.</p> <p class="code"> void httpSetLength (<br> @@ -3135,7 +3135,7 @@ void httpSetLength (<br> <dt>length</dt> <dd class="description">Length (0 for chunked)</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="httpSetTimeout">httpSetTimeout</a></h3> +<h3 class="function"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="httpSetTimeout">httpSetTimeout</a></h3> <p class="description">Set read/write timeouts and an optional callback.</p> <p class="code"> void httpSetTimeout (<br> @@ -3243,7 +3243,7 @@ http_status_t httpUpdate (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">HTTP status</p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="httpWait">httpWait</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="httpWait">httpWait</a></h3> <p class="description">Wait for data available on a connection.</p> <p class="code"> int httpWait (<br> @@ -3283,7 +3283,7 @@ int httpWrite (<br> write more than 2GB of data. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="httpWrite2">httpWrite2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="httpWrite2">httpWrite2</a></h3> <p class="description">Write data to a HTTP connection.</p> <p class="code"> ssize_t httpWrite2 (<br> @@ -3302,7 +3302,7 @@ ssize_t httpWrite2 (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of bytes written</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpWriteResponse">httpWriteResponse</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="httpWriteResponse">httpWriteResponse</a></h3> <p class="description">Write a HTTP response to a client connection.</p> <p class="code"> int httpWriteResponse (<br> @@ -3383,7 +3383,7 @@ The <code>group</code> parameter specifies the IPP attribute group tag: none event notification (<code>IPP_TAG_EVENT_NOTIFICATION</code>), operation (<code>IPP_TAG_OPERATION</code>), printer (<code>IPP_TAG_PRINTER</code>), subscription (<code>IPP_TAG_SUBSCRIPTION</code>), or unsupported (<code>IPP_TAG_UNSUPPORTED_GROUP</code>).</p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ippAddCollection">ippAddCollection</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ippAddCollection">ippAddCollection</a></h3> <p class="description">Add a collection value.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippAddCollection (<br> @@ -3416,7 +3416,7 @@ event notification (<code>IPP_TAG_EVENT_NOTIFICATION</code>), operation (<code>IPP_TAG_SUBSCRIPTION</code>), or unsupported (<code>IPP_TAG_UNSUPPORTED_GROUP</code>). </p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ippAddCollections">ippAddCollections</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ippAddCollections">ippAddCollections</a></h3> <p class="description">Add an array of collection values.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippAddCollections (<br> @@ -3560,7 +3560,7 @@ event notification (<code>IPP_TAG_EVENT_NOTIFICATION</code>), operation <br> Supported values include enum (<code>IPP_TAG_ENUM</code>) and integer (<code>IPP_TAG_INTEGER</code>).</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ippAddOctetString">ippAddOctetString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ippAddOctetString">ippAddOctetString</a></h3> <p class="description">Add an octetString value to an IPP message.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippAddOctetString (<br> @@ -3596,7 +3596,7 @@ event notification (<code>IPP_TAG_EVENT_NOTIFICATION</code>), operation (<code>IPP_TAG_SUBSCRIPTION</code>), or unsupported (<code>IPP_TAG_UNSUPPORTED_GROUP</code>). </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippAddOutOfBand">ippAddOutOfBand</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippAddOutOfBand">ippAddOutOfBand</a></h3> <p class="description">Add an out-of-band value to an IPP message.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippAddOutOfBand (<br> @@ -3848,7 +3848,7 @@ Supported string values include charset (<code>IPP_TAG_CHARSET</code>), keyword <br> The <code>language</code> parameter must be non-<code>NULL</code> for nameWithLanguage and textWithLanguage string values and must be <code>NULL</code> for all other string values.</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippAddStringf">ippAddStringf</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippAddStringf">ippAddStringf</a></h3> <p class="description">Add a formatted string to an IPP message.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippAddStringf (<br> @@ -3907,7 +3907,7 @@ needed. The formatted string is truncated as needed to the maximum length of the corresponding value type. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippAddStringfv">ippAddStringfv</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippAddStringfv">ippAddStringfv</a></h3> <p class="description">Add a formatted string to an IPP message.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippAddStringfv (<br> @@ -4016,7 +4016,7 @@ Supported string values include charset (<code>IPP_TAG_CHARSET</code>), keyword <br> The <code>language</code> parameter must be non-<code>NULL</code> for nameWithLanguage and textWithLanguage string values and must be <code>NULL</code> for all other string values.</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippAttributeString">ippAttributeString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippAttributeString">ippAttributeString</a></h3> <p class="description">Convert the attribute's value to a string.</p> <p class="code"> size_t ippAttributeString (<br> @@ -4041,7 +4041,7 @@ trailing nul. The buffer pointer can be NULL to get the required length, just like (v)snprintf. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippContainsInteger">ippContainsInteger</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippContainsInteger">ippContainsInteger</a></h3> <p class="description">Determine whether an attribute contains the specified value or is within the list of ranges.</p> <p class="code"> @@ -4064,7 +4064,7 @@ enum value, or the value falls within one of the rangeOfInteger values for the attribute. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippContainsString">ippContainsString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippContainsString">ippContainsString</a></h3> <p class="description">Determine whether an attribute contains the specified string value.</p> <p class="code"> @@ -4086,7 +4086,7 @@ int ippContainsString (<br> language, mimeMediaType, name, text, URI, or URI scheme value. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippCopyAttribute">ippCopyAttribute</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippCopyAttribute">ippCopyAttribute</a></h3> <p class="description">Copy an attribute.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippCopyAttribute (<br> @@ -4112,7 +4112,7 @@ created - this should only be done as long as the original source IPP message wi not be freed for the life of the destination. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippCopyAttributes">ippCopyAttributes</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippCopyAttributes">ippCopyAttributes</a></h3> <p class="description">Copy attributes from one IPP message to another.</p> <p class="code"> int ippCopyAttributes (<br> @@ -4149,7 +4149,7 @@ attributes that are copied - the function must return 1 to copy the attribute or itself. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippCreateRequestedArray">ippCreateRequestedArray</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippCreateRequestedArray">ippCreateRequestedArray</a></h3> <p class="description">Create a CUPS array of attribute names from the given requested-attributes attribute.</p> <p class="code"> @@ -4203,7 +4203,7 @@ void ippDelete (<br> <dt>ipp</dt> <dd class="description">IPP message</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ippDeleteAttribute">ippDeleteAttribute</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ippDeleteAttribute">ippDeleteAttribute</a></h3> <p class="description">Delete a single attribute in an IPP message.</p> <p class="code"> void ippDeleteAttribute (<br> @@ -4217,7 +4217,7 @@ void ippDeleteAttribute (<br> <dt>attr</dt> <dd class="description">Attribute to delete</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippDeleteValues">ippDeleteValues</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippDeleteValues">ippDeleteValues</a></h3> <p class="description">Delete values in an attribute.</p> <p class="code"> int ippDeleteValues (<br> @@ -4293,7 +4293,7 @@ const char *ippErrorString (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Text string</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ippErrorValue">ippErrorValue</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ippErrorValue">ippErrorValue</a></h3> <p class="description">Return a status code for the given name.</p> <p class="code"> ipp_status_t ippErrorValue (<br> @@ -4352,7 +4352,7 @@ of attribute and member names separated by slashes, for example <p class="discussion">Starting with CUPS 2.0, the attribute name can contain a hierarchical list of attribute and member names separated by slashes, for example "media-col/media-size".</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippFirstAttribute">ippFirstAttribute</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippFirstAttribute">ippFirstAttribute</a></h3> <p class="description">Return the first attribute in the message.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippFirstAttribute (<br> @@ -4365,7 +4365,7 @@ of attribute and member names separated by slashes, for example </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">First attribute or <code>NULL</code> if none</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetBoolean">ippGetBoolean</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetBoolean">ippGetBoolean</a></h3> <p class="description">Get a boolean value for an attribute.</p> <p class="code"> int ippGetBoolean (<br> @@ -4386,7 +4386,7 @@ int ippGetBoolean (<br> <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetCollection">ippGetCollection</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetCollection">ippGetCollection</a></h3> <p class="description">Get a collection value for an attribute.</p> <p class="code"> <a href="#ipp_t">ipp_t</a> *ippGetCollection (<br> @@ -4407,7 +4407,7 @@ int ippGetBoolean (<br> <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetCount">ippGetCount</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetCount">ippGetCount</a></h3> <p class="description">Get the number of values in an attribute.</p> <p class="code"> int ippGetCount (<br> @@ -4420,7 +4420,7 @@ int ippGetCount (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of values or 0 on error</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetDate">ippGetDate</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetDate">ippGetDate</a></h3> <p class="description">Get a date value for an attribute.</p> <p class="code"> const <a href="#ipp_uchar_t">ipp_uchar_t</a> *ippGetDate (<br> @@ -4441,7 +4441,7 @@ const <a href="#ipp_uchar_t">ipp_uchar_t</a> *ippGetDate (<br> <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetGroupTag">ippGetGroupTag</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetGroupTag">ippGetGroupTag</a></h3> <p class="description">Get the group associated with an attribute.</p> <p class="code"> ipp_tag_t ippGetGroupTag (<br> @@ -4454,7 +4454,7 @@ ipp_tag_t ippGetGroupTag (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Group tag or <code>IPP_TAG_ZERO</code> on error</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetInteger">ippGetInteger</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetInteger">ippGetInteger</a></h3> <p class="description">Get the integer/enum value for an attribute.</p> <p class="code"> int ippGetInteger (<br> @@ -4475,7 +4475,7 @@ int ippGetInteger (<br> <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetName">ippGetName</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetName">ippGetName</a></h3> <p class="description">Get the attribute name.</p> <p class="code"> const char *ippGetName (<br> @@ -4488,7 +4488,7 @@ const char *ippGetName (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Attribute name or <code>NULL</code> for separators</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippGetOctetString">ippGetOctetString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippGetOctetString">ippGetOctetString</a></h3> <p class="description">Get an octetString value from an IPP attribute.</p> <p class="code"> void *ippGetOctetString (<br> @@ -4512,7 +4512,7 @@ void *ippGetOctetString (<br> <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetOperation">ippGetOperation</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetOperation">ippGetOperation</a></h3> <p class="description">Get the operation ID in an IPP message.</p> <p class="code"> ipp_op_t ippGetOperation (<br> @@ -4525,7 +4525,7 @@ ipp_op_t ippGetOperation (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Operation ID or 0 on error</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetRange">ippGetRange</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetRange">ippGetRange</a></h3> <p class="description">Get a rangeOfInteger value from an attribute.</p> <p class="code"> int ippGetRange (<br> @@ -4549,7 +4549,7 @@ int ippGetRange (<br> <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetRequestId">ippGetRequestId</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetRequestId">ippGetRequestId</a></h3> <p class="description">Get the request ID from an IPP message.</p> <p class="code"> int ippGetRequestId (<br> @@ -4562,7 +4562,7 @@ int ippGetRequestId (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Request ID or 0 on error</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetResolution">ippGetResolution</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetResolution">ippGetResolution</a></h3> <p class="description">Get a resolution value for an attribute.</p> <p class="code"> int ippGetResolution (<br> @@ -4589,7 +4589,7 @@ int ippGetResolution (<br> <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetState">ippGetState</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetState">ippGetState</a></h3> <p class="description">Get the IPP message state.</p> <p class="code"> <a href="#ipp_state_t">ipp_state_t</a> ippGetState (<br> @@ -4602,7 +4602,7 @@ int ippGetResolution (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">IPP message state value</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetStatusCode">ippGetStatusCode</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetStatusCode">ippGetStatusCode</a></h3> <p class="description">Get the status code from an IPP response or event message.</p> <p class="code"> ipp_status_t ippGetStatusCode (<br> @@ -4638,7 +4638,7 @@ const char *ippGetString (<br> <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetValueTag">ippGetValueTag</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetValueTag">ippGetValueTag</a></h3> <p class="description">Get the value tag for an attribute.</p> <p class="code"> ipp_tag_t ippGetValueTag (<br> @@ -4651,7 +4651,7 @@ ipp_tag_t ippGetValueTag (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Value tag or <code>IPP_TAG_ZERO</code> on error</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetVersion">ippGetVersion</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippGetVersion">ippGetVersion</a></h3> <p class="description">Get the major and minor version number from an IPP message.</p> <p class="code"> int ippGetVersion (<br> @@ -4686,7 +4686,7 @@ size_t ippLength (<br> <a href="#ipp_t">ipp_t</a> *ippNew (void);</p> <h4 class="returnvalue">Return Value</h4> <p class="description">New IPP message</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ippNewRequest">ippNewRequest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ippNewRequest">ippNewRequest</a></h3> <p class="description">Allocate a new IPP request message.</p> <p class="code"> <a href="#ipp_t">ipp_t</a> *ippNewRequest (<br> @@ -4705,7 +4705,7 @@ attributes-natural-language attributes added. The attributes-natural-language value is derived from the current locale. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippNewResponse">ippNewResponse</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippNewResponse">ippNewResponse</a></h3> <p class="description">Allocate a new IPP response message.</p> <p class="code"> <a href="#ipp_t">ipp_t</a> *ippNewResponse (<br> @@ -4727,7 +4727,7 @@ attributes-natural-language attributes are missing from the request, respectively. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippNextAttribute">ippNextAttribute</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippNextAttribute">ippNextAttribute</a></h3> <p class="description">Return the next attribute in the message.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippNextAttribute (<br> @@ -4740,7 +4740,7 @@ respectively. </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Next attribute or <code>NULL</code> if none</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ippOpString">ippOpString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ippOpString">ippOpString</a></h3> <p class="description">Return a name for the given operation id.</p> <p class="code"> const char *ippOpString (<br> @@ -4753,7 +4753,7 @@ const char *ippOpString (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Name</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ippOpValue">ippOpValue</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ippOpValue">ippOpValue</a></h3> <p class="description">Return an operation id for the given name.</p> <p class="code"> ipp_op_t ippOpValue (<br> @@ -4788,7 +4788,7 @@ int ippPort (void);</p> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Current state</p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ippReadFile">ippReadFile</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ippReadFile">ippReadFile</a></h3> <p class="description">Read data for an IPP message from a file.</p> <p class="code"> <a href="#ipp_state_t">ipp_state_t</a> ippReadFile (<br> @@ -4804,7 +4804,7 @@ int ippPort (void);</p> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Current state</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ippReadIO">ippReadIO</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ippReadIO">ippReadIO</a></h3> <p class="description">Read data for an IPP message.</p> <p class="code"> <a href="#ipp_state_t">ipp_state_t</a> ippReadIO (<br> @@ -4829,7 +4829,7 @@ int ippPort (void);</p> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Current state</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetBoolean">ippSetBoolean</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetBoolean">ippSetBoolean</a></h3> <p class="description">Set a boolean value in an attribute.</p> <p class="code"> int ippSetBoolean (<br> @@ -4861,7 +4861,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetCollection">ippSetCollection</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetCollection">ippSetCollection</a></h3> <p class="description">Set a collection value in an attribute.</p> <p class="code"> int ippSetCollection (<br> @@ -4893,7 +4893,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetDate">ippSetDate</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetDate">ippSetDate</a></h3> <p class="description">Set a date value in an attribute.</p> <p class="code"> int ippSetDate (<br> @@ -4925,7 +4925,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetGroupTag">ippSetGroupTag</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetGroupTag">ippSetGroupTag</a></h3> <p class="description">Set the group tag of an attribute.</p> <p class="code"> int ippSetGroupTag (<br> @@ -4957,7 +4957,7 @@ event notification (<code>IPP_TAG_EVENT_NOTIFICATION</code>), operation (<code>IPP_TAG_SUBSCRIPTION</code>), or unsupported (<code>IPP_TAG_UNSUPPORTED_GROUP</code>). </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetInteger">ippSetInteger</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetInteger">ippSetInteger</a></h3> <p class="description">Set an integer or enum value in an attribute.</p> <p class="code"> int ippSetInteger (<br> @@ -4989,7 +4989,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetName">ippSetName</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetName">ippSetName</a></h3> <p class="description">Set the name of an attribute.</p> <p class="code"> int ippSetName (<br> @@ -5015,7 +5015,7 @@ the <a href="#ippNew"><code>ippNew</code></a>, <a href="#ippNewRequest"><code>ip The <code>attr</code> parameter may be modified as a result of setting the value. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippSetOctetString">ippSetOctetString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippSetOctetString">ippSetOctetString</a></h3> <p class="description">Set an octetString value in an IPP attribute.</p> <p class="code"> int ippSetOctetString (<br> @@ -5050,7 +5050,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetOperation">ippSetOperation</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetOperation">ippSetOperation</a></h3> <p class="description">Set the operation ID in an IPP request message.</p> <p class="code"> int ippSetOperation (<br> @@ -5082,7 +5082,7 @@ void ippSetPort (<br> <dt>p</dt> <dd class="description">Port number to use</dd> </dl> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetRange">ippSetRange</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetRange">ippSetRange</a></h3> <p class="description">Set a rangeOfInteger value in an attribute.</p> <p class="code"> int ippSetRange (<br> @@ -5117,7 +5117,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetRequestId">ippSetRequestId</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetRequestId">ippSetRequestId</a></h3> <p class="description">Set the request ID in an IPP message.</p> <p class="code"> int ippSetRequestId (<br> @@ -5140,7 +5140,7 @@ the <a href="#ippNew"><code>ippNew</code></a>, <a href="#ippNewRequest"><code>ip The <code>request_id</code> parameter must be greater than 0. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetResolution">ippSetResolution</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetResolution">ippSetResolution</a></h3> <p class="description">Set a resolution value in an attribute.</p> <p class="code"> int ippSetResolution (<br> @@ -5178,7 +5178,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetState">ippSetState</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetState">ippSetState</a></h3> <p class="description">Set the current state of the IPP message.</p> <p class="code"> int ippSetState (<br> @@ -5194,7 +5194,7 @@ int ippSetState (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">1 on success, 0 on failure</p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetStatusCode">ippSetStatusCode</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetStatusCode">ippSetStatusCode</a></h3> <p class="description">Set the status code in an IPP response or event message.</p> <p class="code"> int ippSetStatusCode (<br> @@ -5215,7 +5215,7 @@ int ippSetStatusCode (<br> the <a href="#ippNew"><code>ippNew</code></a>, <a href="#ippNewRequest"><code>ippNewRequest</code></a>, or <a href="#ippNewResponse"><code>ippNewResponse</code></a> functions. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetString">ippSetString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetString">ippSetString</a></h3> <p class="description">Set a string value in an attribute.</p> <p class="code"> int ippSetString (<br> @@ -5247,7 +5247,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippSetStringf">ippSetStringf</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippSetStringf">ippSetStringf</a></h3> <p class="description">Set a formatted string value of an attribute.</p> <p class="code"> int ippSetStringf (<br> @@ -5287,7 +5287,7 @@ needed. The formatted string is truncated as needed to the maximum length of the corresponding value type. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippSetStringfv">ippSetStringfv</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippSetStringfv">ippSetStringfv</a></h3> <p class="description">Set a formatted string value of an attribute.</p> <p class="code"> int ippSetStringfv (<br> @@ -5327,7 +5327,7 @@ needed. The formatted string is truncated as needed to the maximum length of the corresponding value type. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetValueTag">ippSetValueTag</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetValueTag">ippSetValueTag</a></h3> <p class="description">Set the value tag of an attribute.</p> <p class="code"> int ippSetValueTag (<br> @@ -5365,7 +5365,7 @@ code in the "attributes-natural-language" attribute or, if not present code for the current locale. </p> -<h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippSetVersion">ippSetVersion</a></h3> +<h3 class="function"><span class="info"> CUPS 1.6/macOS 10.8 </span><a name="ippSetVersion">ippSetVersion</a></h3> <p class="description">Set the version number in an IPP message.</p> <p class="code"> int ippSetVersion (<br> @@ -5404,7 +5404,7 @@ const char *ippStateString (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">State name</p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="ippTagString">ippTagString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="ippTagString">ippTagString</a></h3> <p class="description">Return the tag name corresponding to a tag value.</p> <p class="code"> const char *ippTagString (<br> @@ -5421,7 +5421,7 @@ const char *ippTagString (<br> <p class="discussion">The returned names are defined in RFC 2911 and 3382. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="ippTagValue">ippTagValue</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="ippTagValue">ippTagValue</a></h3> <p class="description">Return the tag value corresponding to a tag name.</p> <p class="code"> ipp_tag_t ippTagValue (<br> @@ -5451,7 +5451,7 @@ const <a href="#ipp_uchar_t">ipp_uchar_t</a> *ippTimeToDate (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">RFC-1903 date/time data</p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippValidateAttribute">ippValidateAttribute</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippValidateAttribute">ippValidateAttribute</a></h3> <p class="description">Validate the contents of an attribute.</p> <p class="code"> int ippValidateAttribute (<br> @@ -5470,7 +5470,7 @@ value tag. 1 is returned if the attribute is valid, 0 otherwise. On failure, cupsLastErrorString() is set to a human-readable message. </p> -<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippValidateAttributes">ippValidateAttributes</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/macOS 10.9 </span><a name="ippValidateAttributes">ippValidateAttributes</a></h3> <p class="description">Validate all attributes in an IPP message.</p> <p class="code"> int ippValidateAttributes (<br> @@ -5505,7 +5505,7 @@ to a human-readable message on failure. </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Current state</p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ippWriteFile">ippWriteFile</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ippWriteFile">ippWriteFile</a></h3> <p class="description">Write data for an IPP message to a file.</p> <p class="code"> <a href="#ipp_state_t">ipp_state_t</a> ippWriteFile (<br> @@ -5521,7 +5521,7 @@ to a human-readable message on failure. </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Current state</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ippWriteIO">ippWriteIO</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ippWriteIO">ippWriteIO</a></h3> <p class="description">Write data for an IPP message.</p> <p class="code"> <a href="#ipp_state_t">ipp_state_t</a> ippWriteIO (<br> @@ -5552,7 +5552,7 @@ to a human-readable message on failure. <p class="code"> typedef struct <a href="#gss_auth_identity">gss_auth_identity</a> gss_auth_identity_desc; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="http_addr_t">http_addr_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="http_addr_t">http_addr_t</a></h3> <p class="description">Socket address union, which makes using IPv6 and other address types easier and @@ -5560,7 +5560,7 @@ more portable. </p> <p class="code"> typedef union _http_addr_u / http_addr_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="http_addrlist_t">http_addrlist_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="http_addrlist_t">http_addrlist_t</a></h3> <p class="description">Socket address list, which is used to enumerate all of the addresses that are associated @@ -5573,7 +5573,7 @@ typedef struct <a href="#http_addrlist_s">http_addrlist_s</a> / http_addrlist_t; <p class="code"> typedef enum <a href="#http_auth_e">http_auth_e</a> http_auth_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="http_credential_t">http_credential_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="http_credential_t">http_credential_t</a></h3> <p class="description">HTTP credential data </p> <p class="code"> typedef struct <a href="#http_credential_s">http_credential_s</a> http_credential_t; @@ -5609,7 +5609,7 @@ typedef enum <a href="#http_state_e">http_state_e</a> http_state_t; <p class="code"> typedef struct _http_s http_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="http_timeout_cb_t">http_timeout_cb_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="http_timeout_cb_t">http_timeout_cb_t</a></h3> <p class="description">HTTP timeout callback </p> <p class="code"> typedef int (*http_timeout_cb_t)(<a href="#http_t">http_t</a> *http, void *user_data); @@ -5640,7 +5640,7 @@ typedef enum <a href="#http_version_e">http_version_e</a> http_version_t; typedef struct _ipp_attribute_s ipp_attribute_t; </p> <h3 class="typedef"><a name="ipp_copycb_t">ipp_copycb_t</a></h3> -<p class="description">The following structures are PRIVATE starting with CUPS 1.6/OS X 10.8. +<p class="description">The following structures are PRIVATE starting with CUPS 1.6/macOS 10.8. Please use the new accessor functions available in CUPS 1.6 and later, as these definitions will be moved to a private header file in a future release.</p> <p class="code"> @@ -5656,7 +5656,7 @@ typedef enum <a href="#ipp_dstate_e">ipp_dstate_e</a> ipp_dstate_t; <p class="code"> typedef enum <a href="#ipp_finishings_e">ipp_finishings_e</a> ipp_finish_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ipp_iocb_t">ipp_iocb_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ipp_iocb_t">ipp_iocb_t</a></h3> <p class="description">IPP IO Callback Function </p> <p class="code"> typedef ssize_t (*ipp_iocb_t)(void *context, <a href="#ipp_uchar_t">ipp_uchar_t</a> *buffer, size_t bytes); @@ -5721,7 +5721,7 @@ typedef unsigned char ipp_uchar_t; <dt>type </dt> <dt>username </dt> </dl> -<h3 class="struct"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="http_addrlist_s">http_addrlist_s</a></h3> +<h3 class="struct"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="http_addrlist_s">http_addrlist_s</a></h3> <p class="description">Socket address list, which is used to enumerate all of the addresses that are associated @@ -5737,7 +5737,7 @@ with a hostname. </p> <dt>next </dt> <dd class="description">Pointer to next address in list</dd> </dl> -<h3 class="struct"><span class="info"> CUPS 1.5/OS X 10.7 </span><a name="http_credential_s">http_credential_s</a></h3> +<h3 class="struct"><span class="info"> CUPS 1.5/macOS 10.7 </span><a name="http_credential_s">http_credential_s</a></h3> <p class="description">HTTP credential data </p> <p class="code">struct http_credential_s {<br> void *data;<br> @@ -5776,7 +5776,7 @@ with a hostname. </p> <dd class="description">MD5-session authentication in use</dd> <dt>HTTP_AUTH_MD5_SESS_INT </dt> <dd class="description">MD5-session authentication in use for body</dd> -<dt>HTTP_AUTH_NEGOTIATE <span class="info"> CUPS 1.3/OS X 10.5 </span></dt> +<dt>HTTP_AUTH_NEGOTIATE <span class="info"> CUPS 1.3/macOS 10.5 </span></dt> <dd class="description">GSSAPI authentication in use </dd> <dt>HTTP_AUTH_NONE </dt> <dd class="description">No authentication in use</dd> @@ -5809,13 +5809,13 @@ with a hostname. </p> <p class="description">HTTP field names</p> <h4 class="constants">Constants</h4> <dl> -<dt>HTTP_FIELD_ACCEPT_ENCODING <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>HTTP_FIELD_ACCEPT_ENCODING <span class="info"> CUPS 1.7/macOS 10.9 </span></dt> <dd class="description">Accepting-Encoding field </dd> <dt>HTTP_FIELD_ACCEPT_LANGUAGE </dt> <dd class="description">Accept-Language field</dd> <dt>HTTP_FIELD_ACCEPT_RANGES </dt> <dd class="description">Accept-Ranges field</dd> -<dt>HTTP_FIELD_ALLOW <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>HTTP_FIELD_ALLOW <span class="info"> CUPS 1.7/macOS 10.9 </span></dt> <dd class="description">Allow field </dd> <dt>HTTP_FIELD_AUTHORIZATION </dt> <dd class="description">Authorization field</dd> @@ -5861,7 +5861,7 @@ with a hostname. </p> <dd class="description">Referer field</dd> <dt>HTTP_FIELD_RETRY_AFTER </dt> <dd class="description">Retry-After field</dd> -<dt>HTTP_FIELD_SERVER <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>HTTP_FIELD_SERVER <span class="info"> CUPS 1.7/macOS 10.9 </span></dt> <dd class="description">Server field </dd> <dt>HTTP_FIELD_TRANSFER_ENCODING </dt> <dd class="description">Transfer-Encoding field</dd> @@ -5916,9 +5916,9 @@ are server-oriented...</p> <dd class="description">Command complete, sending status</dd> <dt>HTTP_STATE_TRACE </dt> <dd class="description">TRACE command, waiting for blank line</dd> -<dt>HTTP_STATE_UNKNOWN_METHOD <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>HTTP_STATE_UNKNOWN_METHOD <span class="info"> CUPS 1.7/macOS 10.9 </span></dt> <dd class="description">Unknown request method, waiting for blank line </dd> -<dt>HTTP_STATE_UNKNOWN_VERSION <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>HTTP_STATE_UNKNOWN_VERSION <span class="info"> CUPS 1.7/macOS 10.9 </span></dt> <dd class="description">Unknown request method, waiting for blank line </dd> <dt>HTTP_STATE_WAITING </dt> <dd class="description">Waiting for command</dd> @@ -5941,7 +5941,7 @@ are server-oriented...</p> <dd class="description">PUT command was successful</dd> <dt>HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED <span class="info"> CUPS 1.4 </span></dt> <dd class="description">User canceled authorization </dd> -<dt>HTTP_STATUS_CUPS_PKI_ERROR <span class="info"> CUPS 1.5/OS X 10.7 </span></dt> +<dt>HTTP_STATUS_CUPS_PKI_ERROR <span class="info"> CUPS 1.5/macOS 10.7 </span></dt> <dd class="description">Error negotiating a secure connection </dd> <dt>HTTP_STATUS_ERROR </dt> <dd class="description">An error response from httpXxxx()</dd> @@ -5963,7 +5963,7 @@ are server-oriented...</p> <dd class="description">Document has moved temporarily</dd> <dt>HTTP_STATUS_MULTIPLE_CHOICES </dt> <dd class="description">Multiple files match request</dd> -<dt>HTTP_STATUS_NONE <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>HTTP_STATUS_NONE <span class="info"> CUPS 1.7/macOS 10.9 </span></dt> <dd class="description">No Expect value </dd> <dt>HTTP_STATUS_NOT_ACCEPTABLE </dt> <dd class="description">Not Acceptable</dd> @@ -6347,15 +6347,15 @@ are server-oriented...</p> <dd class="description">Cancel-Jobs</dd> <dt>IPP_OP_CANCEL_MY_JOBS </dt> <dd class="description">Cancel-My-Jobs</dd> -<dt>IPP_OP_CANCEL_SUBSCRIPTION <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>IPP_OP_CANCEL_SUBSCRIPTION <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Cancel a subscription </dd> <dt>IPP_OP_CLOSE_JOB </dt> <dd class="description">Close-Job</dd> <dt>IPP_OP_CREATE_JOB </dt> <dd class="description">Create an empty print job</dd> -<dt>IPP_OP_CREATE_JOB_SUBSCRIPTIONS <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>IPP_OP_CREATE_JOB_SUBSCRIPTIONS <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Create one of more job subscriptions </dd> -<dt>IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Create one or more printer subscriptions </dd> <dt>IPP_OP_CUPS_ACCEPT_JOBS </dt> <dd class="description">Accept new jobs on a printer</dd> @@ -6363,7 +6363,7 @@ are server-oriented...</p> <dd class="description">Add or modify a class</dd> <dt>IPP_OP_CUPS_ADD_MODIFY_PRINTER </dt> <dd class="description">Add or modify a printer</dd> -<dt>IPP_OP_CUPS_AUTHENTICATE_JOB <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>IPP_OP_CUPS_AUTHENTICATE_JOB <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Authenticate a job </dd> <dt>IPP_OP_CUPS_CREATE_LOCAL_PRINTER <span class="info"> CUPS 2.2 </span></dt> <dd class="description">Create a local (temporary) printer <dt>IPP_OP_CUPS_DELETE_CLASS </dt> @@ -6376,7 +6376,7 @@ are server-oriented...</p> <dd class="description">Get the default printer</dd> <dt>IPP_OP_CUPS_GET_DEVICES <span class="info"> DEPRECATED </span></dt> <dd class="description">Get a list of supported devices </dd> -<dt>IPP_OP_CUPS_GET_DOCUMENT <span class="info"> CUPS 1.4/OS X 10.6 </span></dt> +<dt>IPP_OP_CUPS_GET_DOCUMENT <span class="info"> CUPS 1.4/macOS 10.6 </span></dt> <dd class="description">Get a document file </dd> <dt>IPP_OP_CUPS_GET_PPD <span class="info"> DEPRECATED </span></dt> <dd class="description">Get a PPD file </dd> @@ -6416,7 +6416,7 @@ are server-oriented...</p> <dd class="description">Get job attributes</dd> <dt>IPP_OP_GET_NEXT_DOCUMENT_DATA </dt> <dd class="description">Get-Next-Document-Data</dd> -<dt>IPP_OP_GET_NOTIFICATIONS <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>IPP_OP_GET_NOTIFICATIONS <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Get notification events </dd> <dt>IPP_OP_GET_OUTPUT_DEVICE_ATTRIBUTES </dt> <dd class="description">Get-Output-Device-Attributes</dd> @@ -6424,9 +6424,9 @@ are server-oriented...</p> <dd class="description">Get printer attributes</dd> <dt>IPP_OP_GET_PRINTER_SUPPORTED_VALUES </dt> <dd class="description">Get supported attribute values</dd> -<dt>IPP_OP_GET_SUBSCRIPTIONS <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>IPP_OP_GET_SUBSCRIPTIONS <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Get list of subscriptions </dd> -<dt>IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Get subscription attributes </dd> <dt>IPP_OP_HOLD_JOB </dt> <dd class="description">Hold a job for printing</dd> @@ -6450,7 +6450,7 @@ are server-oriented...</p> <dd class="description">Release new jobs</dd> <dt>IPP_OP_RELEASE_JOB </dt> <dd class="description">Release a job for printing</dd> -<dt>IPP_OP_RENEW_SUBSCRIPTION <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>IPP_OP_RENEW_SUBSCRIPTION <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Renew a printer subscription </dd> <dt>IPP_OP_REPROCESS_JOB </dt> <dd class="description">Reprint a job</dd> @@ -6598,9 +6598,9 @@ are server-oriented...</p> <dd class="description">cups-error-account-info-needed </dd> <dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED <span class="info"> DEPRECATED </span></dt> <dd class="description">cups-error-account-limit-reached </dd> -<dt>IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED <span class="info"> CUPS 1.5/OS X 10.7 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED <span class="info"> CUPS 1.5/macOS 10.7 </span></dt> <dd class="description">cups-authentication-canceled - Authentication canceled by user </dd> -<dt>IPP_STATUS_ERROR_CUPS_PKI <span class="info"> CUPS 1.5/OS X 10.7 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_PKI <span class="info"> CUPS 1.5/macOS 10.7 </span></dt> <dd class="description">cups-pki-error - Error negotiating a secure connection </dd> <dt>IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED </dt> <dd class="description">cups-upgrade-required - TLS upgrade required</dd> diff --git a/doc/help/api-overview.html b/doc/help/api-overview.html index 5960924cf..d6d51402f 100644 --- a/doc/help/api-overview.html +++ b/doc/help/api-overview.html @@ -5,7 +5,7 @@ <title>Introduction to CUPS Programming </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html index ee57da5aa..55fd0ac96 100644 --- a/doc/help/api-ppd.html +++ b/doc/help/api-ppd.html @@ -5,7 +5,7 @@ <title>PPD API (DEPRECATED) </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -366,7 +366,7 @@ div.contents ul.subcontents li { <h1 class='title'>PPD API (DEPRECATED)</h1> -<blockquote>The PPD API is deprecated starting in CUPS 1.6/OS X 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote> +<blockquote>The PPD API is deprecated starting in CUPS 1.6/macOS 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote> <div class='summary'><table summary='General Information'> <thead> @@ -507,7 +507,7 @@ conflicts.">ppdMarkOption</a></li> <h2 class='title'><a name='OVERVIEW'>Overview</a></h2> -<blockquote>The PPD API is deprecated starting in CUPS 1.6/OS X 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote> +<blockquote>The PPD API is deprecated starting in CUPS 1.6/macOS 10.8. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote> <p>The CUPS PPD API provides read-only access the data in PostScript Printer Description ("PPD") files which are used for all printers with a driver. With @@ -710,7 +710,7 @@ for (attr = <a href="#ppdFindAttr">ppdFindAttr</a>(ppd, "Product", NULL); puts(attr->value); </pre> <h2 class="title"><a name="FUNCTIONS">Functions</a></h2> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsGetConflicts">cupsGetConflicts</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsGetConflicts">cupsGetConflicts</a></h3> <p class="description">Get a list of conflicting options in a marked PPD.</p> <p class="code"> int cupsGetConflicts (<br> @@ -763,7 +763,7 @@ in the class.<br> The returned filename is stored in a static buffer and is overwritten with each call to <code>cupsGetPPD</code> or <a href="#cupsGetPPD2"><code>cupsGetPPD2</code></a>. The caller "owns" the file that is created and must <code>unlink</code> the returned filename.</p> -<h3 class="function"><span class="info"> CUPS 1.1.21/OS X 10.4 </span><a name="cupsGetPPD2">cupsGetPPD2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.21/macOS 10.4 </span><a name="cupsGetPPD2">cupsGetPPD2</a></h3> <p class="description">Get the PPD file for a printer from the specified server.</p> <p class="code"> const char *cupsGetPPD2 (<br> @@ -788,7 +788,7 @@ each call to <a href="#cupsGetPPD"><code>cupsGetPPD</code></a> or <code>cupsGetP file that is created and must <code>unlink</code> the returned filename. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsGetPPD3">cupsGetPPD3</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsGetPPD3">cupsGetPPD3</a></h3> <p class="description">Get the PPD file for a printer on the specified server if it has changed.</p> <p class="code"> @@ -832,7 +832,7 @@ For classes, <code>cupsGetPPD3</code> returns the PPD file for the first printer in the class. </p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsGetServerPPD">cupsGetServerPPD</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="cupsGetServerPPD">cupsGetServerPPD</a></h3> <p class="description">Get an available PPD file from the server.</p> <p class="code"> char *cupsGetServerPPD (<br> @@ -883,7 +883,7 @@ int cupsMarkOptions (<br> "multiple-document-handling", "output-bin", "print-color-mode", "print-quality", "printer-resolution", and "sides" attributes to their corresponding PPD options and choices.</p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="cupsResolveConflicts">cupsResolveConflicts</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="cupsResolveConflicts">cupsResolveConflicts</a></h3> <p class="description">Resolve conflicts in a marked PPD.</p> <p class="code"> int cupsResolveConflicts (<br> @@ -964,7 +964,7 @@ int ppdCollect (<br> <h4 class="discussion">Discussion</h4> <p class="discussion">The choices array should be freed using <code>free</code> when you are finished with it.</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdCollect2">ppdCollect2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdCollect2">ppdCollect2</a></h3> <p class="description">Collect all marked options that reside in the specified section and minimum order.</p> <p class="code"> @@ -1027,7 +1027,7 @@ int ppdEmit (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 on success, -1 on failure</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdEmitAfterOrder">ppdEmitAfterOrder</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdEmitAfterOrder">ppdEmitAfterOrder</a></h3> <p class="description">Emit a subset of the code for marked options to a file.</p> <p class="code"> int ppdEmitAfterOrder (<br> @@ -1103,7 +1103,7 @@ int ppdEmitJCL (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 on success, -1 on failure</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdEmitJCLEnd">ppdEmitJCLEnd</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdEmitJCLEnd">ppdEmitJCLEnd</a></h3> <p class="description">Emit JCLEnd code to a file.</p> <p class="code"> int ppdEmitJCLEnd (<br> @@ -1119,7 +1119,7 @@ int ppdEmitJCLEnd (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">0 on success, -1 on failure</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdEmitString">ppdEmitString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdEmitString">ppdEmitString</a></h3> <p class="description">Get a string containing the code for marked options.</p> <p class="code"> char *ppdEmitString (<br> @@ -1148,7 +1148,7 @@ The return string is allocated on the heap and should be freed using <code>free</code> when you are done with it. </p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ppdFindAttr">ppdFindAttr</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ppdFindAttr">ppdFindAttr</a></h3> <p class="description">Find the first matching attribute.</p> <p class="code"> <a href="#ppd_attr_t">ppd_attr_t</a> *ppdFindAttr (<br> @@ -1183,7 +1183,7 @@ The return string is allocated on the heap and should be freed using </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Choice pointer or <code>NULL</code></p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdFindCustomOption">ppdFindCustomOption</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdFindCustomOption">ppdFindCustomOption</a></h3> <p class="description">Find a custom option.</p> <p class="code"> <a href="#ppd_coption_t">ppd_coption_t</a> *ppdFindCustomOption (<br> @@ -1199,7 +1199,7 @@ The return string is allocated on the heap and should be freed using </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Custom option or NULL</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdFindCustomParam">ppdFindCustomParam</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdFindCustomParam">ppdFindCustomParam</a></h3> <p class="description">Find a parameter for a custom option.</p> <p class="code"> <a href="#ppd_cparam_t">ppd_cparam_t</a> *ppdFindCustomParam (<br> @@ -1231,7 +1231,7 @@ The return string is allocated on the heap and should be freed using </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Pointer to choice or <code>NULL</code></p> -<h3 class="function"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ppdFindNextAttr">ppdFindNextAttr</a></h3> +<h3 class="function"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ppdFindNextAttr">ppdFindNextAttr</a></h3> <p class="description">Find the next matching attribute.</p> <p class="code"> <a href="#ppd_attr_t">ppd_attr_t</a> *ppdFindNextAttr (<br> @@ -1266,7 +1266,7 @@ The return string is allocated on the heap and should be freed using </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Pointer to option or <code>NULL</code></p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdFirstCustomParam">ppdFirstCustomParam</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdFirstCustomParam">ppdFirstCustomParam</a></h3> <p class="description">Return the first parameter for a custom option.</p> <p class="code"> <a href="#ppd_cparam_t">ppd_cparam_t</a> *ppdFirstCustomParam (<br> @@ -1279,7 +1279,7 @@ The return string is allocated on the heap and should be freed using </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Custom parameter or NULL</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdFirstOption">ppdFirstOption</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdFirstOption">ppdFirstOption</a></h3> <p class="description">Return the first option in the PPD file.</p> <p class="code"> <a href="#ppd_option_t">ppd_option_t</a> *ppdFirstOption (<br> @@ -1296,7 +1296,7 @@ The return string is allocated on the heap and should be freed using <p class="discussion">Options are returned from all groups in ascending alphanumeric order. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="ppdInstallableConflict">ppdInstallableConflict</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="ppdInstallableConflict">ppdInstallableConflict</a></h3> <p class="description">Test whether an option choice conflicts with an installable option.</p> <p class="code"> @@ -1340,7 +1340,7 @@ int ppdIsMarked (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Non-zero if option is marked</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdLocalize">ppdLocalize</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdLocalize">ppdLocalize</a></h3> <p class="description">Localize the PPD file to the current locale.</p> <p class="code"> int ppdLocalize (<br> @@ -1382,7 +1382,7 @@ localized string uses the UTF-8 character encoding. <p class="discussion">This function uses the current locale to find the localized attribute for the given main and option keywords. If no localized version of the attribute exists for the current locale, the unlocalized version is returned.</p> -<h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="ppdLocalizeIPPReason">ppdLocalizeIPPReason</a></h3> +<h3 class="function"><span class="info"> CUPS 1.3/macOS 10.5 </span><a name="ppdLocalizeIPPReason">ppdLocalizeIPPReason</a></h3> <p class="description">Get the localized version of a cupsIPPReason attribute.</p> <p class="code"> @@ -1417,7 +1417,7 @@ string or attribute value. Otherwise the corresponding URI is returned.<br> If no value of the requested scheme can be found, NULL is returned. </p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="ppdLocalizeMarkerName">ppdLocalizeMarkerName</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="ppdLocalizeMarkerName">ppdLocalizeMarkerName</a></h3> <p class="description">Get the localized version of a marker-names attribute value.</p> <p class="code"> @@ -1471,7 +1471,7 @@ int ppdMarkOption (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of conflicts</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdNextCustomParam">ppdNextCustomParam</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdNextCustomParam">ppdNextCustomParam</a></h3> <p class="description">Return the next parameter for a custom option.</p> <p class="code"> <a href="#ppd_cparam_t">ppd_cparam_t</a> *ppdNextCustomParam (<br> @@ -1484,7 +1484,7 @@ int ppdMarkOption (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Custom parameter or NULL</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppdNextOption">ppdNextOption</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppdNextOption">ppdNextOption</a></h3> <p class="description">Return the next option in the PPD file.</p> <p class="code"> <a href="#ppd_option_t">ppd_option_t</a> *ppdNextOption (<br> @@ -1533,7 +1533,7 @@ float ppdPageLength (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Size record for page or NULL</p> -<h3 class="function"><span class="info"> CUPS 1.4/OS X 10.6 </span><a name="ppdPageSizeLimits">ppdPageSizeLimits</a></h3> +<h3 class="function"><span class="info"> CUPS 1.4/macOS 10.6 </span><a name="ppdPageSizeLimits">ppdPageSizeLimits</a></h3> <p class="description">Return the custom page size limits.</p> <p class="code"> int ppdPageSizeLimits (<br> @@ -1577,7 +1577,7 @@ float ppdPageWidth (<br> <h4 class="returnvalue">Return Value</h4> <p class="description">Width of page in points or 0.0</p> <h2 class="title"><a name="TYPES">Data Types</a></h2> -<h3 class="typedef"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ppd_attr_t">ppd_attr_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ppd_attr_t">ppd_attr_t</a></h3> <p class="description">PPD Attribute Structure </p> <p class="code"> typedef struct <a href="#ppd_attr_s">ppd_attr_s</a> ppd_attr_t; @@ -1587,7 +1587,7 @@ typedef struct <a href="#ppd_attr_s">ppd_attr_s</a> ppd_attr_t; <p class="code"> typedef struct <a href="#ppd_choice_s">ppd_choice_s</a> ppd_choice_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ppd_conform_t">ppd_conform_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ppd_conform_t">ppd_conform_t</a></h3> <p class="description">Conformance Levels </p> <p class="code"> typedef enum <a href="#ppd_conform_e">ppd_conform_e</a> ppd_conform_t; @@ -1597,27 +1597,27 @@ typedef enum <a href="#ppd_conform_e">ppd_conform_e</a> ppd_conform_t; <p class="code"> typedef struct <a href="#ppd_const_s">ppd_const_s</a> ppd_const_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_coption_t">ppd_coption_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_coption_t">ppd_coption_t</a></h3> <p class="description">Custom Option </p> <p class="code"> typedef struct <a href="#ppd_coption_s">ppd_coption_s</a> ppd_coption_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_cparam_t">ppd_cparam_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_cparam_t">ppd_cparam_t</a></h3> <p class="description">Custom Parameter </p> <p class="code"> typedef struct <a href="#ppd_cparam_s">ppd_cparam_s</a> ppd_cparam_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_cplimit_t">ppd_cplimit_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_cplimit_t">ppd_cplimit_t</a></h3> <p class="description">Custom Parameter Limit </p> <p class="code"> typedef union <a href="#ppd_cplimit_u">ppd_cplimit_u</a> ppd_cplimit_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_cptype_t">ppd_cptype_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_cptype_t">ppd_cptype_t</a></h3> <p class="description">Custom Parameter Type </p> <p class="code"> typedef enum ppd_cptype_e ppd_cptype_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_cpvalue_t">ppd_cpvalue_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_cpvalue_t">ppd_cpvalue_t</a></h3> <p class="description">Custom Parameter Value </p> <p class="code"> typedef union <a href="#ppd_cpvalue_u">ppd_cpvalue_u</a> ppd_cpvalue_t; @@ -1662,7 +1662,7 @@ typedef enum <a href="#ppd_section_e">ppd_section_e</a> ppd_section_t; <p class="code"> typedef struct <a href="#ppd_size_s">ppd_size_s</a> ppd_size_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ppd_status_t">ppd_status_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ppd_status_t">ppd_status_t</a></h3> <p class="description">Status Codes </p> <p class="code"> typedef enum <a href="#ppd_status_e">ppd_status_e</a> ppd_status_t; @@ -1673,7 +1673,7 @@ typedef enum <a href="#ppd_status_e">ppd_status_e</a> ppd_status_t; typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; </p> <h2 class="title"><a name="STRUCTURES">Structures</a></h2> -<h3 class="struct"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ppd_attr_s">ppd_attr_s</a></h3> +<h3 class="struct"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ppd_attr_s">ppd_attr_s</a></h3> <p class="description">PPD Attribute Structure </p> <p class="code">struct ppd_attr_s {<br> char name[PPD_MAX_NAME];<br> @@ -1733,7 +1733,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; <dt>option2[PPD_MAX_NAME] </dt> <dd class="description">Second keyword</dd> </dl> -<h3 class="struct"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_coption_s">ppd_coption_s</a></h3> +<h3 class="struct"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_coption_s">ppd_coption_s</a></h3> <p class="description">Custom Option </p> <p class="code">struct ppd_coption_s {<br> char keyword[PPD_MAX_NAME];<br> @@ -1752,7 +1752,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; <dt>params </dt> <dd class="description">Parameters</dd> </dl> -<h3 class="struct"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_cparam_s">ppd_cparam_s</a></h3> +<h3 class="struct"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_cparam_s">ppd_cparam_s</a></h3> <p class="description">Custom Parameter </p> <p class="code">struct ppd_cparam_s {<br> <a href="#ppd_cpvalue_t">ppd_cpvalue_t</a> current;<br> @@ -1907,13 +1907,13 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; <dd class="description">Number of page sizes</dd> <dt>patches </dt> <dd class="description">Patch commands to be sent to printer</dd> -<dt>pcfilename <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>pcfilename <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">PCFileName string </dd> <dt>product </dt> <dd class="description">Product name (from PS RIP/interpreter)</dd> <dt>profiles <span class="info"> DEPRECATED </span></dt> <dd class="description">sRGB color profiles </dd> -<dt>protocols <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>protocols <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">Protocols (BCP, TBCP) string </dd> <dt>shortnickname </dt> <dd class="description">Short version of nickname</dd> @@ -1940,7 +1940,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; <dl> <dt>PPD_MAX_NAME] </dt> <dd class="description">Human-readable group name</dd> -<dt>name[PPD_MAX_NAME] <span class="info"> CUPS 1.1.18/OS X 10.3 </span></dt> +<dt>name[PPD_MAX_NAME] <span class="info"> CUPS 1.1.18/macOS 10.3 </span></dt> <dd class="description">Group name </dd> <dt>num_options </dt> <dd class="description">Number of options</dd> @@ -2039,7 +2039,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; <dd class="description">Width of media in points</dd> </dl> <h2 class="title"><a name="UNIONS">Unions</a></h2> -<h3 class="union"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_cplimit_u">ppd_cplimit_u</a></h3> +<h3 class="union"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_cplimit_u">ppd_cplimit_u</a></h3> <p class="description">Custom Parameter Limit </p> <p class="code">union ppd_cplimit_u {<br> float custom_curve;<br> @@ -2070,7 +2070,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; <dt>custom_string </dt> <dd class="description">String length</dd> </dl> -<h3 class="union"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="ppd_cpvalue_u">ppd_cpvalue_u</a></h3> +<h3 class="union"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="ppd_cpvalue_u">ppd_cpvalue_u</a></h3> <p class="description">Custom Parameter Value </p> <p class="code">union ppd_cpvalue_u {<br> float custom_curve;<br> @@ -2102,7 +2102,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; <dd class="description">String value</dd> </dl> <h2 class="title"><a name="ENUMERATIONS">Constants</a></h2> -<h3 class="enumeration"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ppd_conform_e">ppd_conform_e</a></h3> +<h3 class="enumeration"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ppd_conform_e">ppd_conform_e</a></h3> <p class="description">Conformance Levels </p> <h4 class="constants">Constants</h4> <dl> @@ -2145,7 +2145,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t; <dt>PPD_ORDER_PROLOG </dt> <dd class="description">... must be in the Prolog section</dd> </dl> -<h3 class="enumeration"><span class="info"> CUPS 1.1.19/OS X 10.3 </span><a name="ppd_status_e">ppd_status_e</a></h3> +<h3 class="enumeration"><span class="info"> CUPS 1.1.19/macOS 10.3 </span><a name="ppd_status_e">ppd_status_e</a></h3> <p class="description">Status Codes </p> <h4 class="constants">Constants</h4> <dl> diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html index 7dfcf57c5..a51a8c451 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -5,7 +5,7 @@ <title>Raster API </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -466,7 +466,7 @@ avoid incompatibilities with newer versions of CUPS.</p> <p>Two kinds of CUPS filters use the CUPS raster API - raster image processor (RIP) filters such as <code>pstoraster</code> and <code>cgpdftoraster</code> -(OS X) that produce CUPS raster files and printer driver filters that +(macOS) that produce CUPS raster files and printer driver filters that convert CUPS raster files into a format usable by the printer. Printer driver filters are by far the most common.</p> @@ -586,7 +586,7 @@ the memory used to read the raster file:</p> <ul class="code"> - <li><a href="#cupsRasterReadHeader" title="Read a raster page header and store it in a version 1 page header structure.">cupsRasterReadHeader</a> <span class="info">Deprecated in CUPS 1.2/OS X 10.5</span></li> + <li><a href="#cupsRasterReadHeader" title="Read a raster page header and store it in a version 1 page header structure.">cupsRasterReadHeader</a> <span class="info">Deprecated in CUPS 1.2/macOS 10.5</span></li> <li><a href="#cupsRasterReadHeader2" title="Read a raster page header and store it in a version 2 page header structure.">cupsRasterReadHeader2</a></li> <li><a href="#cupsRasterReadPixels" title="Read raster pixels.">cupsRasterReadPixels</a></li> @@ -597,7 +597,7 @@ the memory used to read the raster file:</p> <ul class="code"> <li><a href="#cupsRasterInterpretPPD" title="Interpret PPD commands to create a page header.">cupsRasterInterpretPPD</a></li> - <li><a href="#cupsRasterWriteHeader" title="Write a raster page header from a version 1 page header structure.">cupsRasterWriteHeader</a> <span class="info">Deprecated in CUPS 1.2/OS X 10.5</span></li> + <li><a href="#cupsRasterWriteHeader" title="Write a raster page header from a version 1 page header structure.">cupsRasterWriteHeader</a> <span class="info">Deprecated in CUPS 1.2/macOS 10.5</span></li> <li><a href="#cupsRasterWriteHeader2" title="Write a raster page header from a version 2 page header structure.">cupsRasterWriteHeader2</a></li> <li><a href="#cupsRasterWritePixels" title="Write raster pixels.">cupsRasterWritePixels</a></li> @@ -661,7 +661,7 @@ The "sheet_back" argument specifies a "pwg-raster-document-sheet- to apply for the back side of a page. Pass <code>NULL</code> for the front side. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsRasterInterpretPPD">cupsRasterInterpretPPD</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsRasterInterpretPPD">cupsRasterInterpretPPD</a></h3> <p class="description">Interpret PPD commands to create a page header.</p> <p class="code"> int cupsRasterInterpretPPD (<br> @@ -796,7 +796,7 @@ of the version 2 page header data. This function handles reading version 2 page headers and copying only the version 1 data into the provided buffer. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsRasterReadHeader2">cupsRasterReadHeader2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsRasterReadHeader2">cupsRasterReadHeader2</a></h3> <p class="description">Read a raster page header and store it in a version 2 page header structure.</p> <p class="code"> @@ -857,7 +857,7 @@ unsigned cupsRasterWriteHeader (<br> <p class="discussion">This function is deprecated. Use <a href="#cupsRasterWriteHeader2"><code>cupsRasterWriteHeader2</code></a> instead. </p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsRasterWriteHeader2">cupsRasterWriteHeader2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cupsRasterWriteHeader2">cupsRasterWriteHeader2</a></h3> <p class="description">Write a raster page header from a version 2 page header structure.</p> <p class="code"> @@ -952,7 +952,7 @@ typedef enum <a href="#cups_order_e">cups_order_e</a> cups_order_t; <p class="code"> typedef enum <a href="#cups_orient_e">cups_orient_e</a> cups_orient_t; </p> -<h3 class="typedef"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cups_page_header2_t">cups_page_header2_t</a></h3> +<h3 class="typedef"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cups_page_header2_t">cups_page_header2_t</a></h3> <p class="description">Version 2 page header </p> <p class="code"> typedef struct <a href="#cups_page_header2_s">cups_page_header2_s</a> cups_page_header2_t; @@ -973,7 +973,7 @@ typedef ssize_t (*cups_raster_iocb_t)(void *ctx, unsigned char *buffer, size_t l typedef struct _cups_raster_s cups_raster_t; </p> <h2 class="title"><a name="STRUCTURES">Structures</a></h2> -<h3 class="struct"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cups_page_header2_s">cups_page_header2_s</a></h3> +<h3 class="struct"><span class="info"> CUPS 1.2/macOS 10.5 </span><a name="cups_page_header2_s">cups_page_header2_s</a></h3> <p class="description">Version 2 page header </p> <p class="code">struct cups_page_header2_s {<br> unsigned AdvanceDistance;<br> @@ -1086,7 +1086,7 @@ typedef struct _cups_raster_s cups_raster_t; <dd class="description">Number of bits for each color</dd> <dt>cupsBitsPerPixel </dt> <dd class="description">Number of bits for each pixel</dd> -<dt>cupsBorderlessScalingFactor <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsBorderlessScalingFactor <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Scaling that was applied to page data </dd> <dt>cupsBytesPerLine </dt> <dd class="description">Number of bytes per line</dd> @@ -1098,26 +1098,26 @@ typedef struct _cups_raster_s cups_raster_t; <dd class="description">Device compression to use</dd> <dt>cupsHeight </dt> <dd class="description">Height of page image in pixels</dd> -<dt>cupsImagingBBox[4] <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsImagingBBox[4] <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Floating point ImagingBoundingBox (scaling factor not applied, left, bottom, right, top) </dd> -<dt>cupsInteger[16] <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsInteger[16] <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">User-defined integer values </dd> -<dt>cupsMarkerType[64] <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsMarkerType[64] <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Ink/toner type </dd> <dt>cupsMediaType </dt> <dd class="description">Media type code</dd> -<dt>cupsNumColors <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsNumColors <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Number of color compoents </dd> -<dt>cupsPageSizeName[64] <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsPageSizeName[64] <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">PageSize name </dd> -<dt>cupsPageSize[2] <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsPageSize[2] <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Floating point PageSize (scaling * factor not applied) </dd> -<dt>cupsReal[16] <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsReal[16] <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">User-defined floating-point values </dd> -<dt>cupsRenderingIntent[64] <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsRenderingIntent[64] <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Color rendering intent </dd> <dt>cupsRowCount </dt> <dd class="description">Rows per band</dd> @@ -1125,7 +1125,7 @@ factor not applied) </dd> <dd class="description">Feed between bands</dd> <dt>cupsRowStep </dt> <dd class="description">Spacing between lines</dd> -<dt>cupsString[16][64] <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>cupsString[16][64] <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">User-defined string values </dd> <dt>cupsWidth </dt> <dd class="description">Width of page image in pixels</dd> @@ -1285,9 +1285,9 @@ factor not applied) </dd> <dl> <dt>CUPS_CSPACE_ADOBERGB <span class="info"> CUPS 1.4.5 </span></dt> <dd class="description">Red, green, blue (Adobe RGB) </dd> -<dt>CUPS_CSPACE_CIELab <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_CIELab <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">CIE Lab </dd> -<dt>CUPS_CSPACE_CIEXYZ <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_CIEXYZ <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">CIE XYZ </dd> <dt>CUPS_CSPACE_CMY </dt> <dd class="description">Cyan, magenta, yellow (DeviceCMY)</dd> @@ -1329,35 +1329,35 @@ factor not applied) </dd> <dd class="description">Gold, magenta, yellow, silver </dd> <dt>CUPS_CSPACE_GOLD <span class="info"> DEPRECATED </span></dt> <dd class="description">Gold foil </dd> -<dt>CUPS_CSPACE_ICC1 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC1 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 1 color </dd> -<dt>CUPS_CSPACE_ICC2 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC2 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 2 colors </dd> -<dt>CUPS_CSPACE_ICC3 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC3 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 3 colors </dd> -<dt>CUPS_CSPACE_ICC4 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC4 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 4 colors </dd> -<dt>CUPS_CSPACE_ICC5 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC5 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 5 colors </dd> -<dt>CUPS_CSPACE_ICC6 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC6 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 6 colors </dd> -<dt>CUPS_CSPACE_ICC7 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC7 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 7 colors </dd> -<dt>CUPS_CSPACE_ICC8 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC8 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 8 colors </dd> -<dt>CUPS_CSPACE_ICC9 <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICC9 <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 9 colors </dd> -<dt>CUPS_CSPACE_ICCA <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICCA <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 10 colors </dd> -<dt>CUPS_CSPACE_ICCB <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICCB <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 11 colors </dd> -<dt>CUPS_CSPACE_ICCC <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICCC <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 12 colors </dd> -<dt>CUPS_CSPACE_ICCD <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICCD <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 13 colors </dd> -<dt>CUPS_CSPACE_ICCE <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICCE <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 14 colors </dd> -<dt>CUPS_CSPACE_ICCF <span class="info"> CUPS 1.1.19/OS X 10.3 </span></dt> +<dt>CUPS_CSPACE_ICCF <span class="info"> CUPS 1.1.19/macOS 10.3 </span></dt> <dd class="description">ICC-based, 15 colors </dd> <dt>CUPS_CSPACE_K </dt> <dd class="description">Black (DeviceK)</dd> @@ -1369,7 +1369,7 @@ factor not applied) </dd> <dd class="description">Red, green, blue (DeviceRGB, sRGB by default)</dd> <dt>CUPS_CSPACE_RGBA </dt> <dd class="description">Red, green, blue, alpha (DeviceRGB, sRGB by default)</dd> -<dt>CUPS_CSPACE_RGBW <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> +<dt>CUPS_CSPACE_RGBW <span class="info"> CUPS 1.2/macOS 10.5 </span></dt> <dd class="description">Red, green, blue, white (DeviceRGB, sRGB by default) </dd> <dt>CUPS_CSPACE_SILVER <span class="info"> DEPRECATED </span></dt> <dd class="description">Silver foil </dd> @@ -1435,9 +1435,9 @@ factor not applied) </dd> <dd class="description">Open stream for reading</dd> <dt>CUPS_RASTER_WRITE </dt> <dd class="description">Open stream for writing</dd> -<dt>CUPS_RASTER_WRITE_COMPRESSED <span class="info"> CUPS 1.3/OS X 10.5 </span></dt> +<dt>CUPS_RASTER_WRITE_COMPRESSED <span class="info"> CUPS 1.3/macOS 10.5 </span></dt> <dd class="description">Open stream for compressed writing </dd> -<dt>CUPS_RASTER_WRITE_PWG <span class="info"> CUPS 1.5/OS X 10.7 </span></dt> +<dt>CUPS_RASTER_WRITE_PWG <span class="info"> CUPS 1.5/macOS 10.7 </span></dt> <dd class="description">Open stream for compressed writing in PWG mode </dd> </dl> <h3 class="enumeration"><a name="cups_order_e">cups_order_e</a></h3> diff --git a/doc/help/kerberos.html b/doc/help/kerberos.html index d6c208c08..ebbadbdf8 100644 --- a/doc/help/kerberos.html +++ b/doc/help/kerberos.html @@ -44,7 +44,7 @@ DNS server(s).</li> <LI><A HREF="http://web.mit.edu/kerberos/">Kerberos: The Network Authentication Protocol</A></LI> <LI><A HREF="http://web.mit.edu/macdev/KfM/Common/Documentation/faq-osx.html">Kerberos - on OS X Frequently Asked Questions</A></LI> + on macOS Frequently Asked Questions</A></LI> </UL> diff --git a/doc/help/license.html b/doc/help/license.html index 005662183..29e24ef41 100644 --- a/doc/help/license.html +++ b/doc/help/license.html @@ -90,7 +90,7 @@ the following special exception:</P> operating system software developed and/or marketed by Apple Inc., including but not limited to all existing releases and versions of Apple's - Darwin, OS X, and OS X Server products and all + Darwin, macOS, and macOS Server products and all follow-on releases and future versions thereof.</LI> <LI>This exception is only available for Apple diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html index 1826dfdee..156717b46 100644 --- a/doc/help/man-backend.html +++ b/doc/help/man-backend.html @@ -151,7 +151,7 @@ CUPS backends are not generally design to be run directly by the user. Aside fro <i>argv[0]</i> and <b>DEVICE_URI</b> -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 OS X) 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. <p>Unless you are a developer and know what you are doing, please do not run backends directly. Instead, use the <a href="man-lp.html?TOPIC=Man+Pages"><b>lp</b>(1)</a> or diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html index 97b618a5f..16c1919e3 100644 --- a/doc/help/man-client.conf.html +++ b/doc/help/man-client.conf.html @@ -12,9 +12,9 @@ client.conf - client configuration file for cups <h2 class="title"><a name="DESCRIPTION">Description</a></h2> The <b>client.conf</b> file configures the CUPS client and is normally located in the <i>/etc/cups</i> and/or <i>~/.cups</i> directories. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. -<p><b>Note:</b> Starting with OS X 10.7, this file is only used by command-line and X11 applications plus the IPP backend. -The <b>ServerName</b> directive is not supported on OS X at all. -Starting with OS X 10.TODO, all applications can access these settings in the <i>/Library/Preferences/org.cups.PrintingPrefs.plist</i> file instead. +<p><b>Note:</b> Starting with macOS 10.7, this file is only used by command-line and X11 applications plus the IPP backend. +The <b>ServerName</b> directive is not supported on macOS at all. +Starting with macOS 10.12, all applications can access these settings in the <i>/Library/Preferences/org.cups.PrintingPrefs.plist</i> file instead. See the NOTES section below for more information. <h3><a name="DIRECTIVES">Directives</a></h3> The following directives are understood by the client. Consult the online help for detailed descriptions: @@ -37,7 +37,7 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n <dt><b>ServerName </b><i>hostname-or-ip-address</i>[<i>:port</i>] <dd style="margin-left: 5.0em"><dt><b>ServerName </b><i>/domain/socket</i> <dd style="margin-left: 5.0em">Specifies the address and optionally the port to use when connecting to the server. -<b>Note: This directive it not supported on OS X 10.7 or later.</b> +<b>Note: This directive it not supported on macOS 10.7 or later.</b> <dt><b>ServerName </b><i>hostname-or-ip-address</i>[<i>:port</i>]<b>/version=1.1</b> <dd style="margin-left: 5.0em">Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier. <dt><b>SSLOptions </b>[<i>AllowDH</i>] [<i>AllowRC4</i>] [<i>AllowSSL3</i>] [<i>DenyTLS1.0</i>] @@ -60,7 +60,7 @@ The default is "Yes". The default is "No". </dl> <h2 class="title"><a name="NOTES">Notes</a></h2> -The <b>client.conf</b> file is deprecated on OS X and will no longer be supported in a future version of CUPS. +The <b>client.conf</b> file is deprecated on macOS and will no longer be supported in a future version of CUPS. Configuration settings can instead be viewed or changed using the <b>defaults</b>(1) command: diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index 75c923343..093ba6f4f 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -38,7 +38,7 @@ The server name may be included in filenames using the string "%s", for example: The default is "/var/log/cups/access_log". <dt><a name="ConfigFilePerm"></a><b>ConfigFilePerm </b><i>mode</i> <dd style="margin-left: 5.0em">Specifies the permissions for all configuration files that the scheduler writes. -The default is "0644" on OS X and "0640" on all other operating systems. +The default is "0644" on macOS and "0640" on all other operating systems. </dl> <p><b>Note:</b> The permissions for the <i>printers.conf</i> file are currently masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. @@ -122,14 +122,14 @@ The default is "/var/spool/cups". <dd style="margin-left: 5.0em"><dt><b>Sandboxing strict</b> <dd style="margin-left: 5.0em">Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler. The default is "strict". -This directive is currently only used/supported on OS X. +This directive is currently only used/supported on macOS. <dt><a name="ServerBin"></a><b>ServerBin </b><i>directory</i> <dd style="margin-left: 5.0em">Specifies the directory containing the backends, CGI programs, filters, helper programs, notifiers, and port monitors. The default is "/usr/lib/cups" or "/usr/libexec/cups" depending on the platform. <dt><a name="ServerKeychain"></a><b>ServerKeychain </b><i>path</i> <dd style="margin-left: 5.0em">Specifies the location of TLS certificates and private keys. -The default is "/Library/Keychains/System.keychain" on OS X and "/etc/cups/ssl" on all other operating systems. -OS X uses its keychain database to store certificates and keys while other platforms use separate files in the specified directory, *.crt for PEM-encoded certificates and *.key for PEM-encoded private keys. +The default is "/Library/Keychains/System.keychain" on macOS and "/etc/cups/ssl" on all other operating systems. +macOS uses its keychain database to store certificates and keys while other platforms use separate files in the specified directory, *.crt for PEM-encoded certificates and *.key for PEM-encoded private keys. <dt><a name="ServerRoot"></a><b>ServerRoot </b><i>directory</i> <dd style="margin-left: 5.0em">Specifies the directory containing the server configuration files. The default is "/etc/cups". diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html index 26b3a8a1a..a40ad2ff8 100644 --- a/doc/help/man-cupsd-helper.html +++ b/doc/help/man-cupsd-helper.html @@ -49,7 +49,7 @@ The <b>cups-deviced</b> helper program runs each CUPS <a href="man-backend.html?TOPIC=Man+Pages"><b>backend</b>(7)</a> with no arguments in order to discover the available printers. <p>The <b>cups-driverd</b> helper program lists all available printer drivers, a subset of "matching" printer drivers, or a copy of a specific driver PPD file. -<p>The <b>cups-exec</b> helper program runs backends, filters, and other programs. On OS X these programs are run in a secure sandbox. +<p>The <b>cups-exec</b> helper program runs backends, filters, and other programs. On macOS these programs are run in a secure sandbox. <h2 class="title"><a name="FILES">Files</a></h2> The <b>cups-driverd</b> program looks for PPD and driver information files in the following directories: <pre class="man"> diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html index 3aa39efd1..5f9e8ad2f 100644 --- a/doc/help/man-filter.html +++ b/doc/help/man-filter.html @@ -166,7 +166,7 @@ for a regular print file. While the filter interface is compatible with System V interface scripts, CUPS does not support System V interface scripts. <h2 class="title"><a name="NOTES">Notes</a></h2> CUPS filters are not meant to be run directly by the user. -Aside from the legacy System V interface issues (<i>argv[0]</i> is the printer name), CUPS filters also expect specific environment variables and file descriptors, and typically run in a user session that (on OS X) has additional restrictions that affect how it runs. +Aside from the legacy System V interface issues (<i>argv[0]</i> 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 <a href="man-cupsfilter.html?TOPIC=Man+Pages"><b>cupsfilter</b>(8)</a> diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html index 15f17b154..bd7ca0164 100644 --- a/doc/help/man-mime.convs.html +++ b/doc/help/man-mime.convs.html @@ -33,7 +33,7 @@ Filenames are relative to the CUPS filter directory. <br> <i>/usr/lib/cups/filter</i> - Typical CUPS filter directory. <br> -<i>/usr/libexec/cups/filter</i> - CUPS filter directory on OS X. +<i>/usr/libexec/cups/filter</i> - CUPS filter directory on macOS. <h2 class="title"><a name="EXAMPLES">Examples</a></h2> Define a filter that converts PostScript documents to CUPS Raster format: <pre class="man"> diff --git a/doc/help/man-ppdpo.html b/doc/help/man-ppdpo.html index 42337332c..a423e5a52 100644 --- a/doc/help/man-ppdpo.html +++ b/doc/help/man-ppdpo.html @@ -22,7 +22,7 @@ ppdpo - ppd message catalog generator (deprecated) ] <i>source-file</i> <h2 class="title"><a name="DESCRIPTION">Description</a></h2> -<b>ppdpo</b> extracts UI strings from PPDC source files and updates either a GNU gettext or OS X strings format message catalog source file for translation. +<b>ppdpo</b> extracts UI strings from PPDC source files and updates either a GNU gettext or macOS strings format message catalog source file for translation. <b>This program is deprecated and will be removed in a future release of CUPS.</b> <h2 class="title"><a name="OPTIONS">Options</a></h2> <b>ppdpo</b> supports the following options: @@ -35,7 +35,7 @@ It is equivalent to using the <i>#define</i> directive in the source file. Multiple <i>-I</i> options can be supplied to add additional directories. <dt><b>-o </b><i>output-file</i> <dd style="margin-left: 5.0em">Specifies the output file. -The supported extensions are <i>.po</i> or <i>.po.gz</i> for GNU gettext format message catalogs and <i>.strings</i> for OS X strings files. +The supported extensions are <i>.po</i> or <i>.po.gz</i> for GNU gettext format message catalogs and <i>.strings</i> for macOS strings files. </dl> <h2 class="title"><a name="SEE_ALSO">See Also</a></h2> <a href="man-ppdc.html?TOPIC=Man+Pages"><b>ppdc</b>(1),</a> diff --git a/doc/help/network.html b/doc/help/network.html index e29c9a45b..6af2a9ce1 100644 --- a/doc/help/network.html +++ b/doc/help/network.html @@ -435,7 +435,7 @@ CUPS_DEBUG_LEVEL=2 /usr/lib/cups/backend/snmp 2>&1 | tee snmp.log (setenv CUPS_DEBUG_LEVEL 2; /usr/lib/cups/backend/snmp) |& tee snmp.log </PRE> -<P>On MacOS X you'll find the SNMP backend in /usr/libexec/cups/backend instead:</P> +<P>On MacmacOS you'll find the SNMP backend in /usr/libexec/cups/backend instead:</P> <PRE CLASS="command"> CUPS_DEBUG_LEVEL=2 /usr/libexec/cups/backend/snmp 2>&1 | tee snmp.log diff --git a/doc/help/overview.html b/doc/help/overview.html index 367434d39..a5240fce8 100644 --- a/doc/help/overview.html +++ b/doc/help/overview.html @@ -49,7 +49,7 @@ different ways.</P> <P>Click on the <var>Administration</var> tab. Click on the <var>Add Printer</var> button and follow the prompts.</P> -<BLOCKQUOTE>When you are asked for a username and password, enter your login username and password or the "root" username and password. On OS X<sup>®</sup>, the login username (or "short name") is typically your first and last name in lowercase.</BLOCKQUOTE> +<BLOCKQUOTE>When you are asked for a username and password, enter your login username and password or the "root" username and password. On macOS<sup>®</sup>, the login username (or "short name") is typically your first and last name in lowercase.</BLOCKQUOTE> <P>After the printer is added, CUPS will ask you to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as diff --git a/doc/help/postscript-driver.html b/doc/help/postscript-driver.html index 065d8824a..a996bacf1 100644 --- a/doc/help/postscript-driver.html +++ b/doc/help/postscript-driver.html @@ -5,7 +5,7 @@ <title>Developing PostScript Printer Drivers </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -367,7 +367,7 @@ div.contents ul.subcontents li { <h1 class='title'>Developing PostScript Printer Drivers</h1> -<p>This document describes how to develop printer drivers for PostScript printers. Topics include: <a href='#BASICS'>printer driver basics</a>, <a href='#CREATE'>creating new PPD files</a>, <a href='#IMPORT'>importing existing PPD files</a>, <a href='#FILTERS'>using custom filters</a>, <a href='#COLOR'>implementing color management</a>, and <a href='#MACOSX'>adding OS X features</a>.</p> +<p>This document describes how to develop printer drivers for PostScript printers. Topics include: <a href='#BASICS'>printer driver basics</a>, <a href='#CREATE'>creating new PPD files</a>, <a href='#IMPORT'>importing existing PPD files</a>, <a href='#FILTERS'>using custom filters</a>, <a href='#COLOR'>implementing color management</a>, and <a href='#MACOSX'>adding macOS features</a>.</p> <div class='summary'><table summary='General Information'> <tbody> @@ -390,7 +390,7 @@ div.contents ul.subcontents li { </ul></li> <li><a href="#FILTERS">Using Custom Filters</a></li> <li><a href="#COLOR">Implementing Color Management</a></li> -<li><a href="#MACOSX">Adding OS X Features</a></li> +<li><a href="#MACOSX">Adding macOS Features</a></li> </ul> <h2 class='title'><a name='BASICS'>Printer Driver Basics</a></h2> @@ -658,9 +658,9 @@ information file.</P> <p>The options used for profile selection can be customized using the <tt>cupsICCQualifier2</tt> and <tt>cupsICCQualifier3</tt> attributes.</p> -<h2 class='title'><a name='MACOSX'>Adding OS X Features</a></h2> +<h2 class='title'><a name='MACOSX'>Adding macOS Features</a></h2> -<p>OS X printer drivers can provide <a href='spec-ppd.html#MACOSX'>additional attributes</a> to specify additional option panes in the print dialog, an image of the printer, a help book, and option presets for the driver software:</p> +<p>macOS printer drivers can provide <a href='spec-ppd.html#MACOSX'>additional attributes</a> to specify additional option panes in the print dialog, an image of the printer, a help book, and option presets for the driver software:</p> <pre class='example'> <a href='ref-ppdcfile.html#Attribute'>Attribute</a> APDialogExtension "" /Library/Printers/Vendor/filename.plugin diff --git a/doc/help/ppd-compiler.html b/doc/help/ppd-compiler.html index 7cfa2f765..d6a457f9e 100644 --- a/doc/help/ppd-compiler.html +++ b/doc/help/ppd-compiler.html @@ -5,7 +5,7 @@ <title>Introduction to the PPD Compiler </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -614,7 +614,7 @@ follows:</P> <LI>Bits per color. In the example file, we define 8 bits per color, for a continuous-tone grayscale output. All versions of CUPS support 1 and - 8 bits per color. CUPS 1.2 and higher (OS X 10.5 and higher) also + 8 bits per color. CUPS 1.2 and higher (macOS 10.5 and higher) also supports 16 bits per color.</LI> <LI>Rows per band. In the example file, we define 0 rows per band to diff --git a/doc/help/raster-driver.html b/doc/help/raster-driver.html index 69e921445..d44e45ca6 100644 --- a/doc/help/raster-driver.html +++ b/doc/help/raster-driver.html @@ -5,7 +5,7 @@ <title>Developing Raster Printer Drivers </title> <meta name="keywords" content="Programming"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -367,7 +367,7 @@ div.contents ul.subcontents li { <h1 class='title'>Developing Raster Printer Drivers</h1> -<p>This document describes how to develop printer drivers for raster printers. Topics include: <a href='#BASICS'>printer driver basics</a>, <a href='#CREATE'>creating new PPD files</a>, <a href='#FILTERS'>using filters</a>, <a href='#COLOR'>implementing color management</a>, and <a href='#MACOSX'>adding OS X features</a>.</p> +<p>This document describes how to develop printer drivers for raster printers. Topics include: <a href='#BASICS'>printer driver basics</a>, <a href='#CREATE'>creating new PPD files</a>, <a href='#FILTERS'>using filters</a>, <a href='#COLOR'>implementing color management</a>, and <a href='#MACOSX'>adding macOS features</a>.</p> <div class='summary'><table summary='General Information'> <tbody> @@ -388,7 +388,7 @@ div.contents ul.subcontents li { <li><a href="#CREATING">Creating New PPD Files</a></li> <li><a href="#FILTERS">Using Filters</a></li> <li><a href="#COLOR">Implementing Color Management</a></li> -<li><a href="#MACOSX">Adding OS X Features</a></li> +<li><a href="#MACOSX">Adding macOS Features</a></li> </ul> <h2 class='title'><a name='BASICS'>Printer Driver Basics</a></h2> @@ -564,9 +564,9 @@ div.contents ul.subcontents li { <p>The options used for profile selection can be customized using the <tt>cupsICCQualifier2</tt> and <tt>cupsICCQualifier3</tt> attributes.</p> -<h3><span class='info'>Since OS X 10.5</span>Custom Color Matching Support</h3> +<h3><span class='info'>Since macOS 10.5</span>Custom Color Matching Support</h3> -<p>OS X printer drivers that are based on an existing standard RGB colorspace can tell the system to use the corresponding colorspace instead of an arbitrary ICC color profile when doing color management. The <a href='#APCustom'><tt>APSupportsCustomColorMatching</tt></a> and <tt>APDefaultCustomColorMatchingProfile</tt> attributes can be used to enable this mode:</p> +<p>macOS printer drivers that are based on an existing standard RGB colorspace can tell the system to use the corresponding colorspace instead of an arbitrary ICC color profile when doing color management. The <a href='#APCustom'><tt>APSupportsCustomColorMatching</tt></a> and <tt>APDefaultCustomColorMatchingProfile</tt> attributes can be used to enable this mode:</p> <pre class='example'> <a href='ref-ppdcfile.html#Attribute'>Attribute</a> APSupportsCustomColorMatching "" true @@ -574,9 +574,9 @@ div.contents ul.subcontents li { </pre> -<h2 class='title'><a name='MACOSX'>Adding OS X Features</a></h2> +<h2 class='title'><a name='MACOSX'>Adding macOS Features</a></h2> -<p>OS X printer drivers can provide <a href='spec-ppd.html#MACOSX'>additional attributes</a> to specify additional option panes in the print dialog, an image of the printer, a help book, and option presets for the driver software:</p> +<p>macOS printer drivers can provide <a href='spec-ppd.html#MACOSX'>additional attributes</a> to specify additional option panes in the print dialog, an image of the printer, a help book, and option presets for the driver software:</p> <pre class='example'> <a href='ref-ppdcfile.html#Attribute'>Attribute</a> APDialogExtension "" /Library/Printers/Vendor/filename.plugin diff --git a/doc/help/ref-ppdcfile.html b/doc/help/ref-ppdcfile.html index 1c77a7356..6c84abd9a 100644 --- a/doc/help/ref-ppdcfile.html +++ b/doc/help/ref-ppdcfile.html @@ -434,7 +434,7 @@ suffixes:</p> <p>The <code>#po</code> directive defines a message catalog to use for the given POSIX language abbreviation. Multiple <code>#po</code> directives can be specified to list multiple catalogs. The filename can be an absolute path or -relative to the driver information file. GNU gettext and OS X .strings +relative to the driver information file. GNU gettext and macOS .strings files are supported.</p> @@ -2414,8 +2414,8 @@ supported keywords for each type.</p> <BR> - <BR><A NAME="REF_COLOR_APPLE">*</A> = This colorspace is not supported on OS X prior to 10.4. - <BR><A NAME="REF_COLOR_APPLE2">**</A> = This colorspace is not supported on OS X.</LI> + <BR><A NAME="REF_COLOR_APPLE">*</A> = This colorspace is not supported on macOS prior to 10.4. + <BR><A NAME="REF_COLOR_APPLE2">**</A> = This colorspace is not supported on macOS.</LI> </UL> @@ -2441,7 +2441,7 @@ supported keywords for each type.</p> <BR><A NAME="REF_COLOR_APPLE2">*</A> = This color order is not supported by the current Apple RIP filters and should not be used when developing printer drivers for - OS X.</LI> + macOS.</LI> </UL> diff --git a/doc/help/security.html b/doc/help/security.html index d96cbf0df..d5d22e22d 100644 --- a/doc/help/security.html +++ b/doc/help/security.html @@ -33,7 +33,7 @@ server.</P> <P><B>Recommendation:</B> Enable encryption to hide the username and password information - this is the default on - MacOS X and systems with GNU TLS or OpenSSL installed.</P></LI> + MacmacOS and systems with GNU TLS or OpenSSL installed.</P></LI> <LI>Local certificate authentication passes 128-bit "certificates" that identify an authenticated user. @@ -117,7 +117,7 @@ variety of denial of service attacks:</P> <H2 CLASS="title"><A NAME="ENCRYPTION">Encryption Issues</A></H2> -<P>CUPS supports 128-bit TLS encryption of network connections via the GNU TLS library, OS X Security framework, and Windows Schannel APIs. Secure deployment of TLS depends on proper certificate management and software maintenance.</P> +<P>CUPS supports 128-bit TLS encryption of network connections via the GNU TLS library, macOS Security framework, and Windows Schannel APIs. Secure deployment of TLS depends on proper certificate management and software maintenance.</P> </BODY> </HTML> diff --git a/doc/help/sharing.html b/doc/help/sharing.html index e13cfed47..9763da76f 100644 --- a/doc/help/sharing.html +++ b/doc/help/sharing.html @@ -49,7 +49,7 @@ lpadmin -p printer -o printer-op-policy=authenticated <h2><a name="AUTO_IPP">Automatic Configuration using IPP</a></h2> <blockquote><b>Note:</b> -<p>This method of configuration does not work on OS X 10.7 or later because sandboxed applications do not always have direct network access.</p> +<p>This method of configuration does not work on macOS 10.7 or later because sandboxed applications do not always have direct network access.</p> </blockquote> <p>CUPS can be configured to run without a local spooler and send all jobs to a @@ -91,7 +91,7 @@ port. The environment variable overrides both the user and system <h2><a name="MANUAL">Manual Configuration of Print Queues</a></h2> <blockquote><b>Note:</b> -<p>This method of configuration does not work on OS X 10.7 or later because sandboxed applications do not always have direct network access.</p> +<p>This method of configuration does not work on macOS 10.7 or later because sandboxed applications do not always have direct network access.</p> </blockquote> <p>The most tedious method of configuring client machines is to configure diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html index 16af6dfae..724695a59 100644 --- a/doc/help/spec-ipp.html +++ b/doc/help/spec-ipp.html @@ -396,7 +396,7 @@ summary='Supported Operations'> -<h3 class='title'><span class='info'>CUPS 1.2/OS X 10.5</span><a +<h3 class='title'><span class='info'>CUPS 1.2/macOS 10.5</span><a name='CREATE_PRINTER_SUBSCRIPTION'>Create-Printer-Subscription</a></h3> <p>The Create-Printer-Subscription operation (0x0016) creates a subscription for printer or server event notifications. CUPS provides several additional events in addition to the standard events in the IPP notifications specification. CUPS adds the following <tt>notify-events (1setOf type2 keyword)</tt> values:<p> @@ -484,7 +484,7 @@ name='CREATE_PRINTER_SUBSCRIPTION'>Create-Printer-Subscription</a></h3> <dd>The "attributes-charset" and "attributes-natural-language" attributes as described in section 3.1.4.1 of the IPP Model and Semantics document. - <dt>"first-printer-name" (name(127)): <span class='info'>CUPS 1.2/OS X 10.5</span> + <dt>"first-printer-name" (name(127)): <span class='info'>CUPS 1.2/macOS 10.5</span> <dd>The client OPTIONALLY supplies this attribute to select the first printer that is returned. @@ -512,7 +512,7 @@ name='CREATE_PRINTER_SUBSCRIPTION'>Create-Printer-Subscription</a></h3> <dd>The client OPTIONALLY supplies a set of attribute names and/or attribute group names in whose values the requester is interested. If the client omits this attribute, the server responds as if this attribute had been supplied with a value of 'all'. - <dt>"requested-user-name" (name(127)): <span class='info'>CUPS 1.2/OS X 10.5</span> + <dt>"requested-user-name" (name(127)): <span class='info'>CUPS 1.2/macOS 10.5</span> <dd>The client OPTIONALLY supplies a user name that is used to filter the returned printers. @@ -571,7 +571,7 @@ name='CREATE_PRINTER_SUBSCRIPTION'>Create-Printer-Subscription</a></h3> <dl> - <dt>"auth-info-required" (1setOf type2 keyword): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"auth-info-required" (1setOf type2 keyword): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies one or more authentication keywords that are required to communicate with the printer/remote queue. @@ -702,7 +702,7 @@ CUPS-Add-Modify-Printer Response: <dd>The "attributes-charset" and "attributes-natural-language" attributes as described in section 3.1.4.1 of the IPP Model and Semantics document. - <dt>"first-printer-name" (name(127)): <span class='info'>CUPS 1.2/OS X 10.5</span> + <dt>"first-printer-name" (name(127)): <span class='info'>CUPS 1.2/macOS 10.5</span> <dd>The client OPTIONALLY supplies this attribute to select the first printer that is returned. @@ -726,7 +726,7 @@ CUPS-Add-Modify-Printer Response: <dd>The client OPTIONALLY supplies a set of attribute names and/or attribute group names in whose values the requester is interested. If the client omits this attribute, the server responds as if this attribute had been supplied with a value of 'all'. - <dt>"requested-user-name" (name(127)): <span class='info'>CUPS 1.2/OS X 10.5</span> + <dt>"requested-user-name" (name(127)): <span class='info'>CUPS 1.2/macOS 10.5</span> <dd>The client OPTIONALLY supplies a user name that is used to filter the returned printers. @@ -784,7 +784,7 @@ CUPS-Add-Modify-Printer Response: <dl> - <dt>"auth-info-required" (1setOf type2 keyword): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"auth-info-required" (1setOf type2 keyword): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies one or more authentication keywords that are required to communicate with the printer/remote queue. @@ -945,11 +945,11 @@ CUPS-Add-Modify-Printer Response: <dd>The client OPTIONALLY supplies a device class keyword to select which devices are returned. - <dt>"exclude-schemes" (1setOf name): <span class='info'>CUPS 1.4/OS X 10.6</span> + <dt>"exclude-schemes" (1setOf name): <span class='info'>CUPS 1.4/macOS 10.6</span> <dd>The client OPTIONALLY supplies a set of scheme names that the requestor does not want to discover. If the client omits this attribute, the server responds with devices of all schemes specified by the "include-schemes" attribute. - <dt>"include-schemes" (1setOf name): <span class='info'>CUPS 1.4/OS X 10.6</span> + <dt>"include-schemes" (1setOf name): <span class='info'>CUPS 1.4/macOS 10.6</span> <dd>The client OPTIONALLY supplies a set of scheme names that the requestor wants to discover. If the client omits this attribute, the server responds with devices of all schemes except those specified by the "exclude-schemes" attribute. @@ -961,7 +961,7 @@ CUPS-Add-Modify-Printer Response: <dd>The client OPTIONALLY supplies a set of attribute names and/or attribute group names in whose values the requester is interested. If the client omits this attribute, the server responds as if this attribute had been supplied with a value of 'all'. - <dt>"timeout" (integer (1:MAX)): <span class='info'>CUPS 1.4/OS X 10.6</span> + <dt>"timeout" (integer (1:MAX)): <span class='info'>CUPS 1.4/macOS 10.6</span> <dd>The client OPTIONALLY supplies this attribute to limit the duration of the lookup. The default timeout is 15 seconds. @@ -1011,11 +1011,11 @@ CUPS-Add-Modify-Printer Response: <dd>The "attributes-charset" and "attributes-natural-language" attributes as described in section 3.1.4.1 of the IPP Model and Semantics document. - <dt>"exclude-schemes" (1setOf name): <span class='info'>CUPS 1.4/OS X 10.6</span> + <dt>"exclude-schemes" (1setOf name): <span class='info'>CUPS 1.4/macOS 10.6</span> <dd>The client OPTIONALLY supplies a set of scheme names that the requestor does not want to list. If the client omits this attribute, the server responds with PPDs of all schemes specified by the "include-schemes" attribute. - <dt>"include-schemes" (1setOf name): <span class='info'>CUPS 1.4/OS X 10.6</span> + <dt>"include-schemes" (1setOf name): <span class='info'>CUPS 1.4/macOS 10.6</span> <dd>The client OPTIONALLY supplies a set of scheme names that the requestor wants to list. If the client omits this attribute, the server responds with PPDs of all schemes except those specified by the "exclude-schemes" attribute. @@ -1027,27 +1027,27 @@ CUPS-Add-Modify-Printer Response: <dd>The client OPTIONALLY supplies a printer manufacturer to select which PPDs are returned. - <dt>"ppd-make-and-model" (text(127)): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"ppd-make-and-model" (text(127)): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies a make and model to select which PPDs are returned. - <dt>"ppd-model-number" (integer): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"ppd-model-number" (integer): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies a model number to select which PPDs are returned. - <dt>"ppd-natural-language" (naturalLanguage): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"ppd-natural-language" (naturalLanguage): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies a language to select which PPDs are returned. - <dt>"ppd-product" (text(127)): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"ppd-product" (text(127)): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies a PostScript product string to select which PPDs are returned. - <dt>"ppd-psversion" (text(127)): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"ppd-psversion" (text(127)): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies a PostScript version string to select which PPDs are returned. - <dt>"ppd-type" (type1 keyword): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"ppd-type" (type1 keyword): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies a driver type to select which PPDs are returned. @@ -1139,7 +1139,7 @@ CUPS-Get-PPDs Response: </dl> -<h3 class='title'><span class='info'>CUPS 1.2/OS X 10.5</span><a name='CUPS_AUTHENTICATE_JOB'>CUPS-Authenticate-Job Operation</a></h3> +<h3 class='title'><span class='info'>CUPS 1.2/macOS 10.5</span><a name='CUPS_AUTHENTICATE_JOB'>CUPS-Authenticate-Job Operation</a></h3> <p>The CUPS-Authenticate-Job operation (0x400E) authenticates a print job for printing, releasing the job if it is held. Typically this is used when printing to a remote server. The authentication information is passed in the HTTP request; the HTTP connection is normally encrypted for this type of request.</p> @@ -1167,11 +1167,11 @@ CUPS-Get-PPDs Response: <dl> - <dt>"auth-info" (1setOf text(MAX)): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"auth-info" (1setOf text(MAX)): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies one or more authentication values as specified by the "auth-info-required" attribute. - <dt>"job-hold-until" (keyword | name(MAX)): <span class='info'>CUPS 1.3/OS X 10.5</span> + <dt>"job-hold-until" (keyword | name(MAX)): <span class='info'>CUPS 1.3/macOS 10.5</span> <dd>The client OPTIONALLY supplies a new job-hold-until value for the job. If specified and not the "no-hold" value, the job is held instead of released for printing. @@ -1261,7 +1261,7 @@ CUPS-Get-PPDs Response: <p>If the status code is <tt>successful-ok</tt>, the PPD file follows the end of the IPP response.</p> -<h3 class='title'><span class='info'>CUPS 1.4/OS X 10.6</span><a name='CUPS_GET_DOCUMENT'>CUPS-Get-Document Operation</a></h3> +<h3 class='title'><span class='info'>CUPS 1.4/macOS 10.6</span><a name='CUPS_GET_DOCUMENT'>CUPS-Get-Document Operation</a></h3> <p>The CUPS-Get-Document operation (0x4027) gets a document file from a job on the server. The document file is specified using the <tt>document-number</tt> and either the <tt>job-uri</tt> or <tt>printer-uri</tt> and <tt>job-id</tt> identifying the job.</p> @@ -1494,7 +1494,7 @@ CUPS-Get-PPDs Response: <h3 class='title'><a name='JOB_ATTRIBUTES'>Job Attributes</a></h3> -<h4><a name="auth-info">auth-info (1setOf text(MAX))</a><span class="info">CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="auth-info">auth-info (1setOf text(MAX))</a><span class="info">CUPS 1.3/macOS 10.5</span></h4> <p>The "auth-info" attribute specifies the authentication information to use when printing to a remote device. The order and content of each text value is specifed by the <a href="#auth-info-required">auth-info-required</a> printer attribute. @@ -1506,15 +1506,15 @@ CUPS-Get-PPDs Response: <p>The "job-hold-until" attribute specifies a hold time. In addition to the standard IPP/1.1 keyword names, CUPS supports name values of the form "HH:MM" and "HH:MM:SS" that specify a hold time. The hold time is in Universal Coordinated Time (UTC) and <i>not</i> in the local time zone. If the specified time is less than the current time, the job is held until the next day. -<h4><a name="job-media-progress">job-media-progress (integer(0:100))</a><span class='info'>CUPS 1.4/OS X 10.6</span></h4> +<h4><a name="job-media-progress">job-media-progress (integer(0:100))</a><span class='info'>CUPS 1.4/macOS 10.6</span></h4> <p>The "job-media-progress" status attribute specifies the percentage of completion of the current page. It is only valid when the "job-state" attribute has the 'processing(5)' value.</p> -<h4><a name="job-printer-state-message">job-printer-state-message (text(MAX))</a><span class='info'>CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="job-printer-state-message">job-printer-state-message (text(MAX))</a><span class='info'>CUPS 1.3/macOS 10.5</span></h4> <p>The "job-printer-state-message" status attribute provides the last known value of the "printer-state-message" attribute for the printer that processed (or is processing) the job.</p> -<h4><a name="job-printer-state-reasons">job-printer-state-reasons (1setOf type2 keyword)</a><span class='info'>CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="job-printer-state-reasons">job-printer-state-reasons (1setOf type2 keyword)</a><span class='info'>CUPS 1.3/macOS 10.5</span></h4> <p>The "job-printer-state-reasons" status attribute provides the last known value of the "printer-state-reasons" attribute for the printer that processed (or is processing) the job.</p> @@ -1524,7 +1524,7 @@ CUPS-Get-PPDs Response: <p>If only one value is supplied, the banner file is printed before the job. If two values are supplied, the first value is used as the starting banner file and the second as the ending banner file. -<h4><a name="job-originating-host-name">job-originating-host-name (name(MAX))</a><span class='info'>CUPS 1.1.5/OS X 10.2</span></h4> +<h4><a name="job-originating-host-name">job-originating-host-name (name(MAX))</a><span class='info'>CUPS 1.1.5/macOS 10.2</span></h4> <p>The "job-originating-host-name" status attribute specifies the host from which the job was queued. The value will be the hostname or IP address of the client depending on whether hostname resolution is enabled. The localhost address (127.0.0.1) is <b>always</b> resolved to the name "localhost". @@ -1609,7 +1609,7 @@ CUPS-Get-PPDs Response: <h3 class='title'><a name='PRINTER_ATTRIBUTES'>Printer Attributes</a></h3> -<h4><a name="auth-info-required">auth-info-required (1setOf type2 keyword)</a><span class="info">CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="auth-info-required">auth-info-required (1setOf type2 keyword)</a><span class="info">CUPS 1.3/macOS 10.5</span></h4> <p>The "auth-info-required" attribute specifies the authentication information that is required for printing a job. The following keywords are recognized:</p> @@ -1637,35 +1637,35 @@ CUPS-Get-PPDs Response: <p>The "job-quota-period" attribute specifies the time period used for quota calculations, in seconds. The default value of 0 specifies that the limits apply to all jobs that have been printed by a user that are still known to the system. -<h4><a name="marker-change-time">marker-change-time (integer)</a><span class='info'>CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="marker-change-time">marker-change-time (integer)</a><span class='info'>CUPS 1.3/macOS 10.5</span></h4> <p>The "marker-change-time" status attribute specifies the "printer-up-time" value when the last change to the marker-colors, marker-levels, marker-message, marker-names, or marker-types attributes was made.</p> -<h4><a name="marker-colors">marker-colors (1setof name(MAX))</a><span class='info'>CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="marker-colors">marker-colors (1setof name(MAX))</a><span class='info'>CUPS 1.3/macOS 10.5</span></h4> <p>The "marker-colors" status attribute specifies the color(s) for each supply in the printer. It is only available when the driver provides supply levels. The color is either 'none' or one or more hex-encoded sRGB colors of the form '#RRGGBB'.</p> -<h4><a name="marker-high-levels">marker-high-levels (1setof integer(0:100))</a><span class='info'>CUPS 1.4/OS X 10.6</span></h4> +<h4><a name="marker-high-levels">marker-high-levels (1setof integer(0:100))</a><span class='info'>CUPS 1.4/macOS 10.6</span></h4> <p>The "marker-high-levels" status attribute specifies the supply levels that indicate a near-full condition. A value of 100 should be used for supplies that are consumed/emptied, e.g. ink cartridges.</p> -<h4><a name="marker-levels">marker-levels (1setof integer(-3:100))</a><span class='info'>CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="marker-levels">marker-levels (1setof integer(-3:100))</a><span class='info'>CUPS 1.3/macOS 10.5</span></h4> <p>The "marker-levels" status attribute specifies the current supply levels for the printer. It is only available when the driver provides supply levels. A value of -1 indicates the level is unavailable, -2 indicates unknown, and -3 indicates the level is unknown but has not yet reached capacity. Values from 0 to 100 indicate the corresponding percentage.</p> -<h4><a name="marker-low-levels">marker-low-levels (1setof integer(0:100))</a><span class='info'>CUPS 1.4/OS X 10.6</span></h4> +<h4><a name="marker-low-levels">marker-low-levels (1setof integer(0:100))</a><span class='info'>CUPS 1.4/macOS 10.6</span></h4> <p>The "marker-low-levels" status attribute specifies the supply levels that indicate a near-empty condition. A value of 0 should be used for supplies that are filled, e.g. waste ink tanks.</p> -<h4><a name="marker-message">marker-message (text(MAX))</a><span class='info'>CUPS 1.4/OS X 10.6</span></h4> +<h4><a name="marker-message">marker-message (text(MAX))</a><span class='info'>CUPS 1.4/macOS 10.6</span></h4> <p>The "marker-message" status attribute provides a human-readable status message for the current supply levels, e.g. "12 pages of ink remaining." It is only available when the driver provides supply levels.</p> -<h4><a name="marker-names">marker-names (1setof name(MAX))</a><span class='info'>CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="marker-names">marker-names (1setof name(MAX))</a><span class='info'>CUPS 1.3/macOS 10.5</span></h4> <p>The "marker-names" status attribute specifies the name(s) for each supply in the printer. It is only available when the driver provides supply levels.</p> -<h4><a name="marker-types">marker-types (1setof type3 keyword)</a><span class='info'>CUPS 1.3/OS X 10.5</span></h4> +<h4><a name="marker-types">marker-types (1setof type3 keyword)</a><span class='info'>CUPS 1.3/macOS 10.5</span></h4> <p>The "marker-types" status attribute specifies the type(s) of each supply in the printer. It is only available when the driver provides supply levels. The following (RFC 3805) types are currently supported:</p> @@ -1745,7 +1745,7 @@ CUPS-Get-PPDs Response: <p>The "printer-commands" attribute specifies the commands that are supported by the CUPS command file filter. The keyword 'none' indicates that no commands are supported.</p> -<h4><a name="printer-dns-sd-name">printer-dns-sd-name (name(MAX) | noValue)</a><span class='info'>CUPS 1.4/OS X 10.6</span></h4> +<h4><a name="printer-dns-sd-name">printer-dns-sd-name (name(MAX) | noValue)</a><span class='info'>CUPS 1.4/macOS 10.6</span></h4> <p>The "printer-dns-sd-name" attribute specifies the registered DNS-SD service name for the printer. If the printer is not being shared using this protocol, "printer-dns-sd-name" will have the no-value value.</p> diff --git a/doc/help/spec-postscript.html b/doc/help/spec-postscript.html index cedff0bc0..8f14416fa 100644 --- a/doc/help/spec-postscript.html +++ b/doc/help/spec-postscript.html @@ -37,7 +37,7 @@ output will work reliably.</p> de-facto standard print job file format/language for UNIX-based applications, it is slowly being phased out in favor of Adobe's Portable Document Format ("PDF") which offers many advantages -over PostScript. OS X uses PDF as the primary print job file +over PostScript. macOS uses PDF as the primary print job file format and Linux is making the transition. Both PostScript and PDF are complex formats, and we highly recommend using high-level toolkits whenever possible to create your print jobs.</blockquote> diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index 4f6c641ff..858bfa11c 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -5,7 +5,7 @@ <title>CUPS PPD Extensions </title> <meta name="keywords" content="Specifications"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.8"> + <meta name="creator" content="Mini-XML v2.7"> <style type="text/css"><!-- BODY { font-family: lucida grande, geneva, helvetica, arial, sans-serif; @@ -400,7 +400,7 @@ div.contents ul.subcontents li { <li><a href="#cupsUIResolver">cupsUIResolver</a></li> </ul></li> <li><a href="#I18N">Globalized PPD Support</a></li> -<li><a href="#OPTIONS">CUPS 1.3/OS X 10.6Custom Options</a></li> +<li><a href="#OPTIONS">CUPS 1.3/macOS 10.6Custom Options</a></li> <li><a href="#RASTERPS">Writing PostScript Option Commands for Raster Drivers</a></li> <li><a href="#MEDIA">Media Keywords</a><ul class="subcontents"> <li><a href="#cupsMediaQualifier2">cupsMediaQualifier2</a></li> @@ -440,7 +440,7 @@ div.contents ul.subcontents li { <li><a href="#cupsVersion">cupsVersion</a></li> <li><a href="#JCLToPDFInterpreter">JCLToPDFInterpreter</a></li> </ul></li> -<li><a href="#MACOSX">OS X Attributes</a><ul class="subcontents"> +<li><a href="#MACOSX">macOS Attributes</a><ul class="subcontents"> <li><a href="#APDialogExtension">APDialogExtension</a></li> <li><a href="#APDuplexRequiresFlippedMargin">APDuplexRequiresFlippedMargin</a></li> <li><a href="#APHelpBook">APHelpBook</a></li> @@ -486,11 +486,11 @@ LINE-END = CR / LF / CR LF <p>CUPS supports several methods of auto-configuration via PPD keywords.</p> -<h3><span class='info'>OS X 10.5</span><a name='APAutoSetupTool'>APAutoSetupTool</a></h3> +<h3><span class='info'>macOS 10.5</span><a name='APAutoSetupTool'>APAutoSetupTool</a></h3> <p class='summary'>*APAutoSetupTool: "/LibraryPrinters/vendor/filename"</p> -<p>This OS X keyword defines a program that sets the default option choices. It is run when a printer is added from the <var>Add Printer</var> window or the <var>Nearby Printers</var> list in the <var>Print</var> dialog.</p> +<p>This macOS keyword defines a program that sets the default option choices. It is run when a printer is added from the <var>Add Printer</var> window or the <var>Nearby Printers</var> list in the <var>Print</var> dialog.</p> <p>The program is provided with two arguments: the printer's device URI and the PPD file to be used for the printer. The program must write an updated PPD file to stdout.</p> @@ -501,7 +501,7 @@ LINE-END = CR / LF / CR LF *APAutoSetupTool: "/Library/Printers/vendor/Tools/autosetuptool" </pre> -<h3><span class='info'>OS X 10.2/CUPS 1.4</span><a name='QUERYKEYWORD'>?MainKeyword</a></h3> +<h3><span class='info'>macOS 10.2/CUPS 1.4</span><a name='QUERYKEYWORD'>?MainKeyword</a></h3> <p class='summary'>*?<i>MainKeyword</i>: "<br> PostScript query code that writes a message using the = operator...<br> @@ -530,7 +530,7 @@ LINE-END = CR / LF / CR LF *CloseUI: OptionDuplex </pre> -<h3><span class='info'>OS X 10.4/CUPS 1.5</span><a name='OID'>OIDMainKeyword</a></h3> +<h3><span class='info'>macOS 10.4/CUPS 1.5</span><a name='OID'>OIDMainKeyword</a></h3> <p class='summary'>*?OID<i>MainKeyword</i>: ".n.n.n..."<br> *OID<i>MainKeyword</i> <i>OptionKeyword1</i>: "value"<br> @@ -553,7 +553,7 @@ LINE-END = CR / LF / CR LF <h2 class='title'><a name='PROFILES'>Color Profiles</a></h2> -<p>CUPS supports three types of color profiles. The first type is based on sRGB and is used by the standard CUPS raster filters and GPL Ghostscript. The second type is based on ICC profiles and is used by the Quartz-based filters on MacOS X. The final type is based on well-known colorspaces such as sRGB and Adobe RGB.</p> +<p>CUPS supports three types of color profiles. The first type is based on sRGB and is used by the standard CUPS raster filters and GPL Ghostscript. The second type is based on ICC profiles and is used by the Quartz-based filters on MacmacOS. The final type is based on well-known colorspaces such as sRGB and Adobe RGB.</p> <blockquote><b>Note:</b> @@ -565,7 +565,7 @@ LINE-END = CR / LF / CR LF <p class='summary'>*cupsColorProfile Resolution/MediaType: "density gamma m00 m01 m02 m10 m11 m12 m20 m21 m22"</p> -<p>This string keyword specifies an sRGB-based color profile consisting of gamma and density controls and a 3x3 CMY color transform matrix. <em>This keyword is not supported on OS X.</em></p> +<p>This string keyword specifies an sRGB-based color profile consisting of gamma and density controls and a 3x3 CMY color transform matrix. <em>This keyword is not supported on macOS.</em></p> <p>The <i>Resolution</i> and <i>MediaType</i> values may be "-" to act as a wildcard. Otherwise they must match one of the <tt>Resolution</tt> or <tt>MediaType</tt> option keywords defined in the PPD file.</p> @@ -598,7 +598,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> </pre> -<h3><span class='info'>OS X 10.3/CUPS 1.2</span><a name='cupsICCProfile'>cupsICCProfile</a></h3> +<h3><span class='info'>macOS 10.3/CUPS 1.2</span><a name='cupsICCProfile'>cupsICCProfile</a></h3> <p class='summary'>*cupsICCProfile ColorModel.MediaType.Resolution/Description: "filename"</p> @@ -637,22 +637,22 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *cupsICCQualifier3: Resolution </pre> -<h3><span class='info'>OS X 10.4</span><a name='APCustom'>Custom Color Matching Support</a></h3> +<h3><span class='info'>macOS 10.4</span><a name='APCustom'>Custom Color Matching Support</a></h3> <p class='summary'>*<a href='#APSupportsCustomColorMatching'>APSupportsCustomColorMatching</a>: true<br> *<a href='#APCustomColorMatchingName'>APCustomColorMatchingName</a> name/text: ""<br> *<a href='#APCustomColorMatchingProfile'>APCustomColorMatchingProfile</a>: profile<br> *<a href='#APDefaultCustomColorMatchingProfile'>APDefaultCustomColorMatchingProfile</a>: profile</p> -<p>These keywords tell the OS X raster filters that the printer driver provides its own custom color matching and that generic color profiles should be used when generating 1-, 3-, and 4-component raster data as requested by the driver. The <tt>APCustomColorMatchingProfile</tt> and <tt>APDefaultColorMatchingProfile</tt> keywords specify alternate color profiles (sRGB or AdobeRGB) to use for 3-color (RGB) raster data.</p> +<p>These keywords tell the macOS raster filters that the printer driver provides its own custom color matching and that generic color profiles should be used when generating 1-, 3-, and 4-component raster data as requested by the driver. The <tt>APCustomColorMatchingProfile</tt> and <tt>APDefaultColorMatchingProfile</tt> keywords specify alternate color profiles (sRGB or AdobeRGB) to use for 3-color (RGB) raster data.</p> <blockquote><b>Note:</b> -<p>Prior to OS X 10.6, the default RGB color space was Apple's "GenericRGB". The new default in OS X 10.6 and later is "sRGB". For more information, see <a href="http://support.apple.com/kb/HT3712">"OS X v10.6: About gamma 2.2"</a> on Apple's support site.</p> +<p>Prior to macOS 10.6, the default RGB color space was Apple's "GenericRGB". The new default in macOS 10.6 and later is "sRGB". For more information, see <a href="http://support.apple.com/kb/HT3712">"macOS v10.6: About gamma 2.2"</a> on Apple's support site.</p> </blockquote> -<h4><span class='info'>OS X 10.5</span><a name='APCustomColorMatchingName'>APCustomColorMatchingName</a></h4> +<h4><span class='info'>macOS 10.5</span><a name='APCustomColorMatchingName'>APCustomColorMatchingName</a></h4> <p class='summary'>*APCustomColorMatchingName name/text: ""</p> @@ -666,7 +666,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *fr.APCustomColorMatchingName name/La AcmeColor(tm): "" </pre> -<h4><span class='info'>OS X 10.5</span><a name='APCustomColorMatchingProfile'>APCustomColorMatchingProfile</a></h4> +<h4><span class='info'>macOS 10.5</span><a name='APCustomColorMatchingProfile'>APCustomColorMatchingProfile</a></h4> <p class='summary'>*APCustomColorMatchingProfile: name</p> @@ -688,7 +688,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *APCustomColorMatchingProfile: AdobeRGB </pre> -<h4><span class='info'>OS X 10.5</span><a name='APDefaultCustomColorMatchingProfile'>APDefaultCustomColorMatchingProfile</a></h4> +<h4><span class='info'>macOS 10.5</span><a name='APDefaultCustomColorMatchingProfile'>APDefaultCustomColorMatchingProfile</a></h4> <p class='summary'>*APDefaultCustomColorMatchingProfile: name</p> @@ -702,7 +702,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *APDefaultCustomColorMatchingProfile: sRGB </pre> -<h4><span class='info'>OS X 10.4</span><a name='APSupportsCustomColorMatching'>APSupportsCustomColorMatching</a></h4> +<h4><span class='info'>macOS 10.4</span><a name='APSupportsCustomColorMatching'>APSupportsCustomColorMatching</a></h4> <p class='summary'>*APSupportsCustomColorMatching: boolean</p> @@ -738,7 +738,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> </blockquote> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsUIConstraints'>cupsUIConstraints</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsUIConstraints'>cupsUIConstraints</a></h3> <p class='summary'>*cupsUIConstraints resolver: "*Keyword1 *Keyword2 ..."<br> *cupsUIConstraints resolver: "*Keyword1 OptionKeyword1 *Keyword2 ..."<br> @@ -768,7 +768,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *cupsUIConstraints photo: "*OutputMode Photo *MediaType Transparency *Resolution 1200dpi" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsUIResolver'>cupsUIResolver</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsUIResolver'>cupsUIResolver</a></h3> <p class='summary'>*cupsUIResolver resolver: "*Keyword1 OptionKeyword1 *Keyword2 OptionKeyword2 ..."</p> @@ -870,7 +870,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> </pre> -<h2 class='title'><a name='OPTIONS'><span class="info">CUPS 1.3/OS X 10.6</span>Custom Options</a></h2> +<h2 class='title'><a name='OPTIONS'><span class="info">CUPS 1.3/macOS 10.6</span>Custom Options</a></h2> <p>CUPS supports custom options using an extension of the <tt>CustomPageSize</tt> and <tt>ParamCustomPageSize</tt> syntax:</p> @@ -1328,7 +1328,7 @@ PRE B { <p>The CUPS media keywords allow drivers to specify alternate custom page size limits based on up to two options.</p> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMediaQualifier2'>cupsMediaQualifier2</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMediaQualifier2'>cupsMediaQualifier2</a></h3> <p class='summary'>*cupsMediaQualifier2: MainKeyword</p> @@ -1347,7 +1347,7 @@ custom page size limits.</p> *cupsMinSize ..Photo: "300 300" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMediaQualifier3'>cupsMediaQualifier3</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMediaQualifier3'>cupsMediaQualifier3</a></h3> <p class='summary'>*cupsMediaQualifier3: MainKeyword</p> @@ -1366,7 +1366,7 @@ custom page size limits.</p> *cupsMinSize ..Photo: "300 300" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMinSize'>cupsMinSize</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMinSize'>cupsMinSize</a></h3> <p class='summary'>*cupsMinSize .Qualifier2.Qualifier3: "width length"<br> *cupsMinSize .Qualifier2.: "width length"<br> @@ -1389,7 +1389,7 @@ are used to identify options to use for matching.</p> *cupsMinSize ..Photo: "300 300" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMaxSize'>cupsMaxSize</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMaxSize'>cupsMaxSize</a></h3> <p class='summary'>*cupsMaxSize .Qualifier2.Qualifier3: "width length"<br> *cupsMaxSize .Qualifier2.: "width length"<br> @@ -1413,11 +1413,11 @@ are used to identify options to use for matching.</p> </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsPageSizeCategory'>cupsPageSizeCategory</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsPageSizeCategory'>cupsPageSizeCategory</a></h3> <p class="summary">*cupsPageSizeCategory name/text: "name name2 ... nameN"</p> -<p>This keyword lists related paper size names that should be grouped together in the Print or Page Setup dialogs. The "name" portion of the keyword specifies the root/default size for the grouping. On OS X the grouped paper sizes are shown in a submenu of the main paper size. When omitted, sizes with the same dimensions are automatically grouped together, for example "Letter" and "Letter.Borderless".</p> +<p>This keyword lists related paper size names that should be grouped together in the Print or Page Setup dialogs. The "name" portion of the keyword specifies the root/default size for the grouping. On macOS the grouped paper sizes are shown in a submenu of the main paper size. When omitted, sizes with the same dimensions are automatically grouped together, for example "Letter" and "Letter.Borderless".</p> <p>Example:</p> @@ -1430,7 +1430,7 @@ are used to identify options to use for matching.</p> <h2 class='title'><a name='ATTRIBUTES'>General Attributes</a></h2> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsBackSide'>cupsBackSide</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsBackSide'>cupsBackSide</a></h3> <p class='summary'>*cupsBackSide: keyword</p> @@ -1506,7 +1506,7 @@ will be ignored.</p> </table> </div> -<p><em>* - Not supported in OS X 10.5.x and earlier</em></p> +<p><em>* - Not supported in macOS 10.5.x and earlier</em></p> <div class='figure'><table summary='Back side images'> <caption>Figure 1: Back side images</caption> @@ -1526,7 +1526,7 @@ will be ignored.</p> <p>Also see the related <a href='#APDuplexRequiresFlippedMargin'><tt>APDuplexRequiresFlippedMargin</tt></a> keyword.</p> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsCommands'>cupsCommands</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsCommands'>cupsCommands</a></h3> <p class='summary'>*cupsCommands: "name name2 ... nameN"</p> @@ -1542,7 +1542,7 @@ by whitespace.</p> </pre> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsEvenDuplex'>cupsEvenDuplex</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsEvenDuplex'>cupsEvenDuplex</a></h3> <p class='summary'>*cupsEvenDuplex: boolean</p> @@ -1620,21 +1620,21 @@ the special filter program "-" may be specified.</p> <p class='summary'>*cupsFlipDuplex: boolean</p> -<p>Due to implementation differences between OS X and Ghostscript, +<p>Due to implementation differences between macOS and Ghostscript, the <tt>cupsFlipDuplex</tt> keyword is deprecated. Instead, use the <a href='#cupsBackSide'><tt>cupsBackSide</tt></a> keyword to specify the coordinate system (pixel layout) of the page data on the back side of duplex pages.</p> <p>The value <code>true</code> maps to a <tt>cupsBackSide</tt> value -of <code>Rotated</code> on OS X and <code>Flipped</code> with +of <code>Rotated</code> on macOS and <code>Flipped</code> with Ghostscript.</p> <p>The default value is <code>false</code>.</p> <blockquote><b>Note:</b> -<p>OS X drivers that previously used +<p>macOS drivers that previously used <tt>cupsFlipDuplex</tt> may wish to provide both the old and new keywords for maximum compatibility, for example:</p> @@ -1651,7 +1651,7 @@ Ghostscript can use:</p> *cupsFlipDuplex: true </pre></blockquote> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsIPPFinishings'>cupsIPPFinishings</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsIPPFinishings'>cupsIPPFinishings</a></h3> <p class='summary'>*cupsIPPFinishings number/text: "*Option Choice ..."</p> @@ -1667,7 +1667,7 @@ values to PPD options and choices.</p> *cupsIPPFinishings 21/staple-bottom-left: "*StapleLocation SingleLandscape" </pre> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsIPPReason'>cupsIPPReason</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsIPPReason'>cupsIPPReason</a></h3> <p class='summary'>*cupsIPPReason reason/Reason Text: "optional URIs"</p> @@ -1721,7 +1721,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobAccountId'>cupsJobAccountId</a></h3> +<h3><span class='info'>CUPS 1.7/macOS 10.9</span><a name='cupsJobAccountId'>cupsJobAccountId</a></h3> <p class='summary'>*cupsJobAccountId: boolean</p> @@ -1735,7 +1735,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobAccountingUserId'>cupsJobAccountingUserId</a></h3> +<h3><span class='info'>CUPS 1.7/macOS 10.9</span><a name='cupsJobAccountingUserId'>cupsJobAccountingUserId</a></h3> <p class='summary'>*cupsJobAccountingUserId: boolean</p> @@ -1749,7 +1749,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobPassword'>cupsJobPassword</a></h3> +<h3><span class='info'>CUPS 1.7/macOS 10.9</span><a name='cupsJobPassword'>cupsJobPassword</a></h3> <p class='summary'>*cupsJobPassword: "format"</p> @@ -1763,7 +1763,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.2/OS X 10.5</span><a name='cupsLanguages'>cupsLanguages</a></h3> +<h3><span class='info'>CUPS 1.2/macOS 10.5</span><a name='cupsLanguages'>cupsLanguages</a></h3> <p class='summary'>*cupsLanguages: "locale list"</p> @@ -1779,7 +1779,7 @@ list of locale names ("en", "en_US", "fr_CA", etc.)</p> </pre> -<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsMandatory'>cupsMandatory</a></h3> +<h3><span class='info'>CUPS 1.7/macOS 10.9</span><a name='cupsMandatory'>cupsMandatory</a></h3> <p class='summary'>*cupsMandatory: "attribute1 attribute2 ... attributeN"</p> @@ -1808,7 +1808,7 @@ hardware. The default value is <code>false</code>.</p> *cupsManualCopies: true </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMarkerName'>cupsMarkerName</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMarkerName'>cupsMarkerName</a></h3> <p class='summary'>*cupsMarkerName/Name Text: ""</p> @@ -1822,7 +1822,7 @@ generated by the driver to human readable text.</p> *cupsMarkerName cyanToner/Cyan Toner: "" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMarkerNotice'>cupsMarkerNotice</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMarkerNotice'>cupsMarkerNotice</a></h3> <p class='summary'>*cupsMarkerNotice: "disclaimer text"</p> @@ -1836,7 +1836,7 @@ are approximate".</p> *cupsMarkerNotice: "Supply levels are approximate." </pre> -<h3><span class='info'>CUPS 1.6/OS X 10.8</span><a name='cupsMaxCopies'>cupsMaxCopies</a></h3> +<h3><span class='info'>CUPS 1.6/macOS 10.8</span><a name='cupsMaxCopies'>cupsMaxCopies</a></h3> <p class='summary'>*cupsMaxCopies: integer</p> @@ -1865,7 +1865,7 @@ the output for a specific model of printer.</p> </pre> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsPJLCharset'>cupsPJLCharset</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsPJLCharset'>cupsPJLCharset</a></h3> <p class='summary'>*cupsPJLCharset: "ISO character set name"</p> @@ -1880,7 +1880,7 @@ assumed.</p> *cupsPJLCharset: "UTF-8" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsPJLDisplay'>cupsPJLDisplay</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsPJLDisplay'>cupsPJLDisplay</a></h3> <p class='summary'>*cupsPJLDisplay: "what"</p> @@ -1899,7 +1899,7 @@ to use "@PJL RDYMSG DISPLAY". The default is "job".</p> *cupsPJLDisplay: "none" </pre> -<h3><span class='info'>CUPS 1.2/OS X 10.5</span><a name='cupsPortMonitor'>cupsPortMonitor</a></h3> +<h3><span class='info'>CUPS 1.2/macOS 10.5</span><a name='cupsPortMonitor'>cupsPortMonitor</a></h3> <p class='summary'>*cupsPortMonitor urischeme/Descriptive Text: "port monitor"</p> @@ -1931,7 +1931,7 @@ to disable the port monitor for the given URI scheme.</p> *cupsPortMonitor usb/USB Status Monitor: "epson-usb" </pre> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsPreFilter'>cupsPreFilter</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsPreFilter'>cupsPreFilter</a></h3> <p class='summary'>*cupsPreFilter: "source/type cost program"</p> @@ -1990,7 +1990,7 @@ before the filter that accepts the given MIME type.</p> *cupsSingleFile: True </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsSNMPSupplies'>cupsSNMPSupplies</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsSNMPSupplies'>cupsSNMPSupplies</a></h3> <p class='summary'>*cupsSNMPSupplies: boolean</p> @@ -2021,7 +2021,7 @@ PPD file extensions was used. Currently it must be the string </pre> -<h3><span class="info">CUPS 1.6/OS X 10.8</span><a name="JCLToPDFInterpreter">JCLToPDFInterpreter</a></h3> +<h3><span class="info">CUPS 1.6/macOS 10.8</span><a name="JCLToPDFInterpreter">JCLToPDFInterpreter</a></h3> <p class="summary">*JCLToPDFInterpreter: "JCL"</p> @@ -2035,9 +2035,9 @@ PPD file extensions was used. Currently it must be the string </pre> -<h2 class='title'><a name='MACOSX'>OS X Attributes</a></h2> +<h2 class='title'><a name='MACOSX'>macOS Attributes</a></h2> -<h3><span class='info'>OS X 10.3</span><a name='APDialogExtension'>APDialogExtension</a></h3> +<h3><span class='info'>macOS 10.3</span><a name='APDialogExtension'>APDialogExtension</a></h3> <p class='summary'>*APDialogExtension: "/Library/Printers/vendor/filename.plugin"</p> @@ -2049,7 +2049,7 @@ plug-ins.</p> <blockquote><b>Note:</b> -<p>Starting with OS X 10.5, each plug-in must be compiled "4-way fat" +<p>Starting with macOS 10.5, each plug-in must be compiled "4-way fat" (32-bit and 64-bit for both PowerPC and Intel) with garbage collection enabled in order to be usable with all applications.</p> @@ -2063,7 +2063,7 @@ in order to be usable with all applications.</p> *APDialogExtension: "/Library/Printers/vendor/options.plugin" </pre> -<h3><span class='info'>OS X 10.4</span><a name='APDuplexRequiresFlippedMargin'>APDuplexRequiresFlippedMargin</a></h3> +<h3><span class='info'>macOS 10.4</span><a name='APDuplexRequiresFlippedMargin'>APDuplexRequiresFlippedMargin</a></h3> <p class='summary'>*APDuplexRequiresFlippedMargin: boolean</p> @@ -2160,7 +2160,7 @@ looking up IPP reason codes for this printer driver. The *APHelpBook: "file:///Library/Printers/vendor/Help.bundle" </pre> -<h3><span class='info'>OS X 10.6</span><a name='APICADriver'>APICADriver</a></h3> +<h3><span class='info'>macOS 10.6</span><a name='APICADriver'>APICADriver</a></h3> <p class='summary'>*APICADriver: boolean</p> @@ -2174,7 +2174,7 @@ Architecture (ICA) driver for scanning. The default is <tt>False</tt>.</p> *APScanAppBundleID: "com.apple.ImageCaptureApp" </pre> -<h3><span class='info'>OS X 10.3</span><a name='APPrinterIconPath'>APPrinterIconPath</a></h3> +<h3><span class='info'>macOS 10.3</span><a name='APPrinterIconPath'>APPrinterIconPath</a></h3> <p class='summary'>*APPrinterIconPath: "/Library/Printers/vendor/filename.icns"</p> @@ -2188,7 +2188,7 @@ displaying the printer. The file must be in the Apple icon format.</p> *APPrinterIconPath: "/Library/Printers/vendor/Icons/filename.icns" </pre> -<h3><span class='info'>OS X 10.4</span><a name='APPrinterLowInkTool'>APPrinterLowInkTool</a></h3> +<h3><span class='info'>macOS 10.4</span><a name='APPrinterLowInkTool'>APPrinterLowInkTool</a></h3> <p class='summary'>*APPrinterLowInkTool: "/Library/Printers/vendor/program"</p> @@ -2205,7 +2205,7 @@ Technical Note TN2144</a> for more information.</p> *APPrinterLowInkTool: "/Library/Printers/vendor/Tools/lowinktool" </pre> -<h3><span class='info'>OS X 10.5</span><a name='APPrinterPreset'>APPrinterPreset</a></h3> +<h3><span class='info'>macOS 10.5</span><a name='APPrinterPreset'>APPrinterPreset</a></h3> <p class='summary'>*APPrinterPreset name/text: "*Option Choice ..."</p> @@ -2275,7 +2275,7 @@ choice (*MainKeyword OptionKeyword) or a preset identifier and value *fr.APPrinterPreset Photo_on_Photo_Paper/Photo sur papier photographique: "" </pre> -<h3><span class='info'>OS X 10.3</span><a name='APPrinterUtilityPath'>APPrinterUtilityPath</a></h3> +<h3><span class='info'>macOS 10.3</span><a name='APPrinterUtilityPath'>APPrinterUtilityPath</a></h3> <p class='summary'>*APPrinterPrinterUtilityPath: "/Library/Printers/vendor/filename.app"</p> @@ -2290,7 +2290,7 @@ information.</p> *APPrinterPrinterUtilityPath: "/Library/Printers/vendor/Tools/utility.app" </pre> -<h3><span class='info'>OS X 10.6</span><a name='APScannerOnly'>APScannerOnly</a></h3> +<h3><span class='info'>macOS 10.6</span><a name='APScannerOnly'>APScannerOnly</a></h3> <p class='summary'>*APScannerOnly: boolean</p> @@ -2304,7 +2304,7 @@ capabilities. The default is <tt>False</tt>.</p> *APScannerOnly: True </pre> -<h3><span class='info'>OS X 10.3</span><a name='APScanAppBundleID'>APScanAppBundleID</a></h3> +<h3><span class='info'>macOS 10.3</span><a name='APScanAppBundleID'>APScanAppBundleID</a></h3> <p class='summary'>*APScanAppBundleID: "bundle ID"</p> @@ -2407,7 +2407,7 @@ the device.</p> <ul> - <li>Added missing OS X <tt>AP</tt> keywords.</li> + <li>Added missing macOS <tt>AP</tt> keywords.</li> <li>Added section on auto-configuration including the <tt>OID<i>MainKeyword</i></tt> and <tt>?<i>MainKeyword</i></tt> diff --git a/doc/index.html.in b/doc/index.html.in index 8ec1d2f63..719d96f3f 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -24,7 +24,7 @@ <div class="body"> <div class="row"> <h1>CUPS @CUPS_VERSION@</h1> - <p>CUPS is the standards-based, open source printing system developed by <a href="http://www.apple.com/">Apple Inc.</a> for OS X<sup>®</sup> and other UNIX<sup>®</sup>-like operating systems.</p> + <p>CUPS is the standards-based, open source printing system developed by <a href="http://www.apple.com/">Apple Inc.</a> for macOS<sup>®</sup> and other UNIX<sup>®</sup>-like operating systems.</p> </div> <div class="row"> <div class="thirds"> diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index 61e9d0885..f68fe9ffd 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -24,7 +24,7 @@ <div class="body"> <div class="row"> <h1>CUPS @CUPS_VERSION@</h1> - <p>CUPS は、OS X<sup>®</sup> およびその他の UNIX <SUP>®</sup> 系 OS のために、<a href="http://www.apple.com/">Apple Inc.</a> によって開発された標準ベースのオープンソース印刷システムです。</p> + <p>CUPS は、macOS<sup>®</sup> およびその他の UNIX <SUP>®</sup> 系 OS のために、<a href="http://www.apple.com/">Apple Inc.</a> によって開発された標準ベースのオープンソース印刷システムです。</p> </div> <div class="row"> <div class="thirds"> diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in index 9aa5d319f..d5f0ca8f6 100644 --- a/doc/pt_BR/index.html.in +++ b/doc/pt_BR/index.html.in @@ -24,8 +24,8 @@ <div class="body"> <div class="row"> <h1>CUPS @CUPS_VERSION@</h1> - - <p>CUPS é o sistema de impressão baseado em padrões e de código aberto desenvolvido pela <a href="http://www.apple.com/">Apple Inc.</a> para OS X<sup>®</sup> e outros sistemas operacionais similares ao UNIX<sup>®</sup>.</p> + + <p>CUPS é o sistema de impressão baseado em padrões e de código aberto desenvolvido pela <a href="http://www.apple.com/">Apple Inc.</a> para macOS<sup>®</sup> e outros sistemas operacionais similares ao UNIX<sup>®</sup>.</p> </div> <div class="row"> <div class="thirds"> diff --git a/filter/api-raster.shtml b/filter/api-raster.shtml index 7d6b8517b..35996f6fa 100644 --- a/filter/api-raster.shtml +++ b/filter/api-raster.shtml @@ -20,7 +20,7 @@ avoid incompatibilities with newer versions of CUPS.</p> <p>Two kinds of CUPS filters use the CUPS raster API - raster image processor (RIP) filters such as <code>pstoraster</code> and <code>cgpdftoraster</code> -(OS X) that produce CUPS raster files and printer driver filters that +(macOS) that produce CUPS raster files and printer driver filters that convert CUPS raster files into a format usable by the printer. Printer driver filters are by far the most common.</p> @@ -140,7 +140,7 @@ the memory used to read the raster file:</p> <ul class="code"> - <li><a href="#cupsRasterReadHeader" title="Read a raster page header and store it in a version 1 page header structure.">cupsRasterReadHeader</a> <span class="info">Deprecated in CUPS 1.2/OS X 10.5</span></li> + <li><a href="#cupsRasterReadHeader" title="Read a raster page header and store it in a version 1 page header structure.">cupsRasterReadHeader</a> <span class="info">Deprecated in CUPS 1.2/macOS 10.5</span></li> <li><a href="#cupsRasterReadHeader2" title="Read a raster page header and store it in a version 2 page header structure.">cupsRasterReadHeader2</a></li> <li><a href="#cupsRasterReadPixels" title="Read raster pixels.">cupsRasterReadPixels</a></li> @@ -151,7 +151,7 @@ the memory used to read the raster file:</p> <ul class="code"> <li><a href="#cupsRasterInterpretPPD" title="Interpret PPD commands to create a page header.">cupsRasterInterpretPPD</a></li> - <li><a href="#cupsRasterWriteHeader" title="Write a raster page header from a version 1 page header structure.">cupsRasterWriteHeader</a> <span class="info">Deprecated in CUPS 1.2/OS X 10.5</span></li> + <li><a href="#cupsRasterWriteHeader" title="Write a raster page header from a version 1 page header structure.">cupsRasterWriteHeader</a> <span class="info">Deprecated in CUPS 1.2/macOS 10.5</span></li> <li><a href="#cupsRasterWriteHeader2" title="Write a raster page header from a version 2 page header structure.">cupsRasterWriteHeader2</a></li> <li><a href="#cupsRasterWritePixels" title="Write raster pixels.">cupsRasterWritePixels</a></li> diff --git a/filter/error.c b/filter/error.c index 47cc539e2..dfbb5c907 100644 --- a/filter/error.c +++ b/filter/error.c @@ -131,7 +131,7 @@ _cupsRasterClearError(void) * * If there are no recent errors, NULL is returned. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ const char * /* O - Last error */ diff --git a/filter/interpret.c b/filter/interpret.c index 932d78df9..f811d1a09 100644 --- a/filter/interpret.c +++ b/filter/interpret.c @@ -122,7 +122,7 @@ static void DEBUG_stack(const char *prefix, _cups_ps_stack_t *st); * @code pop@, @code roll@, @code setpagedevice@, and @code stopped@ operators * are supported. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on failure */ @@ -183,7 +183,7 @@ cupsRasterInterpretPPD( #ifdef __APPLE__ /* - * cupsInteger0 is also used for the total page count on OS X; set an + * cupsInteger0 is also used for the total page count on macOS; set an * uncommon default value so we can tell if the driver is using cupsInteger0. */ diff --git a/filter/postscript-driver.header b/filter/postscript-driver.header index 375c2291f..331792a83 100644 --- a/filter/postscript-driver.header +++ b/filter/postscript-driver.header @@ -13,7 +13,7 @@ <h1 class='title'>Developing PostScript Printer Drivers</h1> -<p>This document describes how to develop printer drivers for PostScript printers. Topics include: <a href='#BASICS'>printer driver basics</a>, <a href='#CREATE'>creating new PPD files</a>, <a href='#IMPORT'>importing existing PPD files</a>, <a href='#FILTERS'>using custom filters</a>, <a href='#COLOR'>implementing color management</a>, and <a href='#MACOSX'>adding OS X features</a>.</p> +<p>This document describes how to develop printer drivers for PostScript printers. Topics include: <a href='#BASICS'>printer driver basics</a>, <a href='#CREATE'>creating new PPD files</a>, <a href='#IMPORT'>importing existing PPD files</a>, <a href='#FILTERS'>using custom filters</a>, <a href='#COLOR'>implementing color management</a>, and <a href='#MACOSX'>adding macOS features</a>.</p> <div class='summary'><table summary='General Information'> <tbody> diff --git a/filter/postscript-driver.shtml b/filter/postscript-driver.shtml index 5e93f8580..40b9c0d9e 100644 --- a/filter/postscript-driver.shtml +++ b/filter/postscript-driver.shtml @@ -264,9 +264,9 @@ information file.</P> <p>The options used for profile selection can be customized using the <tt>cupsICCQualifier2</tt> and <tt>cupsICCQualifier3</tt> attributes.</p> -<h2 class='title'><a name='MACOSX'>Adding OS X Features</a></h2> +<h2 class='title'><a name='MACOSX'>Adding macOS Features</a></h2> -<p>OS X printer drivers can provide <a href='spec-ppd.html#MACOSX'>additional attributes</a> to specify additional option panes in the print dialog, an image of the printer, a help book, and option presets for the driver software:</p> +<p>macOS printer drivers can provide <a href='spec-ppd.html#MACOSX'>additional attributes</a> to specify additional option panes in the print dialog, an image of the printer, a help book, and option presets for the driver software:</p> <pre class='example'> <a href='ref-ppdcfile.html#Attribute'>Attribute</a> APDialogExtension "" /Library/Printers/Vendor/filename.plugin diff --git a/filter/ppd-compiler.shtml b/filter/ppd-compiler.shtml index dca2870f2..3cd754d92 100644 --- a/filter/ppd-compiler.shtml +++ b/filter/ppd-compiler.shtml @@ -205,7 +205,7 @@ follows:</P> <LI>Bits per color. In the example file, we define 8 bits per color, for a continuous-tone grayscale output. All versions of CUPS support 1 and - 8 bits per color. CUPS 1.2 and higher (OS X 10.5 and higher) also + 8 bits per color. CUPS 1.2 and higher (macOS 10.5 and higher) also supports 16 bits per color.</LI> <LI>Rows per band. In the example file, we define 0 rows per band to diff --git a/filter/raster-driver.header b/filter/raster-driver.header index 05aec3457..5028a5950 100644 --- a/filter/raster-driver.header +++ b/filter/raster-driver.header @@ -13,7 +13,7 @@ <h1 class='title'>Developing Raster Printer Drivers</h1> -<p>This document describes how to develop printer drivers for raster printers. Topics include: <a href='#BASICS'>printer driver basics</a>, <a href='#CREATE'>creating new PPD files</a>, <a href='#FILTERS'>using filters</a>, <a href='#COLOR'>implementing color management</a>, and <a href='#MACOSX'>adding OS X features</a>.</p> +<p>This document describes how to develop printer drivers for raster printers. Topics include: <a href='#BASICS'>printer driver basics</a>, <a href='#CREATE'>creating new PPD files</a>, <a href='#FILTERS'>using filters</a>, <a href='#COLOR'>implementing color management</a>, and <a href='#MACOSX'>adding macOS features</a>.</p> <div class='summary'><table summary='General Information'> <tbody> diff --git a/filter/raster-driver.shtml b/filter/raster-driver.shtml index f56982a77..2cdc747ad 100644 --- a/filter/raster-driver.shtml +++ b/filter/raster-driver.shtml @@ -172,9 +172,9 @@ <p>The options used for profile selection can be customized using the <tt>cupsICCQualifier2</tt> and <tt>cupsICCQualifier3</tt> attributes.</p> -<h3><span class='info'>Since OS X 10.5</span>Custom Color Matching Support</h3> +<h3><span class='info'>Since macOS 10.5</span>Custom Color Matching Support</h3> -<p>OS X printer drivers that are based on an existing standard RGB colorspace can tell the system to use the corresponding colorspace instead of an arbitrary ICC color profile when doing color management. The <a href='#APCustom'><tt>APSupportsCustomColorMatching</tt></a> and <tt>APDefaultCustomColorMatchingProfile</tt> attributes can be used to enable this mode:</p> +<p>macOS printer drivers that are based on an existing standard RGB colorspace can tell the system to use the corresponding colorspace instead of an arbitrary ICC color profile when doing color management. The <a href='#APCustom'><tt>APSupportsCustomColorMatching</tt></a> and <tt>APDefaultCustomColorMatchingProfile</tt> attributes can be used to enable this mode:</p> <pre class='example'> <a href='ref-ppdcfile.html#Attribute'>Attribute</a> APSupportsCustomColorMatching "" true @@ -182,9 +182,9 @@ </pre> -<h2 class='title'><a name='MACOSX'>Adding OS X Features</a></h2> +<h2 class='title'><a name='MACOSX'>Adding macOS Features</a></h2> -<p>OS X printer drivers can provide <a href='spec-ppd.html#MACOSX'>additional attributes</a> to specify additional option panes in the print dialog, an image of the printer, a help book, and option presets for the driver software:</p> +<p>macOS printer drivers can provide <a href='spec-ppd.html#MACOSX'>additional attributes</a> to specify additional option panes in the print dialog, an image of the printer, a help book, and option presets for the driver software:</p> <pre class='example'> <a href='ref-ppdcfile.html#Attribute'>Attribute</a> APDialogExtension "" /Library/Printers/Vendor/filename.plugin diff --git a/filter/raster.c b/filter/raster.c index ba5cb535c..e6beef015 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -516,7 +516,7 @@ cupsRasterReadHeader( * 'cupsRasterReadHeader2()' - Read a raster page header and store it in a * version 2 page header structure. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ unsigned /* O - 1 on success, 0 on failure/end-of-file */ @@ -903,7 +903,7 @@ cupsRasterWriteHeader( * * The page header can be initialized using @link cupsRasterInterpretPPD@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ unsigned /* O - 1 on success, 0 on failure */ diff --git a/filter/spec-ppd.shtml b/filter/spec-ppd.shtml index 89d706039..602ffbdb8 100644 --- a/filter/spec-ppd.shtml +++ b/filter/spec-ppd.shtml @@ -30,11 +30,11 @@ LINE-END = CR / LF / CR LF <p>CUPS supports several methods of auto-configuration via PPD keywords.</p> -<h3><span class='info'>OS X 10.5</span><a name='APAutoSetupTool'>APAutoSetupTool</a></h3> +<h3><span class='info'>macOS 10.5</span><a name='APAutoSetupTool'>APAutoSetupTool</a></h3> <p class='summary'>*APAutoSetupTool: "/LibraryPrinters/vendor/filename"</p> -<p>This OS X keyword defines a program that sets the default option choices. It is run when a printer is added from the <var>Add Printer</var> window or the <var>Nearby Printers</var> list in the <var>Print</var> dialog.</p> +<p>This macOS keyword defines a program that sets the default option choices. It is run when a printer is added from the <var>Add Printer</var> window or the <var>Nearby Printers</var> list in the <var>Print</var> dialog.</p> <p>The program is provided with two arguments: the printer's device URI and the PPD file to be used for the printer. The program must write an updated PPD file to stdout.</p> @@ -45,7 +45,7 @@ LINE-END = CR / LF / CR LF *APAutoSetupTool: "/Library/Printers/vendor/Tools/autosetuptool" </pre> -<h3><span class='info'>OS X 10.2/CUPS 1.4</span><a name='QUERYKEYWORD'>?MainKeyword</a></h3> +<h3><span class='info'>macOS 10.2/CUPS 1.4</span><a name='QUERYKEYWORD'>?MainKeyword</a></h3> <p class='summary'>*?<i>MainKeyword</i>: "<br> PostScript query code that writes a message using the = operator...<br> @@ -74,7 +74,7 @@ LINE-END = CR / LF / CR LF *CloseUI: OptionDuplex </pre> -<h3><span class='info'>OS X 10.4/CUPS 1.5</span><a name='OID'>OIDMainKeyword</a></h3> +<h3><span class='info'>macOS 10.4/CUPS 1.5</span><a name='OID'>OIDMainKeyword</a></h3> <p class='summary'>*?OID<i>MainKeyword</i>: ".n.n.n..."<br> *OID<i>MainKeyword</i> <i>OptionKeyword1</i>: "value"<br> @@ -97,7 +97,7 @@ LINE-END = CR / LF / CR LF <h2 class='title'><a name='PROFILES'>Color Profiles</a></h2> -<p>CUPS supports three types of color profiles. The first type is based on sRGB and is used by the standard CUPS raster filters and GPL Ghostscript. The second type is based on ICC profiles and is used by the Quartz-based filters on MacOS X. The final type is based on well-known colorspaces such as sRGB and Adobe RGB.</p> +<p>CUPS supports three types of color profiles. The first type is based on sRGB and is used by the standard CUPS raster filters and GPL Ghostscript. The second type is based on ICC profiles and is used by the Quartz-based filters on MacmacOS. The final type is based on well-known colorspaces such as sRGB and Adobe RGB.</p> <blockquote><b>Note:</b> @@ -109,7 +109,7 @@ LINE-END = CR / LF / CR LF <p class='summary'>*cupsColorProfile Resolution/MediaType: "density gamma m00 m01 m02 m10 m11 m12 m20 m21 m22"</p> -<p>This string keyword specifies an sRGB-based color profile consisting of gamma and density controls and a 3x3 CMY color transform matrix. <em>This keyword is not supported on OS X.</em></p> +<p>This string keyword specifies an sRGB-based color profile consisting of gamma and density controls and a 3x3 CMY color transform matrix. <em>This keyword is not supported on macOS.</em></p> <p>The <i>Resolution</i> and <i>MediaType</i> values may be "-" to act as a wildcard. Otherwise they must match one of the <tt>Resolution</tt> or <tt>MediaType</tt> option keywords defined in the PPD file.</p> @@ -142,7 +142,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> </pre> -<h3><span class='info'>OS X 10.3/CUPS 1.2</span><a name='cupsICCProfile'>cupsICCProfile</a></h3> +<h3><span class='info'>macOS 10.3/CUPS 1.2</span><a name='cupsICCProfile'>cupsICCProfile</a></h3> <p class='summary'>*cupsICCProfile ColorModel.MediaType.Resolution/Description: "filename"</p> @@ -181,22 +181,22 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *cupsICCQualifier3: Resolution </pre> -<h3><span class='info'>OS X 10.4</span><a name='APCustom'>Custom Color Matching Support</a></h3> +<h3><span class='info'>macOS 10.4</span><a name='APCustom'>Custom Color Matching Support</a></h3> <p class='summary'>*<a href='#APSupportsCustomColorMatching'>APSupportsCustomColorMatching</a>: true<br> *<a href='#APCustomColorMatchingName'>APCustomColorMatchingName</a> name/text: ""<br> *<a href='#APCustomColorMatchingProfile'>APCustomColorMatchingProfile</a>: profile<br> *<a href='#APDefaultCustomColorMatchingProfile'>APDefaultCustomColorMatchingProfile</a>: profile</p> -<p>These keywords tell the OS X raster filters that the printer driver provides its own custom color matching and that generic color profiles should be used when generating 1-, 3-, and 4-component raster data as requested by the driver. The <tt>APCustomColorMatchingProfile</tt> and <tt>APDefaultColorMatchingProfile</tt> keywords specify alternate color profiles (sRGB or AdobeRGB) to use for 3-color (RGB) raster data.</p> +<p>These keywords tell the macOS raster filters that the printer driver provides its own custom color matching and that generic color profiles should be used when generating 1-, 3-, and 4-component raster data as requested by the driver. The <tt>APCustomColorMatchingProfile</tt> and <tt>APDefaultColorMatchingProfile</tt> keywords specify alternate color profiles (sRGB or AdobeRGB) to use for 3-color (RGB) raster data.</p> <blockquote><b>Note:</b> -<p>Prior to OS X 10.6, the default RGB color space was Apple's "GenericRGB". The new default in OS X 10.6 and later is "sRGB". For more information, see <a href="http://support.apple.com/kb/HT3712">"OS X v10.6: About gamma 2.2"</a> on Apple's support site.</p> +<p>Prior to macOS 10.6, the default RGB color space was Apple's "GenericRGB". The new default in macOS 10.6 and later is "sRGB". For more information, see <a href="http://support.apple.com/kb/HT3712">"macOS v10.6: About gamma 2.2"</a> on Apple's support site.</p> </blockquote> -<h4><span class='info'>OS X 10.5</span><a name='APCustomColorMatchingName'>APCustomColorMatchingName</a></h4> +<h4><span class='info'>macOS 10.5</span><a name='APCustomColorMatchingName'>APCustomColorMatchingName</a></h4> <p class='summary'>*APCustomColorMatchingName name/text: ""</p> @@ -210,7 +210,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *fr.APCustomColorMatchingName name/La AcmeColor(tm): "" </pre> -<h4><span class='info'>OS X 10.5</span><a name='APCustomColorMatchingProfile'>APCustomColorMatchingProfile</a></h4> +<h4><span class='info'>macOS 10.5</span><a name='APCustomColorMatchingProfile'>APCustomColorMatchingProfile</a></h4> <p class='summary'>*APCustomColorMatchingProfile: name</p> @@ -232,7 +232,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *APCustomColorMatchingProfile: AdobeRGB </pre> -<h4><span class='info'>OS X 10.5</span><a name='APDefaultCustomColorMatchingProfile'>APDefaultCustomColorMatchingProfile</a></h4> +<h4><span class='info'>macOS 10.5</span><a name='APDefaultCustomColorMatchingProfile'>APDefaultCustomColorMatchingProfile</a></h4> <p class='summary'>*APDefaultCustomColorMatchingProfile: name</p> @@ -246,7 +246,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *APDefaultCustomColorMatchingProfile: sRGB </pre> -<h4><span class='info'>OS X 10.4</span><a name='APSupportsCustomColorMatching'>APSupportsCustomColorMatching</a></h4> +<h4><span class='info'>macOS 10.4</span><a name='APSupportsCustomColorMatching'>APSupportsCustomColorMatching</a></h4> <p class='summary'>*APSupportsCustomColorMatching: boolean</p> @@ -282,7 +282,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> </blockquote> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsUIConstraints'>cupsUIConstraints</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsUIConstraints'>cupsUIConstraints</a></h3> <p class='summary'>*cupsUIConstraints resolver: "*Keyword1 *Keyword2 ..."<br> *cupsUIConstraints resolver: "*Keyword1 OptionKeyword1 *Keyword2 ..."<br> @@ -312,7 +312,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> *cupsUIConstraints photo: "*OutputMode Photo *MediaType Transparency *Resolution 1200dpi" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsUIResolver'>cupsUIResolver</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsUIResolver'>cupsUIResolver</a></h3> <p class='summary'>*cupsUIResolver resolver: "*Keyword1 OptionKeyword1 *Keyword2 OptionKeyword2 ..."</p> @@ -414,7 +414,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> </pre> -<h2 class='title'><a name='OPTIONS'><span class="info">CUPS 1.3/OS X 10.6</span>Custom Options</a></h2> +<h2 class='title'><a name='OPTIONS'><span class="info">CUPS 1.3/macOS 10.6</span>Custom Options</a></h2> <p>CUPS supports custom options using an extension of the <tt>CustomPageSize</tt> and <tt>ParamCustomPageSize</tt> syntax:</p> @@ -872,7 +872,7 @@ PRE B { <p>The CUPS media keywords allow drivers to specify alternate custom page size limits based on up to two options.</p> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMediaQualifier2'>cupsMediaQualifier2</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMediaQualifier2'>cupsMediaQualifier2</a></h3> <p class='summary'>*cupsMediaQualifier2: MainKeyword</p> @@ -891,7 +891,7 @@ custom page size limits.</p> *cupsMinSize ..Photo: "300 300" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMediaQualifier3'>cupsMediaQualifier3</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMediaQualifier3'>cupsMediaQualifier3</a></h3> <p class='summary'>*cupsMediaQualifier3: MainKeyword</p> @@ -910,7 +910,7 @@ custom page size limits.</p> *cupsMinSize ..Photo: "300 300" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMinSize'>cupsMinSize</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMinSize'>cupsMinSize</a></h3> <p class='summary'>*cupsMinSize .Qualifier2.Qualifier3: "width length"<br> *cupsMinSize .Qualifier2.: "width length"<br> @@ -933,7 +933,7 @@ are used to identify options to use for matching.</p> *cupsMinSize ..Photo: "300 300" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMaxSize'>cupsMaxSize</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMaxSize'>cupsMaxSize</a></h3> <p class='summary'>*cupsMaxSize .Qualifier2.Qualifier3: "width length"<br> *cupsMaxSize .Qualifier2.: "width length"<br> @@ -957,11 +957,11 @@ are used to identify options to use for matching.</p> </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsPageSizeCategory'>cupsPageSizeCategory</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsPageSizeCategory'>cupsPageSizeCategory</a></h3> <p class="summary">*cupsPageSizeCategory name/text: "name name2 ... nameN"</p> -<p>This keyword lists related paper size names that should be grouped together in the Print or Page Setup dialogs. The "name" portion of the keyword specifies the root/default size for the grouping. On OS X the grouped paper sizes are shown in a submenu of the main paper size. When omitted, sizes with the same dimensions are automatically grouped together, for example "Letter" and "Letter.Borderless".</p> +<p>This keyword lists related paper size names that should be grouped together in the Print or Page Setup dialogs. The "name" portion of the keyword specifies the root/default size for the grouping. On macOS the grouped paper sizes are shown in a submenu of the main paper size. When omitted, sizes with the same dimensions are automatically grouped together, for example "Letter" and "Letter.Borderless".</p> <p>Example:</p> @@ -974,7 +974,7 @@ are used to identify options to use for matching.</p> <h2 class='title'><a name='ATTRIBUTES'>General Attributes</a></h2> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsBackSide'>cupsBackSide</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsBackSide'>cupsBackSide</a></h3> <p class='summary'>*cupsBackSide: keyword</p> @@ -1050,7 +1050,7 @@ will be ignored.</p> </table> </div> -<p><em>* - Not supported in OS X 10.5.x and earlier</em></p> +<p><em>* - Not supported in macOS 10.5.x and earlier</em></p> <div class='figure'><table summary='Back side images'> <caption>Figure 1: Back side images</caption> @@ -1070,7 +1070,7 @@ will be ignored.</p> <p>Also see the related <a href='#APDuplexRequiresFlippedMargin'><tt>APDuplexRequiresFlippedMargin</tt></a> keyword.</p> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsCommands'>cupsCommands</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsCommands'>cupsCommands</a></h3> <p class='summary'>*cupsCommands: "name name2 ... nameN"</p> @@ -1086,7 +1086,7 @@ by whitespace.</p> </pre> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsEvenDuplex'>cupsEvenDuplex</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsEvenDuplex'>cupsEvenDuplex</a></h3> <p class='summary'>*cupsEvenDuplex: boolean</p> @@ -1164,21 +1164,21 @@ the special filter program "-" may be specified.</p> <p class='summary'>*cupsFlipDuplex: boolean</p> -<p>Due to implementation differences between OS X and Ghostscript, +<p>Due to implementation differences between macOS and Ghostscript, the <tt>cupsFlipDuplex</tt> keyword is deprecated. Instead, use the <a href='#cupsBackSide'><tt>cupsBackSide</tt></a> keyword to specify the coordinate system (pixel layout) of the page data on the back side of duplex pages.</p> <p>The value <code>true</code> maps to a <tt>cupsBackSide</tt> value -of <code>Rotated</code> on OS X and <code>Flipped</code> with +of <code>Rotated</code> on macOS and <code>Flipped</code> with Ghostscript.</p> <p>The default value is <code>false</code>.</p> <blockquote><b>Note:</b> -<p>OS X drivers that previously used +<p>macOS drivers that previously used <tt>cupsFlipDuplex</tt> may wish to provide both the old and new keywords for maximum compatibility, for example:</p> @@ -1195,7 +1195,7 @@ Ghostscript can use:</p> *cupsFlipDuplex: true </pre></blockquote> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsIPPFinishings'>cupsIPPFinishings</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsIPPFinishings'>cupsIPPFinishings</a></h3> <p class='summary'>*cupsIPPFinishings number/text: "*Option Choice ..."</p> @@ -1211,7 +1211,7 @@ values to PPD options and choices.</p> *cupsIPPFinishings 21/staple-bottom-left: "*StapleLocation SingleLandscape" </pre> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsIPPReason'>cupsIPPReason</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsIPPReason'>cupsIPPReason</a></h3> <p class='summary'>*cupsIPPReason reason/Reason Text: "optional URIs"</p> @@ -1265,7 +1265,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobAccountId'>cupsJobAccountId</a></h3> +<h3><span class='info'>CUPS 1.7/macOS 10.9</span><a name='cupsJobAccountId'>cupsJobAccountId</a></h3> <p class='summary'>*cupsJobAccountId: boolean</p> @@ -1279,7 +1279,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobAccountingUserId'>cupsJobAccountingUserId</a></h3> +<h3><span class='info'>CUPS 1.7/macOS 10.9</span><a name='cupsJobAccountingUserId'>cupsJobAccountingUserId</a></h3> <p class='summary'>*cupsJobAccountingUserId: boolean</p> @@ -1293,7 +1293,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobPassword'>cupsJobPassword</a></h3> +<h3><span class='info'>CUPS 1.7/macOS 10.9</span><a name='cupsJobPassword'>cupsJobPassword</a></h3> <p class='summary'>*cupsJobPassword: "format"</p> @@ -1307,7 +1307,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.2/OS X 10.5</span><a name='cupsLanguages'>cupsLanguages</a></h3> +<h3><span class='info'>CUPS 1.2/macOS 10.5</span><a name='cupsLanguages'>cupsLanguages</a></h3> <p class='summary'>*cupsLanguages: "locale list"</p> @@ -1323,7 +1323,7 @@ list of locale names ("en", "en_US", "fr_CA", etc.)</p> </pre> -<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsMandatory'>cupsMandatory</a></h3> +<h3><span class='info'>CUPS 1.7/macOS 10.9</span><a name='cupsMandatory'>cupsMandatory</a></h3> <p class='summary'>*cupsMandatory: "attribute1 attribute2 ... attributeN"</p> @@ -1352,7 +1352,7 @@ hardware. The default value is <code>false</code>.</p> *cupsManualCopies: true </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMarkerName'>cupsMarkerName</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMarkerName'>cupsMarkerName</a></h3> <p class='summary'>*cupsMarkerName/Name Text: ""</p> @@ -1366,7 +1366,7 @@ generated by the driver to human readable text.</p> *cupsMarkerName cyanToner/Cyan Toner: "" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsMarkerNotice'>cupsMarkerNotice</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsMarkerNotice'>cupsMarkerNotice</a></h3> <p class='summary'>*cupsMarkerNotice: "disclaimer text"</p> @@ -1380,7 +1380,7 @@ are approximate".</p> *cupsMarkerNotice: "Supply levels are approximate." </pre> -<h3><span class='info'>CUPS 1.6/OS X 10.8</span><a name='cupsMaxCopies'>cupsMaxCopies</a></h3> +<h3><span class='info'>CUPS 1.6/macOS 10.8</span><a name='cupsMaxCopies'>cupsMaxCopies</a></h3> <p class='summary'>*cupsMaxCopies: integer</p> @@ -1409,7 +1409,7 @@ the output for a specific model of printer.</p> </pre> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsPJLCharset'>cupsPJLCharset</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsPJLCharset'>cupsPJLCharset</a></h3> <p class='summary'>*cupsPJLCharset: "ISO character set name"</p> @@ -1424,7 +1424,7 @@ assumed.</p> *cupsPJLCharset: "UTF-8" </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsPJLDisplay'>cupsPJLDisplay</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsPJLDisplay'>cupsPJLDisplay</a></h3> <p class='summary'>*cupsPJLDisplay: "what"</p> @@ -1443,7 +1443,7 @@ to use "@PJL RDYMSG DISPLAY". The default is "job".</p> *cupsPJLDisplay: "none" </pre> -<h3><span class='info'>CUPS 1.2/OS X 10.5</span><a name='cupsPortMonitor'>cupsPortMonitor</a></h3> +<h3><span class='info'>CUPS 1.2/macOS 10.5</span><a name='cupsPortMonitor'>cupsPortMonitor</a></h3> <p class='summary'>*cupsPortMonitor urischeme/Descriptive Text: "port monitor"</p> @@ -1475,7 +1475,7 @@ to disable the port monitor for the given URI scheme.</p> *cupsPortMonitor usb/USB Status Monitor: "epson-usb" </pre> -<h3><span class='info'>CUPS 1.3/OS X 10.5</span><a name='cupsPreFilter'>cupsPreFilter</a></h3> +<h3><span class='info'>CUPS 1.3/macOS 10.5</span><a name='cupsPreFilter'>cupsPreFilter</a></h3> <p class='summary'>*cupsPreFilter: "source/type cost program"</p> @@ -1534,7 +1534,7 @@ before the filter that accepts the given MIME type.</p> *cupsSingleFile: True </pre> -<h3><span class='info'>CUPS 1.4/OS X 10.6</span><a name='cupsSNMPSupplies'>cupsSNMPSupplies</a></h3> +<h3><span class='info'>CUPS 1.4/macOS 10.6</span><a name='cupsSNMPSupplies'>cupsSNMPSupplies</a></h3> <p class='summary'>*cupsSNMPSupplies: boolean</p> @@ -1565,7 +1565,7 @@ PPD file extensions was used. Currently it must be the string </pre> -<h3><span class="info">CUPS 1.6/OS X 10.8</span><a name="JCLToPDFInterpreter">JCLToPDFInterpreter</a></h3> +<h3><span class="info">CUPS 1.6/macOS 10.8</span><a name="JCLToPDFInterpreter">JCLToPDFInterpreter</a></h3> <p class="summary">*JCLToPDFInterpreter: "JCL"</p> @@ -1579,9 +1579,9 @@ PPD file extensions was used. Currently it must be the string </pre> -<h2 class='title'><a name='MACOSX'>OS X Attributes</a></h2> +<h2 class='title'><a name='MACOSX'>macOS Attributes</a></h2> -<h3><span class='info'>OS X 10.3</span><a name='APDialogExtension'>APDialogExtension</a></h3> +<h3><span class='info'>macOS 10.3</span><a name='APDialogExtension'>APDialogExtension</a></h3> <p class='summary'>*APDialogExtension: "/Library/Printers/vendor/filename.plugin"</p> @@ -1593,7 +1593,7 @@ plug-ins.</p> <blockquote><b>Note:</b> -<p>Starting with OS X 10.5, each plug-in must be compiled "4-way fat" +<p>Starting with macOS 10.5, each plug-in must be compiled "4-way fat" (32-bit and 64-bit for both PowerPC and Intel) with garbage collection enabled in order to be usable with all applications.</p> @@ -1607,7 +1607,7 @@ in order to be usable with all applications.</p> *APDialogExtension: "/Library/Printers/vendor/options.plugin" </pre> -<h3><span class='info'>OS X 10.4</span><a name='APDuplexRequiresFlippedMargin'>APDuplexRequiresFlippedMargin</a></h3> +<h3><span class='info'>macOS 10.4</span><a name='APDuplexRequiresFlippedMargin'>APDuplexRequiresFlippedMargin</a></h3> <p class='summary'>*APDuplexRequiresFlippedMargin: boolean</p> @@ -1704,7 +1704,7 @@ looking up IPP reason codes for this printer driver. The *APHelpBook: "file:///Library/Printers/vendor/Help.bundle" </pre> -<h3><span class='info'>OS X 10.6</span><a name='APICADriver'>APICADriver</a></h3> +<h3><span class='info'>macOS 10.6</span><a name='APICADriver'>APICADriver</a></h3> <p class='summary'>*APICADriver: boolean</p> @@ -1718,7 +1718,7 @@ Architecture (ICA) driver for scanning. The default is <tt>False</tt>.</p> *APScanAppBundleID: "com.apple.ImageCaptureApp" </pre> -<h3><span class='info'>OS X 10.3</span><a name='APPrinterIconPath'>APPrinterIconPath</a></h3> +<h3><span class='info'>macOS 10.3</span><a name='APPrinterIconPath'>APPrinterIconPath</a></h3> <p class='summary'>*APPrinterIconPath: "/Library/Printers/vendor/filename.icns"</p> @@ -1732,7 +1732,7 @@ displaying the printer. The file must be in the Apple icon format.</p> *APPrinterIconPath: "/Library/Printers/vendor/Icons/filename.icns" </pre> -<h3><span class='info'>OS X 10.4</span><a name='APPrinterLowInkTool'>APPrinterLowInkTool</a></h3> +<h3><span class='info'>macOS 10.4</span><a name='APPrinterLowInkTool'>APPrinterLowInkTool</a></h3> <p class='summary'>*APPrinterLowInkTool: "/Library/Printers/vendor/program"</p> @@ -1749,7 +1749,7 @@ Technical Note TN2144</a> for more information.</p> *APPrinterLowInkTool: "/Library/Printers/vendor/Tools/lowinktool" </pre> -<h3><span class='info'>OS X 10.5</span><a name='APPrinterPreset'>APPrinterPreset</a></h3> +<h3><span class='info'>macOS 10.5</span><a name='APPrinterPreset'>APPrinterPreset</a></h3> <p class='summary'>*APPrinterPreset name/text: "*Option Choice ..."</p> @@ -1819,7 +1819,7 @@ choice (*MainKeyword OptionKeyword) or a preset identifier and value *fr.APPrinterPreset Photo_on_Photo_Paper/Photo sur papier photographique: "" </pre> -<h3><span class='info'>OS X 10.3</span><a name='APPrinterUtilityPath'>APPrinterUtilityPath</a></h3> +<h3><span class='info'>macOS 10.3</span><a name='APPrinterUtilityPath'>APPrinterUtilityPath</a></h3> <p class='summary'>*APPrinterPrinterUtilityPath: "/Library/Printers/vendor/filename.app"</p> @@ -1834,7 +1834,7 @@ information.</p> *APPrinterPrinterUtilityPath: "/Library/Printers/vendor/Tools/utility.app" </pre> -<h3><span class='info'>OS X 10.6</span><a name='APScannerOnly'>APScannerOnly</a></h3> +<h3><span class='info'>macOS 10.6</span><a name='APScannerOnly'>APScannerOnly</a></h3> <p class='summary'>*APScannerOnly: boolean</p> @@ -1848,7 +1848,7 @@ capabilities. The default is <tt>False</tt>.</p> *APScannerOnly: True </pre> -<h3><span class='info'>OS X 10.3</span><a name='APScanAppBundleID'>APScanAppBundleID</a></h3> +<h3><span class='info'>macOS 10.3</span><a name='APScanAppBundleID'>APScanAppBundleID</a></h3> <p class='summary'>*APScanAppBundleID: "bundle ID"</p> @@ -1951,7 +1951,7 @@ the device.</p> <ul> - <li>Added missing OS X <tt>AP</tt> keywords.</li> + <li>Added missing macOS <tt>AP</tt> keywords.</li> <li>Added section on auto-configuration including the <tt>OID<i>MainKeyword</i></tt> and <tt>?<i>MainKeyword</i></tt> diff --git a/locale/Makefile b/locale/Makefile index bdda03cb0..018fd84ba 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -170,7 +170,7 @@ checkall: checkpo # # po2strings - A simple utility which uses iconv to convert GNU gettext -# message catalogs to OS X .strings files. +# message catalogs to macOS .strings files. # # po2strings filename.po filename.strings # @@ -183,7 +183,7 @@ po2strings: po2strings.o ../cups/$(LIBCUPSSTATIC) # -# strings2po - A simple utility which uses iconv to convert OS X .strings files +# strings2po - A simple utility which uses iconv to convert macOS .strings files # to GNU gettext message catalogs. # # strings2po filename.strings filename.po diff --git a/locale/cups.pot b/locale/cups.pot index bca9240f4..3c2bbfe66 100644 --- a/locale/cups.pot +++ b/locale/cups.pot @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -243,7 +243,7 @@ msgstr "" msgid " REF: Pages 52-54, section 5.2." msgstr "" -#: berkeley/lpq.c:526 +#: berkeley/lpq.c:537 #, c-format msgid " %-39.39s %.0f bytes" msgstr "" @@ -1031,7 +1031,7 @@ msgid " --host regex Match hostname to regular expression." msgstr "" #: ppdc/ppdc.cxx:452 -msgid " --lf End lines with LF (UNIX/Linux/OS X)." +msgid " --lf End lines with LF (UNIX/Linux/macOS)." msgstr "" #: scheduler/cupsfilter.c:1481 @@ -1136,7 +1136,7 @@ msgstr "" msgid " -E Test with HTTP Upgrade to TLS." msgstr "" -#: scheduler/main.c:2194 +#: scheduler/main.c:2200 msgid " -F Run in the foreground but detach from console." msgstr "" @@ -1220,7 +1220,7 @@ msgstr "" msgid " -c cups-files.conf Set cups-files.conf file to use." msgstr "" -#: scheduler/main.c:2192 +#: scheduler/main.c:2198 msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr "" @@ -1244,7 +1244,7 @@ msgstr "" msgid " -e Use every filter from the PPD file." msgstr "" -#: scheduler/main.c:2193 +#: scheduler/main.c:2199 msgid " -f Run in the foreground." msgstr "" @@ -1252,7 +1252,7 @@ msgstr "" msgid " -f filename Set default request filename." msgstr "" -#: scheduler/main.c:2195 +#: scheduler/main.c:2201 msgid " -h Show this usage message." msgstr "" @@ -1284,7 +1284,7 @@ msgstr "" msgid " -l Produce plain text output." msgstr "" -#: scheduler/main.c:2196 +#: scheduler/main.c:2202 msgid " -l Run cupsd on demand." msgstr "" @@ -1352,7 +1352,7 @@ msgstr "" msgid " -s Print service name if true." msgstr "" -#: scheduler/main.c:2197 +#: scheduler/main.c:2203 msgid " -s cups-files.conf Set cups-files.conf file to use." msgstr "" @@ -1364,7 +1364,7 @@ msgstr "" msgid " -t Test PPDs instead of generating them." msgstr "" -#: scheduler/main.c:2198 +#: scheduler/main.c:2204 msgid " -t Test the configuration file." msgstr "" @@ -1721,7 +1721,7 @@ msgstr "" msgid "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)." msgstr "" -#: berkeley/lpq.c:531 +#: berkeley/lpq.c:542 #, c-format msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes" msgstr "" @@ -1766,7 +1766,7 @@ msgstr "" msgid "%s accepting requests since %s" msgstr "" -#: scheduler/ipp.c:10237 +#: scheduler/ipp.c:10254 #, c-format msgid "%s cannot be changed." msgstr "" @@ -1776,17 +1776,17 @@ msgstr "" msgid "%s is not implemented by the CUPS version of lpc." msgstr "" -#: berkeley/lpq.c:616 +#: berkeley/lpq.c:627 #, c-format msgid "%s is not ready" msgstr "" -#: berkeley/lpq.c:609 +#: berkeley/lpq.c:620 #, c-format msgid "%s is ready" msgstr "" -#: berkeley/lpq.c:612 +#: berkeley/lpq.c:623 #, c-format msgid "%s is ready and printing" msgstr "" @@ -1817,26 +1817,26 @@ msgstr "" msgid "%s/%s not accepting requests since %s -" msgstr "" -#: berkeley/lpq.c:524 +#: berkeley/lpq.c:535 #, c-format msgid "%s: %-33.33s [job %d localhost]" msgstr "" #. TRANSLATORS: Message is "subject: error" -#: cups/langprintf.c:75 scheduler/cupsfilter.c:724 systemv/lpadmin.c:783 -#: systemv/lpadmin.c:834 systemv/lpadmin.c:884 systemv/lpadmin.c:940 -#: systemv/lpadmin.c:1038 systemv/lpadmin.c:1090 systemv/lpadmin.c:1146 -#: systemv/lpadmin.c:1561 +#: cups/langprintf.c:75 scheduler/cupsfilter.c:724 systemv/lpadmin.c:772 +#: systemv/lpadmin.c:823 systemv/lpadmin.c:873 systemv/lpadmin.c:929 +#: systemv/lpadmin.c:1027 systemv/lpadmin.c:1079 systemv/lpadmin.c:1135 +#: systemv/lpadmin.c:1550 #, c-format msgid "%s: %s" msgstr "" -#: systemv/cancel.c:299 systemv/cancel.c:362 +#: systemv/cancel.c:304 systemv/cancel.c:368 #, c-format msgid "%s: %s failed: %s" msgstr "" -#: systemv/lpadmin.c:1196 +#: systemv/lpadmin.c:1185 #, c-format msgid "%s: Bad printer URI \"%s\"." msgstr "" @@ -1846,20 +1846,20 @@ msgstr "" msgid "%s: Bad version %s for \"-V\"." msgstr "" -#: systemv/cupsaccept.c:62 +#: systemv/cupsaccept.c:63 #, c-format msgid "%s: Don't know what to do." msgstr "" -#: berkeley/lpq.c:223 berkeley/lpr.c:356 systemv/lp.c:600 +#: berkeley/lpq.c:234 berkeley/lpr.c:365 systemv/lp.c:606 #, c-format msgid "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" -#: berkeley/lpq.c:131 berkeley/lpq.c:201 berkeley/lpr.c:228 berkeley/lpr.c:331 -#: systemv/lp.c:155 systemv/lp.c:575 systemv/lp.c:695 systemv/lp.c:744 -#: systemv/lpstat.c:193 systemv/lpstat.c:239 systemv/lpstat.c:330 -#: systemv/lpstat.c:359 systemv/lpstat.c:383 systemv/lpstat.c:442 +#: berkeley/lpq.c:139 berkeley/lpq.c:212 berkeley/lpr.c:229 berkeley/lpr.c:340 +#: systemv/lp.c:161 systemv/lp.c:581 systemv/lp.c:701 systemv/lp.c:750 +#: systemv/lpstat.c:190 systemv/lpstat.c:235 systemv/lpstat.c:333 +#: systemv/lpstat.c:360 systemv/lpstat.c:382 systemv/lpstat.c:442 #: systemv/lpstat.c:508 systemv/lpstat.c:569 systemv/lpstat.c:694 #: systemv/lpstat.c:878 systemv/lpstat.c:1139 systemv/lpstat.c:1337 #: systemv/lpstat.c:1577 @@ -1867,181 +1867,186 @@ msgstr "" msgid "%s: Error - add '/version=1.1' to server name." msgstr "" -#: systemv/lp.c:232 +#: systemv/lp.c:238 #, c-format msgid "%s: Error - bad job ID." msgstr "" -#: systemv/lp.c:220 +#: systemv/lp.c:227 #, c-format msgid "%s: Error - cannot print files and alter jobs simultaneously." msgstr "" -#: systemv/lp.c:513 +#: systemv/lp.c:518 #, c-format msgid "%s: Error - cannot print from stdin if files or a job ID are provided." msgstr "" -#: systemv/lp.c:462 +#: berkeley/lpr.c:254 systemv/lp.c:280 +#, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#: systemv/lp.c:470 #, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "" -#: systemv/lp.c:481 +#: systemv/lp.c:489 #, c-format msgid "%s: Error - expected content type after \"-T\" option." msgstr "" -#: berkeley/lpr.c:243 +#: berkeley/lpr.c:245 #, c-format msgid "%s: Error - expected copies after \"-#\" option." msgstr "" -#: systemv/lp.c:265 +#: systemv/lp.c:271 #, c-format msgid "%s: Error - expected copies after \"-n\" option." msgstr "" -#: berkeley/lpr.c:204 +#: berkeley/lpr.c:207 #, c-format msgid "%s: Error - expected destination after \"-P\" option." msgstr "" -#: systemv/lp.c:130 +#: systemv/lp.c:137 #, c-format msgid "%s: Error - expected destination after \"-d\" option." msgstr "" -#: systemv/lp.c:169 +#: systemv/lp.c:178 #, c-format msgid "%s: Error - expected form after \"-f\" option." msgstr "" -#: systemv/lp.c:392 +#: systemv/lp.c:406 #, c-format msgid "%s: Error - expected hold name after \"-H\" option." msgstr "" -#: berkeley/lpr.c:98 +#: berkeley/lpr.c:104 #, c-format msgid "%s: Error - expected hostname after \"-H\" option." msgstr "" -#: berkeley/lpq.c:167 berkeley/lprm.c:117 systemv/cancel.c:118 -#: systemv/cupsaccept.c:117 systemv/lp.c:190 systemv/lpstat.c:264 +#: berkeley/lpq.c:173 berkeley/lprm.c:124 systemv/cancel.c:124 +#: systemv/cupsaccept.c:127 systemv/lp.c:198 systemv/lpstat.c:269 #, c-format msgid "%s: Error - expected hostname after \"-h\" option." msgstr "" -#: systemv/lp.c:372 +#: systemv/lp.c:386 #, c-format msgid "%s: Error - expected mode list after \"-y\" option." msgstr "" -#: berkeley/lpr.c:266 +#: berkeley/lpr.c:275 #, c-format msgid "%s: Error - expected name after \"-%c\" option." msgstr "" -#: berkeley/lpr.c:148 systemv/lp.c:289 +#: berkeley/lpr.c:156 systemv/lp.c:301 #, c-format msgid "%s: Error - expected option=value after \"-o\" option." msgstr "" -#: systemv/lp.c:442 +#: systemv/lp.c:449 #, c-format msgid "%s: Error - expected page list after \"-P\" option." msgstr "" -#: systemv/lp.c:309 +#: systemv/lp.c:322 #, c-format msgid "%s: Error - expected priority after \"-%c\" option." msgstr "" -#: systemv/cupsaccept.c:135 +#: systemv/cupsaccept.c:146 #, c-format msgid "%s: Error - expected reason text after \"-r\" option." msgstr "" -#: systemv/lp.c:355 +#: systemv/lp.c:367 #, c-format msgid "%s: Error - expected title after \"-t\" option." msgstr "" -#: berkeley/lpq.c:95 berkeley/lpr.c:79 berkeley/lprm.c:98 systemv/cancel.c:89 -#: systemv/cupsaccept.c:95 systemv/lp.c:108 systemv/lpadmin.c:424 -#: systemv/lpstat.c:122 +#: berkeley/lpq.c:102 berkeley/lpr.c:84 berkeley/lprm.c:104 +#: systemv/cancel.c:94 systemv/cupsaccept.c:104 systemv/lp.c:114 +#: systemv/lpadmin.c:423 systemv/lpstat.c:129 #, c-format msgid "%s: Error - expected username after \"-U\" option." msgstr "" -#: systemv/cancel.c:139 +#: systemv/cancel.c:146 #, c-format msgid "%s: Error - expected username after \"-u\" option." msgstr "" -#: berkeley/lpr.c:120 +#: berkeley/lpr.c:129 #, c-format msgid "%s: Error - expected value after \"-%c\" option." msgstr "" -#: systemv/lpstat.c:142 systemv/lpstat.c:156 +#: systemv/lpstat.c:149 systemv/lpstat.c:158 #, c-format msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option." msgstr "" -#: berkeley/lpq.c:228 berkeley/lpr.c:361 systemv/lp.c:605 +#: berkeley/lpq.c:239 berkeley/lpr.c:370 systemv/lp.c:611 #, c-format msgid "%s: Error - no default destination available." msgstr "" -#: systemv/lp.c:331 +#: systemv/lp.c:342 #, c-format msgid "%s: Error - priority must be between 1 and 100." msgstr "" -#: berkeley/lpr.c:364 systemv/lp.c:608 +#: berkeley/lpr.c:373 systemv/lp.c:614 #, c-format msgid "%s: Error - scheduler not responding." msgstr "" -#: berkeley/lpr.c:309 systemv/lp.c:545 +#: berkeley/lpr.c:316 systemv/lp.c:550 #, c-format msgid "%s: Error - too many files - \"%s\"." msgstr "" -#: berkeley/lpr.c:291 systemv/lp.c:528 +#: berkeley/lpr.c:298 systemv/lp.c:533 #, c-format msgid "%s: Error - unable to access \"%s\" - %s" msgstr "" -#: berkeley/lpr.c:407 systemv/lp.c:639 +#: berkeley/lpr.c:416 systemv/lp.c:645 #, c-format msgid "%s: Error - unable to queue from stdin - %s." msgstr "" -#: berkeley/lprm.c:81 berkeley/lprm.c:166 systemv/cancel.c:216 +#: berkeley/lprm.c:86 berkeley/lprm.c:173 systemv/cancel.c:221 #, c-format msgid "%s: Error - unknown destination \"%s\"." msgstr "" -#: berkeley/lpq.c:135 +#: berkeley/lpq.c:141 #, c-format msgid "%s: Error - unknown destination \"%s/%s\"." msgstr "" -#: berkeley/lpr.c:277 berkeley/lprm.c:133 systemv/cancel.c:157 -#: systemv/cupsaccept.c:158 systemv/lp.c:504 systemv/lpstat.c:454 +#: berkeley/lpr.c:284 berkeley/lprm.c:139 systemv/cancel.c:162 +#: systemv/cupsaccept.c:155 systemv/lp.c:508 systemv/lpstat.c:452 #, c-format msgid "%s: Error - unknown option \"%c\"." msgstr "" -#: systemv/cupsaccept.c:151 systemv/lp.c:495 +#: systemv/lp.c:500 #, c-format msgid "%s: Error - unknown option \"%s\"." msgstr "" -#: systemv/lp.c:209 +#: systemv/lp.c:218 #, c-format msgid "%s: Expected job ID after \"-i\" option." msgstr "" @@ -2071,7 +2076,7 @@ msgstr "" msgid "%s: Missing version for \"-V\"." msgstr "" -#: systemv/lp.c:419 +#: systemv/lp.c:426 #, c-format msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"." msgstr "" @@ -2081,36 +2086,36 @@ msgstr "" msgid "%s: No filter to convert from %s/%s to %s/%s." msgstr "" -#: systemv/cupsaccept.c:192 +#: systemv/cupsaccept.c:189 #, c-format msgid "%s: Operation failed: %s" msgstr "" -#: berkeley/lpq.c:81 berkeley/lpr.c:65 berkeley/lprm.c:61 systemv/cancel.c:76 -#: systemv/cupsaccept.c:82 systemv/cupsaddsmb.c:78 systemv/lp.c:94 -#: systemv/lpadmin.c:228 systemv/lpinfo.c:80 systemv/lpmove.c:66 -#: systemv/lpstat.c:86 test/ipptool.c:282 test/ipptool.c:326 +#: berkeley/lpq.c:87 berkeley/lpr.c:69 berkeley/lprm.c:65 systemv/cancel.c:79 +#: systemv/cupsaccept.c:89 systemv/cupsaddsmb.c:78 systemv/lp.c:99 +#: systemv/lpadmin.c:232 systemv/lpinfo.c:192 systemv/lpmove.c:70 +#: systemv/lpstat.c:91 test/ipptool.c:282 test/ipptool.c:326 #, c-format msgid "%s: Sorry, no encryption support." msgstr "" -#: systemv/lpadmin.c:1203 +#: systemv/lpadmin.c:1192 #, c-format msgid "%s: Unable to connect to \"%s:%d\": %s" msgstr "" -#: berkeley/lpq.c:282 scheduler/cupsfilter.c:1273 systemv/cancel.c:239 +#: berkeley/lpq.c:293 scheduler/cupsfilter.c:1273 systemv/cancel.c:244 #: systemv/cupsaddsmb.c:136 systemv/cupsaddsmb.c:163 #, c-format msgid "%s: Unable to connect to server." msgstr "" -#: systemv/cancel.c:322 +#: systemv/cancel.c:328 #, c-format msgid "%s: Unable to contact server." msgstr "" -#: systemv/lpadmin.c:1216 +#: systemv/lpadmin.c:1205 #, c-format msgid "%s: Unable to create PPD file: %s" msgstr "" @@ -2140,12 +2145,17 @@ msgstr "" msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"." msgstr "" -#: systemv/lpadmin.c:1187 +#: systemv/lpadmin.c:1176 #, c-format msgid "%s: Unable to resolve \"%s\"." msgstr "" -#: berkeley/lpq.c:138 systemv/lpstat.c:573 +#: systemv/lpinfo.c:238 +#, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#: berkeley/lpq.c:143 systemv/lpstat.c:573 #, c-format msgid "%s: Unknown destination \"%s\"." msgstr "" @@ -2155,7 +2165,7 @@ msgstr "" msgid "%s: Unknown destination MIME type %s/%s." msgstr "" -#: scheduler/cupsfilter.c:1477 +#: scheduler/cupsfilter.c:1477 systemv/lpinfo.c:231 systemv/lpmove.c:95 #, c-format msgid "%s: Unknown option \"%c\"." msgstr "" @@ -2175,27 +2185,27 @@ msgstr "" msgid "%s: Unknown source MIME type %s/%s." msgstr "" -#: berkeley/lpr.c:134 +#: berkeley/lpr.c:142 #, c-format msgid "%s: Warning - \"%c\" format modifier not supported - output may not be correct." msgstr "" -#: systemv/lp.c:469 +#: systemv/lp.c:475 #, c-format msgid "%s: Warning - character set option ignored." msgstr "" -#: systemv/lp.c:488 +#: systemv/lp.c:494 #, c-format msgid "%s: Warning - content type option ignored." msgstr "" -#: systemv/lp.c:176 +#: systemv/lp.c:183 #, c-format msgid "%s: Warning - form option ignored." msgstr "" -#: systemv/lp.c:379 +#: systemv/lp.c:391 #, c-format msgid "%s: Warning - mode option ignored." msgstr "" @@ -3048,7 +3058,7 @@ msgstr "" msgid "A Samba username is required to export printer drivers" msgstr "" -#: scheduler/ipp.c:2264 +#: scheduler/ipp.c:2281 #, c-format msgid "A class named \"%s\" already exists." msgstr "" @@ -3252,12 +3262,12 @@ msgstr "" msgid "Attempt to set %s printer-state to bad value %d." msgstr "" -#: scheduler/ipp.c:5368 scheduler/ipp.c:5394 +#: scheduler/ipp.c:5385 scheduler/ipp.c:5411 #, c-format msgid "Attribute \"%s\" is in the wrong group." msgstr "" -#: scheduler/ipp.c:5370 scheduler/ipp.c:5396 +#: scheduler/ipp.c:5387 scheduler/ipp.c:5413 #, c-format msgid "Attribute \"%s\" is the wrong value type." msgstr "" @@ -3319,7 +3329,7 @@ msgstr "" msgid "B9" msgstr "" -#: scheduler/ipp.c:11182 +#: scheduler/ipp.c:11199 #, c-format msgid "Bad 'document-format' value \"%s\"." msgstr "" @@ -3353,7 +3363,7 @@ msgstr "" msgid "Bad PPD cache file." msgstr "" -#: scheduler/ipp.c:2627 +#: scheduler/ipp.c:2644 msgid "Bad PPD file." msgstr "" @@ -3382,22 +3392,22 @@ msgstr "" msgid "Bad custom parameter" msgstr "" -#: cups/http-support.c:1600 scheduler/ipp.c:2362 +#: cups/http-support.c:1600 scheduler/ipp.c:2379 #, c-format msgid "Bad device-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:2401 +#: scheduler/ipp.c:2418 #, c-format msgid "Bad device-uri scheme \"%s\"." msgstr "" -#: scheduler/ipp.c:8394 scheduler/ipp.c:8412 scheduler/ipp.c:9638 +#: scheduler/ipp.c:8409 scheduler/ipp.c:8427 scheduler/ipp.c:9655 #, c-format msgid "Bad document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9656 +#: scheduler/ipp.c:9673 #, c-format msgid "Bad document-format-default \"%s\"." msgstr "" @@ -3419,7 +3429,7 @@ msgstr "" msgid "Bad job-name value: Wrong type or count." msgstr "" -#: scheduler/ipp.c:10252 +#: scheduler/ipp.c:10269 msgid "Bad job-priority value." msgstr "" @@ -3432,24 +3442,24 @@ msgstr "" msgid "Bad job-sheets value type." msgstr "" -#: scheduler/ipp.c:10282 +#: scheduler/ipp.c:10299 msgid "Bad job-state value." msgstr "" -#: scheduler/ipp.c:2951 scheduler/ipp.c:3413 scheduler/ipp.c:6177 -#: scheduler/ipp.c:6324 scheduler/ipp.c:7823 scheduler/ipp.c:8092 -#: scheduler/ipp.c:8956 scheduler/ipp.c:9180 scheduler/ipp.c:9532 -#: scheduler/ipp.c:10145 +#: scheduler/ipp.c:2968 scheduler/ipp.c:3430 scheduler/ipp.c:6194 +#: scheduler/ipp.c:6341 scheduler/ipp.c:7838 scheduler/ipp.c:8107 +#: scheduler/ipp.c:8973 scheduler/ipp.c:9197 scheduler/ipp.c:9549 +#: scheduler/ipp.c:10162 #, c-format msgid "Bad job-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:2030 scheduler/ipp.c:5716 +#: scheduler/ipp.c:2047 scheduler/ipp.c:5733 #, c-format msgid "Bad notify-pull-method \"%s\"." msgstr "" -#: scheduler/ipp.c:1994 scheduler/ipp.c:5680 +#: scheduler/ipp.c:2011 scheduler/ipp.c:5697 #, c-format msgid "Bad notify-recipient-uri \"%s\"." msgstr "" @@ -3473,12 +3483,12 @@ msgstr "" msgid "Bad port number in URI" msgstr "" -#: scheduler/ipp.c:2444 +#: scheduler/ipp.c:2461 #, c-format msgid "Bad port-monitor \"%s\"." msgstr "" -#: scheduler/ipp.c:2516 +#: scheduler/ipp.c:2533 #, c-format msgid "Bad printer-state value %d." msgstr "" @@ -3594,11 +3604,11 @@ msgstr "" msgid "Canceling print job." msgstr "" -#: scheduler/ipp.c:989 scheduler/ipp.c:2494 +#: scheduler/ipp.c:989 scheduler/ipp.c:2511 msgid "Cannot change printer-is-shared for remote queues." msgstr "" -#: scheduler/ipp.c:2484 +#: scheduler/ipp.c:2501 msgid "Cannot share a remote Kerberized printer." msgstr "" @@ -3619,12 +3629,12 @@ msgstr "" msgid "Change Settings" msgstr "" -#: scheduler/ipp.c:2042 scheduler/ipp.c:5728 +#: scheduler/ipp.c:2059 scheduler/ipp.c:5745 #, c-format msgid "Character set \"%s\" not supported." msgstr "" -#: cgi-bin/classes.c:185 cgi-bin/classes.c:312 +#: cgi-bin/classes.c:185 cgi-bin/classes.c:311 msgid "Classes" msgstr "" @@ -3632,7 +3642,7 @@ msgstr "" msgid "Clean Print Heads" msgstr "" -#: scheduler/ipp.c:3865 +#: scheduler/ipp.c:3882 msgid "Close-Job doesn't support the job-uri attribute." msgstr "" @@ -3745,7 +3755,7 @@ msgstr "" msgid "Destination \"%s\" is not accepting jobs." msgstr "" -#: systemv/lpinfo.c:292 +#: systemv/lpinfo.c:273 #, c-format msgid "" "Device: uri = %s\n" @@ -3793,7 +3803,7 @@ msgstr "" msgid "Disc" msgstr "" -#: scheduler/ipp.c:6226 +#: scheduler/ipp.c:6243 #, c-format msgid "Document #%d does not exist in job #%d." msgstr "" @@ -4102,7 +4112,7 @@ msgstr "" msgid "Error sending raster data." msgstr "" -#: systemv/lpinfo.c:95 systemv/lpmove.c:81 +#: systemv/lpinfo.c:208 systemv/lpmove.c:86 msgid "Error: need hostname after \"-h\" option." msgstr "" @@ -4217,7 +4227,7 @@ msgstr "" msgid "File Folder" msgstr "" -#: scheduler/ipp.c:2380 +#: scheduler/ipp.c:2397 #, c-format msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"." msgstr "" @@ -4268,10 +4278,10 @@ msgstr "" msgid "Glossy Photo" msgstr "" -#: scheduler/ipp.c:2929 scheduler/ipp.c:3339 scheduler/ipp.c:3877 -#: scheduler/ipp.c:6155 scheduler/ipp.c:6302 scheduler/ipp.c:7800 -#: scheduler/ipp.c:8934 scheduler/ipp.c:9158 scheduler/ipp.c:9510 -#: scheduler/ipp.c:10123 +#: scheduler/ipp.c:2946 scheduler/ipp.c:3356 scheduler/ipp.c:3894 +#: scheduler/ipp.c:6172 scheduler/ipp.c:6319 scheduler/ipp.c:7815 +#: scheduler/ipp.c:8951 scheduler/ipp.c:9175 scheduler/ipp.c:9527 +#: scheduler/ipp.c:10140 msgid "Got a printer-uri attribute but no job-id." msgstr "" @@ -4475,7 +4485,7 @@ msgstr "" msgid "Invalid media size." msgstr "" -#: scheduler/ipp.c:2667 scheduler/ipp.c:6971 +#: scheduler/ipp.c:2684 scheduler/ipp.c:6986 msgid "Invalid ppd-name value." msgstr "" @@ -4544,52 +4554,52 @@ msgstr "" msgid "JIS B9" msgstr "" -#: scheduler/ipp.c:9230 +#: scheduler/ipp.c:9247 #, c-format msgid "Job #%d cannot be restarted - no files." msgstr "" -#: scheduler/ipp.c:2969 scheduler/ipp.c:3203 scheduler/ipp.c:3262 -#: scheduler/ipp.c:3441 scheduler/ipp.c:3887 scheduler/ipp.c:5814 -#: scheduler/ipp.c:6195 scheduler/ipp.c:6342 scheduler/ipp.c:6680 -#: scheduler/ipp.c:7641 scheduler/ipp.c:7663 scheduler/ipp.c:7841 -#: scheduler/ipp.c:8066 scheduler/ipp.c:8109 scheduler/ipp.c:8974 -#: scheduler/ipp.c:9198 scheduler/ipp.c:9550 scheduler/ipp.c:10163 +#: scheduler/ipp.c:2986 scheduler/ipp.c:3220 scheduler/ipp.c:3279 +#: scheduler/ipp.c:3458 scheduler/ipp.c:3904 scheduler/ipp.c:5831 +#: scheduler/ipp.c:6212 scheduler/ipp.c:6359 scheduler/ipp.c:6696 +#: scheduler/ipp.c:7656 scheduler/ipp.c:7678 scheduler/ipp.c:7856 +#: scheduler/ipp.c:8081 scheduler/ipp.c:8124 scheduler/ipp.c:8991 +#: scheduler/ipp.c:9215 scheduler/ipp.c:9567 scheduler/ipp.c:10180 #, c-format msgid "Job #%d does not exist." msgstr "" -#: scheduler/ipp.c:3473 +#: scheduler/ipp.c:3490 #, c-format msgid "Job #%d is already aborted - can't cancel." msgstr "" -#: scheduler/ipp.c:3467 +#: scheduler/ipp.c:3484 #, c-format msgid "Job #%d is already canceled - can't cancel." msgstr "" -#: scheduler/ipp.c:3479 +#: scheduler/ipp.c:3496 #, c-format msgid "Job #%d is already completed - can't cancel." msgstr "" -#: scheduler/ipp.c:7867 scheduler/ipp.c:8151 scheduler/ipp.c:10178 +#: scheduler/ipp.c:7882 scheduler/ipp.c:8166 scheduler/ipp.c:10195 #, c-format msgid "Job #%d is finished and cannot be altered." msgstr "" -#: scheduler/ipp.c:9212 +#: scheduler/ipp.c:9229 #, c-format msgid "Job #%d is not complete." msgstr "" -#: scheduler/ipp.c:2984 +#: scheduler/ipp.c:3001 #, c-format msgid "Job #%d is not held for authentication." msgstr "" -#: scheduler/ipp.c:8988 +#: scheduler/ipp.c:9005 #, c-format msgid "Job #%d is not held." msgstr "" @@ -4610,7 +4620,7 @@ msgstr "" msgid "Job Stopped" msgstr "" -#: scheduler/ipp.c:10260 +#: scheduler/ipp.c:10277 msgid "Job is completed and cannot be changed." msgstr "" @@ -4618,11 +4628,11 @@ msgstr "" msgid "Job operation failed" msgstr "" -#: scheduler/ipp.c:10296 scheduler/ipp.c:10313 scheduler/ipp.c:10324 +#: scheduler/ipp.c:10313 scheduler/ipp.c:10330 scheduler/ipp.c:10341 msgid "Job state cannot be changed." msgstr "" -#: scheduler/ipp.c:9078 +#: scheduler/ipp.c:9095 msgid "Job subscriptions cannot be renewed." msgstr "" @@ -4654,7 +4664,7 @@ msgstr "" msgid "Laminate" msgstr "" -#: scheduler/ipp.c:2051 scheduler/ipp.c:5737 +#: scheduler/ipp.c:2068 scheduler/ipp.c:5754 #, c-format msgid "Language \"%s\" not supported." msgstr "" @@ -4711,7 +4721,7 @@ msgstr "" msgid "Load paper." msgstr "" -#: scheduler/ipp.c:5446 +#: scheduler/ipp.c:5463 msgid "Local printer created." msgstr "" @@ -4783,7 +4793,7 @@ msgstr "" msgid "Missing asterisk in column 1" msgstr "" -#: scheduler/ipp.c:6218 +#: scheduler/ipp.c:6235 msgid "Missing document-number attribute." msgstr "" @@ -4798,7 +4808,7 @@ msgstr "" msgid "Missing form variable" msgstr "" -#: scheduler/ipp.c:9604 +#: scheduler/ipp.c:9621 msgid "Missing last-document attribute in request." msgstr "" @@ -4810,7 +4820,7 @@ msgstr "" msgid "Missing media-size in media-col." msgstr "" -#: scheduler/ipp.c:6821 +#: scheduler/ipp.c:6836 msgid "Missing notify-subscription-ids attribute." msgstr "" @@ -4818,11 +4828,11 @@ msgstr "" msgid "Missing option keyword" msgstr "" -#: scheduler/ipp.c:3110 scheduler/ipp.c:3135 +#: scheduler/ipp.c:3127 scheduler/ipp.c:3152 msgid "Missing requesting-user-name attribute." msgstr "" -#: scheduler/ipp.c:5366 scheduler/ipp.c:5392 +#: scheduler/ipp.c:5383 scheduler/ipp.c:5409 #, c-format msgid "Missing required attribute \"%s\"." msgstr "" @@ -4856,7 +4866,7 @@ msgstr "" msgid "Missing y-dimension in media-size." msgstr "" -#: systemv/lpinfo.c:462 +#: systemv/lpinfo.c:443 #, c-format msgid "" "Model: name = %s\n" @@ -4941,7 +4951,7 @@ msgstr "" msgid "No active connection." msgstr "" -#: scheduler/ipp.c:3390 +#: scheduler/ipp.c:3407 #, c-format msgid "No active jobs on %s." msgstr "" @@ -4950,7 +4960,7 @@ msgstr "" msgid "No attributes in request." msgstr "" -#: scheduler/ipp.c:3011 +#: scheduler/ipp.c:3028 msgid "No authentication information provided." msgstr "" @@ -4958,11 +4968,11 @@ msgstr "" msgid "No community name" msgstr "" -#: scheduler/ipp.c:6018 +#: scheduler/ipp.c:6035 msgid "No default printer." msgstr "" -#: cgi-bin/ipp-var.c:422 scheduler/ipp.c:7401 +#: cgi-bin/ipp-var.c:422 scheduler/ipp.c:7416 msgid "No destinations added." msgstr "" @@ -4978,7 +4988,7 @@ msgstr "" msgid "No error-status" msgstr "" -#: scheduler/ipp.c:8356 scheduler/ipp.c:9618 +#: scheduler/ipp.c:8371 scheduler/ipp.c:9635 msgid "No file in print request." msgstr "" @@ -5007,7 +5017,7 @@ msgstr "" msgid "No printer-uri found for class" msgstr "" -#: scheduler/ipp.c:6426 +#: scheduler/ipp.c:6442 msgid "No printer-uri in request." msgstr "" @@ -5027,11 +5037,11 @@ msgstr "" msgid "No request-id" msgstr "" -#: scheduler/ipp.c:5622 +#: scheduler/ipp.c:5639 msgid "No subscription attributes in request." msgstr "" -#: scheduler/ipp.c:7740 +#: scheduler/ipp.c:7755 msgid "No subscriptions found." msgstr "" @@ -5075,7 +5085,7 @@ msgstr "" msgid "Not Supported" msgstr "" -#: scheduler/ipp.c:1518 scheduler/ipp.c:10877 +#: scheduler/ipp.c:1518 scheduler/ipp.c:10894 msgid "Not allowed to print." msgstr "" @@ -5103,7 +5113,7 @@ msgstr "" msgid "Online Help" msgstr "" -#: scheduler/ipp.c:5345 +#: scheduler/ipp.c:5362 msgid "Only local users can create a local printer." msgstr "" @@ -5133,7 +5143,7 @@ msgstr "" msgid "Options Installed" msgstr "" -#: scheduler/cupsfilter.c:1480 scheduler/main.c:2191 systemv/cupsaddsmb.c:276 +#: scheduler/cupsfilter.c:1480 scheduler/main.c:2197 systemv/cupsaddsmb.c:276 #: systemv/cupsctl.c:196 systemv/cupstestdsc.c:421 systemv/cupstestppd.c:3859 #: test/ippfind.c:2751 test/ipptool.c:4930 ppdc/ppdc.cxx:430 #: ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:123 ppdc/ppdmerge.cxx:361 @@ -5363,7 +5373,7 @@ msgstr "" msgid "Print job was not accepted." msgstr "" -#: scheduler/ipp.c:5411 +#: scheduler/ipp.c:5428 #, c-format msgid "Printer \"%s\" already exists." msgstr "" @@ -5404,7 +5414,7 @@ msgstr "" msgid "Printer:" msgstr "" -#: cgi-bin/printers.c:194 cgi-bin/printers.c:322 +#: cgi-bin/printers.c:194 cgi-bin/printers.c:321 msgid "Printers" msgstr "" @@ -5422,11 +5432,11 @@ msgstr "" msgid "Quarto" msgstr "" -#: scheduler/ipp.c:1513 scheduler/ipp.c:10872 +#: scheduler/ipp.c:1513 scheduler/ipp.c:10889 msgid "Quota limit reached." msgstr "" -#: berkeley/lpq.c:488 +#: berkeley/lpq.c:499 msgid "Rank Owner Job File(s) Total Size" msgstr "" @@ -5549,7 +5559,7 @@ msgstr "" msgid "See Other" msgstr "" -#: scheduler/ipp.c:7025 scheduler/ipp.c:7044 +#: scheduler/ipp.c:7040 scheduler/ipp.c:7059 msgid "See remote printer." msgstr "" @@ -5577,7 +5587,7 @@ msgstr "" msgid "Server Stopped" msgstr "" -#: cups/tls-darwin.c:1092 cups/tls-gnutls.c:1047 +#: cups/tls-darwin.c:1101 cups/tls-gnutls.c:1187 msgid "Server credentials not set." msgstr "" @@ -5702,8 +5712,8 @@ msgstr "" msgid "Statement" msgstr "" -#: scheduler/ipp.c:3536 scheduler/ipp.c:6837 scheduler/ipp.c:7547 -#: scheduler/ipp.c:9066 +#: scheduler/ipp.c:3553 scheduler/ipp.c:6852 scheduler/ipp.c:7562 +#: scheduler/ipp.c:9083 #, c-format msgid "Subscription #%d does not exist." msgstr "" @@ -5757,8 +5767,8 @@ msgstr "" msgid "The \"%s\" attribute is required for print jobs." msgstr "" -#: scheduler/ipp.c:6497 scheduler/ipp.c:6577 scheduler/ipp.c:6590 -#: scheduler/ipp.c:6602 scheduler/ipp.c:6617 +#: scheduler/ipp.c:6513 scheduler/ipp.c:6593 scheduler/ipp.c:6606 +#: scheduler/ipp.c:6618 scheduler/ipp.c:6633 #, c-format msgid "The %s attribute cannot be provided with job-ids." msgstr "" @@ -5768,17 +5778,17 @@ msgstr "" msgid "The '%s' Job Status attribute cannot be supplied in a job creation request." msgstr "" -#: scheduler/ipp.c:5173 +#: scheduler/ipp.c:5190 #, c-format msgid "The '%s' operation attribute cannot be supplied in a Create-Job request." msgstr "" -#: scheduler/ipp.c:7067 +#: scheduler/ipp.c:7082 #, c-format msgid "The PPD file \"%s\" could not be found." msgstr "" -#: scheduler/ipp.c:7056 +#: scheduler/ipp.c:7071 #, c-format msgid "The PPD file \"%s\" could not be opened: %s" msgstr "" @@ -5808,11 +5818,11 @@ msgstr "" msgid "The fuser's temperature is low." msgstr "" -#: scheduler/ipp.c:2078 +#: scheduler/ipp.c:2095 msgid "The notify-lease-duration attribute cannot be used with job subscriptions." msgstr "" -#: scheduler/ipp.c:2061 scheduler/ipp.c:5747 +#: scheduler/ipp.c:2078 scheduler/ipp.c:5764 #, c-format msgid "The notify-user-data value is too large (%d > 63 octets)." msgstr "" @@ -5888,14 +5898,14 @@ msgstr "" msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." msgstr "" -#: scheduler/ipp.c:790 scheduler/ipp.c:1067 scheduler/ipp.c:3175 -#: scheduler/ipp.c:3356 scheduler/ipp.c:5156 scheduler/ipp.c:5581 -#: scheduler/ipp.c:5896 scheduler/ipp.c:6463 scheduler/ipp.c:7271 -#: scheduler/ipp.c:7327 scheduler/ipp.c:7653 scheduler/ipp.c:7925 -#: scheduler/ipp.c:8014 scheduler/ipp.c:8047 scheduler/ipp.c:8371 -#: scheduler/ipp.c:8778 scheduler/ipp.c:8860 scheduler/ipp.c:10032 -#: scheduler/ipp.c:10484 scheduler/ipp.c:10835 scheduler/ipp.c:10917 -#: scheduler/ipp.c:11292 +#: scheduler/ipp.c:790 scheduler/ipp.c:1067 scheduler/ipp.c:3192 +#: scheduler/ipp.c:3373 scheduler/ipp.c:5173 scheduler/ipp.c:5598 +#: scheduler/ipp.c:5913 scheduler/ipp.c:6479 scheduler/ipp.c:7286 +#: scheduler/ipp.c:7342 scheduler/ipp.c:7668 scheduler/ipp.c:7940 +#: scheduler/ipp.c:8029 scheduler/ipp.c:8062 scheduler/ipp.c:8386 +#: scheduler/ipp.c:8793 scheduler/ipp.c:8875 scheduler/ipp.c:10049 +#: scheduler/ipp.c:10501 scheduler/ipp.c:10852 scheduler/ipp.c:10934 +#: scheduler/ipp.c:11309 msgid "The printer or class does not exist." msgstr "" @@ -5923,12 +5933,12 @@ msgstr "" msgid "The printer's waste bin is full." msgstr "" -#: scheduler/ipp.c:896 scheduler/ipp.c:2242 +#: scheduler/ipp.c:896 scheduler/ipp.c:2259 #, c-format msgid "The printer-uri \"%s\" contains invalid characters." msgstr "" -#: scheduler/ipp.c:3152 +#: scheduler/ipp.c:3169 msgid "The printer-uri attribute is required." msgstr "" @@ -5936,7 +5946,7 @@ msgstr "" msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"." msgstr "" -#: scheduler/ipp.c:2226 +#: scheduler/ipp.c:2243 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"." msgstr "" @@ -5948,12 +5958,12 @@ msgstr "" msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it." msgstr "" -#: scheduler/ipp.c:6561 +#: scheduler/ipp.c:6577 #, c-format msgid "The which-jobs value \"%s\" is not supported." msgstr "" -#: scheduler/ipp.c:5825 +#: scheduler/ipp.c:5842 msgid "There are too many subscriptions." msgstr "" @@ -5975,7 +5985,7 @@ msgstr "" msgid "Too many job-sheets values (%d > 2)." msgstr "" -#: scheduler/ipp.c:2550 +#: scheduler/ipp.c:2567 #, c-format msgid "Too many printer-state-reasons values (%d > %d)." msgstr "" @@ -6227,12 +6237,12 @@ msgstr "" msgid "Unable to copy CUPS printer driver files (%d)." msgstr "" -#: scheduler/ipp.c:2641 +#: scheduler/ipp.c:2658 #, c-format msgid "Unable to copy PPD file - %s" msgstr "" -#: scheduler/ipp.c:2680 +#: scheduler/ipp.c:2697 msgid "Unable to copy PPD file." msgstr "" @@ -6250,11 +6260,11 @@ msgstr "" msgid "Unable to create printer-uri" msgstr "" -#: scheduler/ipp.c:5421 +#: scheduler/ipp.c:5438 msgid "Unable to create printer." msgstr "" -#: cups/tls-darwin.c:1353 cups/tls-gnutls.c:1179 +#: cups/tls-darwin.c:1362 cups/tls-gnutls.c:1375 msgid "Unable to create server credentials." msgstr "" @@ -6278,35 +6288,35 @@ msgstr "" msgid "Unable to edit cupsd.conf files larger than 1MB" msgstr "" -#: cups/tls-darwin.c:1520 +#: cups/tls-darwin.c:1529 msgid "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "" -#: cups/tls-darwin.c:1510 +#: cups/tls-darwin.c:1519 msgid "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "" -#: cups/tls-darwin.c:1505 +#: cups/tls-darwin.c:1514 msgid "Unable to establish a secure connection to host (expired certificate)." msgstr "" -#: cups/tls-darwin.c:1515 +#: cups/tls-darwin.c:1524 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "" -#: cups/tls-darwin.c:1525 +#: cups/tls-darwin.c:1534 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)." msgstr "" -#: cups/tls-darwin.c:1500 +#: cups/tls-darwin.c:1509 msgid "Unable to establish a secure connection to host (self-signed certificate)." msgstr "" -#: cups/tls-darwin.c:1495 +#: cups/tls-darwin.c:1504 msgid "Unable to establish a secure connection to host (untrusted certificate)." msgstr "" -#: cups/tls-darwin.c:1552 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294 +#: cups/tls-darwin.c:1561 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294 msgid "Unable to establish a secure connection to host." msgstr "" @@ -6318,7 +6328,7 @@ msgstr "" msgid "Unable to find printer." msgstr "" -#: cups/tls-darwin.c:1366 +#: cups/tls-darwin.c:1375 msgid "Unable to find server credentials." msgstr "" @@ -6326,11 +6336,11 @@ msgstr "" msgid "Unable to get backend exit status." msgstr "" -#: cgi-bin/classes.c:440 +#: cgi-bin/classes.c:430 msgid "Unable to get class list" msgstr "" -#: cgi-bin/classes.c:539 +#: cgi-bin/classes.c:529 msgid "Unable to get class status" msgstr "" @@ -6342,11 +6352,11 @@ msgstr "" msgid "Unable to get printer attributes" msgstr "" -#: cgi-bin/printers.c:457 +#: cgi-bin/printers.c:447 msgid "Unable to get printer list" msgstr "" -#: cgi-bin/printers.c:559 +#: cgi-bin/printers.c:549 msgid "Unable to get printer status" msgstr "" @@ -6406,7 +6416,7 @@ msgstr "" msgid "Unable to open device file" msgstr "" -#: scheduler/ipp.c:6239 +#: scheduler/ipp.c:6256 #, c-format msgid "Unable to open document #%d in job #%d." msgstr "" @@ -6435,7 +6445,7 @@ msgstr "" msgid "Unable to read print data." msgstr "" -#: scheduler/ipp.c:8530 scheduler/ipp.c:9771 +#: scheduler/ipp.c:8545 scheduler/ipp.c:9788 msgid "Unable to rename job document file." msgstr "" @@ -6549,12 +6559,12 @@ msgstr "" msgid "Unknown print mode: \"%s\"." msgstr "" -#: scheduler/ipp.c:10706 +#: scheduler/ipp.c:10723 #, c-format msgid "Unknown printer-error-policy \"%s\"." msgstr "" -#: scheduler/ipp.c:10689 +#: scheduler/ipp.c:10706 #, c-format msgid "Unknown printer-op-policy \"%s\"." msgstr "" @@ -6571,7 +6581,7 @@ msgstr "" msgid "Unknown scheme in URI" msgstr "" -#: cups/http-addrlist.c:771 +#: cups/http-addrlist.c:775 msgid "Unknown service name." msgstr "" @@ -6580,17 +6590,17 @@ msgstr "" msgid "Unknown version option value: \"%s\"." msgstr "" -#: scheduler/ipp.c:11163 +#: scheduler/ipp.c:11180 #, c-format msgid "Unsupported 'compression' value \"%s\"." msgstr "" -#: scheduler/ipp.c:11193 +#: scheduler/ipp.c:11210 #, c-format msgid "Unsupported 'document-format' value \"%s\"." msgstr "" -#: scheduler/ipp.c:11268 +#: scheduler/ipp.c:11285 msgid "Unsupported 'job-name' value." msgstr "" @@ -6599,17 +6609,17 @@ msgstr "" msgid "Unsupported character set \"%s\"." msgstr "" -#: scheduler/ipp.c:8337 scheduler/ipp.c:9583 +#: scheduler/ipp.c:8352 scheduler/ipp.c:9600 #, c-format msgid "Unsupported compression \"%s\"." msgstr "" -#: scheduler/ipp.c:8473 scheduler/ipp.c:9736 +#: scheduler/ipp.c:8488 scheduler/ipp.c:9753 #, c-format msgid "Unsupported document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9719 +#: scheduler/ipp.c:9736 #, c-format msgid "Unsupported document-format \"%s/%s\"." msgstr "" @@ -6655,7 +6665,7 @@ msgstr "" msgid "Upgrade Required" msgstr "" -#: systemv/lpadmin.c:646 +#: systemv/lpadmin.c:635 msgid "" "Usage:\n" "\n" @@ -6683,7 +6693,7 @@ msgstr "" msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]" msgstr "" -#: scheduler/main.c:2190 +#: scheduler/main.c:2196 msgid "Usage: cupsd [options]" msgstr "" @@ -6711,11 +6721,11 @@ msgstr "" msgid "Usage: ipptool [options] URI filename [ ... filenameN ]" msgstr "" -#: systemv/lpmove.c:118 +#: systemv/lpmove.c:125 msgid "Usage: lpmove job/src dest" msgstr "" -#: systemv/lpoptions.c:538 +#: systemv/lpoptions.c:523 msgid "" "Usage: lpoptions [-h server] [-E] -d printer\n" " lpoptions [-h server] [-E] [-p printer] -l\n" @@ -6723,7 +6733,7 @@ msgid "" " lpoptions [-h server] [-E] -x printer" msgstr "" -#: berkeley/lpq.c:635 +#: berkeley/lpq.c:646 msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -6816,11 +6826,11 @@ msgstr "" msgid "completed" msgstr "" -#: scheduler/ipp.c:6111 +#: scheduler/ipp.c:6128 msgid "cups-deviced failed to execute." msgstr "" -#: scheduler/ipp.c:6999 scheduler/ipp.c:7238 +#: scheduler/ipp.c:7014 scheduler/ipp.c:7253 msgid "cups-driverd failed to execute." msgstr "" @@ -7080,15 +7090,15 @@ msgstr "" msgid "ipptool: Unknown option \"-%c\"." msgstr "" -#: scheduler/ipp.c:8003 +#: scheduler/ipp.c:8018 msgid "job-printer-uri attribute missing." msgstr "" -#: systemv/lpadmin.c:122 systemv/lpadmin.c:362 +#: systemv/lpadmin.c:125 systemv/lpadmin.c:362 msgid "lpadmin: Class name can only contain printable characters." msgstr "" -#: systemv/lpadmin.c:211 +#: systemv/lpadmin.c:215 #, c-format msgid "lpadmin: Expected PPD after \"-%c\" option." msgstr "" @@ -7097,137 +7107,137 @@ msgstr "" msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option." msgstr "" -#: systemv/lpadmin.c:351 +#: systemv/lpadmin.c:353 msgid "lpadmin: Expected class after \"-r\" option." msgstr "" -#: systemv/lpadmin.c:111 +#: systemv/lpadmin.c:115 msgid "lpadmin: Expected class name after \"-c\" option." msgstr "" -#: systemv/lpadmin.c:543 +#: systemv/lpadmin.c:537 msgid "lpadmin: Expected description after \"-D\" option." msgstr "" -#: systemv/lpadmin.c:477 +#: systemv/lpadmin.c:473 msgid "lpadmin: Expected device URI after \"-v\" option." msgstr "" -#: systemv/lpadmin.c:559 +#: systemv/lpadmin.c:550 msgid "lpadmin: Expected file type(s) after \"-I\" option." msgstr "" -#: systemv/lpadmin.c:192 +#: systemv/lpadmin.c:194 msgid "lpadmin: Expected hostname after \"-h\" option." msgstr "" -#: systemv/lpadmin.c:579 +#: systemv/lpadmin.c:569 msgid "lpadmin: Expected location after \"-L\" option." msgstr "" -#: systemv/lpadmin.c:262 +#: systemv/lpadmin.c:266 msgid "lpadmin: Expected model after \"-m\" option." msgstr "" -#: systemv/lpadmin.c:403 +#: systemv/lpadmin.c:401 msgid "lpadmin: Expected name after \"-R\" option." msgstr "" -#: systemv/lpadmin.c:282 +#: systemv/lpadmin.c:286 msgid "lpadmin: Expected name=value after \"-o\" option." msgstr "" -#: systemv/lpadmin.c:301 +#: systemv/lpadmin.c:306 msgid "lpadmin: Expected printer after \"-p\" option." msgstr "" -#: systemv/lpadmin.c:154 +#: systemv/lpadmin.c:157 msgid "lpadmin: Expected printer name after \"-d\" option." msgstr "" -#: systemv/lpadmin.c:510 +#: systemv/lpadmin.c:506 msgid "lpadmin: Expected printer or class after \"-x\" option." msgstr "" -#: systemv/lpadmin.c:953 +#: systemv/lpadmin.c:942 msgid "lpadmin: No member names were seen." msgstr "" -#: systemv/lpadmin.c:740 +#: systemv/lpadmin.c:729 #, c-format msgid "lpadmin: Printer %s is already a member of class %s." msgstr "" -#: systemv/lpadmin.c:967 +#: systemv/lpadmin.c:956 #, c-format msgid "lpadmin: Printer %s is not a member of class %s." msgstr "" -#: systemv/lpadmin.c:165 systemv/lpadmin.c:312 systemv/lpadmin.c:521 +#: systemv/lpadmin.c:166 systemv/lpadmin.c:315 systemv/lpadmin.c:515 msgid "lpadmin: Printer name can only contain printable characters." msgstr "" -#: systemv/lpadmin.c:96 +#: systemv/lpadmin.c:99 msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:87 systemv/lpadmin.c:139 systemv/lpadmin.c:241 -#: systemv/lpadmin.c:326 systemv/lpadmin.c:379 systemv/lpadmin.c:495 -#: systemv/lpadmin.c:622 +#: systemv/lpadmin.c:91 systemv/lpadmin.c:141 systemv/lpadmin.c:244 +#: systemv/lpadmin.c:328 systemv/lpadmin.c:377 systemv/lpadmin.c:489 +#: systemv/lpadmin.c:611 #, c-format msgid "lpadmin: Unable to connect to server: %s" msgstr "" -#: systemv/lpadmin.c:1407 +#: systemv/lpadmin.c:1396 msgid "lpadmin: Unable to create temporary file" msgstr "" -#: systemv/lpadmin.c:388 +#: systemv/lpadmin.c:385 msgid "" "lpadmin: Unable to delete option:\n" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:1399 +#: systemv/lpadmin.c:1388 #, c-format msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d." msgstr "" -#: systemv/lpadmin.c:1419 +#: systemv/lpadmin.c:1408 #, c-format msgid "lpadmin: Unable to open PPD file \"%s\" - %s" msgstr "" -#: systemv/lpadmin.c:335 +#: systemv/lpadmin.c:337 msgid "" "lpadmin: Unable to remove a printer from the class:\n" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:631 +#: systemv/lpadmin.c:620 msgid "" "lpadmin: Unable to set the printer options:\n" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:460 +#: systemv/lpadmin.c:456 #, c-format msgid "lpadmin: Unknown allow/deny option \"%s\"." msgstr "" -#: systemv/lpadmin.c:596 +#: systemv/lpadmin.c:585 #, c-format msgid "lpadmin: Unknown argument \"%s\"." msgstr "" -#: systemv/lpadmin.c:591 +#: systemv/lpadmin.c:578 #, c-format msgid "lpadmin: Unknown option \"%c\"." msgstr "" -#: systemv/lpadmin.c:565 +#: systemv/lpadmin.c:554 msgid "lpadmin: Warning - content type list ignored." msgstr "" @@ -7235,84 +7245,64 @@ msgstr "" msgid "lpc> " msgstr "" -#: systemv/lpinfo.c:129 +#: systemv/lpinfo.c:82 msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"." msgstr "" -#: systemv/lpinfo.c:182 +#: systemv/lpinfo.c:129 msgid "lpinfo: Expected language after \"--language\"." msgstr "" -#: systemv/lpinfo.c:199 +#: systemv/lpinfo.c:144 msgid "lpinfo: Expected make and model after \"--make-and-model\"." msgstr "" -#: systemv/lpinfo.c:216 +#: systemv/lpinfo.c:159 msgid "lpinfo: Expected product string after \"--product\"." msgstr "" -#: systemv/lpinfo.c:147 +#: systemv/lpinfo.c:98 msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"." msgstr "" -#: systemv/lpinfo.c:165 +#: systemv/lpinfo.c:114 msgid "lpinfo: Expected scheme list after \"--include-schemes\"." msgstr "" -#: systemv/lpinfo.c:233 +#: systemv/lpinfo.c:174 msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "" -#: systemv/lpinfo.c:257 -#, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "" - -#: systemv/lpinfo.c:251 -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "" - -#: systemv/lpinfo.c:244 -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "" - -#: systemv/lpmove.c:126 +#: systemv/lpmove.c:133 #, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "" -#: systemv/lpmove.c:112 +#: systemv/lpmove.c:118 #, c-format msgid "lpmove: Unknown argument \"%s\"." msgstr "" -#: systemv/lpmove.c:90 -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "" - -#: systemv/lpoptions.c:142 systemv/lpoptions.c:160 systemv/lpoptions.c:236 +#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:247 msgid "lpoptions: No printers." msgstr "" -#: systemv/lpoptions.c:211 +#: systemv/lpoptions.c:224 #, c-format msgid "lpoptions: Unable to add printer or instance: %s" msgstr "" -#: systemv/lpoptions.c:506 +#: systemv/lpoptions.c:491 #, c-format msgid "lpoptions: Unable to get PPD file for %s: %s" msgstr "" -#: systemv/lpoptions.c:514 +#: systemv/lpoptions.c:499 #, c-format msgid "lpoptions: Unable to open PPD file for %s." msgstr "" -#: systemv/lpoptions.c:91 +#: systemv/lpoptions.c:96 msgid "lpoptions: Unknown printer or class." msgstr "" @@ -7326,7 +7316,7 @@ msgstr "" msgid "members of class %s:" msgstr "" -#: berkeley/lpq.c:547 +#: berkeley/lpq.c:558 msgid "no entries" msgstr "" @@ -7334,16 +7324,16 @@ msgstr "" msgid "no system default destination" msgstr "" -#: scheduler/ipp.c:5796 +#: scheduler/ipp.c:5813 msgid "notify-events not specified." msgstr "" -#: scheduler/ipp.c:2015 scheduler/ipp.c:5701 +#: scheduler/ipp.c:2032 scheduler/ipp.c:5718 #, c-format msgid "notify-recipient-uri URI \"%s\" is already used." msgstr "" -#: scheduler/ipp.c:2005 scheduler/ipp.c:5691 +#: scheduler/ipp.c:2022 scheduler/ipp.c:5708 #, c-format msgid "notify-recipient-uri URI \"%s\" uses unknown scheme." msgstr "" @@ -7859,7 +7849,7 @@ msgstr "" msgid "processing" msgstr "" -#: systemv/lp.c:660 +#: systemv/lp.c:666 #, c-format msgid "request id is %s-%d (%d file(s))" msgstr "" diff --git a/locale/cups.strings b/locale/cups.strings index 892d87fe6..9732fa7b9 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -191,7 +191,7 @@ " --help Show help." = " --help Show help."; " --help Show this help." = " --help Show this help."; " --host regex Match hostname to regular expression." = " --host regex Match hostname to regular expression."; -" --lf End lines with LF (UNIX/Linux/OS X)." = " --lf End lines with LF (UNIX/Linux/OS X)."; +" --lf End lines with LF (UNIX/Linux/macOS)." = " --lf End lines with LF (UNIX/Linux/macOS)."; " --list-filters List filters that will be used." = " --list-filters List filters that will be used."; " --local True if service is local." = " --local True if service is local."; " --ls List attributes." = " --ls List attributes."; @@ -370,6 +370,7 @@ "%s: Error - bad job ID." = "%s: Error - bad job ID."; "%s: Error - cannot print files and alter jobs simultaneously." = "%s: Error - cannot print files and alter jobs simultaneously."; "%s: Error - cannot print from stdin if files or a job ID are provided." = "%s: Error - cannot print from stdin if files or a job ID are provided."; +"%s: Error - copies must be 1 or more." = "%s: Error - copies must be 1 or more."; "%s: Error - expected character set after \"-S\" option." = "%s: Error - expected character set after “-S” option."; "%s: Error - expected content type after \"-T\" option." = "%s: Error - expected content type after “-T” option."; "%s: Error - expected copies after \"-#\" option." = "%s: Error - expected copies after “-#” option."; @@ -421,6 +422,7 @@ "%s: Unable to open PPD file: %s on line %d." = "%s: Unable to open PPD file: %s on line %d."; "%s: Unable to read MIME database from \"%s\" or \"%s\"." = "%s: Unable to read MIME database from “%s” or “%s”."; "%s: Unable to resolve \"%s\"." = "%s: Unable to resolve “%s”."; +"%s: Unknown argument \"%s\"." = "%s: Unknown argument “%s”."; "%s: Unknown destination \"%s\"." = "%s: Unknown destination “%s”."; "%s: Unknown destination MIME type %s/%s." = "%s: Unknown destination MIME type %s/%s."; "%s: Unknown option \"%c\"." = "%s: Unknown option “%c”."; @@ -1634,12 +1636,8 @@ "lpinfo: Expected scheme list after \"--exclude-schemes\"." = "lpinfo: Expected scheme list after “--exclude-schemes”."; "lpinfo: Expected scheme list after \"--include-schemes\"." = "lpinfo: Expected scheme list after “--include-schemes”."; "lpinfo: Expected timeout after \"--timeout\"." = "lpinfo: Expected timeout after “--timeout”."; -"lpinfo: Unknown argument \"%s\"." = "lpinfo: Unknown argument “%s”."; -"lpinfo: Unknown option \"%c\"." = "lpinfo: Unknown option “%c”."; -"lpinfo: Unknown option \"%s\"." = "lpinfo: Unknown option “%s”."; "lpmove: Unable to connect to server: %s" = "lpmove: Unable to connect to server: %s"; "lpmove: Unknown argument \"%s\"." = "lpmove: Unknown argument “%s”."; -"lpmove: Unknown option \"%c\"." = "lpmove: Unknown option “%c”."; "lpoptions: No printers." = "lpoptions: No printers."; "lpoptions: Unable to add printer or instance: %s" = "lpoptions: Unable to add printer or instance: %s"; "lpoptions: Unable to get PPD file for %s: %s" = "lpoptions: Unable to get PPD file for %s: %s"; diff --git a/locale/cups_ca.po b/locale/cups_ca.po index e9b0c4006..17eefdbc3 100644 --- a/locale/cups_ca.po +++ b/locale/cups_ca.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.4.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2012-09-29 11:21+0200\n" "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -978,8 +978,8 @@ msgstr "" msgid " --host regex Match hostname to regular expression." msgstr "" -msgid " --lf End lines with LF (UNIX/Linux/OS X)." -msgstr " --lf Final de línia amb LF (UNIX/Linux/OS X)." +msgid " --lf End lines with LF (UNIX/Linux/macOS)." +msgstr "" msgid " --list-filters List filters that will be used." msgstr "" @@ -1663,6 +1663,10 @@ msgstr "" "l'identificador de la feina." #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "" "%s: error - s'esperava un conjunt de caràcters després de l'opció «-S»." @@ -1872,6 +1876,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "" #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "%s: el destí «%s» és desconegut." @@ -5853,18 +5861,6 @@ msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "lpinfo: s'esperava un temps d'espera després de «--timeout»." #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "lpinfo: l'argument «%s» és desconegut." - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "lpinfo: l'opció «%c» és desconeguda." - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "lpinfo: l'opció «%s» és desconeguda." - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "lpmove: no s'ha pogut connectar al servidor: %s" @@ -5872,10 +5868,6 @@ msgstr "lpmove: no s'ha pogut connectar al servidor: %s" msgid "lpmove: Unknown argument \"%s\"." msgstr "lpmove: l'argument «%s» és desconegut." -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "lpmove: l'opció «%c» és desconeguda." - msgid "lpoptions: No printers." msgstr "lpoptions: no hi ha cap impressora." @@ -6417,6 +6409,9 @@ msgstr "La variable-bindings fa servir una longitud indefinida" #~ msgid " **FAIL** Unable to open PPD file - %s" #~ msgstr " **ERROR** No es pot obrir el fitxer PPD - %s" +#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)." +#~ msgstr " --lf Final de línia amb LF (UNIX/Linux/OS X)." + #~ msgid " -E Enable encryption." #~ msgstr " -E Habilita el xifrat." @@ -6756,6 +6751,18 @@ msgstr "La variable-bindings fa servir una longitud indefinida" #~ msgid "lpadmin: Expected interface after \"-i\" option." #~ msgstr "lpadmin: s'esperava una interfície després de l'opció «-i»." +#~ msgid "lpinfo: Unknown argument \"%s\"." +#~ msgstr "lpinfo: l'argument «%s» és desconegut." + +#~ msgid "lpinfo: Unknown option \"%c\"." +#~ msgstr "lpinfo: l'opció «%c» és desconeguda." + +#~ msgid "lpinfo: Unknown option \"%s\"." +#~ msgstr "lpinfo: l'opció «%s» és desconeguda." + +#~ msgid "lpmove: Unknown option \"%c\"." +#~ msgstr "lpmove: l'opció «%c» és desconeguda." + #~ msgid "lppasswd: Only root can add or delete passwords." #~ msgstr "" #~ "lppasswd: només l'usuari primari (root) pot afegir o esborrar " diff --git a/locale/cups_cs.po b/locale/cups_cs.po index 036334234..1659e3ae6 100644 --- a/locale/cups_cs.po +++ b/locale/cups_cs.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2012-09-14 10:26+0100\n" "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n" "Language-Team: Czech\n" @@ -831,7 +831,7 @@ msgstr "" msgid " --host regex Match hostname to regular expression." msgstr "" -msgid " --lf End lines with LF (UNIX/Linux/OS X)." +msgid " --lf End lines with LF (UNIX/Linux/macOS)." msgstr "" msgid " --list-filters List filters that will be used." @@ -1480,6 +1480,10 @@ msgid "%s: Error - cannot print from stdin if files or a job ID are provided." msgstr "" #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "" @@ -1686,6 +1690,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "" #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "" @@ -5567,18 +5575,6 @@ msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "" #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "" - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "" - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "" - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "" @@ -5586,10 +5582,6 @@ msgstr "" msgid "lpmove: Unknown argument \"%s\"." msgstr "" -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "" - msgid "lpoptions: No printers." msgstr "" diff --git a/locale/cups_de.po b/locale/cups_de.po index 088495ae0..98513cf30 100644 --- a/locale/cups_de.po +++ b/locale/cups_de.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2016-04-22 12:25+0100\n" "Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -852,8 +852,8 @@ msgstr "" " --host regex Prüfe den Hostnamen auf Übereinstimmung mit " "Regulärem Audruck" -msgid " --lf End lines with LF (UNIX/Linux/OS X)." -msgstr " --lf Zeilenenden mit LF (UNIX/Linux/OS X)" +msgid " --lf End lines with LF (UNIX/Linux/macOS)." +msgstr "" msgid " --list-filters List filters that will be used." msgstr " --list-filters Liste die Filter auf die benutzt werden." @@ -1536,6 +1536,10 @@ msgstr "" "Auftrags-ID übergeben werden." #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "%s: Fehler - Zeichensatz nach der \"-S\" Option erwartet." @@ -1744,6 +1748,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "%s: Auflösen von \"%s\" nicht möglich." #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "%s: Unbekanntes Druckziel \"%s\"." @@ -5692,18 +5700,6 @@ msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "" #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "lpinfo: Unbekanntes Argument »%s«." - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "lpinfo: Unbekannte Option »%c«." - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "lpinfo: Unbekannte Option »%s«." - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "lpmove: Verbindung zum Server »%s« nicht möglich" @@ -5711,10 +5707,6 @@ msgstr "lpmove: Verbindung zum Server »%s« nicht möglich" msgid "lpmove: Unknown argument \"%s\"." msgstr "lpmove: Unbekanntes Argument »%s«." -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "lpinfo: Unbekannte Option »%c«." - msgid "lpoptions: No printers." msgstr "lpoptions: Keine Drucker." @@ -6215,6 +6207,9 @@ msgstr "variable-bindings hat unbestimmte Länge" #~ msgid "\tInterface: %s/interfaces/%s" #~ msgstr "\tSchnittstelle: %s/interfaces/%s" +#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)." +#~ msgstr " --lf Zeilenenden mit LF (UNIX/Linux/OS X)" + #~ msgid " -a Browse for all services." #~ msgstr " -a Browse für alle Dienste." @@ -6269,3 +6264,15 @@ msgstr "variable-bindings hat unbestimmte Länge" #~ msgid "lpadmin: Expected interface after \"-i\" option." #~ msgstr "lpadmin: Schnittstelle nach der \"-i\" Option erwartet." + +#~ msgid "lpinfo: Unknown argument \"%s\"." +#~ msgstr "lpinfo: Unbekanntes Argument »%s«." + +#~ msgid "lpinfo: Unknown option \"%c\"." +#~ msgstr "lpinfo: Unbekannte Option »%c«." + +#~ msgid "lpinfo: Unknown option \"%s\"." +#~ msgstr "lpinfo: Unbekannte Option »%s«." + +#~ msgid "lpmove: Unknown option \"%c\"." +#~ msgstr "lpinfo: Unbekannte Option »%c«." diff --git a/locale/cups_es.po b/locale/cups_es.po index 0744b885e..a45ba0bab 100644 --- a/locale/cups_es.po +++ b/locale/cups_es.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2014-09-23 23:45+0100\n" "Last-Translator: Juan Pablo González Riopedre <jpgriopedre@yahoo.es>\n" "Language-Team: Spanish\n" @@ -976,8 +976,8 @@ msgstr "" " --host regex Hacer coincidir el nombre del equipo con la " "expresión regular." -msgid " --lf End lines with LF (UNIX/Linux/OS X)." -msgstr " --lf Finalizar líneas con LF (UNIX/Linux/OS X)." +msgid " --lf End lines with LF (UNIX/Linux/macOS)." +msgstr "" msgid " --list-filters List filters that will be used." msgstr " --list-filters Listar los filtros a usar." @@ -1741,6 +1741,10 @@ msgstr "" "una ID de trabajo." #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "%s: Error - se esperaba un juego de caracteres tras la opción \"-S\"." @@ -1950,6 +1954,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "" #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "%s: Destino \"%s\" desconocido." @@ -5470,8 +5478,8 @@ msgstr "Uso: cupstestdsc [opciones] nombre_archivo.ps [... nombre_archivo.ps]" msgid "" "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]" msgstr "" -"Uso: cupstestppd [opciones] nombre_archivo1.ppd[.gz] [... nombre_archivoN." -"ppd[.gz]]" +"Uso: cupstestppd [opciones] nombre_archivo1.ppd[.gz] [... nombre_archivoN.ppd" +"[.gz]]" msgid "" "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n" @@ -5945,18 +5953,6 @@ msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "lpinfo: Se esperaba un tiempo de espera tras \"--timeout\"." #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "lpinfo: Argumento \"%s\" desconocido." - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "lpinfo: Opción \"%c\" desconocida." - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "lpinfo: Opción \"%s\" desconocida." - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "lpmove: No se ha podido conectar al servidor: %s" @@ -5964,10 +5960,6 @@ msgstr "lpmove: No se ha podido conectar al servidor: %s" msgid "lpmove: Unknown argument \"%s\"." msgstr "lpmove: Argumento \"%s\" desconocido." -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "lpmove: Opción \"%c\" desconocida." - msgid "lpoptions: No printers." msgstr "lpoptions: No hay impresoras." @@ -6496,6 +6488,10 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "\tInterface: %s/interfaces/%s" #~ msgstr "\tInterfaz: %s/interfaces/%s" +#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)." +#~ msgstr "" +#~ " --lf Finalizar líneas con LF (UNIX/Linux/OS X)." + #~ msgid " -a Browse for all services." #~ msgstr " -a Explorar todos los servicios." @@ -6553,3 +6549,15 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "lpadmin: Expected interface after \"-i\" option." #~ msgstr "lpadmin: Se esperaba una interfaz tras la opción \"-i\"." + +#~ msgid "lpinfo: Unknown argument \"%s\"." +#~ msgstr "lpinfo: Argumento \"%s\" desconocido." + +#~ msgid "lpinfo: Unknown option \"%c\"." +#~ msgstr "lpinfo: Opción \"%c\" desconocida." + +#~ msgid "lpinfo: Unknown option \"%s\"." +#~ msgstr "lpinfo: Opción \"%s\" desconocida." + +#~ msgid "lpmove: Unknown option \"%c\"." +#~ msgstr "lpmove: Opción \"%c\" desconocida." diff --git a/locale/cups_fr.po b/locale/cups_fr.po index 0f3eed11d..02d83f50a 100644 --- a/locale/cups_fr.po +++ b/locale/cups_fr.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2012-12-12 11:12+0100\n" "Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -831,7 +831,7 @@ msgstr "" msgid " --host regex Match hostname to regular expression." msgstr "" -msgid " --lf End lines with LF (UNIX/Linux/OS X)." +msgid " --lf End lines with LF (UNIX/Linux/macOS)." msgstr "" msgid " --list-filters List filters that will be used." @@ -1480,6 +1480,10 @@ msgid "%s: Error - cannot print from stdin if files or a job ID are provided." msgstr "" #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "" @@ -1686,6 +1690,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "" #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "" @@ -5569,18 +5577,6 @@ msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "" #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "" - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "" - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "" - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "" @@ -5588,10 +5584,6 @@ msgstr "" msgid "lpmove: Unknown argument \"%s\"." msgstr "" -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "" - msgid "lpoptions: No printers." msgstr "" diff --git a/locale/cups_it.po b/locale/cups_it.po index a657aa753..4fc32c11b 100644 --- a/locale/cups_it.po +++ b/locale/cups_it.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2013-07-14 12:00+0200\n" "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n" "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n" @@ -981,8 +981,8 @@ msgstr "" " --host regex Corrispondenza dell'hostname con l'espressione " "regolare." -msgid " --lf End lines with LF (UNIX/Linux/OS X)." -msgstr " --lf Termina le righe con LF (UNIX/Linux/OS X)." +msgid " --lf End lines with LF (UNIX/Linux/macOS)." +msgstr "" msgid " --list-filters List filters that will be used." msgstr "" @@ -1737,6 +1737,10 @@ msgstr "" "un ID del processo." #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "%s: errore - è previsto un set di caratteri dopo l'opzione \"-S\"." @@ -1949,6 +1953,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "" #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "%s: destinazione sconosciuta \"%s\"." @@ -5918,18 +5926,6 @@ msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "lpinfo: è previsto un timeout dopo \"--timeout\"." #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "lpinfo: argomento sconosciuto \"%s\"." - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "lpinfo: opzione sconosciuta \"%c\"." - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "lpinfo: opzione sconosciuta \"%s\"." - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "lpmove: non è possibile connettersi al server: %s" @@ -5937,10 +5933,6 @@ msgstr "lpmove: non è possibile connettersi al server: %s" msgid "lpmove: Unknown argument \"%s\"." msgstr "lpmove: argomento sconosciuto \"%s\"." -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "lpmove: opzione sconosciuta \"%c\"." - msgid "lpoptions: No printers." msgstr "lpoptions: nessuna stampante." @@ -6468,6 +6460,10 @@ msgstr "variable-bindings utilizza una lunghezza indefinita" #~ msgid "\tInterface: %s/interfaces/%s" #~ msgstr "\tInterfaccia: %s/interfacce/%s" +#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)." +#~ msgstr "" +#~ " --lf Termina le righe con LF (UNIX/Linux/OS X)." + #~ msgid " -a Browse for all services." #~ msgstr " -a Mostra tutti i servizi." @@ -6645,6 +6641,18 @@ msgstr "variable-bindings utilizza una lunghezza indefinita" #~ msgid "lpadmin: Expected interface after \"-i\" option." #~ msgstr "lpadmin: è prevista l'interfaccia dopo l'opzione \"-i\"." +#~ msgid "lpinfo: Unknown argument \"%s\"." +#~ msgstr "lpinfo: argomento sconosciuto \"%s\"." + +#~ msgid "lpinfo: Unknown option \"%c\"." +#~ msgstr "lpinfo: opzione sconosciuta \"%c\"." + +#~ msgid "lpinfo: Unknown option \"%s\"." +#~ msgstr "lpinfo: opzione sconosciuta \"%s\"." + +#~ msgid "lpmove: Unknown option \"%c\"." +#~ msgstr "lpmove: opzione sconosciuta \"%c\"." + #~ msgid "lppasswd: Only root can add or delete passwords." #~ msgstr "lppasswd: solo root può aggiungere o eliminare le password." diff --git a/locale/cups_ja.po b/locale/cups_ja.po index 5e2c8ee3b..bc0d2361d 100644 --- a/locale/cups_ja.po +++ b/locale/cups_ja.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2014-11-15 19:27+0900\n" "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n" "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n" @@ -977,8 +977,8 @@ msgstr " --help このヘルプを表示する。" msgid " --host regex Match hostname to regular expression." msgstr " --host <正規表現> ホスト名が正規表現にマッチするか。" -msgid " --lf End lines with LF (UNIX/Linux/OS X)." -msgstr " --lf 行末を LF とする (UNIX/Linux/OS X)。" +msgid " --lf End lines with LF (UNIX/Linux/macOS)." +msgstr "" msgid " --list-filters List filters that will be used." msgstr " --list-filters 使用されるフィルターのリストを表示する。" @@ -1699,6 +1699,10 @@ msgstr "" "きません。 " #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "%s: エラー - \"-S\" オプションのあとには文字セットが必要です。" @@ -1908,6 +1912,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "" #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "%s: \"%s\" は未知の宛先です。" @@ -5877,18 +5885,6 @@ msgstr "" "lpinfo: \"--timeout\" のあとには、タイムアウト値を指定する必要があります。" #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "lpinfo: 未知の引数 \"%s\"。" - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "lpinfo: 未知のオプション \"%c\"。" - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "lpinfo: 未知のオプション \"%s\"。" - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "lpmove: サーバーに接続できません: %s" @@ -5896,10 +5892,6 @@ msgstr "lpmove: サーバーに接続できません: %s" msgid "lpmove: Unknown argument \"%s\"." msgstr "lpmove: 未知の引数 \"%s\"。" -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "lpmove: 未知のオプション \"%c\"。" - msgid "lpoptions: No printers." msgstr "lpoptions: プリンターがありません。" @@ -6452,6 +6444,9 @@ msgstr "variable-bindings の長さが不定" #~ msgid "\tInterface: %s/interfaces/%s" #~ msgstr "\tインターフェイス: %s/interfaces/%s" +#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)." +#~ msgstr " --lf 行末を LF とする (UNIX/Linux/OS X)。" + #~ msgid " -a Browse for all services." #~ msgstr " -a すべてのサービスをブラウズする。" @@ -6669,6 +6664,18 @@ msgstr "variable-bindings の長さが不定" #~ msgid "lpadmin: Expected interface after \"-i\" option." #~ msgstr "lpadmin: \"-i\" オプションのあとにはインターフェイス名が必要です。" +#~ msgid "lpinfo: Unknown argument \"%s\"." +#~ msgstr "lpinfo: 未知の引数 \"%s\"。" + +#~ msgid "lpinfo: Unknown option \"%c\"." +#~ msgstr "lpinfo: 未知のオプション \"%c\"。" + +#~ msgid "lpinfo: Unknown option \"%s\"." +#~ msgstr "lpinfo: 未知のオプション \"%s\"。" + +#~ msgid "lpmove: Unknown option \"%c\"." +#~ msgstr "lpmove: 未知のオプション \"%c\"。" + #~ msgid "lppasswd: Only root can add or delete passwords." #~ msgstr "lppasswd: root だけがパスワードの追加と削除を行えます。" diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po index 411468916..2aef8c669 100644 --- a/locale/cups_pt_BR.po +++ b/locale/cups_pt_BR.po @@ -40,7 +40,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.1.2\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2016-01-31 16:45-0200\n" "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n" "Language-Team: Brazilian Portuguese <traducao-cups-pt-br@googlegroups.com>\n" @@ -991,8 +991,8 @@ msgid " --host regex Match hostname to regular expression." msgstr "" " --host regex Corresponde o nome da máquina à expressão regular." -msgid " --lf End lines with LF (UNIX/Linux/OS X)." -msgstr " --lf Fim de linhas com LF (UNIX/Linux/OS X)." +msgid " --lf End lines with LF (UNIX/Linux/macOS)." +msgstr "" msgid " --list-filters List filters that will be used." msgstr " --list-filters Lista filtros que serão usados." @@ -1742,6 +1742,10 @@ msgstr "" "trabalho forem fornecidos." #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "%s: Erro - esperava uma codificação de caracteres após a opção \"-S\"." @@ -1950,6 +1954,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "%s: Não foi possível resolver \"%s\"." #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "%s: Destino desconhecido \"%s\"." @@ -5920,18 +5928,6 @@ msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "lpinfo: Esperava tempo de espera após \"--timeout\"." #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "lpinfo: Argumento desconhecido \"%s\"." - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "lpinfo: Opção desconhecida \"%c\"." - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "lpinfo: Opção desconhecida \"%s\"." - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "lpmove: Não foi possível conectar ao servidor: %s" @@ -5939,10 +5935,6 @@ msgstr "lpmove: Não foi possível conectar ao servidor: %s" msgid "lpmove: Unknown argument \"%s\"." msgstr "lpmove: Argumento desconhecido \"%s\"." -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "lpmove: Opção desconhecida \"%c\"." - msgid "lpoptions: No printers." msgstr "lpoptions: Nenhuma impressora." @@ -6457,6 +6449,9 @@ msgstr "variable-bindings usa comprimento indefinido" #~ msgid "\tInterface: %s/interfaces/%s" #~ msgstr "\tInterface: %s/interfaces/%s" +#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)." +#~ msgstr " --lf Fim de linhas com LF (UNIX/Linux/OS X)." + #~ msgid " -a Browse for all services." #~ msgstr " -a Navega por todos os serviços." @@ -6633,6 +6628,18 @@ msgstr "variable-bindings usa comprimento indefinido" #~ msgid "lpadmin: Expected interface after \"-i\" option." #~ msgstr "lpadmin: Esperava interface após a opção \"-i\"." +#~ msgid "lpinfo: Unknown argument \"%s\"." +#~ msgstr "lpinfo: Argumento desconhecido \"%s\"." + +#~ msgid "lpinfo: Unknown option \"%c\"." +#~ msgstr "lpinfo: Opção desconhecida \"%c\"." + +#~ msgid "lpinfo: Unknown option \"%s\"." +#~ msgstr "lpinfo: Opção desconhecida \"%s\"." + +#~ msgid "lpmove: Unknown option \"%c\"." +#~ msgstr "lpmove: Opção desconhecida \"%c\"." + #~ msgid "lppasswd: Only root can add or delete passwords." #~ msgstr "lppasswd: Somente o root pode adicionar ou excluir senhas." diff --git a/locale/cups_ru.po b/locale/cups_ru.po index 7714a4a59..64456871e 100644 --- a/locale/cups_ru.po +++ b/locale/cups_ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2016-05-02 18:01-0400\n" +"POT-Creation-Date: 2016-06-20 15:18-0400\n" "PO-Revision-Date: 2015-01-28 12:00-0800\n" "Last-Translator: Aleksandr Proklov\n" "Language-Team: PuppyRus Linux Team\n" @@ -933,9 +933,8 @@ msgstr " --help Показать эту справку." msgid " --host regex Match hostname to regular expression." msgstr " --host regex Найти hostname по регулярному выражению." -msgid " --lf End lines with LF (UNIX/Linux/OS X)." +msgid " --lf End lines with LF (UNIX/Linux/macOS)." msgstr "" -" --lf Строки заканчиваются на LF (UNIX/Linux/Mac OS X)." msgid " --list-filters List filters that will be used." msgstr "" @@ -1669,6 +1668,10 @@ msgstr "" "задания." #, c-format +msgid "%s: Error - copies must be 1 or more." +msgstr "" + +#, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "%s: Ошибка - после параметра \"-S\" должен идти набор символов." @@ -1885,6 +1888,10 @@ msgid "%s: Unable to resolve \"%s\"." msgstr "" #, c-format +msgid "%s: Unknown argument \"%s\"." +msgstr "" + +#, c-format msgid "%s: Unknown destination \"%s\"." msgstr "%s: Неизвестное назначение \"%s\"." @@ -5828,18 +5835,6 @@ msgid "lpinfo: Expected timeout after \"--timeout\"." msgstr "lpinfo: После \"--timeout\" должно быть указано время ожидания" #, c-format -msgid "lpinfo: Unknown argument \"%s\"." -msgstr "lpinfo: Неизвестный аргумент \"%s\"." - -#, c-format -msgid "lpinfo: Unknown option \"%c\"." -msgstr "lpinfo: Неизвестный параметр \"%c\"." - -#, c-format -msgid "lpinfo: Unknown option \"%s\"." -msgstr "lpinfo: Неизвестный параметр \"%s\"." - -#, c-format msgid "lpmove: Unable to connect to server: %s" msgstr "lpmove: Не удается подключиться к серверу: %s" @@ -5847,10 +5842,6 @@ msgstr "lpmove: Не удается подключиться к серверу: msgid "lpmove: Unknown argument \"%s\"." msgstr "lpmove: Неизвестный аргумент \"%s\"." -#, c-format -msgid "lpmove: Unknown option \"%c\"." -msgstr "lpmove: Неизвестный параметр \"%c\"." - msgid "lpoptions: No printers." msgstr "lpoptions: Нет принтеров." @@ -6380,6 +6371,11 @@ msgstr "Для variable-bindings длина не установлена" #~ " Комментарий %%EndComments отсутствует.\n" #~ " REF: Стр. 41, %%EndComments" +#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)." +#~ msgstr "" +#~ " --lf Строки заканчиваются на LF (UNIX/Linux/Mac OS " +#~ "X)." + #~ msgid " -a Browse for all services." #~ msgstr " -a Обзор всех сервисов." @@ -6427,3 +6423,15 @@ msgstr "Для variable-bindings длина не установлена" #~ msgid "lpadmin: Expected interface after \"-i\" option." #~ msgstr "lpadmin: После параметра \"-i\" должен быть указан интерфейс." + +#~ msgid "lpinfo: Unknown argument \"%s\"." +#~ msgstr "lpinfo: Неизвестный аргумент \"%s\"." + +#~ msgid "lpinfo: Unknown option \"%c\"." +#~ msgstr "lpinfo: Неизвестный параметр \"%c\"." + +#~ msgid "lpinfo: Unknown option \"%s\"." +#~ msgstr "lpinfo: Неизвестный параметр \"%s\"." + +#~ msgid "lpmove: Unknown option \"%c\"." +#~ msgstr "lpmove: Неизвестный параметр \"%c\"." diff --git a/man/backend.man b/man/backend.man index 4c298f6dd..e5bf2a327 100644 --- a/man/backend.man +++ b/man/backend.man @@ -174,7 +174,7 @@ CUPS backends are not generally design to be run directly by the user. Aside fro .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 OS X) 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 .BR lp (1) diff --git a/man/client.conf.man.in b/man/client.conf.man.in index 03fe5fa4c..8f5082a32 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -10,16 +10,16 @@ .\" which should have been included with this file. If this file is .\" file is missing or damaged, see the license at "http://www.cups.org/". .\" -.TH client.conf 5 "CUPS" "18 May 2016" "Apple Inc." +.TH client.conf 5 "CUPS" "20 June 2016" "Apple Inc." .SH NAME client.conf \- client configuration file for cups .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. .LP -\fBNote:\fR Starting with OS X 10.7, this file is only used by command-line and X11 applications plus the IPP backend. -The \fBServerName\fR directive is not supported on OS X at all. -Starting with OS X 10.TODO, all applications can access these settings in the \fI/Library/Preferences/org.cups.PrintingPrefs.plist\fR file instead. +\fBNote:\fR Starting with macOS 10.7, this file is only used by command-line and X11 applications plus the IPP backend. +The \fBServerName\fR directive is not supported on macOS at all. +Starting with macOS 10.12, all applications can access these settings in the \fI/Library/Preferences/org.cups.PrintingPrefs.plist\fR file instead. See the NOTES section below for more information. .SS DIRECTIVES The following directives are understood by the client. Consult the online help for detailed descriptions: @@ -51,7 +51,7 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n .TP 5 \fBServerName \fI/domain/socket\fR Specifies the address and optionally the port to use when connecting to the server. -\fBNote: This directive it not supported on OS X 10.7 or later.\fR +\fBNote: This directive it not supported on macOS 10.7 or later.\fR .TP 5 \fBServerName \fIhostname-or-ip-address\fR[\fI:port\fR]\fB/version=1.1\fR Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier. @@ -81,7 +81,7 @@ Specifies the default user name to use for requests. Specifies whether to only allow TLS with certificates whose common name matches the hostname. The default is "No". .SH NOTES -The \fBclient.conf\fR file is deprecated on OS X and will no longer be supported in a future version of CUPS. +The \fBclient.conf\fR file is deprecated on macOS and will no longer be supported in a future version of CUPS. Configuration settings can instead be viewed or changed using the .BR defaults (1) command: diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index adbdbe31e..df001fba3 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.man.in @@ -1,7 +1,7 @@ .\" .\" cups-files.conf man page for CUPS. .\" -.\" Copyright 2007-2015 by Apple Inc. +.\" Copyright 2007-2016 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the @@ -10,7 +10,7 @@ .\" which should have been included with this file. If this file is .\" file is missing or damaged, see the license at "http://www.cups.org/". .\" -.TH cups-files.conf 5 "CUPS" "3 June 2015" "Apple Inc." +.TH cups-files.conf 5 "CUPS" "20 June 2016" "Apple Inc." .SH NAME cups\-files.conf \- file and directory configuration file for cups .SH DESCRIPTION @@ -49,7 +49,7 @@ The default is "/var/log/cups/access_log". .TP 5 \fBConfigFilePerm \fImode\fR Specifies the permissions for all configuration files that the scheduler writes. -The default is "0644" on OS X and "0640" on all other operating systems. +The default is "0644" on macOS and "0640" on all other operating systems. .LP \fBNote:\fR The permissions for the \fIprinters.conf\fR file are currently masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. @@ -169,7 +169,7 @@ The default is "/var/spool/cups". \fBSandboxing strict\fR Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler. The default is "strict". -This directive is currently only used/supported on OS X. +This directive is currently only used/supported on macOS. .\"#ServerBin .TP 5 \fBServerBin \fIdirectory\fR @@ -179,8 +179,8 @@ The default is "/usr/lib/cups" or "/usr/libexec/cups" depending on the platform. .TP 5 \fBServerKeychain \fIpath\fR Specifies the location of TLS certificates and private keys. -The default is "/Library/Keychains/System.keychain" on OS X and "/etc/cups/ssl" on all other operating systems. -OS X uses its keychain database to store certificates and keys while other platforms use separate files in the specified directory, *.crt for PEM-encoded certificates and *.key for PEM-encoded private keys. +The default is "/Library/Keychains/System.keychain" on macOS and "/etc/cups/ssl" on all other operating systems. +macOS uses its keychain database to store certificates and keys while other platforms use separate files in the specified directory, *.crt for PEM-encoded certificates and *.key for PEM-encoded private keys. .\"#ServerRoot .TP 5 \fBServerRoot \fIdirectory\fR diff --git a/man/cupsd-helper.man b/man/cupsd-helper.man index 57711199c..37bf6a92f 100644 --- a/man/cupsd-helper.man +++ b/man/cupsd-helper.man @@ -55,7 +55,7 @@ with no arguments in order to discover the available printers. .LP The \fBcups-driverd\fR helper program lists all available printer drivers, a subset of "matching" printer drivers, or a copy of a specific driver PPD file. .LP -The \fBcups-exec\fR helper program runs backends, filters, and other programs. On OS X these programs are run in a secure sandbox. +The \fBcups-exec\fR helper program runs backends, filters, and other programs. On macOS these programs are run in a secure sandbox. .SH FILES The \fBcups-driverd\fR program looks for PPD and driver information files in the following directories: .nf diff --git a/man/filter.man b/man/filter.man index 29932ce9f..009e0c05c 100644 --- a/man/filter.man +++ b/man/filter.man @@ -203,7 +203,7 @@ The user executing the filter, typically "lp" or "root"; consult the \fIcups-fil While the filter interface is compatible with System V interface scripts, CUPS does not support System V interface scripts. .SH NOTES 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 OS X) has additional restrictions that affect how it runs. +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. Instead, use the .BR cupsfilter (8) diff --git a/man/mime.convs.man b/man/mime.convs.man index deb5ad447..d120e5ea5 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -42,7 +42,7 @@ Filenames are relative to the CUPS filter directory. .br \fI/usr/lib/cups/filter\fR - Typical CUPS filter directory. .br -\fI/usr/libexec/cups/filter\fR - CUPS filter directory on OS X. +\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS. .SH EXAMPLES Define a filter that converts PostScript documents to CUPS Raster format: .nf diff --git a/man/ppdpo.man b/man/ppdpo.man index 8ee85c381..45d0d2ab4 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.man @@ -26,7 +26,7 @@ ppdpo \- ppd message catalog generator (deprecated) ] .I source-file .SH DESCRIPTION -\fBppdpo\fR extracts UI strings from PPDC source files and updates either a GNU gettext or OS X strings format message catalog source file for translation. +\fBppdpo\fR extracts UI strings from PPDC source files and updates either a GNU gettext or macOS strings format message catalog source file for translation. \fBThis program is deprecated and will be removed in a future release of CUPS.\fR .SH OPTIONS \fBppdpo\fR supports the following options: @@ -41,7 +41,7 @@ Multiple \fI-I\fR options can be supplied to add additional directories. .TP 5 \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 OS X strings files. +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 SEE ALSO .BR ppdc (1), .BR ppdhtml (1), diff --git a/packaging/InstallationCheck b/packaging/InstallationCheck deleted file mode 100755 index 3458cbb5c..000000000 --- a/packaging/InstallationCheck +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -case `uname -r` in - # OS X 10.7.x - 11.*) exit 0;; - - # OS X 10.8.x - 12.*) exit 0;; - - # Older OS X... - *) exit 97;; -esac diff --git a/packaging/LICENSE.rtf b/packaging/LICENSE.rtf deleted file mode 100644 index b348f6b08..000000000 --- a/packaging/LICENSE.rtf +++ /dev/null @@ -1,434 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1011 -{\fonttbl\f0\froman\fcharset0 Times-Roman;\f1\fnil\fcharset0 LucidaGrande;\f2\fmodern\fcharset0 Courier; -\f3\fmodern\fcharset0 Courier-Oblique;} -{\colortbl;\red255\green255\blue255;\red0\green0\blue238;} -{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1} -{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid101\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid102\'02\'01.;}{\levelnumbers\'01;}\fi-360\li1440\lin1440 }{\listname ;}\listid2} -{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid201\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid202\'02\'01.;}{\levelnumbers\'01;}\fi-360\li1440\lin1440 }{\listname ;}\listid3} -{\list\listtemplateid4\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid301\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid4} -{\list\listtemplateid5\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid401\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid5} -{\list\listtemplateid6\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid501\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid6} -{\list\listtemplateid7\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid601\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid7}} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}} -\margl1440\margr1440\margb1800\margt1800\vieww9000\viewh8400\viewkind0 -\deftab720 -\pard\pardeftab720\sa280\qc - -\f0\b\fs36 \cf0 CUPS License Agreement\ -\pard\pardeftab720\sa240\qc - -\b0\fs24 \cf0 Copyright 2007-2009 by Apple Inc. -\f1 \uc0\u8232 -\f0 1 Infinite Loop -\f1 \uc0\u8232 -\f0 Cupertino, CA 95014 USA -\f1 \uc0\u8232 \u8232 -\f0 WWW: {\field{\*\fldinst{HYPERLINK "http://www.cups.org/"}}{\fldrslt \cf2 \ul \ulc2 http://www.cups.org}}\ -\pard\pardeftab720\sa280\ql\qnatural - -\b\fs28 \cf0 Introduction\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0\fs24 \cf0 CUPS -\fs20 \super TM -\fs24 \nosupersub is provided under the GNU General Public License ("GPL") and GNU Library General Public License ("LGPL"), Version 2, with exceptions for Apple operating systems and the OpenSSL toolkit. A copy of the exceptions and licenses follow this introduction.\ -The GNU LGPL applies to the CUPS API library, located in the "cups" subdirectory of the CUPS source distribution and in the "cups" include directory and library files in the binary distributions. The GNU GPL applies to the remainder of the CUPS distribution, including the "pdftops" filter which is based upon Xpdf and the CUPS imaging library.\ -For those not familiar with the GNU GPL, the license basically allows you to:\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls1\ilvl0\cf0 {\listtext \'95 }Use the CUPS software at no charge.\ -{\listtext \'95 }Distribute verbatim copies of the software in source or binary form.\ -{\listtext \'95 }Sell verbatim copies of the software for a media fee, or sell support for the software.\ -{\listtext \'95 }Distribute or sell printer drivers and filters that use CUPS so long as source code is made available under the GPL.\ -\pard\pardeftab720\sa240\ql\qnatural -\cf0 What this license -\b does not -\b0 allow you to do is make changes or add features to CUPS and then sell a binary distribution without source code. You must provide source for any new drivers, changes, or additions to the software, and all code must be provided under the GPL or LGPL as appropriate. The only exceptions to this are the portions of the CUPS software covered by the Apple operating system license exceptions outlined later in this license agreement.\ -The GNU LGPL relaxes the "link-to" restriction, allowing you to develop applications that use the CUPS API library under other licenses and/or conditions as appropriate for your application.\ -\pard\pardeftab720\sa280\ql\qnatural - -\b\fs28 \cf0 License Exceptions\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0\fs24 \cf0 In addition, as the copyright holder of CUPS, Apple Inc. grants the following special exceptions:\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls2\ilvl0 -\b \cf0 {\listtext 1. }Apple Operating System Development License Exception -\b0 ;\ -\pard\tx940\tx1440\pardeftab720\li1440\fi-1440\ql\qnatural -\ls2\ilvl1\cf0 {\listtext 1. }Software that is developed by any person or entity for an Apple Operating System ("Apple OS-Developed Software"), including but not limited to Apple and third party printer drivers, filters, and backends for an Apple Operating System, that is linked to the CUPS imaging library or based on any sample filters or backends provided with CUPS shall not be considered to be a derivative work or collective work based on the CUPS program and is exempt from the mandatory source code release clauses of the GNU GPL. You may therefore distribute linked combinations of the CUPS imaging library with Apple OS-Developed Software without releasing the source code of the Apple OS-Developed Software. You may also use sample filters and backends provided with CUPS to develop Apple OS-Developed Software without releasing the source code of the Apple OS-Developed Software.\ -{\listtext 2. }An Apple Operating System means any operating system software developed and/or marketed by Apple Computer, Inc., including but not limited to all existing releases and versions of Apple's Darwin, Mac OS X, and Mac OS X Server products and all follow-on releases and future versions thereof.\ -{\listtext 3. }This exception is only available for Apple OS-Developed Software and does not apply to software that is distributed for use on other operating systems.\ -{\listtext 4. }All CUPS software that falls under this license exception have the following text at the top of each source file:\ -{\listtext 5. }This file is subject to the Apple OS-Developed Software exception.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls2\ilvl0 -\b \cf0 {\listtext 2. }OpenSSL Toolkit License Exception -\b0 ;\ -\pard\tx940\tx1440\pardeftab720\li1440\fi-1440\ql\qnatural -\ls2\ilvl1\cf0 {\listtext 1. }Apple Inc. explicitly allows the compilation and distribution of the CUPS software with the OpenSSL Toolkit.\ -\pard\pardeftab720\sa240\ql\qnatural -\cf0 No developer is required to provide these exceptions in a derived work.\ -\pard\pardeftab720\sa280\ql\qnatural - -\b\fs28 \cf0 Trademarks\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0\fs24 \cf0 CUPS and the CUPS logo (the "CUPS Marks") are trademarks of Apple Inc. Apple grants you a non-exclusive and non-transferable right to use the CUPS Marks in any direct port or binary distribution incorporating CUPS software and in any promotional material therefor. You agree that your products will meet the highest levels of quality and integrity for similar goods, not be unlawful, and be developed, manufactured, and distributed in compliance with this license. You will not interfere with Apple's rights in the CUPS Marks, and all use of the CUPS Marks shall inure to the benefit of Apple. This license does not apply to use of the CUPS Marks in a derivative products, which requires prior written permission from Apple Inc.\ -\pard\pardeftab720\sa280\ql\qnatural - -\b\fs28 \cf0 \page \pard\pardeftab720\sa280\ql\qnatural - -\fs36 \cf0 GNU GENERAL PUBLIC LICENSE\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0\fs24 \cf0 Version 2, June 1991\ -\pard\pardeftab720\ql\qnatural - -\f2 \cf0 Copyright 1989, 1991 Free Software Foundation, Inc.\ -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\ -\ -Everyone is permitted to copy and distribute verbatim\ -copies of this license document, but changing it is not allowed.\ -\pard\pardeftab720\sa300\ql\qnatural - -\f0\b \cf0 Preamble\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0 \cf0 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.\ -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\ -To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\ -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\ -We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\ -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.\ -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.\ -The precise terms and conditions for copying, distribution and modification follow.\ -\pard\pardeftab720\sa300\ql\qnatural - -\b \cf0 GNU GENERAL PUBLIC LICENSE -\f1 \uc0\u8232 -\f0 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls3\ilvl0 -\b0 \cf0 {\listtext 1. }This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 2. }Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 3. }You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 4. }You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 5. }You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\ -\pard\tx940\tx1440\pardeftab720\li1440\fi-1440\ql\qnatural -\ls3\ilvl1\cf0 {\listtext 1. }You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\ -{\listtext 2. }You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\ -{\listtext 3. }if the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 6. }These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\ -{\listtext 7. }Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\ -{\listtext 8. }In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 9. }You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\ -\pard\tx940\tx1440\pardeftab720\li1440\fi-1440\ql\qnatural -\ls3\ilvl1\cf0 {\listtext 1. }Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\ -{\listtext 2. }Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\ -{\listtext 3. }Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 10. }The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\ -{\listtext 11. }If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 12. }You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\ -{\listtext 13. }You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\ -{\listtext 14. }Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\ -{\listtext 15. }If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 16. }If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\ -{\listtext 17. }It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\ -{\listtext 18. }This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 19. }If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\ -{\listtext 20. }The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 21. }Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls3\ilvl0\cf0 {\listtext 22. }If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\ -\pard\pardeftab720\sa300\ql\qnatural - -\b \cf0 NO WARRANTY\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls4\ilvl0 -\b0 \cf0 {\listtext 1. }BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\ -{\listtext 2. }IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\ -\pard\pardeftab720\sa300\ql\qnatural - -\b \cf0 END OF TERMS AND CONDITIONS\ -How to Apply These Terms to Your New Programs\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0 \cf0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\ -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\ -\pard\pardeftab720\ql\qnatural - -\f3\i \cf0 one line to give the program's name and an idea of what it does. -\f2\i0 \ -Copyright (C) -\f3\i yyyy -\f2\i0 -\f3\i name of author -\f2\i0 \ -\ -This program is free software; you can redistribute it and/or\ -modify it under the terms of the GNU General Public License\ -as published by the Free Software Foundation; either version 2\ -of the License, or (at your option) any later version.\ -\ -This program is distributed in the hope that it will be useful,\ -but WITHOUT ANY WARRANTY; without even the implied warranty of\ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\ -GNU General Public License for more details.\ -\ -You should have received a copy of the GNU General Public License\ -along with this program; if not, write to the Free Software\ -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\ -\pard\pardeftab720\sa240\ql\qnatural - -\f0 \cf0 Also add information on how to contact you by electronic and paper mail.\ -If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\ -\pard\pardeftab720\ql\qnatural - -\f2 \cf0 Gnomovision version 69, Copyright (C) -\f3\i year -\f2\i0 -\f3\i name of author -\f2\i0 \ -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details\ -type `show w'. This is free software, and you are welcome\ -to redistribute it under certain conditions; type `show c' \ -for details.\ -\pard\pardeftab720\sa240\ql\qnatural - -\f0 \cf0 The hypothetical commands -\f2 `show w' -\f0 and -\f2 `show c' -\f0 should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than -\f2 `show w' -\f0 and -\f2 `show c' -\f0 ; they could even be mouse-clicks or menu items--whatever suits your program.\ -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:\ -\pard\pardeftab720\ql\qnatural - -\f2 \cf0 Yoyodyne, Inc., hereby disclaims all copyright\ -interest in the program `Gnomovision'\ -(which makes passes at compilers) written \ -by James Hacker.\ -\ -\pard\pardeftab720\ql\qnatural - -\f3\i \cf0 signature of Ty Coon -\f2\i0 , 1 April 1989\ -Ty Coon, President of Vice\ -\pard\pardeftab720\sa280\ql\qnatural - -\f0\b\fs36 \cf0 GNU LIBRARY GENERAL PUBLIC LICENSE\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0\fs24 \cf0 Version 2, June 1991\ -\pard\pardeftab720\ql\qnatural - -\f2 \cf0 Copyright (C) 1991 Free Software Foundation, Inc.\ -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\ -Everyone is permitted to copy and distribute verbatim copies\ -of this license document, but changing it is not allowed.\ -\ -[This is the first released version of the library GPL. It is\ - numbered 2 because it goes with version 2 of the ordinary GPL.]\ -\pard\pardeftab720\sa300\ql\qnatural - -\f0\b \cf0 Preamble\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0 \cf0 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.\ -This license, the Library General Public License, applies to some specially designated Free Software Foundation software, and to any other libraries whose authors decide to use it. You can use it for your libraries, too.\ -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\ -To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library, or if you modify it.\ -For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link a program with the library, you must provide complete object files to the recipients so that they can relink them with the library, after making changes to the library and recompiling it. And you must show them these terms so they know their rights.\ -Our method of protecting your rights has two steps: (1) copyright the library, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the library.\ -Also, for each distributor's protection, we want to make certain that everyone understands that there is no warranty for this free library. If the library is modified by someone else and passed on, we want its recipients to know that what they have is not the original version, so that any problems introduced by others will not reflect on the original authors' reputations.\ -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that companies distributing free software will individually obtain patent licenses, thus in effect transforming the program into proprietary software. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.\ -Most GNU software, including some libraries, is covered by the ordinary GNU General Public License, which was designed for utility programs. This license, the GNU Library General Public License, applies to certain designated libraries. This license is quite different from the ordinary one; be sure to read it in full, and don't assume that anything in it is the same as in the ordinary license.\ -The reason we have a separate public license for some libraries is that they blur the distinction we usually make between modifying or adding to a program and simply using it. Linking a program with a library, without changing the library, is in some sense simply using the library, and is analogous to running a utility program or application program. However, in a textual and legal sense, the linked executable is a combined work, a derivative of the original library, and the ordinary General Public License treats it as such.\ -Because of this blurred distinction, using the ordinary General Public License for libraries did not effectively promote software sharing, because most developers did not use the libraries. We concluded that weaker conditions might promote sharing better.\ -However, unrestricted linking of non-free programs would deprive the users of those programs of all benefit from the free status of the libraries themselves. This Library General Public License is intended to permit developers of non-free programs to use free libraries, while preserving your freedom as a user of such programs to change the free libraries that are incorporated in them. (We have not seen how to achieve this as regards changes in header files, but we have achieved it as regards changes in the actual functions of the Library.) The hope is that this will lead to faster development of free libraries.\ -The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, while the latter only works together with the library.\ -Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one.\ -\pard\pardeftab720\sa300\ql\qnatural - -\b \cf0 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\ -\pard\pardeftab720\sa240\ql\qnatural -\cf0 0. -\b0 This License Agreement applies to any software library which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Library General Public License (also called "this License"). Each licensee is addressed as "you".\ -A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.\ -The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)\ -"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.\ -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.\ - -\b 1. -\b0 You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.\ -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\ - -\b 2. -\b0 You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls5\ilvl0\cf0 {\listtext 1. }The modified work must itself be a software library.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls5\ilvl0\cf0 {\listtext 2. }\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls5\ilvl0\cf0 {\listtext 3. }You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls5\ilvl0\cf0 {\listtext 4. }\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls5\ilvl0\cf0 {\listtext 5. }You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls5\ilvl0\cf0 {\listtext 6. }\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls5\ilvl0\cf0 {\listtext 7. }If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls5\ilvl0\cf0 {\listtext 8. }(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)\ -\pard\pardeftab720\sa240\ql\qnatural -\cf0 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\ -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.\ -In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\ -\pard\pardeftab720\sa240\ql\qnatural - -\b \cf0 3. -\b0 You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.\ -Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.\ -This option is useful when you wish to copy part of the code of the Library into a program that is not a library.\ - -\b 4. -\b0 You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.\ -If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.\ - -\b 5. -\b0 A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.\ -However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.\ -When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.\ -If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)\ -Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.\ - -\b 6. -\b0 As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.\ -You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls6\ilvl0\cf0 {\listtext 1. }Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls6\ilvl0\cf0 {\listtext 2. }\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls6\ilvl0\cf0 {\listtext 3. }Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls6\ilvl0\cf0 {\listtext 4. }\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls6\ilvl0\cf0 {\listtext 5. }If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls6\ilvl0\cf0 {\listtext 6. }\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls6\ilvl0\cf0 {\listtext 7. }Verify that the user has already received a copy of these materials or that you have already sent this user a copy.\ -\pard\pardeftab720\sa240\ql\qnatural -\cf0 For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\ -It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.\ -\pard\pardeftab720\sa240\ql\qnatural - -\b \cf0 7. -\b0 You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls7\ilvl0\cf0 {\listtext 1. }Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\sa240\ql\qnatural -\ls7\ilvl0\cf0 {\listtext 2. }\ -\pard\tx220\tx720\pardeftab720\li720\fi-720\ql\qnatural -\ls7\ilvl0\cf0 {\listtext 3. }Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.\ -\pard\pardeftab720\sa240\ql\qnatural - -\b \cf0 8. -\b0 You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\ - -\b 9. -\b0 You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.\ - -\b 10. -\b0 Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\ - -\b 11. -\b0 If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.\ -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.\ -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\ -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\ - -\b 12. -\b0 If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\ - -\b 13. -\b0 The Free Software Foundation may publish revised and/or new versions of the Library General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\ -Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.\ - -\b 14. -\b0 If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\ - -\b NO WARRANTY -\b0 \ - -\b 15. -\b0 BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\ - -\b 16. -\b0 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\ -\pard\pardeftab720\sa300\ql\qnatural - -\b \cf0 END OF TERMS AND CONDITIONS\ -How to Apply These Terms to Your New Libraries\ -\pard\pardeftab720\sa240\ql\qnatural - -\b0 \cf0 If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).\ -To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\ -\pard\pardeftab720\ql\qnatural - -\f3\i \cf0 one line to give the library's name and an idea of what it does. -\f2\i0 \ -Copyright (C) -\f3\i year -\f2\i0 -\f3\i name of author -\f2\i0 \ -\ -This library is free software; you can redistribute it and/or\ -modify it under the terms of the GNU Lesser General Public\ -License as published by the Free Software Foundation; either\ -version 2.1 of the License, or (at your option) any later version.\ -\ -This library is distributed in the hope that it will be useful,\ -but WITHOUT ANY WARRANTY; without even the implied warranty of\ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\ -Lesser General Public License for more details.\ -\ -You should have received a copy of the GNU Lesser General Public\ -License along with this library; if not, write to the Free Software\ -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\ -\pard\pardeftab720\sa240\ql\qnatural - -\f0 \cf0 Also add information on how to contact you by electronic and paper mail.\ -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:\ -\pard\pardeftab720\ql\qnatural - -\f2 \cf0 Yoyodyne, Inc., hereby disclaims all copyright interest in\ -the library `Frob' (a library for tweaking knobs) written\ -by James Random Hacker.\ -\ -\pard\pardeftab720\ql\qnatural - -\f3\i \cf0 signature of Ty Coon -\f2\i0 , 1 April 1990\ -Ty Coon, President of Vice\ -\pard\pardeftab720\sa240\ql\qnatural - -\f0 \cf0 That's all there is to it!\ -}
\ No newline at end of file diff --git a/packaging/WELCOME.rtf b/packaging/WELCOME.rtf deleted file mode 100644 index aae117479..000000000 --- a/packaging/WELCOME.rtf +++ /dev/null @@ -1,24 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1009\cocoasubrtf300 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\margl1440\margr1440\margb1800\margt1800\vieww9000\viewh8400\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural - -\f0\fs24 \cf0 This program will install CUPS @CUPS_VERSION@, replacing the CUPS software that is included with Mac OS X.\ -\ - -\b WARNING\ - -\b0 \ -This is pre-release software and should not be used in production environments. Because Mac OS X packages cannot be uninstalled, you will need to reinstall Mac OS X to revert to the original CUPS software.\ -\ -Please report all problems using the Bugs & Features page on the CUPS home page:\ -\ - {\field{\*\fldinst{HYPERLINK "http://www.cups.org/str.php"}}{\fldrslt http://www.cups.org/str.php}}\ -\ - -\b NO WARRANTY\ - -\b0 \ -CUPS is provided under the terms of the GNU General Public License and GNU Library General Public License versions 2. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\ -}
\ No newline at end of file diff --git a/packaging/cups-desc.plist.in b/packaging/cups-desc.plist.in deleted file mode 100644 index 4d1d29688..000000000 --- a/packaging/cups-desc.plist.in +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IFPkgDescriptionDeleteWarning</key> - <string></string> - <key>IFPkgDescriptionDescription</key> - <string>CUPS provides a portable printing layer for UNIX(r) operating systems.</string> - <key>IFPkgDescriptionTitle</key> - <string>CUPS</string> - <key>IFPkgDescriptionVersion</key> - <string>@CUPS_RELEASE@</string> -</dict> -</plist> diff --git a/packaging/cups-info.plist.in b/packaging/cups-info.plist.in deleted file mode 100644 index d1f61348b..000000000 --- a/packaging/cups-info.plist.in +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IFPkgFlagAuthorizationAction</key> - <string>RootAuthorization</string> - <key>IFPkgFlagBackgroundAlignment</key> - <string>bottomleft</string> - <key>IFPkgFlagBackgroundScaling</key> - <string>none</string> - <key>IFPkgFormatVersion</key> - <real>0.1</real> - <key>CFBundleIdentifier</key> - <string>org.cups.cups</string> - <key>CFBundleName</key> - <string>CUPS</string> - <key>CFBundleGetInfoString</key> - <string>CUPS, @CUPS_VERSION@</string> - <key>CFBundleShortVersionString</key> - <string>@CUPS_RELEASE@</string> - <key>IFPkgFlagAllowBackRev</key> - <true/> - <key>IFPkgFlagRootVolumeOnly</key> - <true/> -</dict> -</plist> diff --git a/packaging/cups.list.in b/packaging/cups.list.in index 6f35bde05..16ba1d6bc 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -24,7 +24,7 @@ %version @CUPS_VERSION@ %format all %description CUPS is the standards-based, open source printing system developed by -%description Apple Inc. for OS X and other UNIX®-like operating systems. +%description Apple Inc. for macOS® and other UNIX®-like operating systems. %format rpm %provides lpd diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 46faef2cc..6606635da 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -5,7 +5,7 @@ # # Original version by Jason McMullan <jmcc@ontv.com>. # -# Copyright 2007-2015 by Apple Inc. +# Copyright 2007-2016 by Apple Inc. # Copyright 1999-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -102,7 +102,7 @@ Requires: %{name} = %{epoch}:%{version} xinetd %description CUPS is the standards-based, open source printing system developed by -Apple Inc. for OS X and other UNIX®-like operating systems. +Apple Inc. for macOS® and other UNIX®-like operating systems. %description devel This package provides the CUPS headers and development environment. diff --git a/packaging/installer.gif b/packaging/installer.gif Binary files differdeleted file mode 100644 index 3ae6ea77a..000000000 --- a/packaging/installer.gif +++ /dev/null diff --git a/packaging/installer.tif b/packaging/installer.tif Binary files differdeleted file mode 100644 index cc52bc65a..000000000 --- a/packaging/installer.tif +++ /dev/null diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx index ad7157bc5..1ec051d73 100644 --- a/ppdc/ppdc-catalog.cxx +++ b/ppdc/ppdc-catalog.cxx @@ -254,7 +254,7 @@ ppdcCatalog::load_messages( else if (!strcmp(ptr, ".strings")) { /* - * Read messages in OS X ".strings" format, which are either UTF-8/UTF-16 + * Read messages in macOS ".strings" format, which are either UTF-8/UTF-16 * text files of the format: * * "id" = "str"; diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index bd73c0ee5..78752e5ec 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -450,7 +450,7 @@ usage(void) _cupsLangPuts(stdout, _(" --crlf End lines with CR + LF " "(Windows).")); _cupsLangPuts(stdout, _(" --lf End lines with LF " - "(UNIX/Linux/OS X).")); + "(UNIX/Linux/macOS).")); exit(1); } diff --git a/scheduler/auth.c b/scheduler/auth.c index 9ffc06a5b..2b7eec7af 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1206,7 +1206,7 @@ cupsdCheckGroup( #ifdef HAVE_MBR_UID_TO_UUID /* - * Check group membership through MacOS X membership API... + * Check group membership through MacmacOS membership API... */ if (user && !mbr_uid_to_uuid(user->pw_uid, useruuid)) diff --git a/scheduler/cert.c b/scheduler/cert.c index 17f5bd5dc..2ac8ed720 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -120,7 +120,7 @@ cupsdAddCert(int pid, /* I - Process ID */ # ifdef HAVE_MBR_UID_TO_UUID /* - * On MacOS X, ACLs use UUIDs instead of GIDs... + * On MacmacOS, ACLs use UUIDs instead of GIDs... */ acl = acl_init(NumSystemGroups - 1); diff --git a/scheduler/client.c b/scheduler/client.c index 02e5fafb8..42010def1 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -2369,7 +2369,7 @@ cupsdSendHeader( * requests when the request requires system group membership - then the * client knows the root certificate can/should be used. * - * Also, for OS X we also look for @AUTHKEY and add an "authkey" + * Also, for macOS we also look for @AUTHKEY and add an "authkey" * parameter as needed... */ diff --git a/scheduler/conf.h b/scheduler/conf.h index 076d63db0..3dc442518 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -76,7 +76,7 @@ typedef enum #define PRINTCAP_BSD 0 /* Berkeley LPD format */ #define PRINTCAP_SOLARIS 1 /* Solaris lpsched format */ -#define PRINTCAP_PLIST 2 /* OS X plist format */ +#define PRINTCAP_PLIST 2 /* macOS plist format */ /* diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx index 6e14a3ec6..b6592a6aa 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx @@ -910,7 +910,7 @@ get_file(const char *name, /* I - Name */ slash > printerDriver)) { /* - * Map ppd-name to OS X standard locations... + * Map ppd-name to macOS standard locations... */ snprintf(buffer, bufsize, "/%s", name); @@ -1081,7 +1081,7 @@ list_ppds(int request_id, /* I - Request ID */ #ifdef __APPLE__ /* - * Load PPDs from standard OS X locations... + * Load PPDs from standard macOS locations... */ load_ppds("/Library/Printers", diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index 6dc7e3433..5a829e745 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -820,7 +820,7 @@ exec_filter(const char *filter, /* I - Filter to execute */ /* - * Add special voodoo magic for MacOS X - this allows MacOS X + * Add special voodoo magic for MacmacOS - this allows MacmacOS * programs to access their bundle resources properly... */ diff --git a/scheduler/env.c b/scheduler/env.c index 0645b1380..c5e8c61e9 100644 --- a/scheduler/env.c +++ b/scheduler/env.c @@ -49,7 +49,7 @@ cupsdInitEnv(void) #if defined(__APPLE__) /* - * Add special voodoo magic for MacOS X - this allows MacOS X + * Add special voodoo magic for MacmacOS - this allows MacmacOS * programs to access their bundle resources properly... * * This string is replaced in cupsdStartProcess()... diff --git a/scheduler/job.c b/scheduler/job.c index 11412face..1ce21234a 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -3206,7 +3206,7 @@ finalize_job(cupsd_job_t *job, /* I - Job */ /* * Convert the status to an exit code. Due to the way the W* macros are - * implemented on MacOS X (bug?), we have to store the exit status in a + * implemented on MacmacOS (bug?), we have to store the exit status in a * variable first and then convert... */ diff --git a/scheduler/process.c b/scheduler/process.c index 51d7a7a11..aa1fe96c9 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -514,7 +514,7 @@ cupsdStartProcess( if (envp) { /* - * Add special voodoo magic for OS X - this allows OS X programs to access + * Add special voodoo magic for macOS - this allows macOS programs to access * their bundle resources properly... */ diff --git a/scheduler/select.c b/scheduler/select.c index 0652e450f..3d655cee7 100644 --- a/scheduler/select.c +++ b/scheduler/select.c @@ -42,7 +42,7 @@ * FreeBSD YES YES NO YES NO * HP-UX YES YES NO NO NO * Linux YES YES YES NO NO - * MacOS X YES YES NO YES NO + * MacmacOS YES YES NO YES NO * NetBSD YES YES NO YES NO * OpenBSD YES YES NO YES NO * Solaris YES YES NO NO YES diff --git a/scheduler/sysman.c b/scheduler/sysman.c index 9f0319a62..4eddd1aac 100644 --- a/scheduler/sysman.c +++ b/scheduler/sysman.c @@ -31,10 +31,10 @@ * and state files to minimize the number of times the disk has to spin * up or flash to be written to. * - * Power management support is currently only implemented on OS X, but + * Power management support is currently only implemented on macOS, but * essentially we use four functions to let the OS know when it is OK to * put the system to sleep, typically when we are not in the middle of - * printing a job. And on OS X we can also "sleep print" - basically the + * printing a job. And on macOS we can also "sleep print" - basically the * system only wakes up long enough to service network requests and process * print jobs. */ diff --git a/scheduler/util.c b/scheduler/util.c index 5e67d8028..ac078bd9c 100644 --- a/scheduler/util.c +++ b/scheduler/util.c @@ -156,7 +156,7 @@ cupsdCreateStringsArray(const char *s) /* I - Comma-delimited strings */ /* * 'cupsdExec()' - Run a program with the correct environment. * - * On OS X, we need to update the CFProcessPath environment variable that + * On macOS, we need to update the CFProcessPath environment variable that * is passed in the environment so the child can access its bundled resources. */ @@ -173,7 +173,7 @@ cupsdExec(const char *command, /* I - Full path to program */ /* - * Some OS X programs are bundled and need the CFProcessPath environment + * Some macOS programs are bundled and need the CFProcessPath environment * variable defined. If the command is a symlink, resolve the link and point * to the resolved location, otherwise, use the command path itself. */ diff --git a/test/ipptool.c b/test/ipptool.c index 6d46da162..819ab7437 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -4900,7 +4900,7 @@ timeout_cb(http_t *http, /* I - Connection to server */ * buffer is empty... */ -#ifdef SO_NWRITE /* OS X and some versions of Linux */ +#ifdef SO_NWRITE /* macOS and some versions of Linux */ socklen_t len = sizeof(buffered); /* Size of return value */ if (getsockopt(httpGetFd(http), SOL_SOCKET, SO_NWRITE, &buffered, &len)) diff --git a/vcnet/config.h b/vcnet/config.h index fdbfd68e4..c7ea6aaf6 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -593,7 +593,7 @@ typedef unsigned long useconds_t; /* - * Do we have OS X 10.4's mbr_XXX functions? + * Do we have macOS 10.4's mbr_XXX functions? */ /* #undef HAVE_MEMBERSHIP_H */ @@ -746,7 +746,7 @@ typedef unsigned long useconds_t; /* - * Location of OS X localization bundle, if any. + * Location of macOS localization bundle, if any. */ /* #undef CUPS_BUNDLEDIR */ diff --git a/xcode/config.h b/xcode/config.h index 98aa98749..d7765b3f7 100644 --- a/xcode/config.h +++ b/xcode/config.h @@ -550,10 +550,10 @@ */ #define HAVE_GETGROUPLIST 1 - + /* - * Do we have OS X 10.4's mbr_XXX functions? + * Do we have macOS 10.4's mbr_XXX functions? */ #define HAVE_MEMBERSHIP_H 1 @@ -700,7 +700,7 @@ /* - * Location of OS X localization bundle, if any. + * Location of macOS localization bundle, if any. */ #if !TARGET_OS_IOS |
