From bff9ef64a1ec1e5fcb842fe96a64012f174440ff Mon Sep 17 00:00:00 2001
From: Jiri Malak <malak.jiri@gmail.com>
Date: Mon, 22 Jan 2024 14:46:57 +0100
Subject: [PATCH] rename tag USAGEOGRP to more transparent USAGECHAIN

---
 bld/as/h/options.gml               |  4 ++--
 bld/bdiff/gml/diffopts.gml         |  4 ++--
 bld/bdiff/gml/dumpopts.gml         |  4 ++--
 bld/bdiff/gml/patcopts.gml         |  4 ++--
 bld/cc/gml/options.gml             | 30 ++++++++++++++++++------------
 bld/f77/gml/wfxopts.gml            |  4 ++--
 bld/fe_misc/c/optencod.c           | 10 +++++-----
 bld/mstools/asaxp/gml/options.gml  |  4 ++--
 bld/mstools/cl/gml/options.gml     |  4 ++--
 bld/mstools/cvtres/gml/options.gml |  4 ++--
 bld/mstools/lib/gml/options.gml    |  4 ++--
 bld/mstools/link/gml/options.gml   |  4 ++--
 bld/mstools/nmake/gml/options.gml  |  4 ++--
 bld/mstools/rc/gml/options.gml     |  4 ++--
 bld/ndisasm/stand/options.gml      |  4 ++--
 bld/nwlib/optionsa.gml             | 10 +++++++++-
 bld/nwlib/optionsw.gml             | 16 ++++++++++------
 bld/plusplus/gml/options.gml       | 22 +++++++++++-----------
 bld/rc/rc/h/options.gml            |  6 +++---
 bld/wasm/h/options.gml             |  4 ++--
 bld/wcl/h/owccopts.gml             |  4 ++--
 bld/wcl/h/wclopts.gml              |  4 ++--
 bld/wsample/h/options.gml          |  4 ++--
 bld/wstrip/options.gml             |  4 ++--
 bld/wtouch/options.gml             |  4 ++--
 25 files changed, 94 insertions(+), 76 deletions(-)

diff --git a/bld/as/h/options.gml b/bld/as/h/options.gml
index dcd4f1f85b..47f9216f80 100644
--- a/bld/as/h/options.gml
+++ b/bld/as/h/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.						    	-oa -ox -ot => -oaxt
 :cmt.	:target. <targ1> <targ2> ...                valid for these targets
 :cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                	are chained together in usage
 :cmt.	:usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                	are chained together in usage
diff --git a/bld/bdiff/gml/diffopts.gml b/bld/bdiff/gml/diffopts.gml
index 8c0bbca086..3a49090fd3 100644
--- a/bld/bdiff/gml/diffopts.gml
+++ b/bld/bdiff/gml/diffopts.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/bdiff/gml/dumpopts.gml b/bld/bdiff/gml/dumpopts.gml
index 2db7560e10..73a663d827 100644
--- a/bld/bdiff/gml/dumpopts.gml
+++ b/bld/bdiff/gml/dumpopts.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/bdiff/gml/patcopts.gml b/bld/bdiff/gml/patcopts.gml
index 0da5104890..8ea1804943 100644
--- a/bld/bdiff/gml/patcopts.gml
+++ b/bld/bdiff/gml/patcopts.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/cc/gml/options.gml b/bld/cc/gml/options.gml
index 16713f1c8f..7a84593c4f 100644
--- a/bld/cc/gml/options.gml
+++ b/bld/cc/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2022-2023 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2022-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
@@ -127,7 +127,13 @@
 :chain. o Optimization
 :jusage. o 最適化
 
-:option. h ?
+:option. ?
+:target. any
+:nochain.
+:usage. print this message
+:jusage. このメッセージを表示します
+
+:option. h
 :target. any
 :nochain.
 :usage. print this message
@@ -228,7 +234,7 @@
 :usage. allow non const initializers for local aggregates or unions
 :jusage.
 
