Index: ocrfeeder/ocrfeeder-cli
===================================================================
--- ocrfeeder.orig/ocrfeeder-cli
+++ ocrfeeder/ocrfeeder-cli
@@ -37,12 +37,30 @@ def printError(message):
 	sys.exit(1)
 
 cli_command_retriever = ArgsRetriever(sys.argv)
+
+if cli_command_retriever.hasCommand('--help'):
+        printError('Usage:\n'
+                   '\tocrfeeder-cli --o OUTPUT_FILE [OPTIONS]\n\n'
+                   'Required options:\n\n'
+                   '\t--o OUTPUT_FILE\n'
+                   '\t\tName for the generated file\n\n'
+                   'Other options:\n\n'
+                   '\t--images IMAGE1 IMAGE2 ...\n'
+                   '\t\tImages to be recognized\n\n'
+                   '\t--format FORMAT\n'
+                   '\t\tFormat for the generated document (ODT or HTML)\n\n'
+                   '\t--window-size WINDOW_SIZE\n'
+                   '\t\tDesired window size of OCRFeeder\'s segmentation\n'
+                   '\t\talgorithm. If this option is not used, the window\n'
+                   '\t\tsize will be calculated automatically')
+
 images = cli_command_retriever.getParams('--images')
 window_size = cli_command_retriever.getParams('--window-size') or None
 export_format = cli_command_retriever.getParams('--format')
 file_name = cli_command_retriever.getParams('--o')
 if not file_name:
-	printError('Error: Output name. Please choose the output name.')
+	printError('Usage: ocrfeeder-cli --o OUTPUT_FILE [OPTIONS]\n'
+                   'Try \'ocrfeeder --help\' for more information')
 	
 file_name = file_name.pop()
 
@@ -101,4 +119,4 @@ if 'HTML' in export_format:
 	document_generator = HtmlGenerator(file_name)
 for page in pages:
 	document_generator.addPage(page)
-document_generator.save()
\ No newline at end of file
+document_generator.save()
Index: ocrfeeder/resources/ocrfeeder-cli.1
===================================================================
--- ocrfeeder.orig/resources/ocrfeeder-cli.1
+++ ocrfeeder/resources/ocrfeeder-cli.1
@@ -3,7 +3,7 @@
 ocrfeeder-cli \- command line interface for OCRFeeder, a document layout analysis and optical character recognition system.
 .SH SYNOPSIS
 .B ocrfeeder-cli
-.I [OPTIONS]
+.I \-\-o OUTPUT_FILE [OPTIONS]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B ocrfeeder-cli
@@ -15,6 +15,11 @@ between what's graphics and text and per
 multiple formats being its main one ODT.
 
 .SH OPTIONS
+.SS "Required options"
+.TP
+.BI "\-\-o OUTPUT_FILE"
+Name for the generated file
+.SS "Other options"
 .TP
 .BI "\-\-images IMAGE1 IMAGE2 ..."
 Images to be recognized
@@ -22,9 +27,6 @@ Images to be recognized
 .BI "\-\-format FORMAT"
 Format for the generated document (ODT or HTML)
 .TP
-.BI "\-\-o FILE_NAME"
-Name for the generated file
-.TP
 .BI "\-\-window-size WINDOW_SIZE"
 Desired window size of OCRFeeder's segmentation algorithm. If 
 this option is not used, the window size will be calculated automatically