Merge branch 'master' into quickformorigin/quickform

Conflicts:
	data/templates/bookmarks.tpl.php
	data/templates/sidebar.block.search.php
	data/templates/top.inc.php
	doc/developers/TODO
	src/SemanticScuttle/header.php

5 files changed, 27 insertions, 3 deletions

diff --git a/doc/developers/TODO b/doc/developers/TODO
index b788cbd..10a0cf6 100644
--- a/doc/developers/TODO
+++ b/doc/developers/TODO
@@ -39,7 +39,12 @@
 - Make users inactive by default when registered newly
   - have to be activated by admins (see #1926991)
 - Add RDFa to user profile page
+- use recaptcha or alike -> quickform
 - tutorial about sidebar
+- update php-gettext
+- index on bookmarks->modified, since created is not used in selects/sort
+  - how to optimize sorts, to prevent mysql filesort? -> index enough?
+  - how to optimize DISTINCT bHash
 
 
 
diff --git a/doc/developers/api b/doc/developers/api
new file mode 100644
index 0000000..efa05fe
--- /dev/null
+++ b/doc/developers/api
@@ -0,0 +1,10 @@
+SemanticScuttle API
+===================
+
+SemanticScuttle tries to implement the delicious API v1 as closely as sensible.
+
+Where it makes sense and the delicious API just does things plainly wrong
+(i.e. when returning a wrong status code on an error), we do it better.
+
+- http://www.delicious.com/help/api
+- http://support.delicious.com/forum/comments.php?DiscussionID=5286&page=1
diff --git a/doc/developers/doc-TODO b/doc/developers/doc-TODO
new file mode 100644
index 0000000..4fac4ab
--- /dev/null
+++ b/doc/developers/doc-TODO
@@ -0,0 +1,9 @@
+- Bookmarklets: Text selection is used as description
+- Tag nesting: Paris > France > World
+- Tag alias: Deutschland = Germany
+
+
+- Which fields are searched?
+  title, description, private note, username, tags
+
+- What are [isbn] and so for?
diff --git a/doc/developers/release-new-version b/doc/developers/release-new-version
index 69530df..4b2540a 100644
--- a/doc/developers/release-new-version
+++ b/doc/developers/release-new-version
@@ -4,8 +4,8 @@ How to release a new version of SemanticScuttle
 0. Run unit tests and verify that all of them pass
 1. Update doc/ChangeLog
 2. Update doc/UPGRADE.txt
-3. Update version in data/templates/about.tpl.php
-   and build.xml
+3. Update version in data/templates/about.tpl.php,
+   build.xml and doc/README.txt
 4. Create a release zip file via the build script:
    Just type "phing".
 5. Make a test installation from your zip file with a fresh
diff --git a/doc/developers/translation b/doc/developers/translation
index 401089a..776b5d7 100644
--- a/doc/developers/translation
+++ b/doc/developers/translation
@@ -21,7 +21,7 @@ We keep one base translation file, data/locales/messages.po.
 This file is auto-generated via xgettext from all our php source files.
 In case you added a new string to the code that needs translation,
 update the base translation file by running
-> php scripts/update-translation-base.php.
+> php scripts/update-translation-base.php
 
 After that has been done, the changes to the base messages.po file
 need to be merged into the single language translation files,