diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-05-16 13:11:17 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-05-16 13:11:17 -0500 |
| commit | ebb04821161e4377f311af7192168e2c01e8c1bb (patch) | |
| tree | 37995ccda7c4351653de56db4593b877a443fde0 /docs | |
| parent | f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9 (diff) | |
| parent | fde30aee43edd50a40dd4bfdc0008f5395dfc751 (diff) | |
| download | pleroma-ebb04821161e4377f311af7192168e2c01e8c1bb.tar.gz | |
Merge branch 'develop' into conversations-import
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/admin_api.md | 8 | ||||
| -rw-r--r-- | docs/installation/debian_based_en.md | 3 | ||||
| -rw-r--r-- | docs/installation/debian_based_jp.md | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index 75fa2ee83..59578f8d1 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -106,15 +106,15 @@ Authentication is required and the user must be an admin. - Method: `PUT` - Params: - - `nickname` - - `tags` + - `nicknames` (array) + - `tags` (array) ### Untag a list of users - Method: `DELETE` - Params: - - `nickname` - - `tags` + - `nicknames` (array) + - `tags` (array) ## `/api/pleroma/admin/users/:nickname/permission_group` diff --git a/docs/installation/debian_based_en.md b/docs/installation/debian_based_en.md index 9613a329b..9c0ef92d4 100644 --- a/docs/installation/debian_based_en.md +++ b/docs/installation/debian_based_en.md @@ -12,6 +12,7 @@ This guide will assume you are on Debian Stretch. This guide should also work wi * `erlang-tools` * `erlang-parsetools` * `erlang-eldap`, if you want to enable ldap authenticator +* `erlang-ssh` * `erlang-xmerl` * `git` * `build-essential` @@ -49,7 +50,7 @@ sudo dpkg -i /tmp/erlang-solutions_1.0_all.deb ```shell sudo apt update -sudo apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools +sudo apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools erlang-ssh ``` ### Install PleromaBE diff --git a/docs/installation/debian_based_jp.md b/docs/installation/debian_based_jp.md index ac5dcaaee..41cce6792 100644 --- a/docs/installation/debian_based_jp.md +++ b/docs/installation/debian_based_jp.md @@ -14,6 +14,7 @@ - erlang-dev - erlang-tools - erlang-parsetools +- erlang-ssh - erlang-xmerl (Jessieではバックポートからインストールすること！) - git - build-essential @@ -44,7 +45,7 @@ wget -P /tmp/ https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb * ElixirとErlangをインストールします、 ``` -apt update && apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools +apt update && apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools erlang-ssh ``` ### Pleroma BE (バックエンド) をインストールします |