From 943bf8a2e7de14025b62ed3741416f756cb1fecc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 14 Apr 2018 22:27:08 +0100 Subject: [PATCH] Remove pleroma logo --- doc/EN/app_pleroma.org | 3 - website/EN/app_pleroma.html | 184 ++++++++++++++++++++++++++---------- 2 files changed, 134 insertions(+), 53 deletions(-) diff --git a/doc/EN/app_pleroma.org b/doc/EN/app_pleroma.org index e2202190..af6b1e9f 100644 --- a/doc/EN/app_pleroma.org +++ b/doc/EN/app_pleroma.org @@ -9,9 +9,6 @@ #+attr_html: :width 80% :height 10% :align center [[file:images/logo.png]] -#+attr_html: :width 80% :align center -[[file:images/pleroma-logo.png]] - #+BEGIN_QUOTE "/The way to keep giant companies from sterilizing the Internet is to make their sites irrelevant. If all the cool stuff happens elsewhere, people will follow. We did this with AOL and Prodigy, and we can do it again./" -- Maciej Cegłowski #+END_QUOTE diff --git a/website/EN/app_pleroma.html b/website/EN/app_pleroma.html index 554fc8a8..632408ae 100644 --- a/website/EN/app_pleroma.html +++ b/website/EN/app_pleroma.html @@ -3,26 +3,33 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - - - - - + + +‎ + + + - + @@ -97,7 +189,7 @@ @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012-2013 Free Software Foundation, Inc. +Copyright (C) 2012-2017 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU @@ -144,19 +236,12 @@ for the JavaScript code in this tag.
-

logo.png

- -
-

pleroma-logo.png -

-
-

"The way to keep giant companies from sterilizing the Internet is to make their sites irrelevant. If all the cool stuff happens elsewhere, people will follow. We did this with AOL and Prodigy, and we can do it again." – Maciej Cegłowski @@ -177,15 +262,14 @@ Some general advice about life in the fediverse can b

-
-

Installation

-
+
+

Installation

+

Log into your system with:

- 
ssh myusername@mydomain -p 2222
@@ -200,9 +284,9 @@ Select Add/Remove Apps then pleroma. You will then be asked for a
-
-

Initial setup

-
+
+

Initial setup

+

The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.

@@ -213,9 +297,9 @@ Once you have done that then you can disable further registrations from the A
-
-

Mastodon user interface

-
+
+

Mastodon user interface

+

If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once you have registered an account navigate to /yourpleromadomainname/web and log in.

@@ -228,9 +312,9 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
-
-

Mobile apps

-
+
+

Mobile apps

+

It's also possible to use Mastodon apps together with Pleroma, such as Tusky, since it supports the Mastodon API. You may need to install IcecatMobile and set it as your default browser (under Settings/Apps/Menu) in order for the initial oauth registration process to work.

@@ -243,9 +327,9 @@ It's also possible to use Mastodon apps together with Pleroma, such as Tusky, si
-
-

Blocking controls

-
+
+

Blocking controls

+

control_panel_blocking.jpg