# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1312750154 -10800
# Node ID 365194e01db572057729ae1981d098a6ea1d5efb
# Parent  f3b193a0e566658392ef5e207e683c9183a45cfe# Parent  df742eebd7a14bde8acef2d65469b73919cc213e
merged

diff -r f3b193a0e566 -r 365194e01db5 devel-codetags.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devel-codetags.rst	Sun Aug 07 23:49:14 2011 +0300
@@ -0,0 +1,66 @@
+.. -*- coding: utf-8 -*-
+
+====================
+ TODO like keywords
+====================
+.. contents::
+
+Existing resources.
+===================
+
+  http://www.python.org/dev/peps/pep-0350/
+                Codetags
+  http://tracos.org/codetag/
+                This project aims to provide a Toolset and RFC-style Pep usage
+                convention for Codetags.
+  http://java.sun.com/docs/codeconv/html/CodeConventions.doc9.html#395
+                Code Conventions for the Java TM Programming Language.
+                Programming Practices
+  http://c2.com/cgi/wiki?FixmeComment
+                Fixme Comment
+
+FIXME
+=====
+
+For things which are definitely broken, but where you want to not worry about
+it for the moment.
+
+Use FIXME to flag something that is bogus and broken.
+
+TODO
+====
+
+For useful features, optimizations or refactorings that might be worth doing
+in the future.
+
+TODO used to justify not completing code at the time it is first written.
+
+XXX
+===
+
+Use XXX in a comment to flag something that is bogus but works.
+
+For things that require more thought and that are arguably broken.
+
+An XXX demands attention and is not intended to stay in the code long. We may
+later decide that no problem exists. Or we may need to document unexpected
+behavior. If code is broken, we do not expect it to stay that way. We mark the
+problem immediately so that it is not forgotten.
+
+BUG
+===
+
+BUG [ID бага] – обозначает, что в коде есть известный баг, который ещё не исправлен.
+REVIEW
+BROKEN
+HACK
+
+TRICKY
+======
+
+Говорит о том, что код является мудрёным и нужно хорошо подумать прежде чем
+что-то в нём менять.
+
+WARNING
+=======
+
diff -r f3b193a0e566 -r 365194e01db5 devel-versioning.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devel-versioning.rst	Sun Aug 07 23:49:14 2011 +0300
@@ -0,0 +1,11 @@
+=================
+ Version format.
+=================
+.. contents::
+
+Reference.
+==========
+
+  https://developer.mozilla.org/en/toolkit_version_format
+                Toolkit version format
+
diff -r f3b193a0e566 -r 365194e01db5 emacs.rst
--- a/emacs.rst	Sun Aug 07 23:39:37 2011 +0300
+++ b/emacs.rst	Sun Aug 07 23:49:14 2011 +0300
@@ -457,7 +457,7 @@
 
 * Useful commands.
 
-  flush-lines
+  flush-lines keep-lines
   align-regexp
   C-x C-o
   M-PageUp/M-PageDown