feat(client/v2): combine autocli and custom cmd within a module (#17088)

x/gov/client/cli/query.go

@@ -17,12 +17,11 @@ import (
 
 // GetCustomQueryCmd returns the cli query commands for this module
 // These commands do not rely on gRPC and cannot be autogenerated
-// TODO(@julienrbrt) https://github.com/cosmos/cosmos-sdk/issues/16836
 func GetCustomQueryCmd(ac address.Codec) *cobra.Command {
 	// Group gov queries under a subcommand
 	govQueryCmd := &cobra.Command{
 		Use:                        types.ModuleName,
-		Short:                      "Querying commands for the governance module",
+		Short:                      "Querying commands for the gov module",
 		DisableFlagParsing:         true,
 		SuggestionsMinimumDistance: 2,
 		RunE:                       client.ValidateCmd,