Remove 'bank' as a describer for accounts
diff --git a/doc/html/accounting.shtml b/doc/html/accounting.shtml
index 5191525..ae3eb45 100644
--- a/doc/html/accounting.shtml
+++ b/doc/html/accounting.shtml
@@ -128,7 +128,7 @@
The cached data is written by <i>slurmctld</i> to local storage upon shutdown
and recovered at startup.
If SlurmDBD is not available when <i>slurmctld</i> starts, a cache of
-valid bank accounts, user limits, etc. based upon their state when the
+valid accounts, user limits, etc. based upon their state when the
daemons were last communicating will be used.
Note that SlurmDBD must be responding when <i>slurmctld</i> is first started
since no cache of this critical data will be available.
@@ -878,7 +878,7 @@
account name)</li>
<li><b>Name=</b> Name of account. Note the name must be unique and can not
-represent different bank accounts at different points in the account
+represent different accounts at different points in the account
hierarchy</li>
<li><b>Organization=</b>Organization of the account. (Default is
diff --git a/doc/html/overview.shtml b/doc/html/overview.shtml
index 51d0b62..5827244 100644
--- a/doc/html/overview.shtml
+++ b/doc/html/overview.shtml
@@ -18,7 +18,7 @@
<a href="gang_scheduling.html">gang scheduling</a> (time sharing for
parallel jobs), backfill scheduling,
<a href="topology.html">topology optimized resource selection</a>,
-<a href="resource_limits.html">resource limits</a> by user or bank account,
+<a href="resource_limits.html">resource limits</a> by user or account,
and sophisticated <a href="priority_multifactor.html"> multifactor job
prioritization</a> algorithms.
@@ -49,7 +49,7 @@
There is an administrative tool <b>scontrol</b> available to monitor
and/or modify configuration and state information on the cluster.
The administrative tool used to manage the database is <b>sacctmgr</b>.
-It can be used to identify the clusters, valid users, valid bank accounts, etc.
+It can be used to identify the clusters, valid users, valid accounts, etc.
APIs are available for all functions.</p>
<div class="figure">
diff --git a/doc/html/reservations.shtml b/doc/html/reservations.shtml
index 2067e07..b7a29e4 100644
--- a/doc/html/reservations.shtml
+++ b/doc/html/reservations.shtml
@@ -3,7 +3,7 @@
<h1>Advanced Resource Reservation Guide</h1>
<p>Slurm has the ability to reserve resources for jobs
-being executed by select users and/or select bank accounts.
+being executed by select users and/or select accounts.
A resource reservation identifies the resources in that reservation
and a time period during which the reservation is available.
The resources which can be reserved include cores, nodes, licenses and/or
@@ -505,8 +505,8 @@
</h2>
<p>Jobs executed within a reservation are accounted for using the appropriate
-user and bank account. If resources within a reservation are not used, those
-resources will be accounted for as being used by all users or bank accounts
+user and account. If resources within a reservation are not used, those
+resources will be accounted for as being used by all users or accounts
associated with the reservation on an equal basis (e.g. if two users are
eligible to use a reservation and neither does, each user will be reported
to have used half of the reserved resources).</p>
diff --git a/doc/html/resource_limits.shtml b/doc/html/resource_limits.shtml
index 11010ee..906dd78 100644
--- a/doc/html/resource_limits.shtml
+++ b/doc/html/resource_limits.shtml
@@ -68,7 +68,7 @@
<p>Both accounting and scheduling policies are configured based upon
an <i>association</i>. An <i>association</i> is a 4-tuple consisting
-of the cluster name, bank account, user and (optionally) the Slurm
+of the cluster name, account, user and (optionally) the Slurm
partition.
In order to enforce scheduling policy, set the value of
<b>AccountingStorageEnforce</b>.
@@ -117,7 +117,7 @@
<h2 id="tools">Tools<a class="slurm_link" href="#tools"></a></h2>
<p>The tool used to manage accounting policy is <i>sacctmgr</i>.
-It can be used to create and delete cluster, user, bank account,
+It can be used to create and delete cluster, user, account,
and partition records plus their combined <i>association</i> record.
See <i>man sacctmgr</i> for details on this tools and examples of
its use.</p>
@@ -547,7 +547,7 @@
unique partitions, users will be limited to 20 CPUs for the QOS
rather than being allowed 20 CPUs for each partition.</p>
-<p>Fair-share scheduling is based upon the hierarchical bank account
+<p>Fair-share scheduling is based upon the hierarchical account
data maintained in the Slurm database. More information can be found
in the <a href="priority_multifactor.html">priority/multifactor</a>
plugin description.</p>
diff --git a/doc/html/slurm.shtml b/doc/html/slurm.shtml
index 3cd15a7..5e99d9e 100644
--- a/doc/html/slurm.shtml
+++ b/doc/html/slurm.shtml
@@ -21,7 +21,7 @@
world-class computer centers and rely upon a
<a href="http://www.mysql.com/">MySQL</a> database for archiving
<a href="accounting.html">accounting</a> records, managing
-<a href="resource_limits.html">resource limits</a> by user or bank account,
+<a href="resource_limits.html">resource limits</a> by user or account,
or supporting sophisticated
<a href="priority_multifactor.html">job prioritization</a> algorithms.</p>
diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index 67414fe..162b466 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -19,7 +19,7 @@
\fIcluster\fR is the name of a Slurm managed cluster as specified by
the \fIClusterName\fR parameter in the \fIslurm.conf\fR configuration file.
\fIpartition\fR is the name of a Slurm partition on that cluster.
-\fIaccount\fR is the bank account for a job.
+\fIaccount\fR is the account for a job.
The intended mode of operation is to initiate the \fBsacctmgr\fR command,
add, delete, modify, and/or list \fIassociation\fR records then
commit the changes and exit.
@@ -236,7 +236,7 @@
.TP
\fBaccount\fR
-A bank account, typically specified at job submit time using the
+An account, typically specified at job submit time using the
\fB\-\-account=\fR option.
These may be arranged in a hierarchical fashion, for example
accounts 'chemistry' and 'physics' may be children of
@@ -630,8 +630,8 @@
.TP
\fBName\fR=<\fIname\fR>
-The name of a bank account.
-Note the name must be unique and can not be represent different bank
+The name of an account.
+Note the name must be unique and can not be represent different
accounts at different points in the account hierarchy.
.IP
@@ -690,7 +690,7 @@
.TP
\fBAccount\fR
-The name of a bank account.
+The name of an account.
.IP
.TP
@@ -815,7 +815,7 @@
.TP
\fBAccount\fR
-The name of a bank account in the association.
+The name of an account in the association.
.IP
.TP
@@ -2965,7 +2965,7 @@
.TP
\fBDefaultAccount\fR=<\fIaccount\fR>
-Identify the default bank account name to be used for a job if none is
+Identify the default account name to be used for a job if none is
specified at submission time.
.IP
diff --git a/doc/man/man1/slurm.1 b/doc/man/man1/slurm.1
index 4d5a26d..0f1e2cd 100644
--- a/doc/man/man1/slurm.1
+++ b/doc/man/man1/slurm.1
@@ -16,7 +16,7 @@
pending work.
Optional plugins can be used for accounting, advanced reservation,
gang scheduling (time sharing for parallel jobs), backfill scheduling,
-resource limits by user or bank account,
+resource limits by user or account,
and sophisticated multifactor job prioritization algorithms.
Slurm has a centralized manager, \fBslurmctld\fR, to monitor resources and
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 6bb69d2..0d69cb5 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -3058,7 +3058,7 @@
.TP
\fBPriorityDecayHalfLife\fR
This controls how long prior resource use is considered in determining
-how over\- or under\-serviced an association is (user, bank account and
+how over\- or under\-serviced an association is (user, account and
cluster) in determining job priority.
The record of usage will be decayed over time, with half of the original value
cleared at age \fBPriorityDecayHalfLife\fR.
diff --git a/slurm/slurm.h b/slurm/slurm.h
index 5b63a6a..99f8191 100644
--- a/slurm/slurm.h
+++ b/slurm/slurm.h
@@ -349,9 +349,9 @@
WAIT_HELD, /* job is held by administrator */
WAIT_TIME, /* job waiting for specific begin time */
WAIT_LICENSES, /* job is waiting for licenses */
- WAIT_ASSOC_JOB_LIMIT, /* user/bank job limit reached */
- WAIT_ASSOC_RESOURCE_LIMIT,/* user/bank resource limit reached */
- WAIT_ASSOC_TIME_LIMIT, /* user/bank time limit reached */
+ WAIT_ASSOC_JOB_LIMIT, /* user/account job limit reached */
+ WAIT_ASSOC_RESOURCE_LIMIT,/* user/account resource limit reached */
+ WAIT_ASSOC_TIME_LIMIT, /* user/account time limit reached */
WAIT_RESERVATION, /* reservation not available */
WAIT_NODE_NOT_AVAIL, /* required node is DOWN or DRAINED */
WAIT_HELD_USER, /* job is held by user */
