From 75166607532723055ae24d5c9ac0e7f03160c913 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 13 Oct 2020 16:44:27 -0500
Subject: Remove toggle_activation

---
 docs/administration/CLI_tasks/user.md | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'docs/administration/CLI_tasks')

diff --git a/docs/administration/CLI_tasks/user.md b/docs/administration/CLI_tasks/user.md
index b57dce0e7..9fde9631e 100644
--- a/docs/administration/CLI_tasks/user.md
+++ b/docs/administration/CLI_tasks/user.md
@@ -134,21 +134,6 @@
     ```
 
 
-## Deactivate or activate a user
-
-=== "OTP"
-
-    ```sh
-     ./bin/pleroma_ctl user toggle_activated <nickname>
-    ```
-
-=== "From Source"
-
-    ```sh
-    mix pleroma.user toggle_activated <nickname>
-    ```
-
-
 ## Deactivate a user and unsubscribes local users from the user
 
 === "OTP"
-- 
cgit v1.2.3


From 6e51d7264bf5def49795494f35e023d7e19b9ac9 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 25 Jan 2021 10:38:08 -0600
Subject: Document pleroma.user activate mix task

---
 docs/administration/CLI_tasks/user.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'docs/administration/CLI_tasks')

diff --git a/docs/administration/CLI_tasks/user.md b/docs/administration/CLI_tasks/user.md
index 9fde9631e..24fdaeab4 100644
--- a/docs/administration/CLI_tasks/user.md
+++ b/docs/administration/CLI_tasks/user.md
@@ -133,6 +133,19 @@
     mix pleroma.user sign_out <nickname>
     ```
 
+## Activate a user
+
+=== "OTP"
+
+    ```sh
+     ./bin/pleroma_ctl user activate NICKNAME
+    ```
+
+=== "From Source"
+
+    ```sh
+    mix pleroma.user activate NICKNAME
+    ```
 
 ## Deactivate a user and unsubscribes local users from the user
 
-- 
cgit v1.2.3


From 8d4e0342e1b5ebbe486dc538e3c8fe81d53220e6 Mon Sep 17 00:00:00 2001
From: hyperion <8027-hyperion@users.noreply.git.pleroma.social>
Date: Sat, 6 Feb 2021 09:42:17 +0000
Subject: Update
 priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs,
 priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs
 files

---
 docs/administration/CLI_tasks/database.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'docs/administration/CLI_tasks')

diff --git a/docs/administration/CLI_tasks/database.md b/docs/administration/CLI_tasks/database.md
index 6dca83167..c53c49921 100644
--- a/docs/administration/CLI_tasks/database.md
+++ b/docs/administration/CLI_tasks/database.md
@@ -141,3 +141,21 @@ but should only be run if necessary. **It is safe to cancel this.**
     ```sh
     mix pleroma.database ensure_expiration
     ```
+
+## Change Text Search Configuration
+
+Change `default_text_search_config` for database and (if necessary) text_search_config used in index, then rebuild index (it may take time). 
+
+=== "OTP"
+
+    ```sh
+    ./bin/pleroma_ctl database set_text_search_config english
+    ```
+
+=== "From Source"
+
+    ```sh
+    mix pleroma.database set_text_search_config english
+    ```
+
+See [PostgreSQL documentation](https://www.postgresql.org/docs/current/textsearch-configuration.html) and `docs/configuration/howto_search_cjk.md` for more detail.
-- 
cgit v1.2.3


From 03843a53868860c0b6b2bebcf262bde746482f7e Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 23 Mar 2021 14:23:37 +0300
Subject: migrating config to tmp folder

---
 docs/administration/CLI_tasks/config.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'docs/administration/CLI_tasks')

diff --git a/docs/administration/CLI_tasks/config.md b/docs/administration/CLI_tasks/config.md
index 000ed4d98..fc9f3cbd5 100644
--- a/docs/administration/CLI_tasks/config.md
+++ b/docs/administration/CLI_tasks/config.md
@@ -32,16 +32,20 @@
     config :pleroma, configurable_from_database: false
     ```
 
-To delete transferred settings from database optional flag `-d` can be used. `<env>` is `prod` by default.
+Options:
+
+- `<path>` - where to save migrated config. E.g. `--path=/tmp`. If file saved into non standart folder, you must manually copy file into directory where Pleroma can read it. For OTP install path will be `PLEROMA_CONFIG_PATH` or `/etc/pleroma`. For installation from source - `config` directory in the pleroma folder.
+- `<env>` - environment, for which is migrated config. By default is `prod`.
+- To delete transferred settings from database optional flag `-d` can be used
 
 === "OTP"
     ```sh
-     ./bin/pleroma_ctl config migrate_from_db [--env=<env>] [-d]
+     ./bin/pleroma_ctl config migrate_from_db [--env=<env>] [-d] [--path=<path>]
     ```
 
 === "From Source"
     ```sh
-    mix pleroma.config migrate_from_db [--env=<env>] [-d]
+    mix pleroma.config migrate_from_db [--env=<env>] [-d] [--path=<path>]
     ```
 
 ## Dump all of the config settings defined in the database
-- 
cgit v1.2.3