From 6dd85ec01d8c1f07ef5a8a5da4184fb47394dd78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Baran?= Date: Thu, 2 Jan 2025 15:26:08 +0100 Subject: [PATCH] Fix incorrect word replace --- CONTRIBUTING.md | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3f7bfdfa771..5d105af944a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ for dependencies and detailed build instructions. [Issue a PR from your updated TileDB fork](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) Branch conventions: -- `main` is the mainelopment branch of TileDB, all PR's are merged into `main`. +- `main` is the development branch of TileDB, all PR's are merged into `main`. - `master` tracks the latest stable / released version of TileDB. - `release-x.y.z` are major / bugfix release branches of TileDB. @@ -63,7 +63,7 @@ Formatting conventions: ### Pull Requests: -- `main` is the mainelopment branch, all PR’s should be rebased on top of the latest `main` commit. +- `main` is the development branch, all PR’s should be rebased on top of the latest `main` commit. - Commit changes to a local branch. The convention is to use your initials to identify branches: (ex. “Fred Jones” , `fj/my_bugfix_branch`). Branch names should be identifiable and reflect the feature or bug that they want to address / fix. This helps in deleting old branches later. diff --git a/README.md b/README.md index 2382bbcb007..52510a61266 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # The Universal Storage Engine -TileDB is a powerful engine for storing and accessing **dense and sparse multi-dimensional arrays**, which can help you model any complex data efficiently. It is an embeddable C++ library that works on Linux, macOS, and Windows. It is open-sourced under the permissive MIT License, maineloped and maintained by [TileDB, Inc](https://tiledb.com/). To distinguish this project from other TileDB offerings, we often refer to it as *TileDB Embedded*. +TileDB is a powerful engine for storing and accessing **dense and sparse multi-dimensional arrays**, which can help you model any complex data efficiently. It is an embeddable C++ library that works on Linux, macOS, and Windows. It is open-sourced under the permissive MIT License, developed and maintained by [TileDB, Inc](https://tiledb.com/). To distinguish this project from other TileDB offerings, we often refer to it as *TileDB Embedded*. TileDB includes the following features: