aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-18 18:57:55 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-18 18:57:55 +0000
commit45a1c2555889ee909fb0b9139da56c0e1fbf12ed (patch)
treeab91034f2c769418039e704ee8069ad7245da4a2
parent80952e2cc9c13df0a8a9ea572326f82285b05141 (diff)
parent36d1513d7fc6321c9ecd0abceac8dd0cdcbfedcc (diff)
downloadprosody-45a1c2555889ee909fb0b9139da56c0e1fbf12ed.tar.gz
prosody-45a1c2555889ee909fb0b9139da56c0e1fbf12ed.zip
Merge with 0.7
-rw-r--r--HACKERS8
-rw-r--r--README2
-rw-r--r--TODO15
3 files changed, 19 insertions, 6 deletions
diff --git a/HACKERS b/HACKERS
index a8585af0..40cbd8aa 100644
--- a/HACKERS
+++ b/HACKERS
@@ -5,6 +5,8 @@ involved you can join us on our mailing list and discussion rooms. More
information on these at http://prosody.im/discuss
Patches are welcome, though before sending we would appreciate if you read
-docs/coding_style.txt for guidelines on how to format your code, and are
-comfortable with copyright of contributions being assigned to the core
-developers.
+docs/coding_style.txt for guidelines on how to format your code, and other tips.
+
+Documentation for developers can be found at http://prosody.im/doc/developers
+
+Have fun :)
diff --git a/README b/README
index a28f135d..3cffea49 100644
--- a/README
+++ b/README
@@ -32,6 +32,6 @@ Mailing lists:
## Installation
See the accompanying INSTALL file for help on building Prosody from source. Alternatively
-see our guide at http://prosody.im/install
+see our guide at http://prosody.im/doc/install
diff --git a/TODO b/TODO
index a3266d82..c0d2b959 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,16 @@
-- Ad-hoc commands
-- Clustering
+== 0.8 ==
+- Ad-hoc commands:
+ http://code.google.com/p/prosody-modules/wiki/mod_adhoc
+ http://code.google.com/p/prosody-modules/wiki/mod_adhoc_cmd_admin
+ http://code.google.com/p/prosody-modules/wiki/mod_adhoc_cmd_ping
+ http://code.google.com/p/prosody-modules/wiki/mod_adhoc_cmd_uptime
+
- Pubsub
+- Data storage backend abstraction
+== 0.9 ==
+- Clustering
+== 1.0 ==
+- Web interface?
+- World domination