diff -rX freeciv/diff_ignore freeciv/server/stdinhand.c freeciv-metai/server/stdinhand.c
805d804
<   CMD_META,
806a806
>   CMD_METACONN,
922,930d921
<   {"meta",	ALLOW_HACK,
<    "meta u|up\n"
<    "meta d|down\n"
<    "meta ?",
<    N_("Control metaserver connection."),
<    N_("'meta ?' reports on the status of the connection to metaserver..\n"
<       "'meta d' or 'meta down' brings the metaserver connection down.\n"
<       "'meta u' or 'meta up' brings the metaserver connection up.")
<   },
935a927,935
>   {"metaconnection",	ALLOW_HACK,
>    "metaconnection u|up\n"
>    "metaconnection d|down\n"
>    "metaconnection ?",
>    N_("Control metaserver connection."),
>    N_("'metaconnection ?' reports on the status of the connection to metaserver.\n"
>       "'metaconnection down' or 'metar d' brings the metaserver connection down.\n"
>       "'metaconnection up' or 'metar u' brings the metaserver connection up.")
>   },
1322c1322
<     cmd_reply(CMD_META, caller, C_OK,
---
>     cmd_reply(CMD_METACONN, caller, C_OK,
1336c1336
<     cmd_reply(CMD_META, caller, C_OK,
---
>     cmd_reply(CMD_METACONN, caller, C_OK,
1344c1344
< static void meta_command(struct connection *caller, char *arg)
---
> static void metaconnection_command(struct connection *caller, char *arg)
1349c1349
<       cmd_reply(CMD_META, caller, C_OK,
---
>       cmd_reply(CMD_METACONN, caller, C_OK,
1352c1352
<       cmd_reply(CMD_META, caller, C_OK,
---
>       cmd_reply(CMD_METACONN, caller, C_OK,
1360c1360
<       cmd_reply(CMD_META, caller, C_METAERROR,
---
>       cmd_reply(CMD_METACONN, caller, C_METAERROR,
1368c1368
<       cmd_reply(CMD_META, caller, C_METAERROR,
---
>       cmd_reply(CMD_METACONN, caller, C_METAERROR,
1372c1372
<     cmd_reply(CMD_META, caller, C_METAERROR,
---
>     cmd_reply(CMD_METACONN, caller, C_METAERROR,
1384c1384
<     cmd_reply(CMD_META, caller, C_METAERROR,
---
>     cmd_reply(CMD_METAINFO, caller, C_METAERROR,
1389c1389
<     cmd_reply(CMD_META, caller, C_OK,
---
>     cmd_reply(CMD_METAINFO, caller, C_OK,
1406c1406
<   cmd_reply(CMD_META, caller, C_OK,
---
>   cmd_reply(CMD_METASERVER, caller, C_OK,
2512,2514d2511
<   case CMD_META:
<     meta_command(caller,arg);
<     break;
2517a2515,2517
>   case CMD_METACONN:
>     metaconnection_command(caller,arg);
>     break;
2918,2919d2917
<   cmd_reply_help(CMD_META,
< 	_("meta u|d|?      - metaserver connection control: up, down, report"));
2921a2920,2921
>   cmd_reply_help(CMD_METACONN,
> 	_("metaconn u|d|?  - metaserver connection control: up, down, report"));