Merge pull request '[PR]: chore: use the word "server" instead of "instance" in docs' (#10249) from naskya/calckey:chore/word into develop

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10249

CALCKEY.md

@@ -11,7 +11,7 @@
   - Federate with note edits
   - User "choices" (recommended users) like Mastodon and Soapbox
   - Join Reason system like Mastodon/Pleroma
-  - Option to publicize instance blocks
+  - Option to publicize server blocks
   - Build flag to remove NSFW/AI stuff
   - Filter notifications by user
   - Exclude self from antenna
@@ -19,7 +19,7 @@
   - MFM button
   - Personal notes for all accounts
   - Fully revamp non-logged-in screen
-  - Lookup/details for post/file/instance
+  - Lookup/details for post/file/server
   - [Rat mode?](https://stop.voring.me/notes/933fx97bmd)
 
 ## Work in progress
@@ -43,7 +43,7 @@
   - Upgrade packages with security vunrabilities
 - Saner defaults
 - Fediverse account migration
-- Recommended instances timeline
+- Recommended servers timeline
 - OCR image captioning
 - Improve mobile UX
   - Swipe through pages on mobile
@@ -71,7 +71,7 @@
 - Better welcome screen (not logged in)
 - vue-plyr as video/audio player
 - Ability to turn off "Connection lost" message
-- Raw instance info only for moderators
+- Raw server info only for moderators
 - New spinner animation
 - Spinner instead of "Loading..."
 - SearchX instead of Google
@@ -98,7 +98,7 @@
 - Obliteration of Ai-chan
 - Switch to [Calckey.js](https://codeberg.org/calckey/calckey.js)
 - Woozy mode 🥴
-- Improve blocking instances
+- Improve blocking servers
 - Release notes
 - New post style
 - Admins set default reaction emoji
@@ -117,7 +117,7 @@
 - Sonic search
 - Popular color schemes, including Nord, Gruvbox, and Catppuccin
 - Non-nyaify cat mode
-- Post imports from other Calckey/Misskey/Mastodon/Pleroma/Akkoma instances
+- Post imports from other Calckey/Misskey/Mastodon/Pleroma/Akkoma servers
 - Improve Classic mode
 - Proper Helm/Kubernetes config
 - Multiple boost visibilities

CODE_OF_CONDUCT.md

@@ -59,7 +59,7 @@ representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
+Servers of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
 @thatonecalculator on Codeberg,
 `@kainoa@calckey.social` on the Fediverse,

README.md

@@ -23,15 +23,15 @@
 # ✨ About Calckey
 
 - Calckey is based off of Misskey, a powerful microblogging server on ActivityPub with features such as emoji reactions, a customizable web UI, rich chatting, and much more!
-- Calckey adds many quality of life changes and bug fixes for users and instance admins alike.
+- Calckey adds many quality of life changes and bug fixes for users and server admins alike.
 - Read **[this document](./CALCKEY.md)** all for current and future differences.
 - Notable differences:
   - Improved UI/UX (especially on mobile)
   - Improved notifications
-  - Improved instance security
+  - Improved server security
   - Improved accessibility
   - Improved threads
-  - Recommended Instances timeline
+  - Recommended Servers timeline
   - OCR image captioning
   - New and improved Groups
   - Better intro tutorial
@@ -50,10 +50,10 @@
 - 💸 OpenCollective: <https://opencollective.com/Calckey>
 - 💸 Liberapay: <https://liberapay.com/ThatOneCalculator>
   - Donate publicly to get your name on the Patron list!
-- 🚢 Flagship instance: <https://calckey.social>
+- 🚢 Flagship server: <https://calckey.social>
 - 📣 Official account: <https://i.calckey.cloud/@calckey>
 - 💁 Matrix support room: <https://matrix.to/#/#calckey:matrix.fedibird.com>
-- 📜 Instance list: <https://calckey.fediverse.observer/list>
+- 📜 Server list: <https://calckey.fediverse.observer/list>
 - 📖 JoinFediverse Wiki: <https://joinfediverse.wiki/What_is_Calckey%3F>
 - 🐋 Docker Hub: <https://hub.docker.com/r/thatonecalculator/calckey>
 - ✍️ Weblate: <https://hosted.weblate.org/engage/calckey/>
@@ -177,13 +177,13 @@ Please don't use ElasticSearch unless you already have an ElasticSearch setup an
 ## 💅 Customize
 
 - To add custom CSS for all users, edit `./custom/assets/instance.css`.
-- To add static assets (such as images for the splash screen), place them in the `./custom/assets/` directory. They'll then be available on `https://yourinstance.tld/static-assets/filename.ext`.
+- To add static assets (such as images for the splash screen), place them in the `./custom/assets/` directory. They'll then be available on `https://yourserver.tld/static-assets/filename.ext`.
 - To add custom locales, place them in the `./custom/locales/` directory. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list. Also make sure that the first part of the filename matches the locale you're basing it on. (Example: `en-FOO.yml`)
 - To add custom error images, place them in the `./custom/assets/badges` directory, replacing the files already there.
 - To add custom sounds, place only mp3 files in the `./custom/assets/sounds` directory.
 - To update custom assets without rebuilding, just run `pnpm run gulp`.
 
-## 🧑‍🔬 Configuring a new instance
+## 🧑‍🔬 Configuring a new server
 
 - Run `cp .config/example.yml .config/default.yml`
 - Edit `.config/default.yml`, making sure to fill out required fields.
@@ -198,7 +198,7 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
 ### 🍀 Nginx (recommended)
 
 - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
-- Edit `calckey.nginx.conf` to reflect your instance properly
+- Edit `calckey.nginx.conf` to reflect your server properly
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
@@ -218,7 +218,7 @@ example.tld {
 > Apache has some known problems with Calckey. Only use it if you have to.
 
 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
-- Edit `calckey.apache.conf` to reflect your instance properly
+- Edit `calckey.apache.conf` to reflect your server properly
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 ## 🚀 Build and launch!

docs/docker.md

@@ -1,4 +1,4 @@
-# 🐳 Running a Calckey instance with Docker
+# 🐳 Running a Calckey server with Docker
 
 ## Pre-built docker container
 [thatonecalculator/calckey](https://hub.docker.com/r/thatonecalculator/calckey)
@@ -8,7 +8,7 @@
 There is a `docker-compose.yml` in the root of the project that you can use to build the container from source
 
 - .config/docker.env (**db config settings**)
-- .config/default.yml (**calckey instance settings**)
+- .config/default.yml (**calckey server settings**)
 
 ## Configuring
 
@@ -20,7 +20,7 @@ Rename the files:
 
 then edit them according to your environment.
 You can configure `docker.env` with anything you like, but you will have to pay attention to the `default.yml` file:
-- `url` should be set to the URL you will be hosting the web interface for the instance at.
+- `url` should be set to the URL you will be hosting the web interface for the server at.
 - `host`, `db`, `user`, `pass` will have to be configured in the `PostgreSQL configuration` section - `host` is the name of the postgres container (eg: *calckey_db_1*), and the others should match your `docker.env`.
 - `host`will need to be configured in the *Redis configuration* section - it is the name of the redis container (eg: *calckey_redis_1*)
 - `auth` will need to be configured in the *Sonic* section - cannot be the default `SecretPassword`
@@ -36,7 +36,7 @@ Copy `docker-compose.yml` and the `config/` to a directory, then run the **docke
 
 NOTE: This will take some time to come fully online, even after download and extracting the container images, and it may emit some error messages before completing successfully. Specifically, the `db` container needs to initialize and so isn't available to the `web` container right away. Only once the `db` container comes online does the `web` container start building and initializing the calckey tables.
 
-Once the instance is up you can use a web browser to access the web interface at `http://serverip:3000` (where `serverip` is the IP of the server you are running the calckey instance on).
+Once the server is up you can use a web browser to access the web interface at `http://serverip:3000` (where `serverip` is the IP of the server you are running the calckey server on).
 
 ## Docker for development
 

docs/kubernetes.md

@@ -1,4 +1,4 @@
-# Running a Calckey instance with Kubernetes and Helm
+# Running a Calckey server with Kubernetes and Helm
 
 This is a [Helm](https://helm.sh/) chart directory in the root of the project
 that you can use to deploy calckey to a Kubernetes cluster
@@ -27,7 +27,7 @@ helm upgrade \
     -f .config/helm_values.yml
 ```
 
-4. Watch your calckey instance spin up:
+4. Watch your calckey server spin up:
 ```shell
 kubectl -n calckey get po -w
 ```