-:usageogrp. ad Make Dependency Information
+:usagechain. ad Make Dependency Information
 
 :option. ad
 :target. any
@@ -283,7 +289,7 @@
 :usage. assume short integers are aligned
 :jusage. short 整数が整列していると仮定します
 
-:usageogrp. b Application type
+:usagechain. b Application type
 
 :option. bc
 :target. any
@@ -323,7 +329,7 @@
 :usage. build target is a default windowing application
 :jusage. 構築ターゲットはデフォルト･ウィンドウ･アプリケーションです
 
-:usageogrp. d Debugging Information
+:usagechain. d Debugging Information
 
 :option. d0
 :target. any
@@ -403,7 +409,7 @@
 :usage. emit code coverage gear
 :jusage.
 
-:usageogrp. ec Default calling convention
+:usagechain. ec Default calling convention
 
 :option. ecc
 :target. i86 386
@@ -612,7 +618,7 @@
 :usage. do not check for truncated versions of file names
 :jusage. 切り詰めたファイル名をチェックしません
 
-:usageogrp. fp Generate Floating-point code
+:usagechain. fp Generate Floating-point code
 
 :option. fpc
 :target. i86 386
@@ -684,7 +690,7 @@
 :usage. set code group name
 :jusage. コード･グループ名を設定します
 
-:usageogrp. h Debugging Information format
+:usagechain. h Debugging Information format
 
 :option. hw
 :target. i86 386
@@ -746,7 +752,7 @@
 :usage. enable OWL logging
 :jusage. enable OWL logging
 
-:usageogrp. m Memory model
+:usagechain. m Memory model
 :jusage. メモリ・モデル
 
 :option. mc
@@ -1039,7 +1045,7 @@
 :usage. VC++ compatibility: alloca allowed in argument lists
 :jusage. VC++ 互換性: 引数リストの中でallocaを使用できます
 
-:usageogrp. w Warning control
+:usagechain. w Warning control
 
 :option. w
 :target. any
@@ -1226,7 +1232,7 @@
 :usage. generate function prototypes using base types
 :jusage. 基本型を使用した関数プロトタイプを生成します
 
-:usageogrp. zk Multi-byte/Unicode character support
+:usagechain. zk Multi-byte/Unicode character support
 
 :option. zk0 zk
 :target. any
diff --git a/bld/f77/gml/wfxopts.gml b/bld/f77/gml/wfxopts.gml
index 6bbf46b565..ad664053c4 100644
--- a/bld/f77/gml/wfxopts.gml
+++ b/bld/f77/gml/wfxopts.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/fe_misc/c/optencod.c b/bld/fe_misc/c/optencod.c
index a3f65edaa2..426bb92f7a 100644
--- a/bld/fe_misc/c/optencod.c
+++ b/bld/fe_misc/c/optencod.c
@@ -83,7 +83,7 @@ TAG( TITLE ) \
 TAG( TITLEU ) \
 TAG( USAGE ) \
 TAG( USAGEGRP ) \
-TAG( USAGEOGRP )
+TAG( USAGECHAIN )
 
 #define NEXT_ARG() \
         --argc1; ++argv1
@@ -803,7 +803,7 @@ static CHAIN *addChain( char *pattern, bool chain )
             if( cn->code_used ) {
                 fail( "CHAIN: option '%s' already defined\n", pattern );
             } else {
-                fail( "USAGEOGRP: option '%s' already defined\n", pattern );
+                fail( "USAGECHAIN: option '%s' already defined\n", pattern );
             }
         }
     }
@@ -1580,16 +1580,16 @@ static void doTIMESTAMP( const char *p )
     }
 }
 
-// :usageogrp. <option> <usage>
+// :usagechain. <option> <usage>
 //
 // mark options that start with <option> as group in usage text
 // i.e., -fp0 -fp1 ==> -fp{0,1}
