Re-phrase help texts for mullvad api-access command

`mullvad api-access status` is changed to `mullvad api-access get` to
align with other `mullvad` commands.

mullvad-cli/src/cmds/api_access.rs

@@ -8,27 +8,31 @@ use talpid_types::net::openvpn::SHADOWSOCKS_CIPHERS;
 
 #[derive(Subcommand, Debug, Clone)]
 pub enum ApiAccess {
-    /// List the configured API access methods
-    List,
+    /// Display the current API access method.
+    Get,
     /// Add a custom API access method
     #[clap(subcommand)]
     Add(AddCustomCommands),
-    /// Edit an API access method
+    /// Lists all API access methods
+    ///
+    /// * = Enabled
+    List,
+    /// Edit a custom API access method
     Edit(EditCustomCommands),
-    /// Remove an API access method
+    /// Remove a custom API access method
     Remove(SelectItem),
     /// Enable an API access method
     Enable(SelectItem),
     /// Disable an API access method
     Disable(SelectItem),
-    /// Test an API access method
-    Test(SelectItem),
-    /// Force the use of a specific API access method.
+    /// Try to use a specific API access method (If the API is unreachable, reverts back to the previous access method)
     ///
-    /// Selecting "Mullvad Bridges" respects your current bridge settings.
+    /// Selecting "Direct" will connect to the Mullvad API without going through any proxy. This connection use https and is therefore encrypted.
+    ///
+    /// Selecting "Mullvad Bridges" respects your current bridge settings
     Use(SelectItem),
-    /// Show which access method is currently used to access the Mullvad API.
-    Status,
+    /// Try to reach the Mullvad API using a specific access method
+    Test(SelectItem),
 }
 
 impl ApiAccess {
@@ -54,8 +58,8 @@ impl ApiAccess {
             ApiAccess::Use(cmd) => {
                 Self::set(cmd).await?;
             }
-            ApiAccess::Status => {
-                Self::status().await?;
+            ApiAccess::Get => {
+                Self::get().await?;
             }
         };
         Ok(())
@@ -163,13 +167,11 @@ impl ApiAccess {
         let mut rpc = MullvadProxyClient::new().await?;
         let access_method = Self::get_access_method(&mut rpc, &item).await?;
         rpc.set_access_method(access_method.get_id()).await?;
+        println!("Testing access method \"{}\"", access_method.name);
         // Make the daemon perform an network request which involves talking to the Mullvad API.
         match rpc.get_api_addresses().await {
-            Ok(_) => println!("Connected to the Mullvad API!"),
-            Err(_) => println!(
-                "Could *not* connect to the Mullvad API using access method \"{}\"",
-                access_method.name
-            ),
+            Ok(_) => println!("Success!"),
+            Err(_) => println!("Failed"),
         }
 
         Ok(())
@@ -185,10 +187,11 @@ impl ApiAccess {
         Ok(())
     }
 
-    async fn status() -> Result<()> {
+    async fn get() -> Result<()> {
         let mut rpc = MullvadProxyClient::new().await?;
         let current = rpc.get_current_api_access_method().await?;
-        println!("{}", pp::ApiAccessMethodFormatter::new(&current));
+        let mut access_method_formatter = pp::ApiAccessMethodFormatter::new(&current);
+        println!("{}", access_method_formatter);
         Ok(())
     }
 
@@ -206,16 +209,16 @@ impl ApiAccess {
 
 #[derive(Subcommand, Debug, Clone)]
 pub enum AddCustomCommands {
-    /// Configure a local SOCKS5 proxy
+    /// Configure a SOCKS5 proxy
     #[clap(subcommand)]
     Socks5(AddSocks5Commands),
-    /// Configure Shadowsocks proxy
+    /// Configure a custom Shadowsocks proxy to use as an API access method
     Shadowsocks {
         /// An easy to remember name for this custom proxy
         name: String,
-        /// The IP of the remote Shadowsocks server
+        /// The IP of the remote Shadowsocks-proxy
         remote_ip: IpAddr,
-        /// The port of the remote Shadowsocks server
+        /// Port on which the remote Shadowsocks-proxy listens for traffic
         #[arg(default_value = "443")]
         remote_port: u16,
         /// Password for authentication
@@ -237,9 +240,9 @@ pub enum AddSocks5Commands {
     Remote {
         /// An easy to remember name for this custom proxy
         name: String,
-        /// The IP of the remote proxy server
+        /// IP of the remote SOCKS5-proxy
         remote_ip: IpAddr,
-        /// The port of the remote proxy server
+        /// Port on which the remote SOCKS5-proxy listens for traffic
         remote_port: u16,
         #[clap(flatten)]
         authentication: Option<SocksAuthentication>,

mullvad-cli/src/main.rs

@@ -71,9 +71,20 @@ enum Cli {
     #[clap(subcommand)]
     Relay(relay::Relay),
 
-    /// Manage use of access methods for reaching the Mullvad API.
-    /// Can be used to connect to the the Mullvad API via one of the
-    /// Mullvad bridge servers or a custom proxy (SOCKS5 & Shadowsocks).
+    /// Manage Mullvad API access methods.
+    ///
+    /// Access methods are used to connect to the the Mullvad API via one of
+    /// Mullvad's bridge servers or a custom proxy (SOCKS5 & Shadowsocks) when
+    /// and where establishing a direct connection does not work.
+    ///
+    /// If the Mullvad daemon is unable to connect to the Mullvad API, it will
+    /// automatically try to use any other configured access method and re-try
+    /// the API call. If it succeeds, all subsequent API calls are made using
+    /// the new access method. Otherwise it will re-try using yet another access
+    /// method.
+    ///
+    /// The Mullvad API is used for logging in, accessing the relay list,
+    /// rotating Wireguard keys and more.
     #[clap(subcommand)]
     ApiAccess(api_access::ApiAccess),