summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/remotesubscribe.php2
-rw-r--r--doc/openmublog25
-rw-r--r--htaccess.sample1
3 files changed, 27 insertions, 1 deletions
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 4cadd1496..18eb118ab 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -43,7 +43,7 @@ class RemotesubscribeAction extends Action {
return _t('To subscribe, you can [login](%%action.login%%),' .
' or [register](%%action.register%%) a new ' .
' account. If you already have an account ' .
- ' on another microblogging site, ' .
+ ' on a [compatible microblogging site](%%doc.openmublog%%), ' .
' enter your profile URL below.');
}
diff --git a/doc/openmublog b/doc/openmublog
new file mode 100644
index 000000000..e02c2b7d8
--- /dev/null
+++ b/doc/openmublog
@@ -0,0 +1,25 @@
+[OpenMicroBlogging](http://openmicroblogging.org/) is a protocol that
+lets users of one [microblogging](http://en.wikipedia.org/wiki/microblogging) service
+subscribe to notices by users of another service. The protocol, based on
+[OAuth](http://oauth.net/), is open and free, and doesn't depend on any
+central authority to maintain the federated microblogs.
+
+The [Laconica](http://laconi.ca/) software that runs %%site.name%% supports
+OpenMicroBlogging 0.1. Anyone can make a new installation of Laconica on their
+own servers, and users of that new installation can subscribe to notices from
+%%site.name%%.
+
+Remote subscription
+-------------------
+
+If you have an account on a remote site that supports OpenMicroBlogging, and you
+want to subscribe to the notices of a user on this site, click on the "Subscribe"
+link under their avatar on their profile page. This should take you to the
+(remote subscription)[%%action.remotesubscribe%%] page. Make sure that you've got the
+right nickname registered, and enter your profile URL on the other microblogging
+service.
+
+You'll be taken to your microblogging service, where you'll be asked to confirm the
+subscription. When you confirm, your service will receive new notifications from
+the user on %%site.name%%, and your service will forward them to you (using IM, SMS,
+the Web, or whatever else).
diff --git a/htaccess.sample b/htaccess.sample
index 2179c5800..d57761709 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -8,6 +8,7 @@ RewriteRule ^doc/about$ index.php?action=doc&title=about [L,QSA]
RewriteRule ^doc/faq$ index.php?action=doc&title=faq [L,QSA]
RewriteRule ^doc/help$ index.php?action=doc&title=help [L,QSA]
RewriteRule ^doc/im$ index.php?action=doc&title=im [L,QSA]
+RewriteRule ^doc/openmublog$ index.php?action=doc&title=openmublog [L,QSA]
RewriteRule ^doc/privacy$ index.php?action=doc&title=privacy [L,QSA]
RewriteRule ^doc/source$ index.php?action=doc&title=source [L,QSA]