Merge branch 'main' into move_views_to_diesel

diff --git a/docs/src/administration/administration.md b/docs/src/administration/administration.md
index 3211859bf17580fedae91e926e025988309ecb49..db4e7db1bbc4b4ae89a450622e0ecd12075a00e9 100644 (file)
--- 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 28e304d5a43bed3710a1da7f504a1d9813438d11..d64033dd34c97fe478a70d6feb7ee3cbfbc53485 100644 (file)
--- 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