[26923] in Source-Commits
/svn/athena r25835 - in trunk/debathena/config/printing-config: debathena/printing debian files/usr/share/man/man1
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Mar 5 12:53:33 2013
Date: Tue, 5 Mar 2013 12:53:26 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201303051753.r25HrQtd019386@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-03-05 12:53:26 -0500 (Tue, 05 Mar 2013)
New Revision: 25835
Modified:
trunk/debathena/config/printing-config/debathena/printing/common.py
trunk/debathena/config/printing-config/debathena/printing/lp.py
trunk/debathena/config/printing-config/debathena/printing/lpq.py
trunk/debathena/config/printing-config/debathena/printing/lpr.py
trunk/debathena/config/printing-config/debathena/printing/lprm.py
trunk/debathena/config/printing-config/debathena/printing/test_common.py
trunk/debathena/config/printing-config/debathena/printing/test_lpr.py
trunk/debathena/config/printing-config/debian/changelog
trunk/debathena/config/printing-config/files/usr/share/man/man1/lp.debathena.1
trunk/debathena/config/printing-config/files/usr/share/man/man1/lpq.debathena.1
trunk/debathena/config/printing-config/files/usr/share/man/man1/lpr.debathena.1
trunk/debathena/config/printing-config/files/usr/share/man/man1/lprm.debathena.1
Log:
In printing-config:
* Kill off LPRng (Trac: #1021). Anyone wishing to print to or otherwise
use an lpr printer should use the rlpr(1) suite of commands.
Modified: trunk/debathena/config/printing-config/debathena/printing/common.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/common.py 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/debathena/printing/common.py 2013-03-05 17:53:26 UTC (rev 25835)
@@ -23,8 +23,10 @@
SYSTEM_CUPS = 0
-SYSTEM_LPRNG = 1
-SYSTEMS = [SYSTEM_CUPS, SYSTEM_LPRNG]
+# If in the future we decide we hate ourselves enough to have a second print
+# subsystem, we would specify it here, and add it to the SYSTEMS list.
+# e.g. SYSTEM_LPRNG = 1
+SYSTEMS = [SYSTEM_CUPS]
def _hesiod_lookup(hes_name, hes_type):
@@ -99,15 +101,13 @@
for opt_identifier, optinfo in optinfos:
try:
options, arguments = getopt.gnu_getopt(args, optinfo)
- if opt_identifier == SYSTEM_LPRNG:
- sys.stderr.write("WARNING: You appear to be using LPRng-style arguments (e.g. -Zduplex).\nThese are deprecated and will not be supported in the future.\nFor more information, please see http://kb.mit.edu/confluence/x/HgAABw\n");
return opt_identifier, options, arguments
except getopt.GetoptError:
# That version doesn't work, so try the next one
continue
# If we got this far, they both failed (read: syntax error)
- error(2, "Syntax Error: Incorrect option passed. See the man page for more information.\nA common cause is mixing CUPS and LPRng syntax.\nValid options: %s\n" %
+ error(2, "Syntax Error: Incorrect option passed. See the man page for more information.\nA common cause is using old LPRng syntax.\nValid options: %s\n" %
(string.replace(re.sub(r'([a-zA-Z])', r'-\1 ',
optinfos[SYSTEM_CUPS][1]), ':', '[arg] ')))
@@ -314,11 +314,9 @@
# print queue, the local cupsd is good enough
return SYSTEM_CUPS, None, queue
- # See if rm is running a cupsd. If not, assume it's an LPRng server.
- if is_cups_server(rm):
- return SYSTEM_CUPS, rm, queue
- else:
- return SYSTEM_LPRNG, rm, queue
+ # Give up and return rm and queue. If it's not running a cupsd,
+ # too bad. It's not our job to check whether cupsd is running.
+ return SYSTEM_CUPS, rm, queue
def dispatch_command(system, command, args):
@@ -338,8 +336,6 @@
"""
if system == SYSTEM_CUPS:
prefix = 'cups-'
- elif system == SYSTEM_LPRNG:
- prefix = 'mit-'
else:
error(1, '\nError: Unknown printing infrastructure\n\n')
@@ -352,7 +348,7 @@
os.execvp('%s%s' % (prefix, command), [command] + args)
-__all__ = ['SYSTEM_CUPS', 'SYSTEM_LPRNG', 'SYSTEMS'
+__all__ = ['SYSTEM_CUPS', 'SYSTEMS'
'get_cups_uri',
'parse_args',
'extract_opt',
Modified: trunk/debathena/config/printing-config/debathena/printing/lp.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/lp.py 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/debathena/printing/lp.py 2013-03-05 17:53:26 UTC (rev 25835)
@@ -14,7 +14,6 @@
opts = (
(common.SYSTEM_CUPS, 'EU:cd:h:mn:o:q:st:H:P:i:'),
- (common.SYSTEM_LPRNG, 'ckmprswBGYd:D:f:n:q:t:'),
)
Modified: trunk/debathena/config/printing-config/debathena/printing/lpq.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/lpq.py 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/debathena/printing/lpq.py 2013-03-05 17:53:26 UTC (rev 25835)
@@ -17,7 +17,6 @@
opts = (
(common.SYSTEM_CUPS, 'EU:h:P:al'),
- (common.SYSTEM_LPRNG, 'aAlLVcvP:st:D:'),
)
Modified: trunk/debathena/config/printing-config/debathena/printing/lpr.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/lpr.py 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/debathena/printing/lpr.py 2013-03-05 17:53:26 UTC (rev 25835)
@@ -16,50 +16,8 @@
opts = {
common.SYSTEM_CUPS: 'EH:U:P:#:hlmo:pqrC:J:T:',
- common.SYSTEM_LPRNG: 'ABblC:D:F:Ghi:kJ:K:#:m:NP:rR:sT:U:Vw:X:YZ:z1:2:3:4:',
}
-
-def translate_lprng_args_to_cups(args):
- # TODO yell at user if/when we decide that these args are deprecated
-
- # If getopt fails, something went very wrong -- _we_ generated this
- options, realargs = getopt.gnu_getopt(args, opts[common.SYSTEM_LPRNG])
- cupsargs = []
- for (o, a) in options:
- if o in ('-b', '-l'):
- cupsargs += [('-l', a)]
- elif o in ('-h'):
- cupsargs += [('-h', a)]
- elif o in ('-J'):
- cupsargs += [('-J', a)]
- elif o in ('-K', '-#'):
- cupsargs += [('-#', a)]
- elif o in ('-P'):
- cupsargs += [('-P', a)]
- elif o in ('-T'):
- cupsargs += [('-T', a)]
- elif o in ('-U'):
- cupsargs += [('-U', a)]
- elif o in ('-Z'):
- if a == 'simplex':
- cupsargs += [('-o', 'sides=one-sided')]
- elif a == 'duplex':
- cupsargs += [('-o', 'sides=two-sided-long-edge')]
- elif a == 'duplexshort':
- cupsargs += [('-o', 'sides=two-sided-short-edge')]
- # TODO attempt to deal banner=staff
- elif o in ('-m'):
- # Intentionally drop any argument to -m; zephyrs always go
- # to you
- cupsargs += [('-m', '')]
- else:
- sys.stderr.write("Warning: option %s%s not converted to CUPS\n"
- % (o, a))
- joincupsargs = [o + a for o, a in cupsargs] + realargs
- return joincupsargs
-
-
def _main(args):
args.pop(0)
@@ -78,15 +36,10 @@
queue = queue_args[-1][-1]
# Deal with zephyr notifications
- zephyr_args, options = common.extract_opt(options, '-N')
- if not zephyr_args and os.environ.get('ATHENA_USER'):
+ if os.environ.get('ATHENA_USER'):
system = common.find_queue(queue)[0]
- if argstyle == common.SYSTEM_LPRNG:
- options.append(('-m', 'zephyr%' + os.environ['ATHENA_USER']))
- elif system == common.SYSTEM_CUPS:
+ if system == common.SYSTEM_CUPS:
options.append(('-m', ''))
- elif system == common.SYSTEM_LPRNG:
- options.append(('-m', 'zephyr%' + os.environ['ATHENA_USER']))
# Now that we've sliced up the arguments, put them back
# together
@@ -120,8 +73,6 @@
args.insert(0, '-U%s' % os.environ['ATHENA_USER'])
if server:
os.environ['CUPS_SERVER'] = server
- if system == common.SYSTEM_CUPS and argstyle == common.SYSTEM_LPRNG:
- args = translate_lprng_args_to_cups(args)
if system == common.SYSTEM_CUPS and 'LPROPT' in os.environ:
sys.stderr.write("Use of the $LPROPT environment variable is deprecated and\nits contents will be ignored.\nSee http://kb.mit.edu/confluence/x/awCxAQ\n")
Modified: trunk/debathena/config/printing-config/debathena/printing/lprm.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/lprm.py 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/debathena/printing/lprm.py 2013-03-05 17:53:26 UTC (rev 25835)
@@ -14,7 +14,6 @@
opts = (
(common.SYSTEM_CUPS, 'EU:h:P:'),
- (common.SYSTEM_LPRNG, 'aAD:P:VU:'),
)
Modified: trunk/debathena/config/printing-config/debathena/printing/test_common.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/test_common.py 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/debathena/printing/test_common.py 2013-03-05 17:53:26 UTC (rev 25835)
@@ -46,18 +46,20 @@
def setUp(self):
super(TestParseArgs, self).setUp()
+ # Multiple argument styles can be added here if we ever have any
self.optinfo = ((common.SYSTEM_CUPS, 'P:'),
- (common.SYSTEM_LPRNG, 'X:'))
+ )
def test_valid_primary_args(self):
"""Test parsing arguments with the first set of options"""
self.assertEqual(common.parse_args(['-Pmeadow', 'my_job'], self.optinfo),
(common.SYSTEM_CUPS, [('-P', 'meadow')], ['my_job']))
- def test_valid_secondary_args(self):
- """Test parsing arguments with the second set of options"""
- self.assertEqual(common.parse_args(['-Xmeadow', 'my_job'], self.optinfo),
- (common.SYSTEM_LPRNG, [('-X', 'meadow')], ['my_job']))
+ # We no longer have multiple argument parsing styles
+ # def test_valid_secondary_args(self):
+ # """Test parsing arguments with the second set of options"""
+ # self.assertEqual(common.parse_args(['-Xmeadow', 'my_job'], self.optinfo),
+ # (common.SYSTEM_LPRNG, [('-X', 'meadow')], ['my_job']))
def test_empty_args(self):
"""Test parsing an empty argument list"""
@@ -163,29 +165,31 @@
"""Verify that find_queue can find non-local Athena queues on CUPS"""
common.canonicalize_queue('ajax').AndReturn('ajax')
common.get_hesiod_print_server('ajax').AndReturn('GET-PRINT.MIT.EDU')
- common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
+ # We no longer call "is_cups_server"
+ # common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
self.mox.ReplayAll()
self.assertEqual(common.find_queue('ajax'),
(common.SYSTEM_CUPS, 'GET-PRINT.MIT.EDU', 'ajax'))
- def test_athena_lprng_queue(self):
- """Verify that find_queue can find non-local Athena queues on LPRng"""
- common.canonicalize_queue('ashdown').AndReturn('ashdown')
- common.get_hesiod_print_server('ashdown').AndReturn('MULCH.MIT.EDU')
- common.is_cups_server('MULCH.MIT.EDU').AndReturn(False)
+ # def test_athena_lprng_queue(self):
+ # """Verify that find_queue can find non-local Athena queues on LPRng"""
+ # common.canonicalize_queue('ashdown').AndReturn('ashdown')
+ # common.get_hesiod_print_server('ashdown').AndReturn('MULCH.MIT.EDU')
+ # common.is_cups_server('MULCH.MIT.EDU').AndReturn(False)
- self.mox.ReplayAll()
+ # self.mox.ReplayAll()
- self.assertEqual(common.find_queue('ashdown'),
- (common.SYSTEM_LPRNG, 'MULCH.MIT.EDU', 'ashdown'))
+ # self.assertEqual(common.find_queue('ashdown'),
+ # (common.SYSTEM_LPRNG, 'MULCH.MIT.EDU', 'ashdown'))
def test_misnamed_local_queue(self):
"""Verify that find_queue will use canonicalized queue names"""
common.canonicalize_queue('w20').AndReturn('ajax')
common.get_hesiod_print_server('ajax').AndReturn('GET-PRINT.MIT.EDU')
- common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
+ # We no longer call "is_cups_server"
+ # common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
self.mox.ReplayAll()
@@ -196,7 +200,8 @@
"""Verify that find_queue will strip instances"""
common.canonicalize_queue('ajax/2sided').AndReturn('ajax/2sided')
common.get_hesiod_print_server('ajax').AndReturn('GET-PRINT.MIT.EDU')
- common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
+ # We no longer call "is_cups_server"
+ # common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
self.mox.ReplayAll()
@@ -228,13 +233,13 @@
common.dispatch_command(common.SYSTEM_CUPS, 'lp', ['-dajax'])
- def test_dispatch_lprng(self):
- """Test dispatch_command dispatching to LPRng"""
- os.execvp('mit-lprm', ['lprm', '-Pmeadow', '123'])
+ # def test_dispatch_lprng(self):
+ # """Test dispatch_command dispatching to LPRng"""
+ # os.execvp('rlprm', ['lprm', '-Pbw', '123'])
- self.mox.ReplayAll()
+ # self.mox.ReplayAll()
- common.dispatch_command(common.SYSTEM_LPRNG, 'lprm', ['-Pmeadow', '123'])
+ # common.dispatch_command(common.SYSTEM_LPRNG, 'lprm', ['-Pbw', '123'])
def test_dispatch_error(self):
"""Test that dispatch_command errors out when it doesn't know what to do"""
Modified: trunk/debathena/config/printing-config/debathena/printing/test_lpr.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/test_lpr.py 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/debathena/printing/test_lpr.py 2013-03-05 17:53:26 UTC (rev 25835)
@@ -101,10 +101,12 @@
common._hesiod_lookup('ajax', 'pcap').AndReturn(['ajax:rp=ajax:rm=GET-PRINT.MIT.EDU:ka#0:mc#0:'])
common.get_default_printer().AndReturn(None)
common.get_cups_uri('ajax').AndReturn(None)
- common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
+ # We no longer call "is_cups_server"
+ # common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
common._hesiod_lookup('ajax', 'pcap').AndReturn(['ajax:rp=ajax:rm=GET-PRINT.MIT.EDU:ka#0:mc#0:'])
common.get_cups_uri('ajax').AndReturn(None)
- common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
+ # We no longer call "is_cups_server"
+ # common.is_cups_server('GET-PRINT.MIT.EDU').AndReturn(True)
# Result:
os.execvp('cups-lpr', ['lpr', '-Ujdreed', '-Pajax', '-m'])
@@ -113,30 +115,30 @@
lpr._main(['lpr', '-P', 'ajax'])
-class TestLPRngQueue(TestLpr):
- environ = {'ATHENA_USER': 'jdreed'}
- backends = ['get-print.mit.edu']
+# class TestLPRngQueue(TestLpr):
+# environ = {'ATHENA_USER': 'jdreed'}
+# backends = ['get-print.mit.edu']
- def test(self):
- """Test printing to an LPRng queue
+# def test(self):
+# """Test printing to an LPRng queue
- Ensure we pass zephyr arguments correctly.
- (because 'lpr -Pfoo' will count as 'CUPS argument style')"""
- # We call common.find_queue twice
- common._hesiod_lookup('w20thesis', 'pcap').AndReturn(['w20thesis:rp=w20thesis:rm=IO.MIT.EDU:ka#0:mc#0:auth=kerberos5:xn:'])
- common.get_default_printer().AndReturn(None)
- common.get_cups_uri('w20thesis').AndReturn(None)
- common.is_cups_server('IO.MIT.EDU').AndReturn(False)
- common._hesiod_lookup('w20thesis', 'pcap').AndReturn(['w20thesis:rp=w20thesis:rm=IO.MIT.EDU:ka#0:mc#0:auth=kerberos5:xn:'])
- common.get_cups_uri('w20thesis').AndReturn(None)
- common.is_cups_server('IO.MIT.EDU').AndReturn(False)
+# Ensure we pass zephyr arguments correctly.
+# (because 'lpr -Pfoo' will count as 'CUPS argument style')"""
+# # We call common.find_queue twice
+# common._hesiod_lookup('w20thesis', 'pcap').AndReturn(['w20thesis:rp=w20thesis:rm=IO.MIT.EDU:ka#0:mc#0:auth=kerberos5:xn:'])
+# common.get_default_printer().AndReturn(None)
+# common.get_cups_uri('w20thesis').AndReturn(None)
+# common.is_cups_server('IO.MIT.EDU').AndReturn(False)
+# common._hesiod_lookup('w20thesis', 'pcap').AndReturn(['w20thesis:rp=w20thesis:rm=IO.MIT.EDU:ka#0:mc#0:auth=kerberos5:xn:'])
+# common.get_cups_uri('w20thesis').AndReturn(None)
+# common.is_cups_server('IO.MIT.EDU').AndReturn(False)
- # Result:
- os.execvp('mit-lpr', ['lpr', '-Ujdreed', '-Pw20thesis', '-mzephyr%jdreed'])
+# # Result:
+# os.execvp('mit-lpr', ['lpr', '-Ujdreed', '-Pw20thesis'])
- self.mox.ReplayAll()
+# self.mox.ReplayAll()
- lpr._main(['lpr', '-P', 'w20thesis'])
+# lpr._main(['lpr', '-P', 'w20thesis'])
if __name__ == '__main__':
unittest.main()
Modified: trunk/debathena/config/printing-config/debian/changelog
===================================================================
--- trunk/debathena/config/printing-config/debian/changelog 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/debian/changelog 2013-03-05 17:53:26 UTC (rev 25835)
@@ -1,12 +1,14 @@
-debathena-printing-config (1.30) UNRELEASED; urgency=low
+debathena-printing-config (1.30) unstable; urgency=low
* Remove DEB_UNDIVERT_VERSION, unneeded as of c-p-d 4.12 (and build-dep
on 4.12)
* Drop our english-to-english translation added in version 1.10 because
upstream (https://fedorahosted.org/system-config-printer/ticket/181)
fixed this years ago.
+ * Kill off LPRng (Trac: #1021). Anyone wishing to print to or otherwise
+ use an lpr printer should use the rlpr(1) suite of commands.
- -- Jonathan Reed <jdreed@mit.edu> Fri, 31 Aug 2012 08:45:20 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 05 Mar 2013 12:36:52 -0500
debathena-printing-config (1.29) unstable; urgency=low
Modified: trunk/debathena/config/printing-config/files/usr/share/man/man1/lp.debathena.1
===================================================================
--- trunk/debathena/config/printing-config/files/usr/share/man/man1/lp.debathena.1 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/files/usr/share/man/man1/lp.debathena.1 2013-03-05 17:53:26 UTC (rev 25835)
@@ -1,19 +1,21 @@
-.TH lp 1 Debathena "November 2009" "Athena Printing"
+.TH lp 1 Debathena "March 2013" "Athena Printing"
.SH NAME
-lp \- print to Athena printers
+lp \- a CUPS wrapper print to Athena printers
.SH SYNOPSIS
.B lp
.RB [ \-d printer]
[other options] [filename]
.SH DESCRIPTION
-Debathena supports two printing systems: the traditional LPRng and the
-newer CUPS with better cross-platform support. This command is a script
-which detects if you are printing to an LPRng or CUPS print queue and runs
-the appropriate version of lp.
+This wrapper provides support for Hesiod and MIT's load-balancing
+environment in order to execute the cups-lp(1) command with the correct
+environment and arguments.
+
+This wrapper no longer has support for LPRng or traditional LPD queues.
+To print to an LPD printer, you should ask your workstation
+administrator to add it as a local print queue, or use the rlpr(1)
+program.
.PP
See the
-.BR mit-lp (1)
-man page for the LPRng version of lp, or the
.BR cups-lp (1)
man page for the CUPS version of lp.
.SH OPTIONS
@@ -24,6 +26,8 @@
All other options are passed on to the final lp command.
.SH AUTHOR
Evan Broder, SIPB Debathena <debathena@mit.edu>.
+.br
+Jonathan Reed, Massachusetts Institute of Technology.
.SH SEE ALSO
-.BR mit-lp (1),
+.BR rlpr(1),
.BR cups-lp (1)
Modified: trunk/debathena/config/printing-config/files/usr/share/man/man1/lpq.debathena.1
===================================================================
--- trunk/debathena/config/printing-config/files/usr/share/man/man1/lpq.debathena.1 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/files/usr/share/man/man1/lpq.debathena.1 2013-03-05 17:53:26 UTC (rev 25835)
@@ -1,4 +1,4 @@
-.TH lpq 1 Debathena "November 2009" "Athena Printing"
+.TH lpq 1 Debathena "March 2013" "Athena Printing"
.SH NAME
lpq \- show Athena printer queue status
.SH SYNOPSIS
@@ -6,14 +6,16 @@
.RB [ \-P printer]
[other options]
.SH DESCRIPTION
-Debathena supports two printing systems: the traditional LPRng and the
-newer CUPS with better cross-platform support. This command is a script
-which detects if you are printing to an LPRng or CUPS print queue and runs
-the appropriate version of lpq.
+This wrapper provides support for Hesiod and MIT's load-balancing
+environment in order to execute the cups-lpq(1) command with the correct
+environment and arguments.
+
+This wrapper no longer has support for LPRng or traditional LPD queues.
+To query an LPD printer, you should ask your workstation
+administrator to add it as a local print queue, or use the rlpq(1)
+program.
.PP
See the
-.BR mit-lpq (1)
-man page for the LPRng version of lpq, or the
.BR cups-lpq (1)
man page for the CUPS version of lpq.
.SH OPTIONS
@@ -24,6 +26,8 @@
All other options are passed on to the final lpq command.
.SH AUTHOR
Evan Broder, SIPB Debathena <debathena@mit.edu>.
+.br
+Jonathan Reed, Massachusetts Institute of Technology
.SH SEE ALSO
-.BR mit-lpq (1),
+.BR rlpq(1),
.BR cups-lpq (1)
Modified: trunk/debathena/config/printing-config/files/usr/share/man/man1/lpr.debathena.1
===================================================================
--- trunk/debathena/config/printing-config/files/usr/share/man/man1/lpr.debathena.1 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/files/usr/share/man/man1/lpr.debathena.1 2013-03-05 17:53:26 UTC (rev 25835)
@@ -1,4 +1,4 @@
-.TH lpr 1 Debathena "November 2009" "Athena Printing"
+.TH lpr 1 Debathena "March 2013" "Athena Printing"
.SH NAME
lpr \- print to Athena printers
.SH SYNOPSIS
@@ -6,14 +6,16 @@
.RB [ \-P printer]
[other options] [filename]
.SH DESCRIPTION
-Debathena supports two printing systems: the traditional LPRng and the
-newer CUPS with better cross-platform support. This command is a script
-which detects if you are printing to an LPRng or CUPS print queue and runs
-the appropriate version of lpr.
+This wrapper provides support for Hesiod and MIT's load-balancing
+environment in order to execute the cups-lpr(1) command with the correct
+environment and arguments.
+
+This wrapper no longer has support for LPRng or traditional LPD queues.
+To print to an LPD printer, you should ask your workstation
+administrator to add it as a local print queue, or use the rlpr(1)
+program.
.PP
See the
-.BR mit-lpr (1)
-man page for the LPRng version of lpr, or the
.BR cups-lpr (1)
man page for the CUPS version of lpr.
.PP
@@ -34,6 +36,8 @@
All other options are passed on to the final lpr command.
.SH AUTHOR
Evan Broder, SIPB Debathena <debathena@mit.edu>.
+.br
+Jonathan Reed, Massachusetts Institute of Technology
.SH SEE ALSO
-.BR mit-lpr (1),
+.BR rlpr (1),
.BR cups-lpr (1)
Modified: trunk/debathena/config/printing-config/files/usr/share/man/man1/lprm.debathena.1
===================================================================
--- trunk/debathena/config/printing-config/files/usr/share/man/man1/lprm.debathena.1 2013-03-05 17:08:07 UTC (rev 25834)
+++ trunk/debathena/config/printing-config/files/usr/share/man/man1/lprm.debathena.1 2013-03-05 17:53:26 UTC (rev 25835)
@@ -1,4 +1,4 @@
-.TH lprm 1 Debathena "November 2009" "Athena Printing"
+.TH lprm 1 Debathena "March 2013" "Athena Printing"
.SH NAME
lprm \- remove jobs from Athena printers
.SH SYNOPSIS
@@ -6,14 +6,16 @@
.RB [ \-P printer]
[other options]
.SH DESCRIPTION
-Debathena supports two printing systems: the traditional LPRng and the
-newer CUPS with better cross-platform support. This command is a script
-which detects if you are printing to an LPRng or CUPS print queue and runs
-the appropriate version of lprm.
+This wrapper provides support for Hesiod and MIT's load-balancing
+environment in order to execute the cups-lprm(1) command with the correct
+environment and arguments.
+
+This wrapper no longer has support for LPRng or traditional LPD queues.
+To remove jobs from an LPD printer, you should ask your workstation
+administrator to add it as a local print queue, or use the rlprm(1)
+program.
.PP
See the
-.BR mit-lprm (1)
-man page for the LPRng version of lprm, or the
.BR cups-lprm (1)
man page for the CUPS version of lprm.
.SH OPTIONS
@@ -24,6 +26,8 @@
All other options are passed on to the final lprm command.
.SH AUTHOR
Evan Broder, SIPB Debathena <debathena@mit.edu>.
+.br
+Jonathan Reed, Massachusetts Institute of Technology
.SH SEE ALSO
-.BR mit-lprm (1),
+.BR rlprm (1),
.BR cups-lprm (1)
