diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-12-14 21:25:17 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-12-14 21:25:17 +0000 |
commit | c779abb06a2a4c102b65b3f9f65e4ca6a792fff7 (patch) | |
tree | 5e8da09129ec17662d8b59b5729e116a3c95d11a /filter/spec-ppd.shtml | |
parent | 229681c188bf1940a4963a5796df4be65bb00825 (diff) | |
download | cups-c779abb06a2a4c102b65b3f9f65e4ca6a792fff7.tar.gz |
Merge changes from CUPS 1.5svn-r9407.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2910 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'filter/spec-ppd.shtml')
-rw-r--r-- | filter/spec-ppd.shtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/spec-ppd.shtml b/filter/spec-ppd.shtml index 96fb88133..3e58a3b01 100644 --- a/filter/spec-ppd.shtml +++ b/filter/spec-ppd.shtml @@ -317,7 +317,7 @@ f(x) = density * x <sup style='font-size: 100%'>gamma</sup> <h3><span class='info'>CUPS 1.4/Mac OS X 10.6</span><a name='cupsUIResolver'>cupsUIResolver</a></h3> -<p class='summary'>*cupsUIResolution resolver: "*Keyword1 OptionKeyword1 *Keyword2 OptionKeyword2 ..."</p> +<p class='summary'>*cupsUIResolver resolver: "*Keyword1 OptionKeyword1 *Keyword2 OptionKeyword2 ..."</p> <p>Specifies two or more options to mark/select to resolve a constraint. The "resolver" string identifies a particular action to take for one or more <a href='#cupsUIConstraints'><tt>cupsUIConstraints</tt></a>. The same action can be used for multiple constraints. The option keyword pairs are treated as an ordered list of option selections to try - only the first N selections will be used, where N is the minimum number of selections required. Because <a href="api-ppd.html#cupsResolveConflicts"><code>cupsResolveConflicts()</code></a> will not change the most recent option selection passed to it, at least two options from the constraints must be listed to avoid situations where conflicts cannot be resolved.</p> |