Merge changes from CUPS 1.4svn-r8628.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 13 May 2009 22:29:41 +0000 (22:29 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 13 May 2009 22:29:41 +0000 (22:29 +0000)
commit178cb7369d104b95acb92929f36956a38765c84c
tree4563f57a75df1c4145d25d3ebecf1d3152022362
parentf11a948a02771f78f50b530880a0269d4b4f58eb
Merge changes from CUPS 1.4svn-r8628.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1495 a1ca3aef-8c08-0410-bb20-df032aa958be
132 files changed:
CHANGES.txt
Makefile
backend/usb-darwin.c
cgi-bin/admin.c
cgi-bin/api-cgi.header [new file with mode: 0644]
cgi-bin/api-cgi.shtml [new file with mode: 0644]
cgi-bin/makedocset.c
config-scripts/cups-common.m4
config.h.in
cups/api-array.header
cups/api-cups.header
cups/api-filedir.header
cups/api-filter.header
cups/api-filter.shtml
cups/api-httpipp.header
cups/api-overview.header
cups/api-ppd.header
cups/backend.c
cups/conflicts.c
cups/cups.h
cups/dest.c
cups/emit.c
cups/file.c
cups/getdevices.c
cups/http.c
cups/ipp-support.c
cups/ipp.h
cups/localize.c
cups/page.c
cups/ppd.h
cups/request.c
cups/sidechannel.c
cups/sidechannel.h
cups/usersys.c
cups/util.c
doc/Makefile
doc/cups-printable.css
doc/cups.css
doc/help/accounting.html
doc/help/api-array.html
doc/help/api-cgi.html
doc/help/api-cups.html
doc/help/api-driver.html
doc/help/api-filedir.html
doc/help/api-filter.html
doc/help/api-httpipp.html
doc/help/api-mime.html
doc/help/api-overview.html
doc/help/api-ppd.html
doc/help/api-ppdc.html
doc/help/api-raster.html
doc/help/cgi.html
doc/help/glossary.html
doc/help/kerberos.html
doc/help/license.html
doc/help/network.html
doc/help/options.html
doc/help/overview.html
doc/help/policies.html
doc/help/postscript-driver.html
doc/help/ppd-compiler.html
doc/help/raster-driver.html
doc/help/ref-access_log.html
doc/help/ref-classes-conf.html
doc/help/ref-client-conf.html
doc/help/ref-cupsd-conf.html.in
doc/help/ref-error_log.html
doc/help/ref-mailto-conf.html
doc/help/ref-page_log.html
doc/help/ref-ppdcfile.html
doc/help/ref-printers-conf.html
doc/help/ref-snmp-conf.html
doc/help/ref-subscriptions-conf.html
doc/help/security.html
doc/help/sharing.html
doc/help/spec-banner.html
doc/help/spec-browsing.html
doc/help/spec-cmp.html
doc/help/spec-command.html
doc/help/spec-design.html
doc/help/spec-ipp.html
doc/help/spec-pdf.html
doc/help/spec-postscript.html
doc/help/spec-ppd.html
doc/help/spec-raster.html
doc/help/spec-stp.html
doc/help/standard.html.in
doc/help/translation.html
doc/help/whatsnew.html
driver/api-driver.header
driver/api-driver.shtml
filter/api-raster.header
filter/postscript-driver.header
filter/postscript-driver.shtml
filter/ppd-compiler.header
filter/raster-driver.header
filter/raster-driver.shtml
filter/rastertoepson.c
init/org.cups.cupsd.plist
locale/cups_zh.po
man/Makefile
man/backend.man
man/commandtoescpx.man [deleted file]
man/commandtopclx.man [deleted file]
man/cupsd.conf.man.in
man/filter.man
man/mantohtml.c
man/rastertoescpx.man [deleted file]
man/rastertopclx.man [deleted file]
packaging/cups.list.in
packaging/cups.spec.in
ppdc/api-ppdc.header [new file with mode: 0644]
ppdc/api-ppdc.shtml [new file with mode: 0644]
scheduler/api-mime.header [new file with mode: 0644]
scheduler/api-mime.shtml [new file with mode: 0644]
scheduler/conf.c
scheduler/conf.h
scheduler/cups-driverd.cxx
scheduler/dirsvc.c
scheduler/job.c
scheduler/job.h
scheduler/log.c
scheduler/printers.c
scheduler/sysman.c
standards/Makefile
standards/rfctohtml.c
templates/de/help-printable.tmpl
templates/es/help-printable.tmpl
templates/help-printable.tmpl
templates/ja/help-printable.tmpl
templates/pl/help-printable.tmpl
templates/ru/help-printable.tmpl