From c2116082ab293772bb2d154707542b4bf0ccedf0 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Tue, 19 Nov 2019 23:04:31 +0100
Subject: [PATCH] Remove deprecated options from help and manpage

Ref: ff061b4f30c54dedc5073a588c6c697477b805db
---
 app/scrcpy.1   | 20 ++++++++++----------
 app/src/main.c | 16 ++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/scrcpy.1 b/app/scrcpy.1
index 948cac4d..6cb062b5 100644
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -15,6 +15,10 @@ provides display and control of Android devices connected on USB (or over TCP/IP
 
 .SH OPTIONS
 
+.TP
+.B \-\-always\-on\-top
+Make scrcpy window always on top (above other windows).
+
 .TP
 .BI "\-b, \-\-bit\-rate " value
 Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
@@ -22,7 +26,7 @@ Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are
 Default is 8000000.
 
 .TP
-.BI "\-c, \-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
+.BI \-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
 Crop the device screen on the server.
 
 The values are expressed in the device natural orientation (typically, portrait for a phone, landscape for a tablet). Any
@@ -33,10 +37,6 @@ value is computed on the cropped size.
 .B \-f, \-\-fullscreen
 Start in fullscreen.
 
-.TP
-.BI "\-F, \-\-record\-format " format
-Force recording format (either mp4 or mkv).
-
 .TP
 .B \-h, \-\-help
 Print this help.
@@ -84,9 +84,13 @@ Record screen to
 .IR file .
 
 The format is determined by the
-.B \-F/\-\-record\-format
+.B \-\-record\-format
 option if set, or by the file extension (.mp4 or .mkv).
 
+.TP
+.BI \-\-record\-format " format
+Force recording format (either mp4 or mkv).
+
 .TP
 .B \-\-render\-expired\-frames
 By default, to minimize latency, scrcpy always renders the last available decoded frame, and drops any previous ones. This flag forces to render all frames, at a cost of a possible increased latency.
@@ -105,10 +109,6 @@ Enable "show touches" on start, disable on quit.
 
 It only shows physical touches (not clicks from scrcpy).
 
-.TP
-.B \-T, \-\-always\-on\-top
-Make scrcpy window always on top (above other windows).
-
 .TP
 .B \-v, \-\-version
 Print the version of scrcpy.
diff --git a/app/src/main.c b/app/src/main.c
index 04be1ab0..8a835bf1 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -30,12 +30,15 @@ static void usage(const char *arg0) {
         "\n"
         "Options:\n"
         "\n"
+        "    --always-on-top\n"
+        "        Make scrcpy window always on top (above other windows).\n"
+        "\n"
         "    -b, --bit-rate value\n"
         "        Encode the video at the given bit-rate, expressed in bits/s.\n"
         "        Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
         "        Default is %d.\n"
         "\n"
-        "    -c, --crop width:height:x:y\n"
+        "    --crop width:height:x:y\n"
         "        Crop the device screen on the server.\n"
         "        The values are expressed in the device natural orientation\n"
         "        (typically, portrait for a phone, landscape for a tablet).\n"
@@ -44,9 +47,6 @@ static void usage(const char *arg0) {
         "    -f, --fullscreen\n"
         "        Start in fullscreen.\n"
         "\n"
-        "    -F, --record-format format\n"
-        "        Force recording format (either mp4 or mkv).\n"
-        "\n"
         "    -h, --help\n"
         "        Print this help.\n"
         "\n"
@@ -85,9 +85,12 @@ static void usage(const char *arg0) {
         "\n"
         "    -r, --record file.mp4\n"
         "        Record screen to file.\n"
-        "        The format is determined by the -F/--record-format option if\n"
+        "        The format is determined by the --record-format option if\n"
         "        set, or by the file extension (.mp4 or .mkv).\n"
         "\n"
+        "    --record-format format\n"
+        "        Force recording format (either mp4 or mkv).\n"
+        "\n"
         "    --render-expired-frames\n"
         "        By default, to minimize latency, scrcpy always renders the\n"
         "        last available decoded frame, and drops any previous ones.\n"
@@ -105,9 +108,6 @@ static void usage(const char *arg0) {
         "        Enable \"show touches\" on start, disable on quit.\n"
         "        It only shows physical touches (not clicks from scrcpy).\n"
         "\n"
-        "    -T, --always-on-top\n"
-        "        Make scrcpy window always on top (above other windows).\n"
-        "\n"
         "    -v, --version\n"
         "        Print the version of scrcpy.\n"
         "\n"