diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-10-08 16:49:03 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-10-08 16:49:03 +0300 |
| commit | 541a71c3a561e74d273c0b210bde70f4e0b31681 (patch) | |
| tree | 5a06decc988fb422c0431b4df270939d204fcc00 /docs | |
| parent | a26d55013779d7b41e4a4aa0dc2477a6926116ae (diff) | |
| parent | 122323f35c32a4f12a345a8b3f163e9318f5dea3 (diff) | |
Merge branch 'develop' into feature/following_reblogs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/CONFIGURATION.md | 4 | ||||
| -rw-r--r-- | docs/USER_GUIDE.md | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index a7dcd915..35363537 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -1,7 +1,7 @@ # Pleroma-FE configuration and customization for instance administrators -* *For user configuration, see USER_GUIDE.md* -* *For local development server configuration, see HACKING.md* +* *For user configuration, see [Pleroma-FE user guide](USER_GUIDE.md)* +* *For local development server configuration, see [Hacking, tweaking, contributing](HACKING.md)* ## Where configuration is stored diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md index 18b6c560..076bfb1c 100644 --- a/docs/USER_GUIDE.md +++ b/docs/USER_GUIDE.md @@ -1,3 +1,5 @@ +# Pleroma-FE user guide + > Be prepared for breaking changes, unexpected behavior and this user guide becoming obsolete and wrong. > If there was no insanity @@ -6,8 +8,6 @@ > > --Catbag -# Pleroma-FE user guide - Pleroma-FE user interface is modeled after Qvitter which is modeled after older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options. ## Posting, reading, basic functions. |