From 4cac7040a4d692a25bfdab6b5a184e8e223a3873 Mon Sep 17 00:00:00 2001 From: Joscha Schmiedt <joscha@schmiedt.dev> Date: Tue, 3 Sep 2024 09:15:24 +0200 Subject: [PATCH] Minor remaining renamings --- .gitignore | 2 +- RELEASE_GUIDELINES.md | 2 +- doc/Install_develop.rst | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 109a1c6..82ee632 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 1859b90..5f8e376 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 58f7993..5ae383f 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`` -- GitLab