OptionParser.h in passenger-5.0.10

- old
+ new

@@ -1,8 +1,8 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -53,16 +53,16 @@
 	printf("  -l, --listen ADDRESS        Listen on the given address. The address must be\n");
 	printf("                              formatted as tcp://IP:PORT for TCP sockets, or\n");
 	printf("                              unix:PATH for Unix domain sockets.\n");
 	printf("                              " DEFAULT_LOGGING_AGENT_LISTEN_ADDRESS "\n");
 	printf("\n");
-	printf("      --admin-listen ADDRESS  Listen on the given address for admin commands.\n");
+	printf("      --api-listen ADDRESS    Listen on the given address for API commands.\n");
 	printf("                              The address must be in the same format as that\n");
-	printf("                              of --listen. Default: " DEFAULT_LOGGING_AGENT_ADMIN_LISTEN_ADDRESS "\n");
+	printf("                              of --listen. Default: " DEFAULT_LOGGING_AGENT_API_LISTEN_ADDRESS "\n");
 	printf("      --authorize [LEVEL]:USERNAME:PASSWORDFILE\n");
-	printf("                              Enables authentication on the admin server,\n");
-	printf("                              through the given admin account. LEVEL indicates\n");
+	printf("                              Enables authentication on the API server,\n");
+	printf("                              through the given API account. LEVEL indicates\n");
 	printf("                              the privilege level (see below). PASSWORDFILE must\n");
 	printf("                              point to a file containing the password\n");
 	printf("\n");
 	printf("      --dump-file PATH        Dump transactions without Union Station key to the\n");
 	printf("                              following file. Default: /dev/null\n");
@@ -76,11 +76,11 @@
 	printf("      --log-file PATH         Log to the given file.\n");
 	printf("      --log-level LEVEL       Logging level. Default: %d\n", DEFAULT_LOG_LEVEL);
 	printf("\n");
 	printf("  -h, --help                  Show this help\n");
 	printf("\n");
-	printf("Admin account privilege levels (ordered from most to least privileges):\n");
+	printf("API account privilege levels (ordered from most to least privileges):\n");
 	printf("  readonly    Read-only access\n");
 	printf("  full        Full access (default)\n");
 }
 
 inline bool
@@ -101,23 +101,23 @@
 			fprintf(stderr, "ERROR: invalid address format for --listen. The address "
 				"must be formatted as tcp://IP:PORT for TCP sockets, or unix:PATH "
 				"for Unix domain sockets.\n");
 			exit(1);
 		}
-	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--admin-listen")) {
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--api-listen")) {
 		if (getSocketAddressType(argv[i + 1]) != SAT_UNKNOWN) {
-			vector<string> addresses = options.getStrSet("logging_agent_admin_addresses",
+			vector<string> addresses = options.getStrSet("logging_agent_api_addresses",
 				false);
 			if (addresses.size() == SERVER_KIT_MAX_SERVER_ENDPOINTS) {
-				fprintf(stderr, "ERROR: you may specify up to %u --admin-listen addresses.\n",
+				fprintf(stderr, "ERROR: you may specify up to %u --api-listen addresses.\n",
 					SERVER_KIT_MAX_SERVER_ENDPOINTS);
 				exit(1);
 			}
 			addresses.push_back(argv[i + 1]);
-			options.setStrSet("logging_agent_admin_addresses", addresses);
+			options.setStrSet("logging_agent_api_addresses", addresses);
 			i += 2;
 		} else {
-			fprintf(stderr, "ERROR: invalid address format for --admin-listen. The address "
+			fprintf(stderr, "ERROR: invalid address format for --api-listen. The address "
 				"must be formatted as tcp://IP:PORT for TCP sockets, or unix:PATH "
 				"for Unix domain sockets.\n");
 			exit(1);
 		}
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--authorize")) {