Automated merge with file:///e:\srv\hg\admin-doc
authorOleksandr Gavenko <gavenkoa@gmail.com>
Wed, 13 Jan 2010 21:52:17 +0200
changeset 278 a58e223b692f
parent 273 47bd3ab92f6f (diff)
parent 277 5c7e19c15332 (current diff)
child 279 061995ef35d2
Automated merge with file:///e:\srv\hg\admin-doc
--- a/blog.rst	Wed Jan 13 21:52:07 2010 +0200
+++ b/blog.rst	Wed Jan 13 21:52:17 2010 +0200
@@ -26,6 +26,11 @@
  * Atom 1.0: http://BLOGNAME.blogspot.com/feeds/posts/default
  * RSS 2.0: http://BLOGNAME.blogspot.com/feeds/posts/default?alt=rss
 
+It seens also this link also work:
+
+ * Atom 1.0: http://BLOGNAME.blogspot.com/atom.xml
+ * RSS 2.0: http://BLOGNAME.blogspot.com/rss.xml
+
 *** Comments-only feed.
 
  * Atom 1.0: http://BLOGNAME.blogspot.com/feeds/comments/default
--- a/dict.rst	Wed Jan 13 21:52:07 2010 +0200
+++ b/dict.rst	Wed Jan 13 21:52:17 2010 +0200
@@ -2,7 +2,9 @@
 
 * StarDict.
 
-
+stardic - an English-Chinese dictionary software for Unix
+stardic-gtk
+stardic-gnome
 
 See
 
@@ -13,6 +15,8 @@
 
 sdcv is the command line version of StarDict.
 
+If set STARDICT_DATA_DIR, sdcv uses dir $STARDICT_DATA_DIR/dic as data directory.
+
 See
 
   http://sdcv.sourceforge.net/
@@ -20,8 +24,25 @@
 
 * GoldenDict.
 
+  http://ru.wikipedia.org/wiki/GoldenDict
 
-  http://ru.wikipedia.org/wiki/GoldenDict
+* dict
+
+CLI client to dictd.
+
+* qstardict
+
+International dictionary written using Qt4.
+
+* fantasdic - dictionary application
+
+* kdict
+
+Dictionary client for KDE.
+
+* opendict
+
+Computer dictionary for several dictionary formats.
 
 * Format.
 
@@ -56,3 +77,15 @@
 
   http://www.dict.org
   http://en.wikipedia.org/wiki/DICT
+
+** Network.
+
+*** DICT
+
+Dict servers and clients use TCP port 2628.
+
+See
+
+  http://www.dict.org/
+  http://tools.ietf.org/html/rfc2229
+  http://en.wikipedia.org/wiki/DICT