Index: /pykota/trunk/man/edpykota.1
===================================================================
--- /pykota/trunk/man/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "February 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-edpykota \- manual page for edpykota 1.24alpha10_unofficial
+edpykota \- manual page for edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/sv_SE/edpykota.1
===================================================================
--- /pykota/trunk/man/sv_SE/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/sv_SE/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/pt/edpykota.1
===================================================================
--- /pykota/trunk/man/pt/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/pt/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/tr/edpykota.1
===================================================================
--- /pykota/trunk/man/tr/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/tr/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/el_GR/edpykota.1
===================================================================
--- /pykota/trunk/man/el_GR/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/el_GR/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/de/edpykota.1
===================================================================
--- /pykota/trunk/man/de/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/de/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/nb_NO/edpykota.1
===================================================================
--- /pykota/trunk/man/nb_NO/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/nb_NO/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/zh_TW/edpykota.1
===================================================================
--- /pykota/trunk/man/zh_TW/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/zh_TW/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/pt_BR/edpykota.1
===================================================================
--- /pykota/trunk/man/pt_BR/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/pt_BR/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/fr/edpykota.1
===================================================================
--- /pykota/trunk/man/fr/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/fr/edpykota.1 (revision 2713)
@@ -2,233 +2,128 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
-Un �teur de quotas pour PyKota.
+A Print Quota editor for PyKota.
 .PP
-ligne de commande :
+command line usage :
 .IP
-edpykota [options] utilisateur1 utilisateur2 ... utilisateurN
+edpykota [options] user1 user2 ... userN
 .IP
-edpykota [options] groupe1 groupe2 ... groupeN
+edpykota [options] group1 group2 ... groupN
 .PP
 options :
 .TP
 \fB\-v\fR | \fB\-\-version\fR
-Affiche la version d'edpykota et quitte.
+Prints edpykota's version number then exits.
 .TP
 \fB\-h\fR | \fB\-\-help\fR
-Affiche ce message et quitte.
+Prints this message then exits.
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Ajoute des utilisateurs et/ou des imprimantes
-s'ils n'existent pas d� dans la base de donn�.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Efface des utilisateurs ou des groupes depuis
-la base de donn�.                       Les imprimantes ne sont jamais effac�.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Positionne le co�r page et par travail
-sur l'imprimante. Le prix par travail est optionel.
-Si les deux sont positionn� il faut les s�rer
-par une virgule. Les nombres r�s sont autoris�
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Positionne le facteur de surtaxe qui sera appliqu�
-l'utilisateur lors du calcul du co�un travail
-d'impression. Les valeurs r�les positives ou
-n�tives sont autoris�, ce qui permet de faire
-des choses tr�cr�ives comme donner de l'argent
-�n utilisateur chaque fois qu'il imprime.
-Le nombre de pages d'un travail d'impression n'est
-pas modifi�ar ce coefficient, seulement le co�
-travail pour un utilisateur particulier.
-Seuls les utilisateurs ont un tel coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...] Place les utilisateurs dans chacun des groupes
-list� separ�par des virgules. Les groupes
-doivent d� exister dans la base de donn�.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Modifie les quotas utilisateur, c'est la valeur
-par d�ut.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
-Modifie les quotas sur l'imprimante p seulement.
-En fait p peut contenir des caract�s jokers
-pour s�ctionner seulement certaines imprimantes.
-La valeur par d�ut est *, qui signifie toutes les
-imprimantes.
-Vous pouvez sp�fier plusieurs noms ou jokers,
-en les s�rant avec des virgules.
-.TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Ajoute l'imprimante aux groupes d'imprimantes
-pg1, pg2, etc... qui doivent d� exister.
-Un groupe d'imprimantes est comme une imprimante
-normale, sauf que celle\-ci est inconnue du syst�
-d'impression. On cr�des groupes d'imprimantes de la
-m� mani� que des imprimantes normales, et ensuite
-on y ajoute d'autres imprimantes avec cette option.
-Le d�mpte est fait sur une imprimante et sur tous
-les groupes d'imprimantes auxquels elle appartient,
-la v�fication de quota est faite sur une imprimante
-et sur tous les groupes d'imprimantes auxquels elle
-appartient.
+Edit quotas on printer p only. Actually p can
+use wildcards characters to select only
+some printers. The default value is *, meaning
+all printers.
+You can specify several names or wildcards,
+by separating them with commas.
 .TP
 \fB\-g\fR | \fB\-\-groups\fR
