Merge pull request #279 from domaframework/translate

Polish documents

Author: nakamura-to

docs/expression.rst

@@ -5,7 +5,7 @@ Expression language
 .. contents:: Contents
    :depth: 3
 
-You can write simple expressions in expression comments of :doc:`sql`.
+You can write simple expressions in directives of :doc:`sql`.
 The grammar is almost the same as Java.
 However, not everything is possible that Java can do.
 

docs/sql.rst

@@ -189,10 +189,10 @@ The expression enclosed between ``/*`` and ``*/`` is evaluated and
 its evaluation result is passed to bind variable in SQL statement.
 The directive must be followed by test data, which is never used in runtime.
 
-Basic or domain parameters
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+Basic and domain parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The parameter whose type is one of :doc:`basic` or :doc:`domain`
+The parameter whose type is one of :doc:`basic` and :doc:`domain`
 is recognised as a bind variable.
 
 The following example is the pair of a DAO method and an SQL template:
@@ -785,5 +785,5 @@ In other hand, the followings are the beginning of a directive:
 
 .. note::
 
-  We recommend you always to use ``/**～*/`` to begin multi line comments.
+  We recommend you always use ``/**...*/`` to begin multi line comments because it is simple.