merge heads

This commit is contained in:
Sandro Tosi 2011-10-31 19:23:25 +01:00
commit 236c0ea614

View file

@ -347,7 +347,7 @@ A string conversion is an expression list enclosed in reverse (a.k.a. backward)
quotes: quotes:
.. productionlist:: .. productionlist::
string_conversion: "'" `expression_list` "'" string_conversion: "`" `expression_list` "`"
A string conversion evaluates the contained expression list and converts the A string conversion evaluates the contained expression list and converts the
resulting object into a string according to rules specific to its type. resulting object into a string according to rules specific to its type.