Index: doc/theses/fangren_yu_MMath/intro.tex
===================================================================
--- doc/theses/fangren_yu_MMath/intro.tex	(revision 16d7535da9c071e1cb43db0b30c474f12f7953ac)
+++ doc/theses/fangren_yu_MMath/intro.tex	(revision 3ae2069b7565944d782e763cc7cd124694f0a2ed)
@@ -193,8 +193,8 @@
 \# of parameters		& yes	& yes	& yes	& yes	& yes	& yes	\\
 parameter types			& yes	& yes	& yes	& yes	& yes	& yes	\\
-parameter Order/Name	& O/N	& O		& O		& O		& 		& O/N	\\
-return type				& yes	& no	& yes	& no	& 		& yes	\\
-Safe/Unsafe arg. conv.	& 		& 		& S/U	& 		& 		& no\footnote{literals only, Int -> Double (Safe)}	\\
-generic					& 		& 		& yes	& 		& 		& yes
+parameter Order/Name	& O/N	& O		& O		& O		& O/N	& O/N	\\
+return type				& yes	& no	& yes	& no	& no	& yes	\\
+Safe/Unsafe arg. conv.	& 		& yes\footnote{no conversions allowed during template parameter deduction}	& S/U	& S\footnote{unsafe (narrowing) conversion only allowed in assignment or initialization to a primitive variable}	& S		& no\footnote{literals only, Int -> Double (Safe)}	\\
+generic					& 		& yes\footnote{compile-time only, using template expansion}	& yes	& yes	& yes	& yes
 \end{tabular}
 \end{minipage}