-static void doUSAGEOGRP( const char *p )
+static void doUSAGECHAIN( const char *p )
 {
     CHAIN *cn;
 
     if( *p == '\0' ) {
-        fail( "missing <option> in :usageogrp. tag\n" );
+        fail( "missing <option> in :usagechain. tag\n" );
     }
     p = nextWord( p, tokbuff );
     cn = addChain( tokbuff, false );
diff --git a/bld/mstools/asaxp/gml/options.gml b/bld/mstools/asaxp/gml/options.gml
index bdc03626b9..c5a8218b54 100644
--- a/bld/mstools/asaxp/gml/options.gml
+++ b/bld/mstools/asaxp/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.						    	-oa -ox -ot => -oaxt
 :cmt.	:target. <targ1> <targ2> ...                valid for these targets
 :cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                	are chained together in usage
 :cmt.	:usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                	are chained together in usage
diff --git a/bld/mstools/cl/gml/options.gml b/bld/mstools/cl/gml/options.gml
index 836afc6a8d..8459f6f1ec 100644
--- a/bld/mstools/cl/gml/options.gml
+++ b/bld/mstools/cl/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.						    	-oa -ox -ot => -oaxt
 :cmt.	:target. <targ1> <targ2> ...                valid for these targets
 :cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                	are chained together in usage
 :cmt.	:usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                	are chained together in usage
diff --git a/bld/mstools/cvtres/gml/options.gml b/bld/mstools/cvtres/gml/options.gml
index 86960ef63a..f92bc59f69 100644
--- a/bld/mstools/cvtres/gml/options.gml
+++ b/bld/mstools/cvtres/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.						    	-oa -ox -ot => -oaxt
 :cmt.	:target. <targ1> <targ2> ...                valid for these targets
 :cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                	are chained together in usage
 :cmt.	:usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                	are chained together in usage
diff --git a/bld/mstools/lib/gml/options.gml b/bld/mstools/lib/gml/options.gml
index 4cf69d760b..e2db87b688 100644
--- a/bld/mstools/lib/gml/options.gml
+++ b/bld/mstools/lib/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.						    	-oa -ox -ot => -oaxt
 :cmt.	:target. <targ1> <targ2> ...                valid for these targets
 :cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                	are chained together in usage
 :cmt.	:usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                	are chained together in usage
diff --git a/bld/mstools/link/gml/options.gml b/bld/mstools/link/gml/options.gml
index af3f32b6a3..89ae2668d6 100644
--- a/bld/mstools/link/gml/options.gml
+++ b/bld/mstools/link/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.						    	-oa -ox -ot => -oaxt
 :cmt.	:target. <targ1> <targ2> ...                valid for these targets
 :cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                	are chained together in usage
 :cmt.	:usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                	are chained together in usage
diff --git a/bld/mstools/nmake/gml/options.gml b/bld/mstools/nmake/gml/options.gml
index 6124866695..45671ab318 100644
--- a/bld/mstools/nmake/gml/options.gml
+++ b/bld/mstools/nmake/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.						    	-oa -ox -ot => -oaxt
 :cmt.	:target. <targ1> <targ2> ...                valid for these targets
 :cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                	are chained together in usage
 :cmt.	:usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                	are chained together in usage
diff --git a/bld/mstools/rc/gml/options.gml b/bld/mstools/rc/gml/options.gml
index d2084ae48d..decbb72041 100644
--- a/bld/mstools/rc/gml/options.gml
+++ b/bld/mstools/rc/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.						    	-oa -ox -ot => -oaxt
 :cmt.	:target. <targ1> <targ2> ...                valid for these targets
 :cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                	are chained together in usage
 :cmt.	:usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                	are chained together in usage
diff --git a/bld/ndisasm/stand/options.gml b/bld/ndisasm/stand/options.gml
index 55b7b0c5de..fd35930b6f 100644
--- a/bld/ndisasm/stand/options.gml
+++ b/bld/ndisasm/stand/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/nwlib/optionsa.gml b/bld/nwlib/optionsa.gml
index 3cb680dd74..8ffab140cf 100644
--- a/bld/nwlib/optionsa.gml
+++ b/bld/nwlib/optionsa.gml
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
@@ -112,6 +112,10 @@
 :title.  Commands:
 :jtitle. コマンド：
 
+:option. ?
+:usage.  .     display this screen
+:jusage. .     この画面を表示します
+
 :option. c
 :internal.
 :usage.  .     create archive
@@ -121,6 +125,10 @@
 :usage.  .     delete modules from archive
 :jusage. .     アーカイブからモジュールを削除する
 
+:option. h
+:usage.  .     display this screen
+:jusage. .     この画面を表示します
+
 :option. p
 :target. unused
 :usage.  unused
diff --git a/bld/nwlib/optionsw.gml b/bld/nwlib/optionsw.gml
index b5899454ec..efb05f0074 100644
--- a/bld/nwlib/optionsw.gml
+++ b/bld/nwlib/optionsw.gml
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
@@ -182,6 +182,10 @@
 :jtitle. .         ( /ｵﾌﾟｼｮﾝ でも指定できます )
 :ntarget. bsd linux osx qnx haiku
 
+:option. ?
+:usage.  display this screen
+:jusage. この画面を表示します
+
 :option. b
 :usage.  don't create .bak file
 :jusage. .bakファイルを作成しません
@@ -195,7 +199,7 @@
 :usage.  object output directory
 :jusage. オブジェクト出力ディレクトリ
 
-:usageogrp. f Output Library format
+:usagechain. f Output Library format
 :jusage. 出力ライブラリ形式
 
 :option. fa
@@ -228,11 +232,11 @@
 :usage.  output OMF format library
 :jusage. OMF形式ライブラリを出力します
 
-:option. h ?
+:option. h
 :usage.  display this screen
 :jusage. この画面を表示します
 
-:usageogrp. i
+:usagechain. i
 
 :usagegrp. 1 Import records architecture
 :jusage. インポートレコードのアーキテクチャ
@@ -281,7 +285,7 @@
 :usage.  generate MIPS import records
 :jusage. MIPSインポート･レコードを生成します
 
-:usageogrp. in Non-resident table imports
+:usagechain. in Non-resident table imports
 
 :option. inn
 :enumerate. non_resident
@@ -305,7 +309,7 @@
 :usage.  generate PPC import records
 :jusage. PPCインポート･レコードを生成します
 
-:usageogrp. ir Resident table imports
+:usagechain. ir Resident table imports
 
 :option. irn
 :enumerate. resident
diff --git a/bld/plusplus/gml/options.gml b/bld/plusplus/gml/options.gml
index 0fb08b3392..a61c147524 100644
--- a/bld/plusplus/gml/options.gml
+++ b/bld/plusplus/gml/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
@@ -211,7 +211,7 @@
 :usage.  Pentium Pro stack calling conventions
 :jusage. Pentium Pro スタック呼び出し規約
 
-:usageogrp. ad Make Dependency info
+:usagechain. ad Make Dependency info
 
 :option. ad
 :target. any
@@ -264,7 +264,7 @@
 :usage.  build target is operating system <os>
 :jusage. 構築ターゲットはオペレーティング･システム <os>
 
-:usageogrp. b Application type
+:usagechain. b Application type
 
 :option. bc
 :target. any
@@ -310,7 +310,7 @@
 :usage.  allow extended -d macro definitions
 :jusage. 拡張された -d マクロ定義を許可します
 
-:usageogrp. d Debugging information
+:usagechain. d Debugging information
 
 :option. d0
 :target. any
@@ -381,7 +381,7 @@
 :usage.  generate browsing information
 :jusage. ブラウズ情報を生成します
 
-:usageogrp. ec Default calling convention
+:usagechain. ec Default calling convention
 
 :option. ecc
 :target. i86 386
@@ -634,7 +634,7 @@
 :usage.  inline 80x87 instructions with specified depth
 :jusage. 指定した深さのインライン80x87命令
 
-:usageogrp. fp Generate Floating-point code
+:usagechain. fp Generate Floating-point code
 
 :option. fpc
 :target. i86 386
@@ -694,7 +694,7 @@
 :usage.  set code group name
 :jusage. コード･グループ名を設定します
 
-:usageogrp. h Debugging Information Format
+:usagechain. h Debugging Information Format
 
 :option. hw
 :target. i86 386
@@ -755,7 +755,7 @@
 :jusage. OWLリストを出力します
 :internal.
 
-:usageogrp. m Memory model
+:usagechain. m Memory model
 :jusage. メモリ・モデル
 
 :option. mc
@@ -1069,7 +1069,7 @@
 :usage.  VC++ compatibility: alloca allowed in argument lists
 :jusage. VC++ 互換性: 引数リストの中でallocaを使用できます
 
-:usageogrp. w Warning control
+:usagechain. w Warning control
 
 :option. w
 :target. any
@@ -1322,7 +1322,7 @@
 :usage.  dump informational statistics to stdout
 :jusage. 情報として統計値をstdoutに出力します
 
-:usageogrp. zk Multi-byte/Unicode character support
+:usagechain. zk Multi-byte/Unicode character support
 
 :option. zk0 zk
 :target. any
diff --git a/bld/rc/rc/h/options.gml b/bld/rc/rc/h/options.gml
index af528e32e4..af7bda48c2 100644
--- a/bld/rc/rc/h/options.gml
+++ b/bld/rc/rc/h/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
@@ -98,7 +98,7 @@
 :target. any
 :ntarget. bsd linux osx qnx haiku
 
-:usageogrp. s Segment and resource sorting method
+:usagechain. s Segment and resource sorting method
 :jusage.
 :chain. v Verbose output
 :jusage.
diff --git a/bld/wasm/h/options.gml b/bld/wasm/h/options.gml
index 66dab89a5c..932784c802 100644
--- a/bld/wasm/h/options.gml
+++ b/bld/wasm/h/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/wcl/h/owccopts.gml b/bld/wcl/h/owccopts.gml
index aa2333c1a8..1db57bd227 100644
--- a/bld/wcl/h/owccopts.gml
+++ b/bld/wcl/h/owccopts.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/wcl/h/wclopts.gml b/bld/wcl/h/wclopts.gml
index 69a28fccc0..d4ca5532e6 100644
--- a/bld/wcl/h/wclopts.gml
+++ b/bld/wcl/h/wclopts.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/wsample/h/options.gml b/bld/wsample/h/options.gml
index 48b60479eb..3a937a88cb 100644
--- a/bld/wsample/h/options.gml
+++ b/bld/wsample/h/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/wstrip/options.gml b/bld/wstrip/options.gml
index d29ede44b2..83aa9f4691 100644
--- a/bld/wstrip/options.gml
+++ b/bld/wstrip/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage
diff --git a/bld/wtouch/options.gml b/bld/wtouch/options.gml
index 788995693e..d7a8852c5d 100644
--- a/bld/wtouch/options.gml
+++ b/bld/wtouch/options.gml
@@ -2,7 +2,7 @@
 :cmt.*
 :cmt.*                            Open Watcom Project
 :cmt.*
-:cmt.* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 :cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 :cmt.*
 :cmt.*  ========================================================================
@@ -39,7 +39,7 @@
 :cmt.                                                   -oa -ox -ot => -oaxt
 :cmt.   :target. <targ1> <targ2> ...                valid for these targets
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.   :usageogrp. <option> <usage text>           group of options that start with <option>
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
 :cmt.   :usagegrp. <num> <usage text>               group of options that have group <num>
 :cmt.                                                   are chained together in usage