pleroma

commit: 78dc59269625a6a54b88aca6fd91a1cd4f84d089
parent 639016bdee37e848b0e72eab5726337c66ecf47f
Author: tusooa <tusooa@kazv.moe>
Date:   Mon, 21 Oct 2024 00:10:28 +0000

Merge branch 'develop' into 'develop'

Some tidying and grammer improvements for these installation docs, based on my experience installing Pleroma on Ubuntu 24.04 a few minutes ago.

See merge request pleroma/pleroma!4288
Diffstat:
A
changelog.d/debian-install-improve.skip
2
++
M
docs/installation/debian_based_en.md
10
++++++++--

2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/changelog.d/debian-install-improve.skip b/changelog.d/debian-install-improve.skip
@@ -0,0 +1 @@
+Fixed a formatting issue that had a required commend embedded in a textblock, and change the language to make it a bit more idiomatic.
+\ No newline at end of file
diff --git a/docs/installation/debian_based_en.md b/docs/installation/debian_based_en.md
@@ -69,12 +69,18 @@ cd /opt/pleroma
 sudo -Hu pleroma mix deps.get
 ```
 
-* Generate the configuration: `sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen`
+* Generate the configuration: 
+
+```shell
+sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen`
+```
+
+* During this process:
   * Answer with `yes` if it asks you to install `rebar3`.
   * This may take some time, because parts of pleroma get compiled first.
   * After that it will ask you a few questions about your instance and generates a configuration file in `config/generated_config.exs`.
 
-* Check the configuration and if all looks right, rename it, so Pleroma will load it (`prod.secret.exs` for productive instance, `dev.secret.exs` for development instances):
+* Check the configuration and if all looks right, rename it, so Pleroma will load it (`prod.secret.exs` for production instances, `dev.secret.exs` for development instances):
 
 ```shell
 sudo -Hu pleroma mv config/{generated_config.exs,prod.secret.exs}