From 1d2b4242c8830fd7311aa0e89af2d3110ad8077b Mon Sep 17 00:00:00 2001
From: Owen Voke <development@voke.dev>
Date: Fri, 27 Nov 2020 09:27:13 +0000
Subject: [PATCH 01/30] ci: generate PDF version of tldr pages

---
 .github/workflows/ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ddaa0e79c..1774fefff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,19 @@ jobs:
     - name: Build
       run: bash scripts/build.sh
 
+    - name: Setup Python for PDF generation
+      if: github.repository == 'tldr-pages/tldr' && github.ref == 'refs/heads/master'
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+
+    - name: Build PDF
+      if: github.repository == 'tldr-pages/tldr' && github.ref == 'refs/heads/master'
+      run: |
+        cd scripts/pdf/
+        pip3 install -r requirements.txt
+        python3 render.py ../../pages -c solarized-light
+
     - name: Deploy
       if: github.repository == 'tldr-pages/tldr' && github.ref == 'refs/heads/master'
       run: bash scripts/deploy.sh

From 252271c35a40155b8ec9eec29ff116ca5527fbb5 Mon Sep 17 00:00:00 2001
From: Owen Voke <development@voke.dev>
Date: Fri, 27 Nov 2020 09:29:09 +0000
Subject: [PATCH 02/30] ci: add PDF upload to deploy script

