Merge remote-tracking branch 'origin/master'

REST_APIDoc.md

@@ -28,12 +28,14 @@ Authorization: Bearer [YOUR_API_KEY]
 
 > you need to use the string 'Bearer' before your API KEY
 
-a valid key is generated from FTS' [CLI](https://github.com/FreeTAKTeam/FreeTAKServer-User-Docs/blob/main/docs/docs/CLI.md) and stored into the DB. 
+a valid key is generated from FTS' [CLI](https://github.com/FreeTAKTeam/FreeTAKServer-User-Docs/blob/main/docs/docs/CLI.md) or, since 1.4 also from the Web UI, and stored into the DB. 
 to add an API user in the CLI type  
 ```
 add_api_user
 ```
-see CLI help for details
+see CLI help for details.
+To create a API TOKEN using the Web UI, go the User section.
+
 to consume the API you need to request a key to your FTS admin. 
 
 the following is a key non working example

REST_API_InternalDoc.md

@@ -579,7 +579,7 @@ return JSON data containing the following information regarding current checklis
 		"id": "111-111-111",
 		"address": "127.0.0.1",
 		"port": "9000",
-		"fallback": "federation 2",
+		"fallBack": "federation 2",
 		"status": "Disabled",
 		"reconnectInterval": "32",
 		"maxRetries": "15",
@@ -599,7 +599,7 @@ create a new federation configuration
       	"name": "federation 1",
 		"address": "127.0.0.1",
 		"port": "9000",
-		"fallback": "federation 2",
+		"fallBack": "federation 2",
 		"status": "Disabled",
 		"reconnectInterval": "32",
 		"maxRetries": "15"
@@ -630,7 +630,7 @@ modify an existing federation configuration
       {
         "id": "111-111-111",
         "name": "new federation 1",
-        "fallback": "new fallback",
+        "fallBack": "new fallback",
         "status": "Enabled",
         "reconnectInterval": "15",
         "maxRetries": "10"
@@ -643,4 +643,4 @@ modify an existing federation configuration
 * fallback(optional): name of new fallback
 * status(optional): new status of connection
 * reconnectInterval(optional): new reconnect interval
-* maxRetries(optional): new maximum number of retries
+* maxRetries(optional): new maximum number of retries