Merge pull request #1494 from nasa/integration-candidate

osal Integration candidate: Equuleus-rc1+dev26

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev97
+- Correct README.md OSAL User's Guide links
+- See <https://github.com/nasa/osal/pull/1493>
+
 ## Development Build: equuleus-rc1+dev93
 - Adding a strstr() check
 - See <https://github.com/nasa/osal/pull/1486>

README.md

@@ -7,7 +7,7 @@ This repository contains NASA's Operating System Abstraction Layer (OSAL), which
 
 This is a collection of abstraction APIs and associated framework to be located in the `osal` subdirectory of a cFS Mission Tree. The Core Flight System is bundled at <https://github.com/nasa/cFS>, which includes build and execution instructions.
 
-The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cFS/blob/gh-pages/OSAL_Users_Guide.pdf>.
+The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cFS/blob/gh-pages/osal-apiguide.pdf>.
 
 # Quick Start:
 
@@ -32,7 +32,7 @@ make test
 
 See the [Configuration Guide](https://github.com/nasa/osal/blob/main/docs/OSAL-Configuration-Guide.md) for more information.
 
-See also the autogenerated user's guide: <https://github.com/nasa/cFS/blob/gh-pages/OSAL_Users_Guide.pdf>
+See also the autogenerated user's guide: <https://github.com/nasa/cFS/blob/gh-pages/osal-apiguide.pdf>
 
 ## Known issues
 

src/os/inc/osapi-version.h

@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER     93
+#define OS_BUILD_NUMBER     97
 #define OS_BUILD_BASELINE   "equuleus-rc1"
 #define OS_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define OS_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */