[WWcvs] webwork2: Bring HEAD and rel-2-1-patches in line with each other.

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
Bring HEAD and rel-2-1-patches in line with each other.

Tags:
----
rel-2-1-patches

Modified Files:
--------------
    webwork2/clients:
        webwork_xmlrpc_client.pl
    webwork2/lib/WeBWorK/ContentGenerator/Instructor:
        Scoring.pm

Revision Data
-------------
Index: webwork_xmlrpc_client.pl
===================================================================
RCS file: /webwork/cvs/system/webwork2/clients/webwork_xmlrpc_client.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lclients/webwork_xmlrpc_client.pl -Lclients/webwork_xmlrpc_client.pl -u -r1.1.2.1 -r1.1.2.2
--- clients/webwork_xmlrpc_client.pl
+++ clients/webwork_xmlrpc_client.pl
@@ -36,9 +36,9 @@
 
 } else {
 
-	print STDERR "Useage: .xmlrpc_client4.pl command   file_name\n";
-	print STDERR "For example: .xmlrpc_client4.pl renderProblem   input.txt\n";
-	print STDERR "For example: .xmlrpc_client4.pl listLibraries   \n";
+	print STDERR "Useage: ./webwork_xmlrpc_client.pl command   [file_name]\n";
+	print STDERR "For example: ./webwork_xmlrpc_client.pl renderProblem   input.txt\n";
+	print STDERR "For example: ./webwork_xmlrpc_client.pl  listLibraries   \n";
 	print STDERR "Commands are: ", join(" ", @COMMANDS), "\n";
 	
 }
Index: Scoring.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -u -r1.36.2.4 -r1.36.2.5
--- lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
@@ -520,6 +520,7 @@
 	return @scoringData;
 }
 
+}
 # Often it's more efficient to just get everything out of the database
 # and then pick out what you want later.  Hence, these "everything2*" functions
 sub everything2info {