Index: tools/smaz.adb
==================================================================
--- tools/smaz.adb
+++ tools/smaz.adb
@@ -45,11 +45,11 @@
    end Actions;
 
    package Dict_Sources is
       type Enum is
         (S_Expression,
-         Word_List);
+         Text_List);
    end Dict_Sources;
 
    package Options is
       type Id is
         (Output_Ada_Dict,
@@ -64,11 +64,11 @@
          Sx_Dict_Output,
          Min_Sub_Size,
          Max_Sub_Size,
          Stat_Output,
          No_Stat_Output,
-         Word_List_Input,
+         Text_List_Input,
          Max_Word_Size,
          Sx_Output,
          No_Sx_Output);
    end Options;
 
@@ -186,12 +186,12 @@
             Handler.Sx_Output := True;
 
          when Options.Dictionary_Input =>
             Handler.Dict_Source := Dict_Sources.S_Expression;
 
-         when Options.Word_List_Input =>
-            Handler.Dict_Source := Dict_Sources.Word_List;
+         when Options.Text_List_Input =>
+            Handler.Dict_Source := Dict_Sources.Text_List;
 
          when Options.Sx_Dict_Output =>
             Handler.Need_Dictionary := True;
             Handler.Sx_Dict_Output := True;
 
@@ -231,11 +231,11 @@
       R.Add_Option ("sx-dict",       'L', No_Argument,       Sx_Dict_Output);
       R.Add_Option ("min-substring", 'm', Required_Argument, Min_Sub_Size);
       R.Add_Option ("max-substring", 'M', Required_Argument, Max_Sub_Size);
       R.Add_Option ("stats",         's', No_Argument,       Stat_Output);
       R.Add_Option ("no-stats",      'S', No_Argument,       No_Stat_Output);
-      R.Add_Option ("word-list",     'w', No_Argument,       Word_List_Input);
+      R.Add_Option ("text-list",     't', No_Argument,       Text_List_Input);
       R.Add_Option ("max-word-len",  'W', Required_Argument, Max_Word_Size);
       R.Add_Option ("s-expr",        'x', No_Argument,       Sx_Output);
       R.Add_Option ("no-s-expr",     'X', No_Argument,       No_Sx_Output);
 
       return R;
@@ -442,14 +442,15 @@
             when Options.Dictionary_Input =>
                New_Line (Output);
                Put_Line (Output, Indent & Indent
                  & "Read dictionary directly in input S-expression (default)");
 
-            when Options.Word_List_Input =>
+            when Options.Text_List_Input =>
                New_Line (Output);
                Put_Line (Output, Indent & Indent
-                 & "Compute dictionary from word list in input S-expression");
+                 & "Compute dictionary from sample texts"
+                 & " in input S-expression");
 
             when Options.Sx_Dict_Output =>
                New_Line (Output);
                Put_Line (Output, Indent & Indent
                  & "Output the dictionary as a S-expression");
@@ -498,11 +499,11 @@
    begin
       case Handler.Dict_Source is
          when Dict_Sources.S_Expression =>
             return Natools.Smaz.Tools.To_Dictionary (Input, True);
 
-         when Dict_Sources.Word_List =>
+         when Dict_Sources.Text_List =>
             declare
                Counter : Natools.Smaz.Tools.Word_Counter;
             begin
                for S of Input loop
                   Natools.Smaz.Tools.Add_Substrings