vty doc: drop "(HO algo 2 only)" strings

These indicators are a legacy of early handover_decision_2.c work, where there
were no separate handover1 and handover2 config commands. No need to restate
the abundantly obvious anymore.

Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612

3 files changed, 26 insertions, 27 deletions

diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h
index 865fab9bc..92b5cd44c 100644
--- a/include/osmocom/bsc/handover_cfg.h
+++ b/include/osmocom/bsc/handover_cfg.h
@@ -21,11 +21,10 @@ struct handover_cfg *ho_cfg_init(void *ctx, struct handover_cfg *higher_level_cf
 #define HO_CFG_STR_WIN_RXQUAL HO_CFG_STR_WIN "Received-Quality averaging\n"
 #define HO_CFG_STR_POWER_BUDGET "Neighbor cell power triggering\n" "Neighbor cell power triggering\n"
 #define HO_CFG_STR_AVG_COUNT "Number of values to average over\n"
-#define HO_CFG_STR_2 " (HO algo 2 only)\n"
-#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO" HO_CFG_STR_2
-#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs" HO_CFG_STR_2
-#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested" HO_CFG_STR_2
-#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers" HO_CFG_STR_2
+#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO\n"
+#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs\n"
+#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested\n"
+#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers\n"
 
 #define as_is(x) (x)
 
@@ -185,14 +184,14 @@ static inline const char *tdma2a(bool val)
 	HO_CFG_ONE_MEMBER(bool, hodec2_as_active, 0, \
 		"handover2 ", "assignment", "0|1", a2bool, "%d", bool2i, \
 		HO_CFG_STR_HANDOVER2 \
-		"Enable or disable in-call channel re-assignment" HO_CFG_STR_2 \
+		"Enable or disable in-call channel re-assignment\n" \
 		"Disable in-call assignment\n" \
 		"Enable in-call assignment\n") \
 	\
 	HO_CFG_ONE_MEMBER(bool, hodec2_full_tdma, subset, \
 		"handover2 ", "tdma-measurement", "full|subset", a2tdma, "%s", tdma2a, \
 		HO_CFG_STR_HANDOVER2 \
-		"Define measurement set of TDMA frames" HO_CFG_STR_2 \
+		"Define measurement set of TDMA frames\n" \
 		"Full set of 102/104 TDMA frames\n" \
 		"Sub set of 4 TDMA frames (SACCH)\n") \
 	\
@@ -241,7 +240,7 @@ static inline const char *tdma2a(bool val)
 	HO_CFG_ONE_MEMBER(int, hodec2_ho_max, 9999, \
 		"handover2 ", "max-handovers", "<1-9999>", atoi, "%d", as_is, \
 		HO_CFG_STR_HANDOVER2 \
-		"Maximum number of concurrent handovers allowed per cell" HO_CFG_STR_2 \
+		"Maximum number of concurrent handovers allowed per cell\n" \
 		"Number\n") \
 	\
 	HO_CFG_ONE_MEMBER(int, hodec2_penalty_max_dist, 300, \
@@ -268,7 +267,7 @@ static inline const char *tdma2a(bool val)
 	HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \
 		"handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \
 		HO_CFG_STR_HANDOVER2 \
-		"Immediately retry on handover/assignment failure" HO_CFG_STR_2 \
+		"Immediately retry on handover/assignment failure\n" \
 		"Number of retries\n") \
 
 #define HO_CFG_ALL_MEMBERS \
diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c
index 51e448e03..79795115e 100644
--- a/src/osmo-bsc/handover_vty.c
+++ b/src/osmo-bsc/handover_vty.c
@@ -106,7 +106,7 @@ static inline const char *congestion_check_interval2a(int val)
 DEFUN(cfg_net_ho_congestion_check_interval, cfg_net_ho_congestion_check_interval_cmd,
       "handover2 congestion-check (disabled|<1-999>|now)",
       HO_CFG_STR_HANDOVER2
-      "Configure congestion check interval" HO_CFG_STR_2
+      "Configure congestion check interval\n"
       "Disable congestion checking, do not handover based on cell overload\n"
       "Congestion check interval in seconds (default "
       OSMO_STRINGIFY_VAL(HO_CFG_CONGESTION_CHECK_DEFAULT) ")\n"
diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty
index 119eaf575..94c20d962 100644
--- a/tests/handover_cfg.vty
+++ b/tests/handover_cfg.vty
@@ -218,15 +218,15 @@ OsmoBSC(config-net)# handover2 ?
   window            Measurement averaging settings
   power             Neighbor cell power triggering
   maximum           Maximum Timing-Advance value (i.e. MS distance) before triggering HO
-  assignment        Enable or disable in-call channel re-assignment (HO algo 2 only)
-  tdma-measurement  Define measurement set of TDMA frames (HO algo 2 only)
-  min               Minimum Level/Quality thresholds before triggering HO (HO algo 2 only)
-  afs-bias          Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only)
-  min-free-slots    Minimum free TCH timeslots before cell is considered congested (HO algo 2 only)
-  max-handovers     Maximum number of concurrent handovers allowed per cell (HO algo 2 only)
-  penalty-time      Set penalty times to wait between repeated handovers (HO algo 2 only)
-  retries           Immediately retry on handover/assignment failure (HO algo 2 only)
-  congestion-check  Configure congestion check interval (HO algo 2 only)
+  assignment        Enable or disable in-call channel re-assignment
+  tdma-measurement  Define measurement set of TDMA frames
+  min               Minimum Level/Quality thresholds before triggering HO
+  afs-bias          Configure bias to prefer AFS (AMR on TCH/F) over other codecs
+  min-free-slots    Minimum free TCH timeslots before cell is considered congested
+  max-handovers     Maximum number of concurrent handovers allowed per cell
+  penalty-time      Set penalty times to wait between repeated handovers
+  retries           Immediately retry on handover/assignment failure
+  congestion-check  Configure congestion check interval
 
 OsmoBSC(config-net)# handover algorithm ?
   1        Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only.
@@ -437,14 +437,14 @@ OsmoBSC(config-net-bts)# handover2 ?
   window            Measurement averaging settings
   power             Neighbor cell power triggering
   maximum           Maximum Timing-Advance value (i.e. MS distance) before triggering HO
-  assignment        Enable or disable in-call channel re-assignment (HO algo 2 only)
-  tdma-measurement  Define measurement set of TDMA frames (HO algo 2 only)
-  min               Minimum Level/Quality thresholds before triggering HO (HO algo 2 only)
-  afs-bias          Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only)
-  min-free-slots    Minimum free TCH timeslots before cell is considered congested (HO algo 2 only)
-  max-handovers     Maximum number of concurrent handovers allowed per cell (HO algo 2 only)
-  penalty-time      Set penalty times to wait between repeated handovers (HO algo 2 only)
-  retries           Immediately retry on handover/assignment failure (HO algo 2 only)
+  assignment        Enable or disable in-call channel re-assignment
+  tdma-measurement  Define measurement set of TDMA frames
+  min               Minimum Level/Quality thresholds before triggering HO
+  afs-bias          Configure bias to prefer AFS (AMR on TCH/F) over other codecs
+  min-free-slots    Minimum free TCH timeslots before cell is considered congested
+  max-handovers     Maximum number of concurrent handovers allowed per cell
+  penalty-time      Set penalty times to wait between repeated handovers
+  retries           Immediately retry on handover/assignment failure
 
 OsmoBSC(config-net-bts)# handover algorithm ?
   1        Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only.