-Modifie les quotas de groupes plut�ue ceux des
-utilisateurs.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Prend l'utilisateur u ou le groupe g comme mod�
-pour positionner le quota d'impression.
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Fixe les limites souples et dures �one pour une
-entr�de quota d'impression particuli�.
-NE FAIT PAS la m� chose que \fB\-\-limitby\fR noquota qui
-agit sur toutes les entr� de quotas d'impression
-d'un utilisateur donn�.TP
+Sets both soft and hard limits to None for users
+or groups print quota entries.
+.TP
 \fB\-r\fR | \fB\-\-reset\fR
-Remet �� le compteur de pages courant pour
-l'utilisateur ou le groupe sur les imprimantes
-sp�fi�.
-Le compteur de pages '�rnel' est inchang�.TP
+Resets the actual page counter for the user
+or group to zero on the specified printers.
+The life time page counter is kept unchanged.
+.TP
 \fB\-R\fR | \fB\-\-hardreset\fR
-Remet �� les compteurs de pages courant et
-\&'�rnel' pour l'utilisateur ou le groupe sur les
-imprimantes sp�fi�. Ceci est un raccourci
-pour '\-\-used 0'.
-.TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-D�nit le facteur de limitation pour l'utilisateur
-ou le groupe : soit par le solde du compte (balance),
-soit par le quota par pages.
-La valeur par d�ut est 'quota'. Les valeurs
-autoris� sont 'quota' 'balance' 'noquota' 'noprint'
-et 'nochange' :
-.IP
-\- quota : limite par le nombre de pages sur chaque
-.IP
-imprimante.
-.IP
-\- balance : limite par le nombre de cr�ts.
-\- noquota : aucune limite, d�mpte effectu�\- nochange : aucune limite, d�mpte non effectu�\- noprint : imprimer est interdit.
-.IP
-NB : nochange et noprint ne sont pas support�pour
-.IP
-les groupes.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Fixe le solde de l'utiliateur �a valeur b.
-Le solde peut aussi �e incr�nt�u d��nt�i b est pr�d�'un signe + ou \-.
-ATTENTION : si on d��nte le solde, le total
-r��ar l'utilisateur est d��nt�ussi.
-Les groupes n'ont pas de solde, leur solde est la
-somme des soldes des utilisateurs membres.
+Resets the actual and life time page counters
+for the user or group to zero on the specified
+printers. This is a shortcut for '\-\-used 0'.
 .TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
-Fixe la limite souple �l pages.
+Sets the quota soft limit to sl pages.
 .TP
 \fB\-H\fR | \fB\-\-hardlimit\fR hl
-Fixe la limite dure �l pages.
+Sets the quota hard limit to hl pages.
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Incr�nte �a fois les limites souple et dure de la
-valeur de v. Vous pouvez pr�xer v avec + ou \-, si
-aucun signe n'est pr�nt, + est utilis�.TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Positionne les compteurs de pages de l'utilisateur �a valeur usage; utile pour migrer des utilisateurs
-depuis un logiciel diff�nt dans lequel ils ont d�
-imprim�uelques pages. Les compteurs de pages actuels
-et globaux peuvent �e incr�nt�ou d��nt�si
-usage est pr�x�'un signe + ou \-.
-ATTENTION : LES DEUX compteurs de pages sont modifi�dans tous les cas, donc soyez prudents.
-NB : si 'usage' vaut '0', alors l'action effectu�est identique �elle effectu�avec \fB\-\-hardreset\fR.
+Increase existing Soft and Hard limits by the value
+of v. You can prefix v with + or \-, if no sign is
+used, + is assumed.
+.TP
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
+where they have already used some pages. Actual
+and Life Time page counters may be increased or decreased
+if u is prefixed with + or \-.
+WARNING : BOTH page counters are modified in all cases,
+so be careful.
+NB : if u equals '0', then the action taken is
+the same as if \fB\-\-hardreset\fR was used.
 .IP
-les noms d'utilisateurs ou de groupes peuvent contenir des caract�s
-joker si l'option \fB\-\-add\fR n'est pas utilis�
+user1 through userN and group1 through groupN can use wildcards
+if the \fB\-\-add\fR option is not set.
 .PP
