update TODO, and add variables to docs

darcs-hash:20080613171538-84dde-ffd6abee1ae304e55f4ff4224dfebf4be8fff0fd.gz

diff --git a/actions/doc.php b/actions/doc.php
index 0ace0424668f24f837b20fdba73412359747bafc..a23cf9ad0716ccc1d2baa55e51e14478775a6a23 100644 (file)
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -31,7 +31,11 @@ class DocAction extends Action {
                        common_user_error(_t('No such document.'));
                        return;
                }
-               $output = Markdown(file_get_contents($filename));
+               $c = file_get_contents($filename);
+               $c = preg_replace('/%%action.(\w+)%%/e', "common_local_url('\\1')", $c);
+               $c = preg_replace('/%%doc.(\w+)%%/e', "common_local_url('doc', array('title'=>'\\1'))", $c);
+               $c = preg_replace('/%%(\w+).(\w+)%%/e', '$config[\'\\1\'][\'\\2\']', $c);
+               $output = Markdown($c);
                common_show_header(_t(ucfirst($title)));
                common_raw($output);
                common_show_footer();

diff --git a/doc/about b/doc/about
index a423d7a158f89145678bfa73fcfdca12880fd671..c6b50bc53bbf2a2f99303a3f41e9df9ab342375c 100644 (file)
--- a/doc/about
+++ b/doc/about
@@ -1,10 +1,14 @@
 About
 -----
 
-This site is a
+%%site.name%% is a
 [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service
-based on the Free Software [Laconica](http://laconi.ca/) tool. You can
-register for an account, post small (140 chars or less) text notices
-about yourself (or practically anything), and follow along as your
-friends or people you're interested in post their own notices.
+based on the Free Software [Laconica](http://laconi.ca/) tool.
+
+If you [register](%%action.register%%) for an account,
+you can post small (140 chars or less) text notices
+about yourself, where you are, what you're doing, or practically
+anything you want. You can also subscribe to the notices of your
+friends, or other people you're interested in, and follow them on the
+Web or in an [RSS](http://en.wikipedia.org/wiki/RSS) feed.
 

diff --git a/doc/roadmap b/doc/roadmap
index f8c417275a71b3ebda7dbf0c5ff7583cad2cb863..6008b4f1002bbab571b879b2508793dc3db7c8e1 100644 (file)
--- a/doc/roadmap
+++ b/doc/roadmap
@@ -124,8 +124,8 @@ First public release (theoretically). Added distributed subscriptions,
 + Automatically linkify URLs in notices
 + themes
 + theme per site
-- only local notices in public stream
-- only local notices in public RSS
++ only local notices in public stream
++ only local notices in public RSS
 + graphic refresh on all
 + graphic refresh on avatar
 + graphic refresh on doc