---
 scripts/deploy.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 98b0700a6..48066dcbf 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -30,6 +30,11 @@ function upload_assets {
   mv -f "$TLDR_ARCHIVE" "$SITE_HOME/assets/"
   cp -f "$TLDRHOME/index.json" "$SITE_HOME/assets/"
 
+  # Copy PDF to assets
+  if [[ -f "${TLDRHOME}/scripts/pdf/tldr-pages.pdf" ]]; then
+    cp -f "${TLDRHOME}/scripts/pdf/tldr-pages.pdf" "${SITE_HOME}/assets/tldr-book.pdf"
+  fi
+
   cd "$SITE_HOME"
   git add -A
   git commit -m "[GitHub Actions] uploaded assets after commit ${GITHUB_SHA}"

From 935d337cc67878d2a1c3bdec52149ba5086995fb Mon Sep 17 00:00:00 2001
From: Sahil Dhiman <52946452+sahilister@users.noreply.github.com>
Date: Fri, 4 Dec 2020 19:05:15 +0000
Subject: [PATCH 03/30] resolveip: add page (#4982)

---
 pages/linux/resolveip.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 pages/linux/resolveip.md

diff --git a/pages/linux/resolveip.md b/pages/linux/resolveip.md
new file mode 100644
index 000000000..32e55be9b
--- /dev/null
+++ b/pages/linux/resolveip.md
@@ -0,0 +1,16 @@
+# resolveip
+
+> Resolve hostnames to their IP addresses and vice versa.
+> More information: <https://mariadb.com/kb/en/resolveip/>.
+
+- Resolve a hostname to an IP address:
+
+`resolveip {{example.org}}`
+
+- Resolve an IP address to a hostname:
+
+`resolveip {{1.1.1.1}}`
+
+- Silent mode. Produces less output:
+
+`resolveip --silent {{example.org}}`

From c7ed28053aad3cae4fe8dd4b1856a3dc50dc39b1 Mon Sep 17 00:00:00 2001
From: IacobusKopiirefuto
 <71605946+IacobusKopiirefuto@users.noreply.github.com>
Date: Fri, 4 Dec 2020 20:11:39 +0000
Subject: [PATCH 04/30] openssl-prime: add page (#4422)

---
 pages/common/openssl-genrsa.md |  2 +-
 pages/common/openssl-prime.md  | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pages/common/openssl-prime.md

diff --git a/pages/common/openssl-genrsa.md b/pages/common/openssl-genrsa.md
index 8a743561a..5d598cf63 100644
--- a/pages/common/openssl-genrsa.md
+++ b/pages/common/openssl-genrsa.md
@@ -1,7 +1,7 @@
 # openssl genrsa
 
 > OpenSSL command to generate RSA private keys.
-> More information: <https://www.openssl.org/docs/man1.0.2/man1/genrsa.html>.
+> More information: <https://www.openssl.org/docs/manmaster/man1/openssl-genrsa.html>.
 
 - Generate an RSA private key of 2048 bits to stdout:
 
diff --git a/pages/common/openssl-prime.md b/pages/common/openssl-prime.md
new file mode 100644
index 000000000..ea7a5f114
--- /dev/null
+++ b/pages/common/openssl-prime.md
@@ -0,0 +1,12 @@
+# openssl prime
+
+> OpenSSL command to compute prime numbers.
+> More information: <https://www.openssl.org/docs/manmaster/man1/openssl-prime.html>.
+
+- Generate a 2048bit prime number and display it in hexadecimal:
+
+`openssl prime -generate -bits 2048 -hex`
+
+- Check if a given number is prime:
+
+`openssl prime {{number}}`

From 4d4b44fd697cb9cfd72108cc61ebdab82a0275c3 Mon Sep 17 00:00:00 2001
From: Mark Bluemer <mark@theblue.dev>
Date: Sun, 6 Dec 2020 16:02:17 -0500
Subject: [PATCH 05/30] fisher: update page to comply with Fisher 4.0 (#4999)

---
 pages/common/fisher.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pages/common/fisher.md b/pages/common/fisher.md
index 6a4a690da..866862a09 100644
--- a/pages/common/fisher.md
+++ b/pages/common/fisher.md
@@ -20,14 +20,10 @@
 
 `fisher ls`
 
-- Show available plugins:
-
-`fisher ls-remote`
-
 - Update plugins:
 
-`fisher up`
+`fisher update`
 
 - Remove one or more plugins:
 
-`fisher rm {{plugin1}} {{plugin2}}`
+`fisher remove {{plugin1}} {{plugin2}}`

From 256d99646cab38cbaf502a448e262d2d954aeb3f Mon Sep 17 00:00:00 2001
From: Ali Malek <ali.malek.71@gmail.com>
Date: Mon, 7 Dec 2020 16:41:31 +0330
Subject: [PATCH 06/30] lynx: add page (#4815)

---
 pages/common/lynx.md | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pages/common/lynx.md b/pages/common/lynx.md
index c05bc984d..ba915726f 100644
--- a/pages/common/lynx.md
+++ b/pages/common/lynx.md
@@ -1,19 +1,32 @@
 # lynx
 
 > Command-line web browser.
+> More information: <https://lynx.browser.org>.
 
 - Visit a website:
 
-`lynx {{https://duckduckgo.com}}`
+`lynx {{example.com}}`
+
+- Apply restrictions for anonymous account:
+
+`lynx -anonymous {{example.com}}`
+
+- Turn on mouse support, if available:
+
+`lynx -use_mouse {{example.com}}`
+
+- Force color mode on, if available:
+
+`lynx -color {{example.com}}`
+
+- Open a link, using a specific file to read and write cookies:
+
+`lynx -cookie_file={{path/to/file}} {{example.com}}`
 
 - Navigate forwards and backwards through the links on a page:
 
 `Up arrow key, Down arrow key`
 
-- Follow the currently selected link:
-
-`Enter or the right arrow key`
-
 - Go back to the previously displayed page:
 
 `Left arrow key or u`

From 9d2f609139d9168e7a4d95c9cc42c7ce097601c8 Mon Sep 17 00:00:00 2001
From: bl-ue <54780737+bl-ue@users.noreply.github.com>
Date: Mon, 7 Dec 2020 22:48:19 -0500
Subject: [PATCH 07/30] htop: move from linux to common (#5012)

---
 pages/{linux => common}/htop.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pages/{linux => common}/htop.md (100%)

diff --git a/pages/linux/htop.md b/pages/common/htop.md
similarity index 100%
rename from pages/linux/htop.md
rename to pages/common/htop.md

From 8c73770afb23d81cf34ba89f56e6efd00bd4b66d Mon Sep 17 00:00:00 2001
From: Ronan D'Souza <ronan696@gmail.com>
Date: Wed, 9 Dec 2020 00:18:04 +0530
Subject: [PATCH 08/30] README: add keypirinha client (#5003)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a4ee55b4c..3ddf26a3b 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,7 @@ both for the command line and for other platforms:
   or `apt-get install tldr` on Debian-based distributions
   - [fast-tldr](https://github.com/gutjuri/fast-tldr)
 - [Java client](https://github.com/seenukarthi/tldr-java-client)
+- [Keypirinha Plugin](https://github.com/ronan696/keypirinha-tldr)
 - [Node.js client](https://github.com/tldr-pages/tldr-node-client):
   `npm install -g tldr`
 - [OCaml client](https://github.com/RosalesJ/tldr-ocaml): `opam install tldr`

From bd07d874ee98fe4d29cef13583d6e3e3a82ac2f8 Mon Sep 17 00:00:00 2001
From: Axel Navarro <navarroaxel@gmail.com>
Date: Wed, 9 Dec 2020 11:13:00 -0300
Subject: [PATCH 09/30] flow: add page (#4978)

---
 pages/common/flow.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pages/common/flow.md

diff --git a/pages/common/flow.md b/pages/common/flow.md
new file mode 100644
index 000000000..3c4caf41f
--- /dev/null
+++ b/pages/common/flow.md
@@ -0,0 +1,20 @@
+# flow
+
+> A static type checker for JavaScript.
+> More information: <https://flow.org>.
+
+- Run a flow check:
+
+`flow`
+
+- Check which files are being checked by flow:
+
+`flow ls`
+
+- Run a type coverage check on all files in a directory:
+
+`flow batch-coverage --show-all --strip-root {{path/to/directory}}`
+
+- Display line-by-line type coverage stats:
+
+`flow coverage --color {{path/to/file.jsx}}`

From 5b5b590ee29265b39ff8805a52774512aee5c884 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Fri, 11 Dec 2020 20:25:11 +0000
Subject: [PATCH 10/30] pdf script: format & add datetime (#4993)

---
 scripts/pdf/basic.css |  28 +++----
 scripts/pdf/render.py | 166 ++++++++++++++++++++++--------------------
 2 files changed, 102 insertions(+), 92 deletions(-)

diff --git a/scripts/pdf/basic.css b/scripts/pdf/basic.css
index 916b4f297..76bc255b5 100644
--- a/scripts/pdf/basic.css
+++ b/scripts/pdf/basic.css
@@ -1,34 +1,34 @@
 @font-face {
-  font-family: "PT Serif";
-  src: url("pt-serif-web-regular.ttf") format("truetype");
+    font-family: "PT Serif";
+    src: url("pt-serif-web-regular.ttf") format("truetype");
 }
 
 p {
-  margin-left: 2.5em;
+    margin-left: 2.5em;
 }
 
 code {
-  color: darkslategrey;
+    color: darkslategrey;
 }
 
 h1, h2, h4, ul {
-  font-family: "PT Serif";
+    font-family: "PT Serif";
 }
 
 .title-main {
-  text-align: center;
-  margin-top: 6em;
-  font-size: 350%;
+    text-align: center;
+    margin-top: 6em;
+    font-size: 350%;
 }
 
 .title-sub {
-  text-align: center;
-  font-size: 120%;
-  color: darkslategrey;
+    text-align: center;
+    font-size: 120%;
+    color: darkslategrey;
 }
 
 .title-dir {
-  text-align: center;
-  margin-top: 8.2em;
-  font-size: 300%;
+    text-align: center;
+    margin-top: 8.2em;
+    font-size: 300%;
 }
diff --git a/scripts/pdf/render.py b/scripts/pdf/render.py
index 220b679e9..3af17e96c 100644
--- a/scripts/pdf/render.py
+++ b/scripts/pdf/render.py
@@ -10,116 +10,126 @@ import glob
 import re
 import markdown
 import argparse
+from datetime import datetime
 
 from weasyprint import HTML
 
+
 def main(loc, colorscheme):
 
-  oslist = []
-  allmd = []
-  group = []
-  ap = []
+    oslist = []
+    allmd = []
+    group = []
+    ap = []
 
-  # Checking correctness of path
-  if not os.path.isdir(loc):
-    print("Invalid directory. Please try again!", file = sys.stderr)
-    sys.exit(1)
+    # Checking correctness of path
+    if not os.path.isdir(loc):
+        print("Invalid directory. Please try again!", file=sys.stderr)
+        sys.exit(1)
 
-  # Writing names of all directories inside 'pages' to a list
-  for os_dir in os.listdir(loc):
-    oslist.append(os_dir)
+    # Writing names of all directories inside 'pages' to a list
+    for os_dir in os.listdir(loc):
+        oslist.append(os_dir)
 
-  oslist.sort()
+    oslist.sort()
 
-  # Required strings to create intermediate HTML files
-  header = '<!doctype html><html><head><meta charset="utf-8"><link rel="stylesheet" href="basic.css">'
-  if colorscheme != "basic":
-    header += '<link rel="stylesheet" href="' + colorscheme + '.css"></head><body>\n'
-  header += "</head><body>\n"
-  footer = "</body></html>"
-  title_content = "<h1 class=title-main>tldr pages</h1><h4 class=title-sub>Simplified and community-driven man pages</h4></body></html>"
+    # Required strings to create intermediate HTML files
+    header = '<!doctype html><html><head><meta charset="utf-8"><link rel="stylesheet" href="basic.css">'
+    if colorscheme != "basic":
+        header += '<link rel="stylesheet" href="' + colorscheme + '.css"></head><body>\n'
 
-  # Creating title page
-  with open("title.html", "w") as f:
-    f.write(header + title_content)
+    header += "</head><body>\n"
+    footer = "</body></html>"
+    title_content = "<h1 class=title-main>tldr pages</h1>" \
+        + "<h4 class=title-sub>Simplified and community-driven man pages</h4>" \
+        + "<h6 class=title-sub><em><small>Generated on " + datetime.now().strftime("%c") + "</small></em></h6>" \
+        + "</body></html>"
 
-  group.append(HTML("title.html").render())
+    # Creating title page
+    with open("title.html", "w") as f:
+        f.write(header + title_content)
 
-  for operating_sys in oslist:
+    group.append(HTML("title.html").render())
 
-    i = 1
+    for operating_sys in oslist:
 
-    # Required string to create directory title pages
-    dir_title = "<h2 class=title-dir>" + operating_sys.capitalize() + "</h2></body></html>"
+        i = 1
 
-    # Creating directory title page for current directory
-    with open("dir_title.html", "w") as os_html:
-      os_html.write(header + dir_title)
+        # Required string to create directory title pages
+        dir_title = "<h2 class=title-dir>" + \
+            operating_sys.capitalize() + "</h2></body></html>"
 
-    group.append(HTML("dir_title.html").render())
+        # Creating directory title page for current directory
+        with open("dir_title.html", "w") as os_html:
+            os_html.write(header + dir_title)
 
-    # Creating a list of all md files in the current directory
-    for temp in glob.glob(os.path.join(loc, operating_sys, "*.md")):
-      allmd.append(temp)
+        group.append(HTML("dir_title.html").render())
 
-    # Sorting all filenames in the directory, to maintain the order of the PDF
-    allmd.sort()
+        # Creating a list of all md files in the current directory
+        for temp in glob.glob(os.path.join(loc, operating_sys, "*.md")):
+            allmd.append(temp)
 
-    # Conversion of Markdown to HTML
-    for md in allmd:
+        # Sorting all filenames in the directory, to maintain the order of the PDF
+        allmd.sort()
 
-      with open(md, "r") as inp:
-        text = inp.readlines()
+        # Conversion of Markdown to HTML
+        for md in allmd:
 
-      with open("htmlout.html", "w") as out:
-        out.write(header)
+            with open(md, "r") as inp:
+                text = inp.readlines()
 
-        for line in text:
-          if re.match(r'^>', line):
-            line = line[:0] + '####' + line[1:]
-          html = markdown.markdown(line)
-          out.write(html)
-        out.write(footer)
+            with open("htmlout.html", "w") as out:
+                out.write(header)
 
-      group.append(HTML("htmlout.html").render())
-      print("Rendered page {} of the directory {}".format(str(i), operating_sys))
-      i += 1
+                for line in text:
+                    if re.match(r'^>', line):
+                        line = line[:0] + '####' + line[1:]
+                    html = markdown.markdown(line)
+                    out.write(html)
+                out.write(footer)
 
-    allmd.clear()
+            group.append(HTML("htmlout.html").render())
+            print("Rendered page {} of the directory {}".format(
+                str(i), operating_sys))
+            i += 1
 
-  # Merging all the documents into a single PDF
-  for doc in group:
-    for p in doc.pages:
-      ap.append(p)
+        allmd.clear()
 
-  # Writing the PDF to disk, preserving metadata of first `tldr` page
-  group[2].copy(ap).write_pdf('tldr-pages.pdf')
+    # Merging all the documents into a single PDF
+    for doc in group:
+        for p in doc.pages:
+            ap.append(p)
 
-  if os.path.exists("tldr-pages.pdf"):
-    print("\nCreated tldr-pages.pdf in the current directory!\n")
+    # Writing the PDF to disk, preserving metadata of first `tldr` page
+    group[2].copy(ap).write_pdf('tldr-pages.pdf')
 
-  # Removing unnecessary intermediate files
-  try:
-    os.remove("htmlout.html")
-    os.remove("title.html")
-    os.remove("dir_title.html")
-  except OSError:
-    print("Error removing temporary file(s)")
+    if os.path.exists("tldr-pages.pdf"):
+        print("\nCreated tldr-pages.pdf in the current directory!\n")
+
+    # Removing unnecessary intermediate files
+    try:
+        os.remove("htmlout.html")
+        os.remove("title.html")
+        os.remove("dir_title.html")
+    except OSError:
+        print("Error removing temporary file(s)")
 
 
 if __name__ == "__main__":
 
-  # Unless specified otherwise by the user, this is the default colorscheme
-  colorscheme = "basic"
+    # Unless specified otherwise by the user, this is the default colorscheme
+    colorscheme = "basic"
 
-  # Parsing the arguments
-  parser = argparse.ArgumentParser()
-  parser.add_argument("dir_path", help = "Path to the 'pages' directory")
-  parser.add_argument("-c", choices=["solarized-light", "solarized-dark"], help="Color scheme of the PDF")
-  args = parser.parse_args()
+    # Parsing the arguments
+    parser = argparse.ArgumentParser()
+    parser.add_argument("dir_path", help="Path to the 'pages' directory")
+    parser.add_argument("-c",
+                        choices=["solarized-light", "solarized-dark"],
+                        help="Color scheme of the PDF")
+    args = parser.parse_args()
 
-  loc = args.dir_path
-  if args.c == "solarized-light" or args.c == "solarized-dark":
-    colorscheme = args.c
+    loc = args.dir_path
+    if args.c == "solarized-light" or args.c == "solarized-dark":
+        colorscheme = args.c
 
-  main(loc, colorscheme)
+    main(loc, colorscheme)

From c978cc81725bcd61f102da5d9ede20ded10c3662 Mon Sep 17 00:00:00 2001
From: Sahil Dhiman <52946452+sahilister@users.noreply.github.com>
Date: Fri, 11 Dec 2020 20:43:32 +0000
Subject: [PATCH 11/30] add sahilister name in repo collaborators (#5009)

---
 MAINTAINERS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index e362679e6..da95c19f5 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -35,6 +35,8 @@ If you are an owner of the organization, you should be able to see an automated
   [19 November 2019](https://github.com/tldr-pages/tldr/issues/3580) — present
 - **Proscream ([@Proscream](https://github.com/Proscream))**:
   [22 November 2019](https://github.com/tldr-pages/tldr/issues/3592) — present
+- **Sahil Dhiman ([@sahilister](https://github.com/sahilister))**:
+  [05 December 2020](https://github.com/tldr-pages/tldr/issues/4994) — present
 - Lucas Schneider ([@schneiderl](https://github.com/schneiderl)):
   [11 April 2019](https://github.com/tldr-pages/tldr/issues/2898) — [17 January 2019](https://github.com/tldr-pages/tldr/issues/3764)
 - Ein Verne ([@einverne](https://github.com/einverne)):

From 6db7d9f7d13eb092903e2b2c098a800b96bc0dfb Mon Sep 17 00:00:00 2001
From: Ein Verne <einverne@gmail.com>
Date: Sat, 12 Dec 2020 05:06:23 +0800
Subject: [PATCH 12/30] parted: add page (#4961)

---
 pages/linux/parted.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pages/linux/parted.md

diff --git a/pages/linux/parted.md b/pages/linux/parted.md
new file mode 100644
index 000000000..bf63cd2de
--- /dev/null
+++ b/pages/linux/parted.md
@@ -0,0 +1,36 @@
+# parted
+
+> A partition manipulation program.
+> More information: <https://www.gnu.org/software/parted/parted.html>.
+
+- List partitions on all block devices:
+
+`sudo parted --list`
+
+- Start to manipulate disk partition:
+
+`sudo parted {{/dev/sdX}}`
+
+- Create a new partition table of label-type directly, label-type can be gpt, msdos etc:
+
+`sudo parted --script {{/dev/sdX}} mklabel {{gpt}}`
+
+- Show disk partition information in interactive mode:
+
+`print`
+
+- Select a disk in interactive mode:
+
+`select {{/dev/sdX}}`
+
+- Interactively create a 16GB partition with a given filesystem:
+
+`mkpart {{primary|logical|extended}} {{filesystem}} {{0%}} {{16G}}`
+
+- Resize partition size:
+
+`resizepart {{/dev/sdXN}} {{end_position_of_partition}}`
+
+- Remove partition:
+
+`rm {{/dev/sdXN}}`

From 37b7e9d13ef99e6490ff63eac00988a54e8e5420 Mon Sep 17 00:00:00 2001
From: ruru4143 <37406068+ruru4143@users.noreply.github.com>
Date: Fri, 11 Dec 2020 22:20:02 +0100
Subject: [PATCH 13/30] i3: add missing space (#5018)

---
 pages/linux/i3.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/linux/i3.md b/pages/linux/i3.md
index 6fac0502f..abe0e6cb3 100644
--- a/pages/linux/i3.md
+++ b/pages/linux/i3.md
@@ -1,7 +1,7 @@
 # i3
 
 > A dynamic tiling window manager.
-> More information:<https://i3wm.org/docs/userguide.html>.
+> More information: <https://i3wm.org/docs/userguide.html>.
 
 - Start i3 (Note that a pre-existing window manager must not be open when this command is run.):
 

From e5a6af0299b00a9953caaca2acaff40d163a6171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Soszy=C5=84ski?= <mateusz.soszynski@tuta.io>
Date: Fri, 11 Dec 2020 21:25:47 +0000
Subject: [PATCH 14/30] flutter: fix typo (#5020)

Platforms need to be divided only by `,` not space
---
 pages/common/flutter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/common/flutter.md b/pages/common/flutter.md
index 01489a250..f8fc0b32a 100644
--- a/pages/common/flutter.md
+++ b/pages/common/flutter.md
@@ -29,4 +29,4 @@
 
 - Build a release APK targeting most modern smartphones:
 
-`flutter build apk --target-platform {{android-arm}} {{android-arm64}}`
+`flutter build apk --target-platform {{android-arm}},{{android-arm64}}`

From 2718393db1a358b04f94effb6a8b16e61647fb0b Mon Sep 17 00:00:00 2001
From: bl-ue <54780737+bl-ue@users.noreply.github.com>
Date: Fri, 4 Dec 2020 07:37:44 -0500
Subject: [PATCH 15/30] [many]: fix typos

---
 pages/common/emulator.md     | 2 +-
 pages/common/fgrep.md        | 2 +-
 pages/common/git-lfs.md      | 2 +-
 pages/common/git-prune.md    | 2 +-
 pages/common/git-shortlog.md | 2 +-
 pages/common/iverilog.md     | 2 +-
 pages/common/jhipster.md     | 2 +-
 pages/common/kops.md         | 2 +-
 pages/common/lzop.md         | 2 +-
 pages/common/mr.md           | 2 +-
 pages/common/nmap.md         | 2 +-
 pages/common/pipx.md         | 2 +-
 pages/common/reflac.md       | 2 +-
 pages/common/scheme.md       | 2 +-
 pages/common/thunderbird.md  | 2 +-
 pages/common/twm.md          | 2 +-
 pages/linux/cewl.md          | 2 +-
 pages/linux/e2image.md       | 2 +-
 pages/linux/guake.md         | 2 +-
 pages/linux/htpdate.md       | 4 ++--
 pages/linux/isosize.md       | 2 +-
 pages/linux/lastcomm.md      | 2 +-
 pages/linux/lvextend.md      | 2 +-
 pages/linux/lvresize.md      | 2 +-
 pages/linux/medusa.md        | 2 +-
 pages/linux/openfortivpn.md  | 2 +-
 pages/linux/opkg.md          | 2 +-
 pages/linux/rtcwake.md       | 2 +-
 pages/linux/vipw.md          | 2 +-
 pages/linux/x11vnc.md        | 2 +-
 pages/osx/GetFileInfo.md     | 2 +-
 pages/osx/whatis.md          | 2 +-
 32 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/pages/common/emulator.md b/pages/common/emulator.md
index 49a56fd11..6c8407427 100644
--- a/pages/common/emulator.md
+++ b/pages/common/emulator.md
@@ -19,7 +19,7 @@
 
 `emulator -avd {{name}} -camera-back {{none|emulated|webcamN}}`
 
-- Start an emulator, with a maximun network speed:
+- Start an emulator, with a maximum network speed:
 
 `emulator -avd {{name}} -netspeed {{gsm|hscsd|gprs|edge|hsdpa|lte|evdo|full}}`
 
diff --git a/pages/common/fgrep.md b/pages/common/fgrep.md
index 1470ad4f5..7d33e48f9 100644
--- a/pages/common/fgrep.md
+++ b/pages/common/fgrep.md
@@ -23,6 +23,6 @@
 
 `fgrep -v {{^regex$}} {{path/to/file}}`
 
-- Display filenames whose content matchs the regular expression at least once:
+- Display filenames whose content matches the regular expression at least once:
 
 `fgrep -l {{^regex$}} {{path/to/file1}} {{path/to/file2}}`
diff --git a/pages/common/git-lfs.md b/pages/common/git-lfs.md
index a6f933ae1..b96647259 100644
--- a/pages/common/git-lfs.md
+++ b/pages/common/git-lfs.md
@@ -19,7 +19,7 @@
 
 `git lfs track`
 
-- List tracked files that have been commited:
+- List tracked files that have been committed:
 
 `git lfs ls-files`
 
diff --git a/pages/common/git-prune.md b/pages/common/git-prune.md
index b16413abb..30c9dd890 100644
--- a/pages/common/git-prune.md
+++ b/pages/common/git-prune.md
@@ -1,7 +1,7 @@
 # git prune
 
 > Git command for pruning all unreachable objects from the object database.
-> This command is often not used directely but as an internal command that is used by git gc.
+> This command is often not used directly but as an internal command that is used by git gc.
 > More information: <https://git-scm.com/docs/git-prune>.
 
 - Report what would be removed by git prune without removing it:
diff --git a/pages/common/git-shortlog.md b/pages/common/git-shortlog.md
index ae37d0d18..2774f3348 100644
--- a/pages/common/git-shortlog.md
+++ b/pages/common/git-shortlog.md
@@ -11,7 +11,7 @@
 
 `git shortlog -n`
 
-- View a summary of all the commits made, grouped by the commiter identities (name and email):
+- View a summary of all the commits made, grouped by the committer identities (name and email):
 
 `git shortlog -c`
 
diff --git a/pages/common/iverilog.md b/pages/common/iverilog.md
index 007510362..d470768a2 100644
--- a/pages/common/iverilog.md
+++ b/pages/common/iverilog.md
@@ -13,7 +13,7 @@
 
 - Compile and run explicitly using the VVP runtime:
 
-`iverilog -o {{execuable}} -tvvp {{source.v}}`
+`iverilog -o {{executable}} -tvvp {{source.v}}`
 
 - Compile using Verilog library files from a different path:
 
diff --git a/pages/common/jhipster.md b/pages/common/jhipster.md
index cd25a49b6..0513d3925 100644
--- a/pages/common/jhipster.md
+++ b/pages/common/jhipster.md
@@ -15,7 +15,7 @@
 
 `jhipster --skip-client`
 
-- Apply lastest JHipster updates to the project:
+- Apply latest JHipster updates to the project:
 
 `jhipster upgrade`
 
diff --git a/pages/common/kops.md b/pages/common/kops.md
index aeab23f33..ae7135368 100644
--- a/pages/common/kops.md
+++ b/pages/common/kops.md
@@ -1,7 +1,7 @@
 # kops
 
 > Create, destroy, upgrade and maintain Kubernetes clusters from the command line.
-> More informations: <https://github.com/kubernetes/kops/>.
+> More information: <https://github.com/kubernetes/kops/>.
 
 - Create a cluster from the configuration specification:
 
diff --git a/pages/common/lzop.md b/pages/common/lzop.md
index f103d228d..aaa0f37a8 100644
--- a/pages/common/lzop.md
+++ b/pages/common/lzop.md
@@ -11,6 +11,6 @@
 
 `lzop -d {{file}}.lzo`
 
-- Compress a file, while specifing the compression level. 0 = Worst, 9 = Best (Default level is 3):
+- Compress a file, while specifying the compression level. 0 = Worst, 9 = Best (Default level is 3):
 
 `lzop -{{level}} {{file}}`
diff --git a/pages/common/mr.md b/pages/common/mr.md
index 7ead63eb0..fcd175cf3 100644
--- a/pages/common/mr.md
+++ b/pages/common/mr.md
@@ -7,7 +7,7 @@
 
 `mr register`
 
-- Update repositories in 5 concurent jobs:
+- Update repositories in 5 concurrent jobs:
 
 `mr -j{{5}} update`
 
diff --git a/pages/common/nmap.md b/pages/common/nmap.md
index 212ac5e3e..66f68a3dd 100644
--- a/pages/common/nmap.md
+++ b/pages/common/nmap.md
@@ -36,6 +36,6 @@
 
 `nmap --script ssl-enum-ciphers {{address_or_addresses}} -p 443`
 
-- Perform full port, service, version detection scan with all default NSE scripts active against a host to determin weaknesses and info:
+- Perform full port, service, version detection scan with all default NSE scripts active against a host to determine weaknesses and info:
 
 `nmap -sC -sV {{address_or_addresses}}`
diff --git a/pages/common/pipx.md b/pages/common/pipx.md
index c26b7f913..6d2bf06e9 100644
--- a/pages/common/pipx.md
+++ b/pages/common/pipx.md
@@ -15,6 +15,6 @@
 
 `pipx list`
 
-- Run an app in a temporary virtual environment with a pakage name different from the executable:
+- Run an app in a temporary virtual environment with a package name different from the executable:
 
 `pipx run --spec {{httpx-cli}} {{httpx}} {{http://www.github.com}}`
diff --git a/pages/common/reflac.md b/pages/common/reflac.md
index 86cdca4dd..ed014d02f 100644
--- a/pages/common/reflac.md
+++ b/pages/common/reflac.md
@@ -19,6 +19,6 @@
 
 `reflac --recursive {{path/to/directory}}`
 
-- Perserve file modification times:
+- Preserve file modification times:
 
 `reflac --preserve {{path/to/directory}}`
diff --git a/pages/common/scheme.md b/pages/common/scheme.md
index 836c504a8..1b411be02 100644
--- a/pages/common/scheme.md
+++ b/pages/common/scheme.md
@@ -1,6 +1,6 @@
 # scheme
 
-> MIT Scheme language interperter and REPL (interactive shell).
+> MIT Scheme language interpreter and REPL (interactive shell).
 > More information: <https://www.gnu.org/software/mit-scheme>.
 
 - Open an interactive shell (REPL):
diff --git a/pages/common/thunderbird.md b/pages/common/thunderbird.md
index d01c2b6d2..4058d9cc9 100644
--- a/pages/common/thunderbird.md
+++ b/pages/common/thunderbird.md
@@ -1,4 +1,4 @@
-# thundebird
+# thunderbird
 
 > Email client and RSS reader.
 
diff --git a/pages/common/twm.md b/pages/common/twm.md
index ffbe41dc8..d1fbdfd60 100644
--- a/pages/common/twm.md
+++ b/pages/common/twm.md
@@ -1,6 +1,6 @@
 # twm
 
-> A window manager for the X Window sytem.
+> A window manager for the X Window system.
 > More information: <https://gitlab.freedesktop.org/xorg/app/twm>.
 
 - Connect to the default X server:
diff --git a/pages/linux/cewl.md b/pages/linux/cewl.md
index 57aefd30e..5e97adb7d 100644
--- a/pages/linux/cewl.md
+++ b/pages/linux/cewl.md
@@ -7,7 +7,7 @@
 
 `cewl --depth {{2}} --write {{path/to/wordlist.txt}} {{url}}`
 
-- Output an alpha-numeric wordlist from the given URL with words of minimum 5 characters:
+- Output an alphanumeric wordlist from the given URL with words of minimum 5 characters:
 
 `cewl --with-numbers --min_word_length {{5}} {{url}}`
 
diff --git a/pages/linux/e2image.md b/pages/linux/e2image.md
index d776949ed..a0c963276 100644
--- a/pages/linux/e2image.md
+++ b/pages/linux/e2image.md
@@ -19,6 +19,6 @@
 
 `e2image -r {{/dev/sdXN}} {{path/to/image_file}}`
 
-- Ceate a QCOW2 image file instead of a normal or raw image file:
+- Create a QCOW2 image file instead of a normal or raw image file:
 
 `e2image -Q {{/dev/sdXN}} {{path/to/image_file}}`
diff --git a/pages/linux/guake.md b/pages/linux/guake.md
index 845815a70..3fa98e48b 100644
--- a/pages/linux/guake.md
+++ b/pages/linux/guake.md
@@ -2,7 +2,7 @@
 
 > A drop-down terminal for GNOME.
 
-- Toggle Guake visiblity:
+- Toggle Guake visibility:
 
 `F12`
 
diff --git a/pages/linux/htpdate.md b/pages/linux/htpdate.md
index c7b3b7278..8dff65691 100644
--- a/pages/linux/htpdate.md
+++ b/pages/linux/htpdate.md
@@ -7,7 +7,7 @@
 
 `sudo htpdate {{host}}`
 
-- Perform simulation of syncronization, without any action:
+- Perform simulation of synchronization, without any action:
 
 `htpdate -q {{host}}`
 
@@ -15,6 +15,6 @@
 
 `sudo htpdate -x {{host}}`
 
-- Set time immediate after the syncronization:
+- Set time immediate after the synchronization:
 
 `sudo htpdate -s {{host}}`
diff --git a/pages/linux/isosize.md b/pages/linux/isosize.md
index c9cc60098..1e4298bab 100644
--- a/pages/linux/isosize.md
+++ b/pages/linux/isosize.md
@@ -7,7 +7,7 @@
 
 `isosize {{path/to/file.iso}}`
 
-- Diplay the block count and block size of an ISO file:
+- Display the block count and block size of an ISO file:
 
 `isosize --sectors {{path/to/file.iso}}`
 
diff --git a/pages/linux/lastcomm.md b/pages/linux/lastcomm.md
index 98067578c..1aecfe0b8 100644
--- a/pages/linux/lastcomm.md
+++ b/pages/linux/lastcomm.md
@@ -3,7 +3,7 @@
 > Show last commands executed.
 > More information: <https://manpages.debian.org/stable/acct/lastcomm.1.en.html>.
 
-- Print informations about all of the commands in the acct (record file):
+- Print information about all of the commands in the acct (record file):
 
 `lastcomm`
 
diff --git a/pages/linux/lvextend.md b/pages/linux/lvextend.md
index 2d3121334..0c3c9cc05 100644
--- a/pages/linux/lvextend.md
+++ b/pages/linux/lvextend.md
@@ -10,6 +10,6 @@
 
 `lvextend --size +{{40G}} -r {{logical_volume}}`
 
-- Increase a volume's size to 100% of the free phyiscal volume space:
+- Increase a volume's size to 100% of the free physical volume space:
 
 `lvextend --size {{100}}%FREE {{logical_volume}}`
diff --git a/pages/linux/lvresize.md b/pages/linux/lvresize.md
index 1c4ea549a..ea8d38426 100644
--- a/pages/linux/lvresize.md
+++ b/pages/linux/lvresize.md
@@ -10,6 +10,6 @@
 
 `lvresize --size -{{120G}} -r {{logical_volume}}`
 
-- Increase a volume's size to 100% of the free phyiscal volume space:
+- Increase a volume's size to 100% of the free physical volume space:
 
 `lvresize --size {{100}}%FREE {{logical_volume}}`
diff --git a/pages/linux/medusa.md b/pages/linux/medusa.md
index 06ceb4117..3985fbab8 100644
--- a/pages/linux/medusa.md
+++ b/pages/linux/medusa.md
@@ -10,7 +10,7 @@
 
 `medusa -M HTTP -h host -u {{username}} -p {{password}} -m USER-AGENT:"{{Agent}}"`
 
-- Execute a brute force against a MySQL server using a file cointaining usernames and a hash:
+- Execute a brute force against a MySQL server using a file containing usernames and a hash:
 
 `medusa -M mysql -h host -U {{path/to/username_file}} -p {{hash}} -m PASS:HASH`
 
diff --git a/pages/linux/openfortivpn.md b/pages/linux/openfortivpn.md
index 1842e2316..00fbb3fc1 100644
--- a/pages/linux/openfortivpn.md
+++ b/pages/linux/openfortivpn.md
@@ -11,7 +11,7 @@
 
 `sudo openfortivpn --config={{path/to/config}}`
 
-- Connect to a VPN by specifiying the host and port:
+- Connect to a VPN by specifying the host and port:
 
 `openfortivpn {{host}}:{{port}}`
 
diff --git a/pages/linux/opkg.md b/pages/linux/opkg.md
index 309bccdaf..1a6ad6599 100644
--- a/pages/linux/opkg.md
+++ b/pages/linux/opkg.md
@@ -22,7 +22,7 @@
 
 `opkg upgrade {{package(s)}}`
 
-- Display informations for a specific package:
+- Display information for a specific package:
 
 `opkg info {{package}}`
 
diff --git a/pages/linux/rtcwake.md b/pages/linux/rtcwake.md
index 6ec59bd7d..27d553661 100644
--- a/pages/linux/rtcwake.md
+++ b/pages/linux/rtcwake.md
@@ -22,6 +22,6 @@
 
 `sudo rtcwake -m disable`
 
-- Perform a dry run to wakup the computer at a given time. (Press Ctrl + C to abort):
+- Perform a dry run to wakeup the computer at a given time. (Press Ctrl + C to abort):
 
 `sudo rtcwake -m on --date {{hh:ss}}`
diff --git a/pages/linux/vipw.md b/pages/linux/vipw.md
index a525f26bf..efd27f32a 100644
--- a/pages/linux/vipw.md
+++ b/pages/linux/vipw.md
@@ -7,6 +7,6 @@
 
 `vipw`
 
-- Display the current verson of `vipw`:
+- Display the current version of `vipw`:
 
 `vipw --version`
diff --git a/pages/linux/x11vnc.md b/pages/linux/x11vnc.md
index 5db1cd8a2..cf115b295 100644
--- a/pages/linux/x11vnc.md
+++ b/pages/linux/x11vnc.md
@@ -1,6 +1,6 @@
 # x11vnc
 
-> A VNC server that will enable VNC on an existing display ser.
+> A VNC server that will enable VNC on an existing display server.
 > By default, the server will automatically terminate once all clients disconnect from it.
 
 - Launch a VNC server that allows multiple clients to connect:
diff --git a/pages/osx/GetFileInfo.md b/pages/osx/GetFileInfo.md
index 5efd1bf6d..02681db99 100644
--- a/pages/osx/GetFileInfo.md
+++ b/pages/osx/GetFileInfo.md
@@ -2,7 +2,7 @@
 
 > Get information about a file in an HFS+ directory.
 
-- Display infomation about a given file:
+- Display information about a given file:
 
 `GetFileInfo {{path/to/filename}}`
 
diff --git a/pages/osx/whatis.md b/pages/osx/whatis.md
index 35e343ec8..39916d1f2 100644
--- a/pages/osx/whatis.md
+++ b/pages/osx/whatis.md
@@ -3,7 +3,7 @@
 > Tool that searches a set of database files containing short descriptions of system commands for keywords.
 > More information: <http://www.linfo.org/whatis.html>.
 
-- Search for informations about keyword:
+- Search for information about keyword:
 
 `whatis {{keyword}}`
 

From 244a7b1c707ca3853ab2aa6d9509352d21ba0023 Mon Sep 17 00:00:00 2001
From: bl-ue <54780737+bl-ue@users.noreply.github.com>
Date: Fri, 11 Dec 2020 16:29:31 -0500
Subject: [PATCH 16/30] etcdctl: add page (#5006)

---
 pages/common/etcdctl.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pages/common/etcdctl.md

diff --git a/pages/common/etcdctl.md b/pages/common/etcdctl.md
new file mode 100644
index 000000000..5021ee6fb
--- /dev/null
+++ b/pages/common/etcdctl.md
@@ -0,0 +1,37 @@
+# etcdctl
+
+> CLI interface for interacting with `etcd`, a highly-available key-value pair store.
+> Etcd stores data in hierarchically organized directories, as in a standard filesystem.
+> More information: <https://etcd.io/docs/latest/dev-guide/interacting_v3/>.
+
+- Display the value associated with a specified key:
+
+`etcdctl get {{my/key}}`
+
+- Store a key-value pair:
+
+`etcdctl put {{my/key}} {{my_value}}`
+
+- Delete a key-value pair:
+
+`etcdctl del {{my/key}}`
+
+- Store a key-value pair, reading the value from a file:
+
+`etcdctl put {{my/file}} < {{path/to/file.txt}}`
+
+- Save a snapshot of the etcd keystore:
+
+`etcdctl snapshot save {{path/to/snapshot.db}}`
+
+- Restore a snapshot of an etcd keystore (restart the etcd server afterwards):
+
+`etcdctl snapshot restore {{path/to/snapshot.db}}`
+
+- Add a user:
+
+`etcdctl user add {{my_user}}`
+
+- Watch a key for changes:
+
+`etcdctl watch {{my/key}}`

From f6748fd0902b86d2249059f74e52c3331662c70c Mon Sep 17 00:00:00 2001
From: Tim Hwang <timhwang21@users.noreply.github.com>
Date: Fri, 11 Dec 2020 22:12:55 -0500
Subject: [PATCH 17/30] fd: add --exec (#5019)

---
 pages/common/fd.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/common/fd.md b/pages/common/fd.md
index d13b548d1..00073c05e 100644
--- a/pages/common/fd.md
+++ b/pages/common/fd.md
@@ -23,3 +23,7 @@
 - Include ignored and hidden files in the search:
 
 `fd --hidden --no-ignore {{pattern}}`
+
+- Execute a command on each search result returned:
+
+`fd {{pattern}} --exec {{command}}`

From 5ccf69e1c38d49a3f459e4e8e5c8e51e35a8cebb Mon Sep 17 00:00:00 2001
From: klew <417879751@qq.com>
Date: Sat, 12 Dec 2020 11:13:57 +0800
Subject: [PATCH 18/30] redis-cli: add new argument -c (#5022)

---
 pages/common/redis-cli.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/common/redis-cli.md b/pages/common/redis-cli.md
index 68c5d7912..ab699beab 100644
--- a/pages/common/redis-cli.md
+++ b/pages/common/redis-cli.md
@@ -26,3 +26,7 @@
 - Execute Redis command:
 
 `redis-cli {{redis_command}}`
+
+- Connect to the local cluster:
+
+`redis-cli -c`

From 1d9c989711b173580229d66ebdadc06239c5cca6 Mon Sep 17 00:00:00 2001
From: bl-ue <54780737+bl-ue@users.noreply.github.com>
Date: Sat, 12 Dec 2020 00:21:46 -0500
Subject: [PATCH 19/30] from: add page (#5011)

---
 pages/common/from.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pages/common/from.md

diff --git a/pages/common/from.md b/pages/common/from.md
new file mode 100644
index 000000000..95c25d6fc
--- /dev/null
+++ b/pages/common/from.md
@@ -0,0 +1,20 @@
+# from
+
+> Prints mail header lines from the current user's mailbox.
+> More information: <https://mailutils.org/manual/html_chapter/Programs.html#frm-and-from>.
+
+- List mail:
+
+`from`
+
+- Display the number of messages stored:
+
+`from --count`
+
+- List mail in the specified mailbox directory:
+
+`MAIL={{path/to/mailbox}} from`
+
+- Print the mail from the specified address:
+
+`from --sender={{me@example.com}}`

From cc8246f3aaa46eee525565c7d4158d3c59a345ca Mon Sep 17 00:00:00 2001
From: bl-ue <54780737+bl-ue@users.noreply.github.com>
Date: Sat, 12 Dec 2020 13:06:49 -0500
Subject: [PATCH 20/30] conan: add page (#5008)

---
 pages/common/conan.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pages/common/conan.md

diff --git a/pages/common/conan.md b/pages/common/conan.md
new file mode 100644
index 000000000..ed5f36f78
--- /dev/null
+++ b/pages/common/conan.md
@@ -0,0 +1,28 @@
+# conan
+
+> The open source, decentralized and multi-platform package manager to create and share all your native binaries.
+> More information: <https://conan.io/>.
+
+- Install packages based on conanfile.txt:
+
+`conan install {{.}}`
+
+- Install packages and create configuation files for a specific generator:
+
+`conan install -g {{generator}}`
+
+- Install packages, building from source:
+
+`conan install {{.}} --build`
+
+- Search for locally installed packages:
+
+`conan search {{package}}`
+
+- Search for remote packages:
+
+`conan search {{package}} -r {{remote}}`
+
+- List remotes:
+
+`conan remote --list`

From a1dbd179a5810f9e812d79db1765e9c3a525d338 Mon Sep 17 00:00:00 2001
From: Zapan Gao <g0ne150@hotmail.com>
Date: Sun, 13 Dec 2020 03:50:14 +0800
Subject: [PATCH 21/30] bg, fg, jobs: add a '%' before '{{job_id}}' (#5021)

---
 pages.ko/common/bg.md | 2 +-
 pages.zh/common/bg.md | 2 +-
 pages/common/bg.md    | 2 +-
 pages/common/fg.md    | 2 +-
 pages/common/jobs.md  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages.ko/common/bg.md b/pages.ko/common/bg.md
index 4453679f1..e488a9412 100644
--- a/pages.ko/common/bg.md
+++ b/pages.ko/common/bg.md
@@ -8,4 +8,4 @@
 
 - 특정 작업을 재개하고(`jobs -l` 를 사용하여 ID 가져오기) background에서 실행:
 
-`bg {{job_id}}`
+`bg %{{job_id}}`
diff --git a/pages.zh/common/bg.md b/pages.zh/common/bg.md
index 8cb987095..06a397e2a 100644
--- a/pages.zh/common/bg.md
+++ b/pages.zh/common/bg.md
@@ -8,4 +8,4 @@
 
 - 恢复特定的任务 (使用 `jobs -l` 可以获取任务ID) 并在后台运行:
 
-`bg {{job_id}}`
+`bg %{{job_id}}`
diff --git a/pages/common/bg.md b/pages/common/bg.md
index 6b7313397..2d34d48c1 100644
--- a/pages/common/bg.md
+++ b/pages/common/bg.md
@@ -8,4 +8,4 @@
 
 - Resume a specific job (use `jobs -l` to get its ID) and run it in the background:
 
-`bg {{job_id}}`
+`bg %{{job_id}}`
diff --git a/pages/common/fg.md b/pages/common/fg.md
index f4fbe6c4d..5610abff5 100644
--- a/pages/common/fg.md
+++ b/pages/common/fg.md
@@ -8,4 +8,4 @@
 
 - Bring a specific job to foreground:
 
-`fg {{job_id}}`
+`fg %{{job_id}}`
diff --git a/pages/common/jobs.md b/pages/common/jobs.md
index 30c2c0fcd..d7a037558 100644
--- a/pages/common/jobs.md
+++ b/pages/common/jobs.md
@@ -8,7 +8,7 @@
 
 - Show status of a particular job:
 
-`jobs {{job_id}}`
+`jobs %{{job_id}}`
 
 - Show status and process IDs of all jobs:
 

From 05cdce5001cfce6c98903460fdfc99652fe1a212 Mon Sep 17 00:00:00 2001
From: Sosthene-Guedon <51865119+Sosthene-Guedon@users.noreply.github.com>
Date: Sat, 12 Dec 2020 20:52:03 +0100
Subject: [PATCH 22/30] brotli: add page (#5016)

---
 pages/common/brotli.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 pages/common/brotli.md

diff --git a/pages/common/brotli.md b/pages/common/brotli.md
new file mode 100644
index 000000000..7edada2bd
--- /dev/null
+++ b/pages/common/brotli.md
@@ -0,0 +1,24 @@
+# Brotli
+
+> Compress/uncompress files with brotli compression.
+> More information: <https://github.com/google/brotli>.
+
+- Compress a file, creating a compressed version next to the file:
+
+`brotli {{file.ext}}`
+
+- Decompress a file, creating an uncompressed version next to the file:
+
+`brotli -d {{file.ext}}.br`
+
+- Compress a file specifying the output filename:
+
+`brotli {{file.ext}} -o {{compressed_file.ext.br}}`
+
+- Decompress a brotli file specifying the output filename:
+
+`brotli -d {{compressed_file.ext.br}} -o {{file.ext}}`
+
+- Specify the compression level. 1=Fastest (Worst), 11=Slowest (Best):
+
+`brotli -q {{11}} {{file.ext}} -o {{compressed_file.ext.br}}`

From 051ce4819b543378f17b477bde5f2f2be6e81f40 Mon Sep 17 00:00:00 2001
From: bl-ue <54780737+bl-ue@users.noreply.github.com>
Date: Sat, 12 Dec 2020 15:07:25 -0500
Subject: [PATCH 23/30] etcd: add page (#5007)

---
 pages/common/etcd.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pages/common/etcd.md

diff --git a/pages/common/etcd.md b/pages/common/etcd.md
new file mode 100644
index 000000000..29fe2a77e
--- /dev/null
+++ b/pages/common/etcd.md
@@ -0,0 +1,20 @@
+# etcd
+
+> A distributed, reliable key-value store for the most critical data of a distributed system.
+> More information: <https://etcd.io>.
+
+- Start a single-node etcd cluster:
+
+`etcd`
+
+- Start a single-node etcd cluster, listening for client requests on a custom url:
+
+`etcd --advertise-client-urls {{http://127.0.0.1:1234}} --listen-client-urls {{http://127.0.0.1:1234}}`
+
+- Start a single-node etcd cluster with a custom name:
+
+`etcd --name {{my_etcd_cluster}}`
+
+- Start a single-node etcd cluster with extensive metrics available at http://localhost:2379/debug/pprof/:
+
+`etcd --enable-pprof --metrics extensive`

From 6ebb4969f1fa7d7ba298783752469f504dd938fc Mon Sep 17 00:00:00 2001
From: bl-ue <54780737+bl-ue@users.noreply.github.com>
Date: Sat, 12 Dec 2020 15:58:02 -0500
Subject: [PATCH 24/30] 2to3: add page (#5015)

---
 pages/common/2to3.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pages/common/2to3.md

diff --git a/pages/common/2to3.md b/pages/common/2to3.md
new file mode 100644
index 000000000..d91f6f108
--- /dev/null
+++ b/pages/common/2to3.md
@@ -0,0 +1,28 @@
+# 2to3
+
+> Automated Python 2 to 3 code translation.
+> More information: <https://docs.python.org/3/library/2to3.html>.
+
+- Display changes that would be performed:
+
+`2to3 {{path/to/file.py}}`
+
+- Convert a Python 2 file to Python 3:
+
+`2to3 --write {{path/to/file.py}}`
+
+- Convert a specified Python 2 feature to Python 3:
+
+`2to3 --write {{file.py}} --fix={{raw_input}} --fix={{print}}`
+
+- Convert all features except *raw_input* the specified ones to Python 3:
+
+`2to3 --nofix={{raw_input}} --fix={{print}} example.py`
+
+- Display the list of available transformation features:
+
+`2to3 --list-fixes`
+
+- Convert an entire directory:
+
+`2to3 --output-dir={{path/to/code_python3_version}} --write-unchanged-files --nobackups {{path/to/code_python2_version}}`

From 31f4dbf8e5d068d2a97367eaf1015dae58ba1c99 Mon Sep 17 00:00:00 2001
From: Axel Navarro <navarroaxel@gmail.com>
Date: Sat, 12 Dec 2020 19:50:32 -0300
Subject: [PATCH 25/30] MAINTAINERS: add navarroaxel (#5024)

---
 MAINTAINERS.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index da95c19f5..122639943 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -45,6 +45,8 @@ If you are an owner of the organization, you should be able to see an automated
   [30 November 2019](https://github.com/tldr-pages/tldr/issues/3636) — [17 December 2019](https://github.com/tldr-pages/tldr/issues/3663)
 - Iván Hernández Cazorla ([@ivanhercaz](https://github.com/ivanhercaz)):
   [24 December 2019](https://github.com/tldr-pages/tldr/issues/3690) — [5 January 2020](https://github.com/tldr-pages/tldr/issues/3736)
+- Axel Navarro ([@navarroaxel](https://github.com/navarroaxel)):
+  [24 August 2020](https://github.com/tldr-pages/tldr/issues/4291) — [05 October 2020](https://github.com/tldr-pages/tldr/issues/4504)
 
 ## Organization members
 
@@ -58,6 +60,8 @@ An automated list can be found [here](https://github.com/orgs/tldr-pages/people)
   [12 January 2020](https://github.com/tldr-pages/tldr/issues/3738) — present
 - **Lucas Schneider ([@schneiderl](https://github.com/schneiderl))**:
   [17 January 2019](https://github.com/tldr-pages/tldr/issues/3764) — present
+- **Axel Navarro ([@navarroaxel](https://github.com/navarroaxel))**:
+  [05 October 2020](https://github.com/tldr-pages/tldr/issues/4504) — present
 - Owen Voke ([@owenvoke](https://github.com/owenvoke))
   [26 August 2018](https://github.com/tldr-pages/tldr/issues/2258) — [8 May 2019](https://github.com/tldr-pages/tldr/issues/2989)
 - Marco Bonelli ([@mebeim](https://github.com/mebeim)):

From cb83e50f5522477e0f561f0e7e9137ed651549e9 Mon Sep 17 00:00:00 2001
From: George Vlahavas <vlahavas@gmail.com>
Date: Mon, 14 Dec 2020 14:05:58 +0200
Subject: [PATCH 26/30] slapt-src, spi: add page, slapt-get: fix example
 (#5014)

---
 pages/linux/slapt-get.md |  2 +-
 pages/linux/slapt-src.md | 25 +++++++++++++++++++++++++
 pages/linux/spi.md       | 28 ++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 pages/linux/slapt-src.md
 create mode 100644 pages/linux/spi.md

diff --git a/pages/linux/slapt-get.md b/pages/linux/slapt-get.md
index 0af3c82d6..df0cc8a76 100644
--- a/pages/linux/slapt-get.md
+++ b/pages/linux/slapt-get.md
@@ -17,7 +17,7 @@
 
 - Upgrade all installed packages to their latest available versions:
 
-`slapt-get --upgrade {{package_name}}`
+`slapt-get --upgrade`
 
 - Locate packages of interest by the package name, disk set, or version:
 
diff --git a/pages/linux/slapt-src.md b/pages/linux/slapt-src.md
new file mode 100644
index 000000000..6ebfc2d9d
--- /dev/null
+++ b/pages/linux/slapt-src.md
@@ -0,0 +1,25 @@
+# slapt-src
+
+> A utility to automate building of slackbuilds.
+> SlackBuild sources need to be configured in the slapt-srcrc file.
+> More information: <https://github.com/jaos/slapt-src>.
+
+- Update the list of available slackbuilds and versions:
+
+`slapt-src --update`
+
+- List all available slackbuilds:
+
+`slapt-src --list`
+
+- Fetch, build and install the specified slackbuild(s):
+
+`slapt-src --install {{slackbuild_name}}`
+
+- Locate slackbuilds of interest by their name or description:
+
+`slapt-src --search {{search_term}}`
+
+- Display information about a slackbuild:
+
+`slapt-src --show {{slackbuild_name}}`
diff --git a/pages/linux/spi.md b/pages/linux/spi.md
new file mode 100644
index 000000000..a45790772
--- /dev/null
+++ b/pages/linux/spi.md
@@ -0,0 +1,28 @@
+# spi
+
+> A meta package manager that handles both packages and slackbuilds.
+> More information: <https://github.com/gapan/spi>.
+
+- Update the list of available packages and slackbuilds:
+
+`spi --update`
+
+- Install a package or slackbuild:
+
+`spi --install {{package/slackbuild_name}}`
+
+- Upgrade all installed packages to the latest versions available:
+
+`spi --upgrade`
+
+- Locate packages or slackbuilds of interest by package name or description:
+
+`spi {{search_terms}}`
+
+- Display information about a package or slackbuild:
+
+`spi --show {{package/slackbuild_name}}`
+
+- Purge the local package and slackbuild caches:
+
+`spi --clean`

From 76c19c3dfdc2dfda918cea09dd9efa3dec8fb56b Mon Sep 17 00:00:00 2001
From: hodapp512 <hodapp512@gmail.com>
Date: Mon, 14 Dec 2020 07:03:56 -0600
Subject: [PATCH 27/30] vimdiff: cleanup and update page (#4968)

---
 pages/common/vimdiff.md | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/pages/common/vimdiff.md b/pages/common/vimdiff.md
index 096be297e..3fb83a05b 100644
--- a/pages/common/vimdiff.md
+++ b/pages/common/vimdiff.md
@@ -1,16 +1,37 @@
 # vimdiff
 
-> Open up to four files in vim and show the differences between them.
-> See `vim` documentation for working with files and navigating within a window.
+> Open up two or more files in vim and show the differences between them.
+> See also `vim`.
+> More information: <https://www.vim.org>.
 
-- Open two files and show the differences (up to four files can be compared):
+- Open two files and show the differences:
 
 `vimdiff {{file1}} {{file2}}`
 
-- Open two files using a horizontal window split instead of the default vertical split:
+- Move the cursor to the window on the left|right:
 
-`vimdiff -o {{file1}} {{file2}}`
+`Ctrl + w {{h|l}}`
 
-- Move the cursor to the window on the left|right|up|down:
+- Jump to the next difference:
 
-`Ctrl + w {{h|l|k|j}}`
+`[c`
+
+- Jump to the previous difference:
+
+`]c`
+
+- Copy the highlighted difference from the other window to the current window:
+
+`do`
+
+- Copy the highlighted difference from the current window to the other window:
+
+`dp`
+
+- Update all highlights and folds:
+
+`:diffupdate`
+
+- Toggle the highlighted code fold:
+
+`za`

From 37eee7881c87abc6993496061689aed1d0f82046 Mon Sep 17 00:00:00 2001
From: Mattia Righetti <matt95.righetti@gmail.com>
Date: Wed, 16 Dec 2020 20:23:47 +0100
Subject: [PATCH 28/30] nmap: add Italian translation (#5029)

---
 pages.it/common/nmap.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pages.it/common/nmap.md

diff --git a/pages.it/common/nmap.md b/pages.it/common/nmap.md
new file mode 100644
index 000000000..8d7aab3a7
--- /dev/null
+++ b/pages.it/common/nmap.md
@@ -0,0 +1,41 @@
+# nmap
+
+> Nmap è un tool per port scanning ed esplorazione di rete.
+> Alcune funzionalità diventano attive solamente con privilegi d'amministratore.
+> Ulteriori informazioni: <https://nmap.org>.
+
+- Controlla se un indirizzo IP è attivo, e indovina il suo sistema operativo:
+
+`nmap -O {{ip_o_nome_host}}`
+
+- Cerca di determinare se gli host specificati sono attivi e quali sono i loro nomi:
+
+`nmap -sn {{ip_o_nome_host}} {{opzionale_altro_indirizzo}}`
+
+- Come sopra, ma esegui una scansione della porta TCP predefinita 1000 se l'host sembra attivo:
+
+`nmap {{ip_o_nome_host}} {{opzionale_altro_indirizzo}}`
+
+- Attiva scripts, segnalazione di servizi, OS fingerprinting e traceroute:
+
+`nmap -A {{indirizzo_o_indirizzi}}`
+
+- Velocizza esecuzione dando per scontato una buona connessione di rete:
+
+`nmap -T4 {{indirizzo_o_indirizzi}}`
+
+- Scansiona una specifica lista di porte (usa -p- per tutte le porte 1-65535):
+
+`nmap -p {{porta1,porta2,…,portaN}} {{indirizzo_o_indirizzi}}`
+
+- Esegui scansione TCP e UDP (usa -sU per usare solo UDP, -sZ per SCTP, -sO per IP):
+
+`nmap -sSU {{indirizzo_o_indirizzi}}`
+
+- Esegui una scansione di cifratori TLS verso un host per individuarne i cifratori supportati e i protocolli SSL/TLS:
+
+`nmap --script ssl-enum-ciphers {{indirizzo_o_indirizzi}} -p 443`
+
+- Determina vulnerabilità e informazioni di un host eseguendo una scansione di tutte le porte, servizi e versioni con tutti gli script di default NSE attivi:
+
+`nmap -sC -sV {{indirizzo_o_indirizzi}}`

From 365397c40b4879b8168b76ec57b39275c626c9c5 Mon Sep 17 00:00:00 2001
From: Kiran Joshi <kiran.j88@gmail.com>
Date: Thu, 17 Dec 2020 10:16:17 +0000
Subject: [PATCH 29/30] scp: add -P example (#5027)

---
 pages/common/scp.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pages/common/scp.md b/pages/common/scp.md
index 6188179e2..cda70bd9b 100644
--- a/pages/common/scp.md
+++ b/pages/common/scp.md
@@ -2,11 +2,16 @@
 
 > Secure copy.
 > Copy files between hosts using Secure Copy Protocol over SSH.
+> More information: <https://man.openbsd.org/scp>.
 
 - Copy a local file to a remote host:
 
 `scp {{path/to/local_file}} {{remote_host}}:{{path/to/remote_file}}`
 
+- Use a specific port when connecting to the remote host:
+
+`scp {{path/to/local_file}} -P {{port}} {{remote_host}}:{{path/to/remote_file}}`
+
 - Copy a file from a remote host to a local directory:
 
 `scp {{remote_host}}:{{path/to/remote_file}} {{path/to/local_directory}}`

From abd16f124c04f03164f98b0c703f1f9155246ba0 Mon Sep 17 00:00:00 2001
From: Gianni Young <43043456+GianniBYoung@users.noreply.github.com>
Date: Fri, 18 Dec 2020 07:22:05 -0600
Subject: [PATCH 30/30] tmpmail: add page (#5026)

* tmpmail: add page

* Update tmpmail.md

* Update tmpmail.md

* Update pages/common/tmpmail.md

Co-authored-by: Axel Navarro <navarroaxel@gmail.com>

* Update pages/common/tmpmail.md

Co-authored-by: Axel Navarro <navarroaxel@gmail.com>

* Update pages/common/tmpmail.md

Co-authored-by: Axel Navarro <navarroaxel@gmail.com>

* Update pages/common/tmpmail.md

Co-authored-by: Axel Navarro <navarroaxel@gmail.com>

Co-authored-by: Axel Navarro <navarroaxel@gmail.com>
---
 pages/common/tmpmail.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pages/common/tmpmail.md

diff --git a/pages/common/tmpmail.md b/pages/common/tmpmail.md
new file mode 100644
index 000000000..c92352e30
--- /dev/null
+++ b/pages/common/tmpmail.md
@@ -0,0 +1,28 @@
+# tmpmail
+
+> A temporary email right from your terminal written in POSIX sh.
+> More information: <https://github.com/sdushantha/tmpmail>.
+
+- Create a temporary inbox:
+
+`tmpmail --generate`
+
+- List messages and their numeric ID:
+
+`tmpmail`
+
+- Display the most recent received email:
+
+`tmpmail --recent`
+
+- Open a specific message:
+
+`tmpmail {{email_id}}`
+
+- View email as raw text without HTML tags:
+
+`tmpmail --text`
+
+- Open email with a specific browser (default is w3m):
+
+`tmpmail --browser {{browser}}`