Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

1 files changed, 4 insertions, 4 deletions

diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 6e35cd519..8075ef6af 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -11,9 +11,9 @@
 //usage:#define rdate_trivial_usage
 //usage:       "[-sp] HOST"
 //usage:#define rdate_full_usage "\n\n"
-//usage:       "Get and possibly set the system date/time from a remote HOST\n"
-//usage:     "\n        -s      Set the system date/time (default)"
-//usage:     "\n        -p      Print the date/time"
+//usage:       "Get and possibly set system time from a remote HOST\n"
+//usage:     "\n        -s      Set system time (default)"
+//usage:     "\n        -p      Print time"
 
 #include "libbb.h"
 
@@ -36,7 +36,7 @@ static time_t askremotedate(const char *host)
         fd = create_and_connect_stream_or_die(host, bb_lookup_port("time", "tcp", 37));
 
         if (safe_read(fd, &nett, 4) != 4)    /* read time from server */
-                bb_error_msg_and_die("%s did not send the complete time", host);
+                bb_error_msg_and_die("%s: %s", host, "short read");
         if (ENABLE_FEATURE_CLEAN_UP)
                 close(fd);