From 826e9f41232ca104e8fc7658a11096ebb64da21b Mon Sep 17 00:00:00 2001
From: Jacob Hageman <jacob.hageman@nasa.gov>
Date: Tue, 17 Aug 2021 12:59:40 +0000
Subject: [PATCH] Fix #1831, Consolidate msg get/set doxygen group

---
 docs/src/cfe_api.dox              | 5 +----
 modules/core_api/fsw/inc/cfe_sb.h | 7 +------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/docs/src/cfe_api.dox b/docs/src/cfe_api.dox
index 5cda61674..0c058a2f3 100644
--- a/docs/src/cfe_api.dox
+++ b/docs/src/cfe_api.dox
@@ -225,14 +225,11 @@
       <LI> #CFE_SB_ReleaseMessageBuffer - \copybrief CFE_SB_ReleaseMessageBuffer
       <LI> #CFE_SB_TransmitBuffer - \copybrief CFE_SB_TransmitBuffer
     </UL>
-    <LI> \ref CFEAPISBSetMessage
+    <LI> \ref CFEAPISBMessageCharacteristics
     <UL>
       <LI> #CFE_SB_SetUserDataLength - \copybrief CFE_SB_SetUserDataLength
       <LI> #CFE_SB_TimeStampMsg - \copybrief CFE_SB_TimeStampMsg
       <LI> #CFE_SB_MessageStringSet - \copybrief CFE_SB_MessageStringSet
-    </UL>
-    <LI> \ref CFEAPIGetMessage
-    <UL>
       <LI> #CFE_SB_GetUserData - \copybrief CFE_SB_GetUserData
       <LI> #CFE_SB_GetUserDataLength - \copybrief CFE_SB_GetUserDataLength
       <LI> #CFE_SB_MessageStringGet - \copybrief CFE_SB_MessageStringGet
diff --git a/modules/core_api/fsw/inc/cfe_sb.h b/modules/core_api/fsw/inc/cfe_sb.h
index 92f83c82c..0d0bca144 100644
--- a/modules/core_api/fsw/inc/cfe_sb.h
+++ b/modules/core_api/fsw/inc/cfe_sb.h
@@ -569,7 +569,7 @@ CFE_Status_t CFE_SB_TransmitBuffer(CFE_SB_Buffer_t *BufPtr, bool IncrementSequen
 
 /** @} */
 
-/** @defgroup CFEAPISBSetMessage cFE Setting Message Characteristics APIs
+/** @defgroup CFEAPISBMessageCharacteristics cFE Message Characteristics APIs
  * @{
  */
 
@@ -647,11 +647,6 @@ void CFE_SB_TimeStampMsg(CFE_MSG_Message_t *MsgPtr);
 */
 int32 CFE_SB_MessageStringSet(char *DestStringPtr, const char *SourceStringPtr, size_t DestMaxSize,
                               size_t SourceMaxSize);
-/** @} */
-
-/** @defgroup CFEAPIGetMessage cFE Getting Message Characteristics APIs
- * @{
- */
 
 /*****************************************************************************/
 /**