diff --git a/.gitignore b/.gitignore index 109a1c662e332aa16dee2de295fb1fd0dd116207..82ee632624bd0b2aa8876df6435b72046a2f7db3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # General build/ -include/libcaosdbConfig.h +include/liblinkaheadConfig.h .* # CMake diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 1859b90acefbd889ee4b5774898d01cc08c67272..5f8e3765e877194957ace552d0c905fbb5225462 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -25,7 +25,7 @@ guidelines of the LinkAhead Project 1. In [CMakeLists.txt](./CMakeLists.txt): Check the version variables and make sure that the compatible caosdb-server version is set correctly. 2. In `conanfile.py`: Update the `version` variable. - 3. In `caosdb-cppinttest/conanfile.py`: Update the version + 3. In `linkahead-cppinttest/conanfile.py`: Update the version 5. Merge the release branch into the main branch. diff --git a/doc/Install_develop.rst b/doc/Install_develop.rst index 58f799356ea3d2b085db3ab1a731d7a15d43cc9f..5ae383f1e8193088f00dda898d9d775b012db58b 100644 --- a/doc/Install_develop.rst +++ b/doc/Install_develop.rst @@ -183,14 +183,14 @@ Client Configuration You can use a json file for the configuration of the client. See ``test/test_data/test_caosdb_client.json`` for an example. You may use -``caosdb-client-configuration-schema.json`` to validate your schema. +``linkahead-client-configuration-schema.json`` to validate your schema. Typically, you will need to provide the path to your SSL certificate. The client will load the configuration file from the first existing file in the following locations (precedence from highest to lowest): 1. A file specified by the environment variable - ``$CAOSDB_CLIENT_CONFIGURATION``. + ``$LINKAHEAD_CLIENT_CONFIGURATION``. 2. ``$PWD/caosdb_client.json`` 3. ``$PWD/caosdb-client.json`` 4. ``$PWD/.caosdb_client.json``