HTCONDOR-1968: Minor re-wording, example link, and python syntax impr…

…ovements

config/01-ce-router-defaults.conf

@@ -109,7 +109,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/01-ce-router.conf

@@ -43,7 +43,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-bosco-defaults.conf

@@ -13,7 +13,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-bosco.conf

@@ -11,7 +11,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-condor-defaults.conf

@@ -13,7 +13,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-condor.conf

@@ -11,7 +11,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-lsf-defaults.conf

@@ -12,7 +12,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-lsf.conf

@@ -10,7 +10,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-pbs-defaults.conf

@@ -12,7 +12,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-pbs.conf

@@ -10,7 +10,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-sge-defaults.conf

@@ -12,7 +12,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-sge.conf

@@ -10,7 +10,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-slurm-defaults.conf

@@ -12,7 +12,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

config/02-ce-slurm.conf

@@ -10,7 +10,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf

@@ -11,7 +11,7 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          HTCondor. New configuration syntax for the job router is defined using
+#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
 #          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.

src/verify_ce_config.py

@@ -83,10 +83,10 @@ def main():
             if knob in htcondor.param:
                 used_deprecated_knobs.append(knob)
         if len(used_deprecated_knobs) > 0:
-            warn("%s are deprecated and will be removed for V24 of HTCondor. New configuration"
-                 % ", ".join(used_deprecated_knobs)
-                 + " syntax for the job router is defined using JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>."
-                 + " Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n")
+            warn(f"{', '.join(used_deprecated_knobs)} are deprecated and will be removed for V24 of HTCondor. New configuration"
+                 + " syntax for the job router is defined using JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For example"
+                 + " use of new syntax visit:\nhttps://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration\n\n"
+                 + "   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n")
 
         for attr in ['JOB_ROUTER_DEFAULTS', 'JOB_ROUTER_ENTRIES']:
             try: