From: Felix Ableitner Date: Tue, 8 Dec 2020 18:09:11 +0000 (+0100) Subject: Some more minor docs changes X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%22https:/nerdica.net/static/%7Bpost.url%7D?a=commitdiff_plain;h=5010f693bac5a6f4c23093868297b3e6c6c0dbe1;p=lemmy.git Some more minor docs changes --- diff --git a/docs/src/administration/administration.md b/docs/src/administration/administration.md index 3211859b..db4e7db1 100644 --- a/docs/src/administration/administration.md +++ b/docs/src/administration/administration.md @@ -4,8 +4,8 @@ Information for Lemmy instance admins, and those who want to run a server. ## Install -Lemmy has two primary install methods, [docker](install_docker.md), and [ansible](install_ansible.md). Ansible simplifies deploying to a remote server, while docker is best for local testing. +Lemmy has two primary installation methods, [manually with Docker](install_docker.md), and [automated with Ansible](install_ansible.md). We recommend using Ansible, because it simplifies the installation and also makes updating easier. -### Manual install +### Manual install (without Docker) Manual installs are *possible*, but not preferred, since Lemmy is dependent on other local services: The [lemmy-ui](https://github.com/LemmyNet/lemmy-ui), [a Postgresql Database](https://www.postgresql.org/), [pict-rs](https://git.asonix.dog/asonix/pict-rs/) for images, and [iframely](https://iframely.com/) for embeds. To see how these are wired together, look at the docker-compose.yml files. Due to the complexity of different systems, we will not support manual installs. diff --git a/docs/src/federation/federation.md b/docs/src/federation/federation.md index 28e304d5..d64033dd 100644 --- a/docs/src/federation/federation.md +++ b/docs/src/federation/federation.md @@ -11,4 +11,6 @@ One way you can take advantage of federation is by opening a different instance, - `https://lemmy.ml/c/programming` (Community) - `https://lemmy.ml/u/nutomic` (User) - `https://lemmy.ml/post/123` (Post) -- `https://lemmy.ml/comment/321` (Comment) \ No newline at end of file +- `https://lemmy.ml/comment/321` (Comment) + +You can see the list of linked instances by following the "Instances" link at the bottom of any Lemmy page. \ No newline at end of file