-exemples :
+examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-Ceci va ajouter les utilisateurs john, paul, george and ringo �a base
-de donn�, et fixer leur quota par pages �a m� valeur que
-l'utilisateur jerome. L'utilisateur jerome doit exister.
-L'adresse email de ringo sera fix��ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
-Ceci va fixer une limite souple de 50 pages et une limite dure de 60 pages
-pour l'utilisteur jerome sur l'imprimante lp.
-Si l'utilisateur jerome ou l'imprimante lp n'existent pas dans la base de
-donn�alors aucune modification n'est effectu�
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Comme ci\-dessus, mais l'utilisateur jerome et l'imprimante lp sont ajout�automatiquement s'ils n'existaient pas. L'utilisateur jerome est aussi
-ajout�aux groupes "coders" et "it" quoi doivent d� exister dans
-la base de donn�.
+This will set jerome's print quota on the lp printer to a soft limit
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
 .IP
-Ceci va fixer une limite souple de 500 pages et une limite dure de 550
-pages pour les groupes financial et support sur toutes les imprimantes.
+This will set print quota soft limit to 500 pages and hard limit
+to 550 pages for groups financial and support on all printers.
 .IP
 \f(CW$ edpykota --reset jerome "jo*"\fR
 .IP
-Ceci va remettre �� le compteur de pages courant de jerome sur toutes
-les imprimantes, ainsi que pour chaque utilisateur dont le nom commence
-par 'jo'.
-Leurs compteurs '�rnels' ne seront pas modifi�
-Vous pouvez �lement remettre �� les compteurs '�rnels' gr� �'option \fB\-\-hardreset\fR | \fB\-R\fR de la ligne de commande.
+This will reset jerome's page counter to zero on all printers, as
+well as every user whose name begins with 'jo'.
+Their life time page counter on each printer will be kept unchanged.
+You can also reset the life time page counters by using the
+\fB\-\-hardreset\fR | \fB\-R\fR command line option.
 .IP
 \f(CW$ edpykota --printer hpcolor --noquota jerome\fR
 .IP
-Ceci indique �yKota de ne pas limiter jerome lorsqu'il va imprimer
-sur l'imprimante hpcolor. Tous ses travaux seront autoris�sur cette
-imprimantes, mais la comptabilit�e ses impressions sera quand m�
-tenue. Les quotas des autres utilisateurs sont inchang�
+This will tell PyKota to not limit jerome when printing on the
+hpcolor printer. All his jobs will be allowed on this printer, but
+accounting of the pages he prints will still be kept.
+Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-Ceci indique �yKota de limiter jerome par le solde de son compte
-lorsqu'il imprime.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-Ceci va incr�nter le solde de jerome de 10.0 unit�(dans votre
-propre monnaie). Vous pouvez d��nter ce solde en utilisant le signe
-n�tif, et positionner la valeur en n'utilisant aucun signe.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-Ceci va compl�ment effacer les utilisateurs jerome et rachel de la base
-de donn�. Tous leurs quotas et leurs historiques seront aussi effac�
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-Ceci va fixer le co�r page �.1 unit�ur l'imprimante lp. Le co�un travail ne sera pas modifi�.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-Ceci va ajouter les imprimantes hplj1 et hplj2 dans les groupes
-d'imprimantes Laser et HP.
-En imprimant sur hplj1 ou hplj2, les quotas seront �lement v�fi�et comptabilis�sur les imprimantes virtuelles Laser et HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 pauvreetudiant\fR
-.IP
-Ceci va surtaxer l'utilisateur pauvreetudiant par un facteur de 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-L'utilisateur jerome va gagner de l'argent �haque fois qu'il imprimera.
-.IP
-\f(CW$ edpykota --overcharge 0 patron\fR
-.IP
-L'utilisateur patron peut imprimer �olont�cela ne lui co� rien
-car le co� chaque travail d'impression sera multipli�ar z� avant
-de d�ter son compte.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/es/edpykota.1
===================================================================
--- /pykota/trunk/man/es/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/es/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/pl/edpykota.1
===================================================================
--- /pykota/trunk/man/pl/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/pl/edpykota.1 (revision 2713)
@@ -2,225 +2,128 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
-Edytor limit�rukowania dla systemu PyKota.
+A Print Quota editor for PyKota.
 .PP
-u�ycie z linii polece�.IP
-edpykota [opcje] u�ytkownik1 u�ytkownik2 ... u�ytkownikN
+command line usage :
 .IP
-edpykota [opcje] grupa1 grupa2 ... grupaN
+edpykota [options] user1 user2 ... userN
+.IP
+edpykota [options] group1 group2 ... groupN
 .PP
-opcje :
+options :
 .TP
 \fB\-v\fR | \fB\-\-version\fR
-Wy�wietla wersj�ystemu PyKota i ko� dzia�anie.
+Prints edpykota's version number then exits.
 .TP
 \fB\-h\fR | \fB\-\-help\fR
-Wy�wietla t� wiadomo�� ko� dzia�anie.
+Prints this message then exits.
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Dodaje u�ytkownik�/lib drukarki je�li te nie istniej�
-w systemie limit�a serwerze.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Usuwa u�ytkownik�rupy z systemu limit�Drukarki nigdy nie s� usuwane.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Ustawia cen�a stron� za zadanie drukowania
-dla wybranej drukarki. Cena zadania drukowania jest argumentem opcjonalnym.
-Je�li obydwie warto�ci maj� by�stawione, oddziel je przecinkiem.
-Liczby zmiennoprzecinkowe s� dozwolone.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Ustawia wsp�ynnik doliczania dla wybranego u�ytkownika
-kt�b�ie u�yty podczas wyliczania ceny zadania drukowania. Dodatnie oraz
-ujemne warto�ci zmiennoprzecinkowe s� dozwolone,
-co pozwala na ustawienie na prawd�iekawych
-efekt�ak uzupe�nianie konta za ka�dym razem kiedy uzytkownik co�
-drukuje. Liczba stron nie jest modyfikowana
-przez ten wsp�ynnik, tylko
-koszt zadania drukowania dla danego u�ytkownika.
-Tylko u�ytkownicy posiadaj� wsp�ynniki.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Do��cza u�ytkownik�o ka�dej z wymienionych grup,
-oddzielonych przecinkami. Grupy
-.IP
-musz� istnie� systemie limit�.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edytuj limity u�ytkownika, akcja domy�lna.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
-Edytuj limity tylko dla drukarki p. Dodatkowo p akceptuje
-wzorce dopasowania tak aby� m�wybra�ylko
-niekt�drukarki. Domy�ln� warto�ci� jest * co oznacza
-wszystkie drukarki.
-Mo�esz poda�iele nazw lub wzorc�opasowania,
-rozdziel je przecinkami.
-.TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Dodaje drukark�rukarki do grup drukarek
-pg1, pg2, etc... kt�musz� istnie� bazie danych.
-Grupa drukarek to nic innego jak zwyk�a drukarka ,
-z t� r�c�, �e nie jest widoczna przez nadrz�y system drukowania.
-Utw�grup�rukarek tak
-jak dodajesz nowe drukarki, nast�ie dodaj inne
-drukarki do tej grupy przy u�yciu tej opcji.
-Rozliczanie jest przeprowadzane na drukarce oraz na
-wszystkich grupach drukarek do kt�h nale�y dana drukarka, sprawdzanie limit�est przeprowadzane na drukarce oraz na wszystkich grupach drukarek
-do kt�h nale�y dana drukarka.
+Edit quotas on printer p only. Actually p can
+use wildcards characters to select only
+some printers. The default value is *, meaning
+all printers.
+You can specify several names or wildcards,
+by separating them with commas.
 .TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edytuj limity grup u�ytkownik�nie u�ytkownik�.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g U�ywa u�ytkownika u lub grupy g jako prototypu dla ustalenia
-limit�rukowania
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Ustawia obydwa limity (mi�i i twardy) na warto��one dla
-konkretnego wpisu w systemie limit�Ta opcja NIE jest r�wa�na opcji \fB\-\-limitby\fR noquota
-kt�swoim dzia�aniem obejmuje WSZYSTKIE wpisy limit�la
-wybranego uzytkownika.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
-Zeruje licznik stron dla wybranego u�ytkownika lub
-grupy na podanej drukarce.
-Licznik 'life time page counter' nie jest modyfikowany.
+Resets the actual page counter for the user
+or group to zero on the specified printers.
+The life time page counter is kept unchanged.
 .TP
 \fB\-R\fR | \fB\-\-hardreset\fR
-Zeruje WSZYSTKIE liczniki stron (aktualny i 'life time')
-dla u�ytkownika lub grupy na wybranej
-drukarce/wybranych drukarkach. Jest to skr�la opcji '\-\-used 0'.
-.TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Wybierz spos�graniczania drukowania
-albo poprzez stan konta lub poprzez limit stron.
-Domy�ln� warto�ci� jest limit stron. Dozwolone warto�ci to
-\&'quota' 'balance' 'noquota' 'noprint'
-i 'nochange' :
-.IP
-\- quota : ograniczaj wzgl�j liczby wydrukowanych stron na danej drukarce.
-\- balance : ograniczaj wzgl�m stanu konta.
-\- noquota : brak limitu, rozliczanie jest przeprowadzane.
-\- nochange : brak limitu, rozliczanie nie jest przeprowadzane.
-\- noprint : zakaz drukowania.
-.IP
-UWAGA : 'nochange' i 'noprint' nie maj� zastosowania w przypadku grup.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Ustawia stan konta na b.
-Stan konta mo�e by�wi�zony lub zmniejszony
-je�li b jest poprzedzone znakiem + lub \-.
-UWAGA : je�li pomniejszasz stan konta,
-w�as og� warto��p�at dla u�ytkownika jest tak�e pomniejszana.
-Grupy nie maj� rzeczywistego stanu konta, jedynie
-sum�ald u�ytkownik�worz�cych grup�.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Definiuje tekst informacyjny kt�b�ie po��czony ze zmian�
-stanu konta u�ytkownika.
-Ma sens tylko je�li opcja \fB\-b\fR | \fB\-\-balance\fR jest okre�lona.
+Resets the actual and life time page counters
+for the user or group to zero on the specified
+printers. This is a shortcut for '\-\-used 0'.
 .TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
-Ustala limit mi�i na sl stron.
+Sets the quota soft limit to sl pages.
 .TP
 \fB\-H\fR | \fB\-\-hardlimit\fR hl
-Ustawia limit twardy na hl stron.
+Sets the quota hard limit to hl pages.
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Zmie�a limity (twardy i mi�i) o warto��.
-Warto�� mo�e by�oprzedzona znakiem + lub \-. Je�li �aden ze znak�ie jest
-podany,w�as domy�lnym jest znak +.
+Increase existing Soft and Hard limits by the value
+of v. You can prefix v with + or \-, if no sign is
+used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR ustr
-Ustawia liczniki stron na warto��str stron;
-u�yteczne podczas migracji u�ytkownik� innego systemu
-gdzie liczniki mia�y warto��iezerow�. Oba liczniki : Aktualny
-i Life Time mog� by�wi�zone lub zmniejszone
-je�li ustr jest poprzedzone znakiem + lub \-.
-UWAGA : OBA liczniki stron s� modyfikowane w ka�dym przypadku,
-wi�b�d� ostro�ny.
-UWAGA : je�li istr jest r� 0, w�as opcja ta odpowiada opcji
-\fB\-\-hardreset\fR opisanej powy�ej.
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
+where they have already used some pages. Actual
+and Life Time page counters may be increased or decreased
+if u is prefixed with + or \-.
+WARNING : BOTH page counters are modified in all cases,
+so be careful.
+NB : if u equals '0', then the action taken is
+the same as if \fB\-\-hardreset\fR was used.
 .IP
-Nazwy u�ytkownik1 do u�ytkownikN i grupa1 do grupaN ackeptuj� wzorce dopasowania
-je�li opcja \fB\-\-add\fR nie jest obecna.
+user1 through userN and group1 through groupN can use wildcards
+if the \fB\-\-add\fR option is not set.
 .PP
-przyk�ady :
+examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-Komenda doda u�ytkownik�ohn, paul, george oraz ringo do systemu
-limit�dodatkowo ich limity zostan� ustawione na warto��imit��ytkownika
-jerome. U�ytkownik jerome musi istnie� systemie limit�Adres e\-mail u�ytkownika ringo zostanie dodatkowo ustawiony na 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
-Powy�sza komenda ustali na drukarce lp limit mi�i dla u�ytkownika jerome na 50 stron,
-za� limit twardy na 60 stron. Je�li u�ytkownik jerome lub
-drukarka lp nie istniej� w systemie limit��as nic nie jest wykonywane.
+This will set jerome's print quota on the lp printer to a soft limit
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Jak powy�ej z t� r�c�, �e je�li u�ytkownik jerome lub drukarka lp nie istniej�
-w systemie limit��as s� automatycznie dodawane. Dodatkowo
-u�ytkownik jerome b�ie dodany do grup "coders" i "it" kt�to
-musz� istnie� systemie limit�.IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
 .IP
-Komenda ustali limit mi�i na 500 stron i limit twardy na 550 stron
-dla grup financial i support na wszystkich drukarkach.
+This will set print quota soft limit to 500 pages and hard limit
+to 550 pages for groups financial and support on all printers.
 .IP
 \f(CW$ edpykota --reset jerome "jo*"\fR
 .IP
-Komenda wyzeruje licznik stron dla u�ytkownika jerome na wszystkich drukarkach, jak i
-dla ka�dego innego u�ytkownika kt�o nazwa ropoczyna si�d s�owa 'jo'.
-Licznik 'life time' dla tych u�ytkownik�ozostanie niezmieniony.
-Je�li chcesz wyzerowa�icznik 'life time' w�as skorzystaj z opcji
-\fB\-\-hardreset\fR | \fB\-R\fR.
+This will reset jerome's page counter to zero on all printers, as
+well as every user whose name begins with 'jo'.
+Their life time page counter on each printer will be kept unchanged.
+You can also reset the life time page counters by using the
+\fB\-\-hardreset\fR | \fB\-R\fR command line option.
 .IP
 \f(CW$ edpykota --printer hpcolor --noquota jerome\fR
 .IP
-Powy�sza komenda spowoduje �e u�ytkownik jerome b�ie m�drukowa�ez ogranicze� drukarce hpcolor. Wszystkie zadania drukowania b� akceptowane przez drukark�jednak�e
-rozliczanie stron w dalszym ci�gu b�ie prowadzone.
-Limity drukowania na innych drukarkach dla u�ytkownika jerome pozostan� niezmienione.
+This will tell PyKota to not limit jerome when printing on the
+hpcolor printer. All his jobs will be allowed on this printer, but
+accounting of the pages he prints will still be kept.
+Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-Powy�sza komenda spowoduje, �e u�ytkownik jerome b�ie ograniczany wzgl�m
-stanu swojego konta.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-Powy�sza komenda spowoduje zwi�zenie stanu konta u�ytkownika jerome o 10.0 jednostek (w lokalnej
-walucie). Mo�esz pomniejszy�tan konta je�li podasz znak \-
-przed kwot�, mo�esz r�e� ustali�tan konta na sztywno, w�as nie podawaj znaku + ani \-.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-Usuwa u�ytkownik�erome i rachel z systemu limit�Wszystkie limity oraz historia zada�ukowania skojarzona z tymi u�ytkownikami zostanie tak�e usuni�.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-Powy�sza komenda ustali cen�a stron�a drukarce lp na 0.1. Cena za zadanie drukowania
-nie b�ie zmieniona.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-Drukarki hplj1 i hplj2 zostan�mieszczone w grupach drukarek Laser i HP.
-Podczas drukowania na hplj1 lub hplj2, limit drukowania b�ie sprawdzony i rozliczony
-tak�e na wirtualnych drukarkach Laser i HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 biednystudent\fR
-.IP
-Od tego momentu u�ytkownik biednystudent b�ie p�aci� 2.5 raza wi�j za ka�d� wydrukowan� stron�adanie drukowania.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-Od tego momentu u�ytkownik jerome b�ie 'zarabia�' za ka�dym razem kiedy drukuje.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-U�ytkownik boss mo�e drukowa�ez �adnych ogranicze�oniewa�
-koszt ka�dego zadania drukowania b�ie przemno�ony przez 0.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/th/edpykota.1
===================================================================
--- /pykota/trunk/man/th/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/th/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: /pykota/trunk/man/it/edpykota.1
===================================================================
--- /pykota/trunk/man/it/edpykota.1 (revision 2667)
+++ /pykota/trunk/man/it/edpykota.1 (revision 2713)
@@ -2,7 +2,7 @@
 .TH EDPYKOTA "1" "f�ier 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-edpykota \- page de manuel de edpykota 1.24alpha10_unofficial
+edpykota \- page de manuel de edpykota 1.24alpha12_unofficial
 .SH DESCRIPTION
-edpykota v1.24alpha10_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+edpykota v1.24alpha12_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 A Print Quota editor for PyKota.
@@ -23,35 +23,11 @@
 .TP
 \fB\-a\fR | \fB\-\-add\fR
-Adds users and/or printers if they don't
-exist on the Quota Storage Server.
+Adds users or groups print quota entries if
+they don't exist in database.
 .TP
 \fB\-d\fR | \fB\-\-delete\fR
-Deletes users/groups from the quota storage.
-Printers are never deleted.
-.TP
-\fB\-c\fR | \fB\-\-charge\fR p[,j]
-Sets the price per page and per job to charge
-for a particular printer. Job price is optional.
-If both are to be set, separate them with a comma.
-Floating point values are allowed.
-.TP
-\fB\-o\fR | \fB\-\-overcharge\fR f
-Sets the overcharging factor applied to the user
-when computing the cost of a print job. Positive or
-negative floating point values are allowed,
-this allows you to do some really creative
-things like giving money to an user whenever
-he prints. The number of pages in a print job
-is not modified by this coefficient, only the
-cost of the job for a particular user.
-Only users have a coefficient.
-.TP
-\fB\-i\fR | \fB\-\-ingroups\fR g1[,g2...]
-Puts the users into each of the groups
-listed, separated by commas. The groups
-must already exist in the Quota Storage.
-.TP
-\fB\-u\fR | \fB\-\-users\fR
-Edit users print quotas, this is the default.
+Deletes users or groups print quota entries.
+Users or groups are never deleted, you have
+to use the pkusers command to delete them.
 .TP
 \fB\-P\fR | \fB\-\-printer\fR p
@@ -63,28 +39,11 @@
 by separating them with commas.
 .TP
-\fB\-G\fR | \fB\-\-pgroups\fR pg1[,pg2...] Adds the printer(s) to the printer groups
-pg1, pg2, etc... which must already exist.
-A printer group is just like a normal printer,
-only that it is usually unknown from the printing
-system. Create printer groups exactly the same
-way that you create printers, then add other
-printers to them with this option.
-Accounting is done on a printer and on all
-the printer groups it belongs to, quota checking
-is done on a printer and on all the printer groups
-it belongs to.
-.TP
 \fB\-g\fR | \fB\-\-groups\fR
-Edit users groups print quotas instead of users.
-.TP
-\fB\-p\fR | \fB\-\-prototype\fR u|g Uses user u or group g as a prototype to set
-print quotas
+Edit groups print quota entries instead of
+users print quota entries.
 .TP
 \fB\-n\fR | \fB\-\-noquota\fR
-Sets both soft and hard limits to None for a
-particular print quota entry.
-This is NOT the same as \fB\-\-limitby\fR noquota
-which acts on ALL print quota entries for a
-particular user.
+Sets both soft and hard limits to None for users
+or groups print quota entries.
 .TP
 \fB\-r\fR | \fB\-\-reset\fR
@@ -98,34 +57,4 @@
 printers. This is a shortcut for '\-\-used 0'.
 .TP
-\fB\-l\fR | \fB\-\-limitby\fR l
-Choose if the user/group is limited in printing
-by its account balance or by its page quota.
-The default value is 'quota'. Allowed values
-are 'quota' 'balance' 'noquota' 'noprint'
-and 'nochange' :
-.IP
-\- quota : limit by number of pages per printer.
-\- balance : limit by number of credits in account.
-\- noquota : no limit, accounting still done.
-\- nochange : no limit, accounting not done.
-\- noprint : printing is denied.
-.IP
-NB : nochange and noprint are not supported for groups.
-.TP
-\fB\-b\fR | \fB\-\-balance\fR b
-Sets the user's account balance to b.
-Account balance may be increase or decreased
-if b is prefixed with + or \-.
-WARNING : when decreasing account balance,
-the total paid so far by the user is decreased
-too.
-Groups don't have a real balance, but the
-sum of their users' account balance.
-.TP
-\fB\-C\fR | \fB\-\-comment\fR txt
-Defines some informational text to be associated
-with a change to an user's account balance.
-Only meaningful if \fB\-b\fR | \fB\-\-balance\fR is also used.
-.TP
 \fB\-S\fR | \fB\-\-softlimit\fR sl
 Sets the quota soft limit to sl pages.
@@ -135,17 +64,20 @@
 .TP
 \fB\-I\fR | \fB\-\-increase\fR v
-Increase both Soft and Hard limits by the value
+Increase existing Soft and Hard limits by the value
 of v. You can prefix v with + or \-, if no sign is
 used, + is assumed.
 .TP
-\fB\-U\fR | \fB\-\-used\fR usage
-Sets the pagecounters for the user to usage pages;
-useful for migrating users from a different system
+\fB\-U\fR | \fB\-\-used\fR u
+Sets the page counters for the user u pages on
+the selected printers. Doesn't work for groups, since
+their page counters are the sum of all their members'
+page counters.
+Useful for migrating users from a different system
 where they have already used some pages. Actual
 and Life Time page counters may be increased or decreased
-if usage is prefixed with + or \-.
+if u is prefixed with + or \-.
 WARNING : BOTH page counters are modified in all cases,
 so be careful.
-NB : if 'usage' equals '0', then the action taken is
+NB : if u equals '0', then the action taken is
 the same as if \fB\-\-hardreset\fR was used.
 .IP
@@ -155,23 +87,16 @@
 examples :
 .IP
-\f(CW$ edpykota --add -p jerome john paul george ringo/ringo@example.com\fR
+\f(CW$ edpykota --add john paul george ringo\fR
 .IP
-This will add users john, paul, george and ringo to the quota
-database, and set their print quotas to the same values than user
-jerome. User jerome must already exist.
-User ringo's email address will also be set to 'ringo@example.com'
+This will create print quota entries for users john, paul, george
+and ringo on all printers. These print quota entries will have no
+limit set.
 .IP
 \f(CW$ edpykota --printer lp -S 50 -H 60 jerome\fR
 .IP
 This will set jerome's print quota on the lp printer to a soft limit
-of 50 pages, and a hard limit of 60 pages. If either user jerome or
-printer lp doesn't exist on the Quota Storage Server then nothing is done.
-.IP
-\f(CW$ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome\fR
-.IP
-Same as above, but if either user jerome or printer lp doesn't exist
-on the Quota Storage Server they are automatically added. Also
-user jerome is put into the groups "coders" and "it" which must
-already exist in the Quota Storage.
+of 50 pages, and a hard limit of 60 pages. Both user jerome and
+printer lp have been previously created with the pkusers and pkprinters
+commands, respectively.
 .IP
 \f(CW$ edpykota -g -S 500 -H 550 financial support\fR
@@ -195,44 +120,10 @@
 Print Quotas for jerome on other printers are unchanged.
 .IP
-\f(CW$ edpykota --limitby balance jerome\fR
+\f(CW$ edpykota --delete --printer "HP*,XER*" jerome rachel\fR
 .IP
-This will tell PyKota to limit jerome by his account's balance
-when printing.
-.IP
-\f(CW$ edpykota --balance +10.0 jerome\fR
-.IP
-This will increase jerome's account balance by 10.0 (in your
-own currency). You can decrease the account balance with a
-dash prefix, and set it to a fixed amount with no prefix.
-.IP
-\f(CW$ edpykota --delete jerome rachel\fR
-.IP
-This will completely delete jerome and rachel from the Quota Storage
-database. All their quotas and jobs will be deleted too.
-.IP
-\f(CW$ edpykota --printer lp --charge 0.1\fR
-.IP
-This will set the page price for printer lp to 0.1. Job price
-will not be changed.
-.IP
-\f(CW$ edpykota --printer hplj1,hplj2 --pgroups Laser,HP\fR
-.IP
-This will put printers hplj1 and hplj2 in printers groups Laser and HP.
-When printing either on hplj1 or hplj2, print quota will also be
-checked and accounted for on virtual printers Laser and HP.
-.IP
-\f(CW$ edpykota --overcharge 2.5 poorstudent\fR
-.IP
-This will overcharge the poorstudent user by a factor of 2.5.
-.IP
-\f(CW$ edpykota --overcharge -1 jerome\fR
-.IP
-User jerome will actually earn money whenever he prints.
-.IP
-\f(CW$ edpykota --overcharge 0 boss\fR
-.IP
-User boss can print at will, it won't cost him anything because the
-cost of each print job will be multiplied by zero before charging
-his account.
+This will delete users jerome and rachel's print quota
+entries on all printers which name begin with 'HP' or
+\&'XER'. The jobs printed by these users on these printers
+will be deleted from the history.
 .PP
 This program is free software; you can redistribute it and/or modify
