diff --git a/doc/EN/app_gnusocial.org b/doc/EN/app_gnusocial.org index 7f62ef6c..ad527590 100644 --- a/doc/EN/app_gnusocial.org +++ b/doc/EN/app_gnusocial.org @@ -22,6 +22,12 @@ You can host your own GNU Social instance and then "/remote follow/" other users You should regard anything posted to GNU Social as being /public communication/ visible to anyone on the internet. There is a direct messaging capability between users but it's not particularly secure, so for one-to-one messages stick to better methods, such as XMPP with OTR/OMEMO or Tox. + +#+BEGIN_CENTER +[[file:images/gnusocial_pleroma.jpg]] +#+END_CENTER + + * Installation Log into your system with: diff --git a/img/gnusocial_mobile.jpg b/img/gnusocial_mobile.jpg index c1070e3c..c51e9062 100644 Binary files a/img/gnusocial_mobile.jpg and b/img/gnusocial_mobile.jpg differ diff --git a/img/gnusocial_pleroma.jpg b/img/gnusocial_pleroma.jpg new file mode 100644 index 00000000..6761d67b Binary files /dev/null and b/img/gnusocial_pleroma.jpg differ diff --git a/website/EN/app_gnusocial.html b/website/EN/app_gnusocial.html index 55eae090..917038b7 100644 --- a/website/EN/app_gnusocial.html +++ b/website/EN/app_gnusocial.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -71,6 +71,7 @@ pre.src-fortran:before { content: 'Fortran'; } pre.src-gnuplot:before { content: 'gnuplot'; } pre.src-haskell:before { content: 'Haskell'; } + pre.src-hledger:before { content: 'hledger'; } pre.src-java:before { content: 'Java'; } pre.src-js:before { content: 'Javascript'; } pre.src-latex:before { content: 'LaTeX'; } @@ -188,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 @@ -259,16 +260,26 @@ You can host your own GNU Social instance and then "remote follow" other You should regard anything posted to GNU Social as being public communication visible to anyone on the internet. There is a direct messaging capability between users but it's not particularly secure, so for one-to-one messages stick to better methods, such as XMPP with OTR/OMEMO or Tox.

-
-

Installation

-
+ +
+ +
+

gnusocial_pleroma.jpg +

+
+
+ + +
+

Installation

+

Log into your system with:

-
ssh myusername@mydomain -p 2222
-
+
ssh myusername@mydomain -p 2222
+

@@ -286,9 +297,9 @@ After the install has completed go to Security settings and select Cre

-
-

Initial setup

-
+
+

Initial setup

+

If you have just obtained a Lets Encrypt certificate as above then go to About on the administrator control panel and you should see your GNU Social domain listed there along with an onion address. You can then navigate to your site in a browser.

@@ -316,15 +327,15 @@ GNU Social has a clutter-free mobile user interface which can be accessed via a
-
-

Using with Emacs

-
+
+

Using with Emacs

+

If you are an Emacs user it's also possible to set up GNU Social mode as follows:

-
mkdir ~/elisp
+
mkdir ~/elisp
 git clone git://git.savannah.nongnu.org/gnu-social-mode ~/elisp/gnu-social-mode
 sed -i 's|"http"|"https"|g' ~/elisp/gnu-social-mode/gnu-social-mode.el
 sed -i 's|http:|https:|g' ~/elisp/gnu-social-mode/gnu-social-mode.el
@@ -335,7 +346,7 @@ sed -i 's|http?|https?|g' ~/elisp/gnu-social-mod
 echo "      gnu-social-server \"yourgnusocialdomain\"" >> ~/.emacs
 echo "    gnu-social-username \"yourusername\"" >> ~/.emacs
 echo "    gnu-social-password \"gnusocialpassword\")" >> ~/.emacs
-

+

@@ -402,9 +413,9 @@ And as a quick reference the main keys are:

-
-

Sharing things

-
+
+

Sharing things

+

If you have the GNU Social microblogging system installed then it's also possible to share things or services between groups or with particular users. This can be useful for sharing items within a family, club or in a local sharing economy. Sharing things freely, without money, reveals the social basis at the root of all economics which money normally conceals or obscures.