summaryrefslogtreecommitdiff
path: root/ppdc/ppdmerge.cxx
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-03-23 00:05:29 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-03-23 00:05:29 +0000
commit84315f460a5c9eb38f7fcc4204acf98ed2b29406 (patch)
tree13135924a24fee3f340569f7cd39e00d087dced9 /ppdc/ppdmerge.cxx
parent82f972324ddde683be8a6d302f9937532ab0cf81 (diff)
downloadcups-84315f460a5c9eb38f7fcc4204acf98ed2b29406.tar.gz
Merge changes from CUPS 1.5svn-r9641
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3071 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'ppdc/ppdmerge.cxx')
-rw-r--r--ppdc/ppdmerge.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index bd5be92ac..923355c09 100644
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -3,7 +3,7 @@
//
// PPD file merge utility for the CUPS PPD Compiler.
//
-// Copyright 2007-2010 by Apple Inc.
+// Copyright 2007-2011 by Apple Inc.
// Copyright 2002-2007 by Easy Software Products.
//
// These coded instructions, statements, and computer programs are the
@@ -367,7 +367,8 @@ usage(void)
_cupsLangPuts(stdout, _("Usage: ppdmerge [options] filename.ppd [ ... "
"filenameN.ppd ]"));
_cupsLangPuts(stdout, _("Options:"));
- _cupsLangPuts(stdout, _(" -o filename.ppd[.gz]"));
+ _cupsLangPuts(stdout, _(" -o filename.ppd[.gz] Set output file "
+ "(otherwise stdout)."));
exit(1);
}