Merge branch 'release-prep'

bin/rt-extension-import-csv.in

@@ -25,11 +25,6 @@ if ( $opt{help} || !$file ) {
     exit;
 }
 
-unless ( $opt{config} ) {
-    Pod::Usage::pod2usage( "Option config is required" );
-    exit;
-}
-
 unless ( ( $opt{type} // '' ) =~ /^(?:user|ticket|transaction|article)$/ ) {
     Pod::Usage::pod2usage( "Invalid type provided, should be one of user/ticket/transaction/article" );
     exit;
@@ -189,7 +184,7 @@ __END__
 
 =head1 NAME
 
-rt-extension-csv-importer - Import data and create tickets in RT
+rt-extension-csv-importer - Import data into RT
 
 =head1 SYNOPSIS
 
@@ -201,8 +196,8 @@ rt-extension-csv-importer - Import data and create tickets in RT
 
 =head1 DESCRIPTION
 
-This script will import/update RT from data in a CSV file. See
-L<RT::Extension::Import::CSV> for configuration.
+This script will import/update RT from data in a CSV and other types of
+delimted files. See L<RT::Extension::Import::CSV> for configuration.
 
 =head1 OPTIONS
 
@@ -213,15 +208,15 @@ L<RT::Extension::Import::CSV> for configuration.
 Provides an explicit extra configuration file which is loaded before any
 other configuration files.  This is useful to provide per-import settings.
 F<RT_SiteConfig.pm> should B<not> contain settings for options with hashes
-that may get merged with per-import settings. This option is required.
+that may get merged with per-import settings.
 
 =item C<--type> I<user|ticket|transaction|article> or C<-t> I<user|ticket|transaction|article>
 
-Specify which type of data we shall import
+Specify which type of data shall be imported. This is required.
 
 =item C<--article-class> I<article class name>
 
-Specify the article class when type is article.
+Specify the article class. Required when type is article.
 
 =item C<--update>
 
@@ -251,13 +246,17 @@ ticket if not found.
 By default, tickets containing not-existing users will be skipped; with this
 flag, they will be created without those users.
 
-This also allows the script to continue processing even errors are found
-when parsing csv.
+This also allows the script to continue processing even if errors are found
+when parsing the CSV file.
 
 =item C<--run-scrips>
 
-By default, scrips are temporarily deactivated on C<Transaction> creation. Use
-this flag to allow RT to run scrips accordingly.
+When importing transactions, the default behavior is to deactivate scrips
+on transaction creation. Use this flag to allow RT to run scrips
+accordingly.
+
+This flag only affects transaction import; scrips are always run for
+all other import types.
 
 =item C<--mdy>, C<--dmy>