Merge branch 'refs/heads/t/server_cmds'

Was cooking for three weeks.

	* Add sender subcommand "status".
	* com_si(): Don't print git version string.
	* Doxify the sender_subcommand enum.
	* Overhaul help texts of server and afs commands.
	* com_sender: Replace memcpy by struct copy.

Conflicts:
	command.c

diff --cc NEWS
index f7158c455fc90723d11ad6902b4e2042d6b93955,40ab08a10cc59a8dd8849436feee4a669b5d972c..6ff788bf06107d4c2d18c54b543ce775840b3583
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,16 -1,6 +1,18 @@@
  NEWS
  ====
  
-       * Minor cleanups to daemon.c.
-       * New URLs for home page and git services.
-       * Improved error diagnostics for the mvblob commands.
 +-----------------------------------------------
 +0.5.4 (to be announced) "exponential alignment"
 +-----------------------------------------------
 +
++      - Minor cleanups to daemon.c.
++      - New URLs for home page and git services.
++      - Improved error diagnostics for the mvblob commands.
++      - New sender subcommand: status.
++      - Improved help text for server and afs commands.
 +
 +Download: ./releases/paraslash-git.tar.bz2
 +
  ---------------------------------------------
  0.5.3 (2014-08-01) "symbolic synchronization"
  ---------------------------------------------

diff --cc command.c
index c832beeaa42dc5a4b9162e16c57b11e66980cfb4,585bb31c54b8df7395c8330f7f4d6e7b15890ad8..db28b39dff8362a76d668d16ca6c7ac13541a9c7
--- 1/command.c
--- 2/command.c
+++ b/command.c
@@@ -380,14 -383,8 +383,8 @@@ static int com_si(struct command_contex
        if (cc->argc != 1)
                return -E_COMMAND_SYNTAX;
        mutex_lock(mmd_mutex);
-       for (i = 0; senders[i].name; i++) {
-               char *info = senders[i].info();
-               sender_info = para_strcat(sender_info, info);
-               free(info);
-       }
 -      ut = get_server_uptime_str(now);
 +      ut = daemon_get_uptime_str(now);
        ret = xasprintf(&msg,
-               "version: %s\n"
                "up: %s\nplayed: %u\n"
                "server_pid: %d\n"
                "afs_pid: %d\n"

diff --cc dccp_send.c
Simple merge

diff --cc http_send.c
Simple merge

diff --cc send.h
Simple merge

diff --cc send_common.c
Simple merge

diff --cc udp_send.c
Simple merge

diff --cc web/manual.m4
Simple merge