summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-06-03 15:39:24 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-06-03 15:39:24 -0400
commit53aab8b0c324a9bcb86903d075bf56cd7eb362dc (patch)
tree6584c9be048c7e53d3625d0ab69c3fbb8aa24410
parent00c1898ebda3f6a5b2413c0e6e83436370ed8e08 (diff)
downloadaskbot-53aab8b0c324a9bcb86903d075bf56cd7eb362dc.tar.gz
askbot-53aab8b0c324a9bcb86903d075bf56cd7eb362dc.tar.bz2
askbot-53aab8b0c324a9bcb86903d075bf56cd7eb362dc.zip
edited documentation and the contributors file
-rw-r--r--askbot/doc/source/changelog.rst1
-rw-r--r--askbot/doc/source/contributors.rst1
-rw-r--r--askbot/doc/source/management-commands.rst5
3 files changed, 7 insertions, 0 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 48afb5ea..2e300278 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -3,6 +3,7 @@ Changes in Askbot
Development version
-------------------
+* Added backend support for the tag synonyms
* Added management command `apply_hinted_tags` to batch-apply tags from a list
* Added hovercard on the user's karma display in the header
* Added option to hide ad blocks from logged in users
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst
index 85d252bc..04a93e40 100644
--- a/askbot/doc/source/contributors.rst
+++ b/askbot/doc/source/contributors.rst
@@ -48,6 +48,7 @@ Programming, bug fixes and documentation
* `Zafer Cakmak <https://github.com/xaph>`_
* `Kevin Porterfield <http://www.shotgunsoftware.com>_`
* `Robert Martin <https://github.com/bobbydavid>_`
+* `pcompassion https://github.com/pcompassion`_
Translations
------------
diff --git a/askbot/doc/source/management-commands.rst b/askbot/doc/source/management-commands.rst
index da93dcb5..a56aa47a 100644
--- a/askbot/doc/source/management-commands.rst
+++ b/askbot/doc/source/management-commands.rst
@@ -30,6 +30,11 @@ The bulk of the management commands fall into this group and will probably be th
| | one per line. If many tags match - only the most frequent |
| | will be selected. |
+---------------------------------+-------------------------------------------------------------+
+| `create_tag_synonyms --from | Creates tag synonym record from one name to another, |
+| <from_name> --to <to_name> | creates the tag named as given with the value of `--to` |
+| --user-id <user_id>` | if not existing, and the tag creator will be user with id |
+| | equal to the value of `--user-id` parameter. |
++---------------------------------+-------------------------------------------------------------+
| `remove_admin <user_id>` | Remove admin status from a user account - the opposite of |
| | the `add_admin` command |
+---------------------------------+-------------------------------------------------------------+