From 39df861585ee056ae092e65bbdac2143a04e97d3 Mon Sep 17 00:00:00 2001
From: John Kleint <jkleint@gmail.com>
Date: Tue, 29 Dec 2015 23:55:04 -0500
Subject: [PATCH 01/34] Add GNU Parallel

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

diff --git a/pages/common/parallel.md b/pages/common/parallel.md
new file mode 100644
index 000000000..1338b8451
--- /dev/null
+++ b/pages/common/parallel.md
@@ -0,0 +1,27 @@
+# GNU Parallel
+
+> Run commands on multiple CPU cores
+
+- gzip several files at once, using all cores
+
+`parallel gzip ::: {{file1}} {{file2}} {{file3}}`
+
+- read arguments from stdin, run 4 jobs at once
+
+`ls *.txt | parallel -j4 gzip`
+
+- Convert JPG images to PNG using replacement strings
+
+`parallel convert {} {.}.png ::: *.jpg`
+
+- parallel xargs, cram as many args as possible onto one command
+
+`{{args}} | parallel -X {{command}}`
+
+- break stdin into ~1M blocks, feed each block to stdin of new command
+
+`cat {{bigfile.txt}} | parallel --pipe --block 1M {{command}}`
+
+- run on multiple machines via SSH
+
+`parallel -S {{machine1}},{{machine2}} {{command}} ::: {{arg1}} {{arg2}}`

From 2de7c9f932b0c69abeaa0e6ae12eace2124f2edf Mon Sep 17 00:00:00 2001
From: Robbie S <robbie@selwynsoftware.com>
Date: Tue, 29 Dec 2015 18:45:42 -0800
Subject: [PATCH 02/34] cat: added the append example

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

diff --git a/pages/common/cat.md b/pages/common/cat.md
index 3122ae471..a9c03f681 100644
--- a/pages/common/cat.md
+++ b/pages/common/cat.md
@@ -2,10 +2,14 @@
 
 > Print and concatenate files.
 
-- Print the contents of *file1* to the standard output
+- Print the contents of a file to the standard output
 
-`cat {{file1}}`
+`cat {{file}}`
 
 - Concatenate several files into the target file.
 
 `cat {{file1}} {{file2}} > {{target-file}}`
+
+- Append serveral files into the target file.
+
+`cat {{file1}} {{file2}} >> {{target-file}}`

From 36f1b3ec726711547923a7e9b350e5aadc92cb22 Mon Sep 17 00:00:00 2001
From: "Son A. Pham" <sp@sonpham.me>
Date: Tue, 29 Dec 2015 22:46:40 -0600
Subject: [PATCH 03/34] Add npm -g option

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

diff --git a/pages/common/npm.md b/pages/common/npm.md
index 67bd44d1f..c26454676 100644
--- a/pages/common/npm.md
+++ b/pages/common/npm.md
@@ -10,6 +10,10 @@
 
 `npm install`
 
+- Download and install a module globally
+
+`npm install -g {{module_name}}`
+
 - Download a given dependency, and add it to the package.json
 
 `npm install {{module_name}}@{{version}} --save`

From 9f3b9aa636d353d8f6eac64cc3a0a7c988175863 Mon Sep 17 00:00:00 2001
From: Son Pham <sonpa1993@gmail.com>
Date: Tue, 29 Dec 2015 23:38:43 -0600
Subject: [PATCH 04/34] add virtualenv page

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

diff --git a/pages/common/virtualenv.md b/pages/common/virtualenv.md
new file mode 100644
index 000000000..f48780be1
--- /dev/null
+++ b/pages/common/virtualenv.md
@@ -0,0 +1,16 @@
+# virtualenv
+
+> Create virtual isolated Python environments
+
+- Create a new environment
+
+`virtualenv {{path/to/venv}}`
+
+- Start (select) the environment
+
+`source {{path/to/venv}}/bin/activate`
+
+- Stop the environment
+
+`deactivate`
+

From 9da8263cfdf3125e7f8ed1eea7d2490f6be3e212 Mon Sep 17 00:00:00 2001
From: Paul Haller <haller.paul@gmail.com>
Date: Wed, 30 Dec 2015 22:01:40 +0100
Subject: [PATCH 05/34] Fixed tldr for gem

Specific version instruction missed gem name and mixed up -v and --version
---
 pages/common/gem.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/common/gem.md b/pages/common/gem.md
index 44a71ea82..e781a2ead 100644
--- a/pages/common/gem.md
+++ b/pages/common/gem.md
@@ -8,7 +8,7 @@
 
 - Install specific version of a gem
 
-`gem install -v={{0.0.15}}`
+`gem install {{gemname}} -v {{1.0.0}}
 
 - Update a gem
 

From 775a858aa6feba44fa3ca7c48637489ad7d74a6e Mon Sep 17 00:00:00 2001
From: Matt <contact@mattmcfarland.com>
Date: Wed, 30 Dec 2015 16:30:37 -0500
Subject: [PATCH 06/34] add bashmarks.sh https://github.com/huyng/bashmarks

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

diff --git a/pages/common/bashmarks.md b/pages/common/bashmarks.md
new file mode 100644
index 000000000..cfa3cd7f4
--- /dev/null
+++ b/pages/common/bashmarks.md
@@ -0,0 +1,23 @@
+# bashmarks
+
+> Save and jump to commonly used directories using 1 character commands.
+
+- List available bookmarks
+
+`l`
+
+- Saves the current directory as "bookmark_name"
+
+`s {{bookmark_name}}`
+
+- Goes (cd) to the directory associated with "bookmark_name"
+
+`g {{bookmark_name}}`
+
+- Prints the directory associated with "bookmark_name"
+
+`p {{bookmark_name}}`
+
+- Deletes the bookmark
+
+`d {{bookmark_name}}`

From 76d44e6192426ad6495c4645519bfb9845261600 Mon Sep 17 00:00:00 2001
From: Igor Shubovych <igor.shubovych@gmail.com>
Date: Wed, 23 Dec 2015 14:45:11 +0200
Subject: [PATCH 07/34] whoami: add page

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

diff --git a/pages/common/whoami.md b/pages/common/whoami.md
new file mode 100644
index 000000000..3582689fa
--- /dev/null
+++ b/pages/common/whoami.md
@@ -0,0 +1,7 @@
+# whoami
+
+> Show the username of the current user
+
+- Display currently logged user name
+
+`whoami`

From a4768ccd28e54efa495e0e11da1a3e9feef2abfc Mon Sep 17 00:00:00 2001
From: Eddie Antonio Santos <easantos@ualberta.ca>
Date: Wed, 30 Dec 2015 15:05:57 -0700
Subject: [PATCH 08/34] ar: add examples and clean-up

---
 pages/common/ar.md | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pages/common/ar.md b/pages/common/ar.md
index d52f32256..2e46b2d51 100644
--- a/pages/common/ar.md
+++ b/pages/common/ar.md
@@ -2,10 +2,22 @@
 
 > Create, modify, and extract from archives (.a .so .o)
 
-- Extract members of the archive
+- Extract all members from an archive
 
-`ar -x libfoo.a`
+`ar -x {{libfoo.a}}`
 
-- List the content (files) of libfoo.a
+- List the members of an archive
 
-`ar -t libfoo.a`
+`ar -t {{libfoo.a}}`
+
+- Replace or add files to an archive
+
+`ar -r {{libfoo.a}} {{foo.o}} {{bar.o}} {{baz.o}}`
+
+- Insert an object file index (equivalent to using `ranlib`)
+
+`ar -s {{libfoo.a}}`
+
+- Create an archive with files and an accompanying object file index
+
+`ar -rs {{libfoo.a}} {{foo.o}} {{bar.o}} {{baz.o}}`

From 85cde43d8534fb4e1bbb2fa9069e8ff5579261f1 Mon Sep 17 00:00:00 2001
From: Eddie Antonio Santos <easantos@ualberta.ca>
Date: Wed, 30 Dec 2015 15:22:13 -0700
Subject: [PATCH 09/34] strings: add page

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

diff --git a/pages/common/strings.md b/pages/common/strings.md
new file mode 100644
index 000000000..517e06850
--- /dev/null
+++ b/pages/common/strings.md
@@ -0,0 +1,19 @@
+# strings
+
+> Find printable strings in an object file or binary
+
+- Print all strings in a binary
+
+`strings {{file}}`
+
+- Limit results to strings at least *length* characters long
+
+`strings -n {{length}} {{file}}`
+
+- Prefix each result with its offset within the file
+
+`strings -t d {{file}}`
+
+- Prefix each result with its offset within the file in hexadecimal
+
+`strings -t x {{file}}`

From 10232ce7c21adcccdf23c14fc9c372676883c645 Mon Sep 17 00:00:00 2001
From: Sam D <llamaswill@gmail.com>
Date: Wed, 30 Dec 2015 18:21:59 -0500
Subject: [PATCH 10/34] removes no-longer-there diskutil verb

As of El Capitan, `sudo diskutil repairPermissions /` returns `diskutil: did not recognize verb "repairPermissions"; type "diskutil" for a list` since repairPermissions has been removed.

In the interest of keeping this tldr-compatible I've removed it. In the interest of not leaving things out, there could instead be a "this no longer works" notice.
---
 pages/osx/diskutil.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pages/osx/diskutil.md b/pages/osx/diskutil.md
index a9ed26dad..dd70d1241 100644
--- a/pages/osx/diskutil.md
+++ b/pages/osx/diskutil.md
@@ -6,10 +6,6 @@
 
 `diskutil list`
 
-- Repair permissions on a volume
-
-`diskutil repairPermissions {{/Volumes/Name}}`
-
 - Repair the file system data structures of a volume
 
 `diskutil repairVolume {{/dev/diskX}}`

From a41b1c087553abee07706f02a2af3c71f6741804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Tue, 29 Dec 2015 15:18:59 +0100
Subject: [PATCH 11/34] Add host

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

diff --git a/pages/common/host.md b/pages/common/host.md
new file mode 100644
index 000000000..6a5927eda
--- /dev/null
+++ b/pages/common/host.md
@@ -0,0 +1,15 @@
+# host
+
+Lookup Domain Name Server
+
+- Lookup A, AAAA, and MX records of a domain
+
+`host {{domain}}`
+
+- Lookup a field (CNAME, TXT,...) of a domain
+
+`host -t {{field}} {{domain}}`
+
+- Reverse lookup an IP
+
+`host {{ip_address}}`

From 27b2bfac54437bf13812134c5640a955cee464ec Mon Sep 17 00:00:00 2001
From: lagel <lagel@live.com>
Date: Wed, 30 Dec 2015 23:04:51 +0800
Subject: [PATCH 12/34] Add gradle commands

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

diff --git a/pages/common/gradle.md b/pages/common/gradle.md
new file mode 100644
index 000000000..561e3bae2
--- /dev/null
+++ b/pages/common/gradle.md
@@ -0,0 +1,15 @@
+# Gradle
+
+> Gradle is the official build system for Android Studio
+
+- Compile a package
+
+`gradle build`
+
+- Clear the build folder
+
+`gradle clean`
+
+- Compile and Release package
+
+`gradle assembleRelease`

From c9807c9cda9b71a6f9ec6e6cb3cddef9b579de87 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@gmail.com>
Date: Thu, 31 Dec 2015 13:12:49 +1100
Subject: [PATCH 13/34] Fixed typo

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

diff --git a/pages/osx/netstat.md b/pages/osx/netstat.md
index 76839d4a5..ed7e063f4 100644
--- a/pages/osx/netstat.md
+++ b/pages/osx/netstat.md
@@ -18,6 +18,6 @@
 
 `netstat -p {PROTOCOL}`
 
-- List information continiously
+- List information continuously
 
 `netstat -c`

From 44eb0501023a5eb2f2263089e2406332faf35c0e Mon Sep 17 00:00:00 2001
From: Igor Shubovych <igor.shubovych@gmail.com>
Date: Wed, 23 Dec 2015 15:02:45 +0200
Subject: [PATCH 14/34] vagrant: add page

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

diff --git a/pages/common/vagrant.md b/pages/common/vagrant.md
new file mode 100644
index 000000000..b7efaba8b
--- /dev/null
+++ b/pages/common/vagrant.md
@@ -0,0 +1,23 @@
+# vagrant
+
+> Manage lightweight, reproducible, and portable development environments
+
+- Create Vagrantfile in current folder with the base Vagrant box
+
+`vagrant init`
+
+- Create Vagrantfile with the Ubuntu 14.04 (Trusty Tahr) box from HashiCorp Atlas
+
+`vagrant init ubuntu/trusty32`
+
+- Start and provision the vagrant environment
+
+`vagrant up`
+
+- Suspend the machine
+
+`vagrant suspend`
+
+- Connect to machine via SSH
+
+`vagrant ssh`

From 268a6fefd48f8e4ce641c7200847124b42a185f2 Mon Sep 17 00:00:00 2001
From: Matt McFarland <MattMcFarland@users.noreply.github.com>
Date: Wed, 30 Dec 2015 21:31:24 -0500
Subject: [PATCH 15/34] Update bashmarks.md

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

diff --git a/pages/common/bashmarks.md b/pages/common/bashmarks.md
index cfa3cd7f4..7ba7035d8 100644
--- a/pages/common/bashmarks.md
+++ b/pages/common/bashmarks.md
@@ -6,18 +6,18 @@
 
 `l`
 
-- Saves the current directory as "bookmark_name"
+- Save the current folder as "bookmark_name"
 
 `s {{bookmark_name}}`
 
-- Goes (cd) to the directory associated with "bookmark_name"
+- Go to a bookmarked folder
 
 `g {{bookmark_name}}`
 
-- Prints the directory associated with "bookmark_name"
+- Print a bookmarked folder's contents
 
 `p {{bookmark_name}}`
 
-- Deletes the bookmark
+- Delete a bookmark
 
 `d {{bookmark_name}}`

From fe6223160717b1c217fd1b2ca2252d1de5bfee42 Mon Sep 17 00:00:00 2001
From: Leandro Ostera <leandro@ostera.io>
Date: Thu, 31 Dec 2015 04:40:04 +0100
Subject: [PATCH 16/34] Updates links to point to tldr.jsx

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d4da1a55b..6f5a66e0d 100644
--- a/README.md
+++ b/README.md
@@ -54,8 +54,8 @@ You can access these pages on your computer using one of the following clients:
     [Google Play](https://play.google.com/store/apps/details?id=io.github.hidroh.tldroid)
 - [Ruby client](https://github.com/YellowApple/tldrb): `gem install tldrb`
 - [R client](https://github.com/kirillseva/tldrrr): `devtools::install_github('kirillseva/tldrrr')`
-- [Web client](https://github.com/ostera/tldr.js): try tldr on your browser
-  [here](https://ostera.github.io/tldr.js)!
+- [Web client](https://github.com/ostera/tldr.jsx): try tldr on your browser
+  [here](https://ostera.github.io/tldr.jsx)!
 
 Let us know if you are building one and we can add it to this list!
 

From c9b0b290f98d5875fe7fdc9a4cb3222f148a3ea5 Mon Sep 17 00:00:00 2001
From: ElectricSquid <beastmode25800@gmail.com>
Date: Wed, 30 Dec 2015 23:41:06 -0600
Subject: [PATCH 17/34] Addition to shutdown.md

Added section to indicate how to shutdown at a specific time rather than shutting down X minutes from now
---
 pages/linux/shutdown.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/linux/shutdown.md b/pages/linux/shutdown.md
index ff0982165..9ae3bb7a4 100644
--- a/pages/linux/shutdown.md
+++ b/pages/linux/shutdown.md
@@ -14,6 +14,10 @@
 
 `shutdown -r +{{5}} &`
 
+- Shutdown at 1:00 pm (Uses 24h clock)
+
+`shutdown -h 13:00`
+
 - Cancel a pending shutdown/reboot operation
 
 `shutdown -c`

From d5f8b3f4275f341fe4f6863b79519ade3d56b31a Mon Sep 17 00:00:00 2001
From: Harry Terkelsen <harry.terkelsen@gmail.com>
Date: Wed, 30 Dec 2015 22:11:45 -0800
Subject: [PATCH 18/34] Add Dart client to README

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

diff --git a/README.md b/README.md
index 6f5a66e0d..0f681f3da 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ You can access these pages on your computer using one of the following clients:
     [Google Play](https://play.google.com/store/apps/details?id=io.github.hidroh.tldroid)
 - [Ruby client](https://github.com/YellowApple/tldrb): `gem install tldrb`
 - [R client](https://github.com/kirillseva/tldrrr): `devtools::install_github('kirillseva/tldrrr')`
+- [Dart client](https://github.com/hterkelsen/tldr): `pub global activate tldr`
 - [Web client](https://github.com/ostera/tldr.jsx): try tldr on your browser
   [here](https://ostera.github.io/tldr.jsx)!
 

From b6ca634bb1e7511fa18517fa6549db9764fd0ce1 Mon Sep 17 00:00:00 2001
From: Jacek Wielemborek <d33tah@gmail.com>
Date: Tue, 29 Dec 2015 16:28:01 +0100
Subject: [PATCH 19/34] Update nmap.md.

---
 pages/common/nmap.md | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pages/common/nmap.md b/pages/common/nmap.md
index a8861f0d4..4c13ea37d 100644
--- a/pages/common/nmap.md
+++ b/pages/common/nmap.md
@@ -1,19 +1,28 @@
 # nmap
 
-> Network exploration tool and security / port scanner
+> Network exploration tool and security / port scanner.
+> Some features only activate when Nmap is run with privileges.
 
-- scan open ports of a single host
+- Try to determine whether the specified hosts are up and what are their names.
 
-`nmap {{192.168.0.1}}`
+`nmap -sn {{ip_or_hostname}} {{optional_another_address}}`
 
-- discover hosts in the 192.168.0.X area (no port scan)
+- Like above, but also run a default 1000-port TCP scan if host seems up.
 
-`nmap -sn {{192.168.0.1/24}}`
+`nmap {{ip_or_hostname}} {{optional_another_address}}`
 
-- faster scan of a single host (scans for common ports)
+- Also enable service detection, OS fingerprinting and traceroute.
 
-`nmap -F {{192.168.0.1}}`
+`nmap -A {{address_or_addresses}}`
 
-- faster scan of a subnet (scans for common ports)
+- Assume good network connection and speed up execution:
 
-`nmap -F {{192.168.0.1/24}}`
+`nmap -T4 {{address_or_addresses}}`
+
+- Scan a specific list of ports (use -p- for all ports 1-65535)
+
+`nmap -p {{port1,port2,...,portN}} {{address_or_addresses}}`
+
+- Perform TCP and UDP scanning (use -sU for UDP only, -sZ for SCTP, -sO for IP):
+
+`nmap -sSU {{address_or_addresses}}`

From bdfa9c394f6f2b275228937be8161a1d9ba442d1 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Wed, 30 Dec 2015 19:53:12 +0000
Subject: [PATCH 20/34] Add apt-cache

---
 pages/linux/apt-cache.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 pages/linux/apt-cache.md

diff --git a/pages/linux/apt-cache.md b/pages/linux/apt-cache.md
new file mode 100644
index 000000000..73317742a
--- /dev/null
+++ b/pages/linux/apt-cache.md
@@ -0,0 +1,15 @@
+# apt-cache
+
+> Debian and Ubuntu package query tool
+
+ - Search for a package in your current sources
+
+`apt-cache search {{query}}`
+
+ - Show information about a package
+
+`apt-cache show {{package}}`
+
+ - Show whether a package is installed and up to date
+ 
+`apt-cache policy {{package}}`

From c7f5c3440206a0bc32f7fdd52768ada09cd43a15 Mon Sep 17 00:00:00 2001
From: Igor Shubovych <igor.shubovych@gmail.com>
Date: Thu, 31 Dec 2015 12:33:21 +0200
Subject: [PATCH 21/34] Linting after merging #507

---
 pages/linux/apt-cache.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/linux/apt-cache.md b/pages/linux/apt-cache.md
index 73317742a..e66886b8d 100644
--- a/pages/linux/apt-cache.md
+++ b/pages/linux/apt-cache.md
@@ -2,14 +2,14 @@
 
 > Debian and Ubuntu package query tool
 
- - Search for a package in your current sources
+- Search for a package in your current sources
 
 `apt-cache search {{query}}`
 
- - Show information about a package
+- Show information about a package
 
 `apt-cache show {{package}}`
 
- - Show whether a package is installed and up to date
- 
+- Show whether a package is installed and up to date
+
 `apt-cache policy {{package}}`

From a3f0d36a80501bcbfd38fea37fd0e196a9d980e6 Mon Sep 17 00:00:00 2001
From: 85pando <85pando@googlemail.com>
Date: Thu, 31 Dec 2015 11:54:03 +0100
Subject: [PATCH 22/34] Fix another much needed imagemagick command.

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

diff --git a/pages/common/convert.md b/pages/common/convert.md
index 8c4e9f461..e4b2c79ed 100644
--- a/pages/common/convert.md
+++ b/pages/common/convert.md
@@ -10,6 +10,10 @@
 
 `convert {{image.png}} -resize 50% {{image2.png}}`
 
+- Scale an image keeping the original aspect ratio to a maximum dimension of 640x480.
+
+`convert {{image.png}} -resize 640x480 {{image2.png}}`
+
 - Horizontally append images
 
 `convert {{image1.png}} {{image2.png}} {{image3.png}} +append {{image123.png}}`

From b63075e51f8254a684ae61eb650b06a242ae3e1f Mon Sep 17 00:00:00 2001
From: Jeroen Meulemeester <jeroen.meulemeester@gmail.com>
Date: Thu, 31 Dec 2015 10:43:10 +0100
Subject: [PATCH 23/34] xrandr: add page

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

diff --git a/pages/linux/xrandr.md b/pages/linux/xrandr.md
new file mode 100644
index 000000000..ba3c06e91
--- /dev/null
+++ b/pages/linux/xrandr.md
@@ -0,0 +1,23 @@
+# xrandr
+
+> Set the size, orientation and/or reflection of the outputs for a screen
+
+- Display the current state of the system (known screens, resolutions, ...)
+
+`xrandr --query`
+
+- Disable disconnected outputs and enable connected ones with default settings
+
+`xrandr --auto`
+
+- Change the resolution and update frequency of DisplayPort 1 to 1920x1080, 60Hz
+
+`xrandr --output {{DP1}} --mode {{1920x1080}} --rate {{60}}`
+
+- Set the resolution of HDMI2 to 1280x1024 and put it on the right of DP1
+
+`xrandr --output {{HDMI2}} --mode {{1280x1024}} --right-of {{DP1}}`
+
+- Disable the VGA1 output
+
+`xrandr --output {{VGA1}} --off`

From 7d60083f20af4c79f5dd84c200c77f3b24eafaee Mon Sep 17 00:00:00 2001
From: amine hajyoussef <hajyoussef.amine@gmail.com>
Date: Thu, 31 Dec 2015 13:28:12 +0100
Subject: [PATCH 24/34] fix markup

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

diff --git a/pages/common/gem.md b/pages/common/gem.md
index e781a2ead..44380f546 100644
--- a/pages/common/gem.md
+++ b/pages/common/gem.md
@@ -8,7 +8,7 @@
 
 - Install specific version of a gem
 
-`gem install {{gemname}} -v {{1.0.0}}
+`gem install {{gemname}} -v {{1.0.0}}`
 
 - Update a gem
 

From 29717aac4cea0897bcf127347c41c076fac47907 Mon Sep 17 00:00:00 2001
From: 85pando <85pando@googlemail.com>
Date: Thu, 31 Dec 2015 12:20:13 +0100
Subject: [PATCH 25/34] Add steam-locomotive

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

diff --git a/pages/common/sl.md b/pages/common/sl.md
new file mode 100644
index 000000000..ae2f5a5ec
--- /dev/null
+++ b/pages/common/sl.md
@@ -0,0 +1,15 @@
+# sl
+
+> Steam locomotive running through your terminal.
+
+- Let a steam locomotive run through your terminal.
+
+`sl`
+
+- The train burns, people scream.
+
+`sl -a`
+
+- Let the train fly.
+
+`sl -F`

From 3fe8681e19acf79351509fb46b1988a0ab64397f Mon Sep 17 00:00:00 2001
From: Amine Hajyoussef <hajyoussef.amine@gmail.com>
Date: Thu, 31 Dec 2015 14:11:18 +0100
Subject: [PATCH 26/34] consistent markup

---
 pages/common/host.md    | 2 +-
 pages/common/passwd.md  | 8 ++++----
 pages/common/salt.md    | 6 +++---
 pages/common/sed.md     | 3 +--
 pages/common/touch.md   | 6 +++---
 pages/linux/hostname.md | 2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pages/common/host.md b/pages/common/host.md
index 6a5927eda..784f24245 100644
--- a/pages/common/host.md
+++ b/pages/common/host.md
@@ -1,6 +1,6 @@
 # host
 
-Lookup Domain Name Server
+> Lookup Domain Name Server
 
 - Lookup A, AAAA, and MX records of a domain
 
diff --git a/pages/common/passwd.md b/pages/common/passwd.md
index e4ebbe043..ddf4893e7 100644
--- a/pages/common/passwd.md
+++ b/pages/common/passwd.md
@@ -2,18 +2,18 @@
 
 > passwd is a tool used to change a user's password.
 
-* Change the password of the current user
+- Change the password of the current user
 
 `passwd {{new password}}`
 
-* Change the password of the specified user
+- Change the password of the specified user
 
 `passwd {{username}} {{new password}}`
 
-* Get the current statuts of the user
+- Get the current statuts of the user
 
 `passwd -S`
 
-* Make the password of the account blank (it will set the named account passwordless)
+- Make the password of the account blank (it will set the named account passwordless)
 
 `passwd -d`
diff --git a/pages/common/salt.md b/pages/common/salt.md
index 4044e9275..b11b24759 100644
--- a/pages/common/salt.md
+++ b/pages/common/salt.md
@@ -8,12 +8,12 @@
 
 - Execute a highstate on all connected minions:
 
-`salt '*' state.highstate
+`salt '*' state.highstate`
 
 - Upgrade packages using the OS package manager (apt, yum, brew) on a subset of minions
 
-`salt '*.domain.com' pkg.upgrade
+`salt '*.domain.com' pkg.upgrade`
 
 - Execute an arbitrary command on a particular minion:
 
-`salt '{{minion_id}}' cmd.run "ls "
+`salt '{{minion_id}}' cmd.run "ls "`
diff --git a/pages/common/sed.md b/pages/common/sed.md
index 249d9d58a..6ae128e8f 100644
--- a/pages/common/sed.md
+++ b/pages/common/sed.md
@@ -6,8 +6,7 @@
 
 `sed 's/{{find}}/{{replace}}/g' {{filename}}`
 
-- replace all occurrences of a string in a file, and overwrite the file
-  contents
+- replace all occurrences of a string in a file, and overwrite the file contents
 
 `sed -i 's/{{find}}/{{replace}}/g' {{filename}}`
 
diff --git a/pages/common/touch.md b/pages/common/touch.md
index fb7c4e116..7937c861f 100644
--- a/pages/common/touch.md
+++ b/pages/common/touch.md
@@ -2,14 +2,14 @@
 
 > Change a file access and modification times (atime, mtime)
 
-- Create a new empty file(s) or change the times for existing file(s) to current time.`
+- Create a new empty file(s) or change the times for existing file(s) to current time
 
 `touch {{filename}}`
 
 - Set the times on a file to those specified
 
-`touch -t 201412250801.59 {{filename}}
-`touch -t {{YYYYMMDDHHMM.SS}} {{filename}}
+`touch -t 201412250801.59 {{filename}}`
+`touch -t {{YYYYMMDDHHMM.SS}} {{filename}}`
 
 - Set the times on a file to match those on second file
 
diff --git a/pages/linux/hostname.md b/pages/linux/hostname.md
index b807d87b6..592179bc2 100644
--- a/pages/linux/hostname.md
+++ b/pages/linux/hostname.md
@@ -1,6 +1,6 @@
 # hostname
 
-Show or set the system's host name
+> Show or set the system's host name
 
 - Show current host name
 

From f8fb3381ec186e596a73a0278c7748e47c381747 Mon Sep 17 00:00:00 2001
From: Amine Hajyoussef <hajyoussef.amine@gmail.com>
Date: Thu, 31 Dec 2015 14:26:31 +0100
Subject: [PATCH 27/34] last fix

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

diff --git a/pages/osx/hostname.md b/pages/osx/hostname.md
index ed4c36a6c..abc0269c4 100644
--- a/pages/osx/hostname.md
+++ b/pages/osx/hostname.md
@@ -1,6 +1,6 @@
 # hostname
 
-Show or set the system's host name
+> Show or set the system's host name
 
 - Show current host name
 

From fc835b18bbe7e0e2741d190d5f17f055f3d7cb78 Mon Sep 17 00:00:00 2001
From: Cvetomird91 <cvetomirdenchev@gmail.com>
Date: Thu, 31 Dec 2015 00:46:40 +0200
Subject: [PATCH 28/34] last: edited to stick to the convetion and added more
 options

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

diff --git a/pages/common/last.md b/pages/common/last.md
new file mode 100644
index 000000000..c796082a5
--- /dev/null
+++ b/pages/common/last.md
@@ -0,0 +1,27 @@
+# last 
+
+> View the last logged in users
+
+- view last logins, their duration  and other information as read from /var/log/wtmp
+
+`last`
+
+- specify how many of the last logins to show
+
+`last -n {{login_count}}`
+
+- view full login times and dates 
+
+`last -F`
+
+- view the last login by a specific user
+
+`last {{user_name}}`
+
+- view the last reboot (last login of the pseudo user reboot)
+
+`last reboot`
+
+- view the last shutdown (last login of the pseudo user shutdown)
+
+`last shutdown`

From 856351df98807931819b756648a6275b2d93e205 Mon Sep 17 00:00:00 2001
From: Timothy Sutton <tim@synthist.net>
Date: Thu, 31 Dec 2015 22:36:21 -0500
Subject: [PATCH 29/34] Typo "it's" in mdfind

---
 pages/osx/mdfind.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/osx/mdfind.md b/pages/osx/mdfind.md
index a2c104008..b2eae54dc 100644
--- a/pages/osx/mdfind.md
+++ b/pages/osx/mdfind.md
@@ -2,11 +2,11 @@
 
 > List files matching a given query
 
-- Find a file by it's name
+- Find a file by its name
 
 `mdfind -name {{file}}`
 
-- Find a file by it's content
+- Find a file by its content
 
 `mdfind {{query}}`
 

From 88e15c9cc0a1f3acad72a9034739a07ce5b3fff1 Mon Sep 17 00:00:00 2001
From: Waldir Pimenta <waldyrious@gmail.com>
Date: Fri, 1 Jan 2016 20:05:46 +0000
Subject: [PATCH 30/34] README.md: rework clients section a bit

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0f681f3da..afe362d3f 100644
--- a/README.md
+++ b/README.md
@@ -41,13 +41,14 @@ for the most common UNIX / Linux / OSX / SunOS commands.
 You can access these pages on your computer using one of the following clients:
 
 - [Node.js client](https://github.com/tldr-pages/tldr-node-client) : `npm install -g tldr`
-- [Python client](https://github.com/tldr-pages/tldr-python-client) : `pip install tldr`
-- [Python client](https://github.com/lord63/tldr.py): `pip install tldr.py`
+- Python clients:
+  - [tldr-python-client](https://github.com/tldr-pages/tldr-python-client) : `pip install tldr`
+  - [tldr.py](https://github.com/lord63/tldr.py): `pip install tldr.py`
 - [Go client](https://github.com/pranavraja/tldr): `go get github.com/pranavraja/tldr`
-  or [platform binaries](https://github.com/pranavraja/tldr/releases)
-- [Elixir client](https://github.com/tldr-pages/tldr_elixir_client): binaries available soon
+  (or [platform binaries](https://github.com/pranavraja/tldr/releases))
+- [Elixir client](https://github.com/tldr-pages/tldr_elixir_client) (binaries not yet available)
 - [C++ client](https://github.com/tldr-pages/tldr-cpp-client): `brew tap tldr-pages/tldr && brew install tldr`
-- Android client:
+- Android clients:
   - [tldr-viewer](https://github.com/gianasista/tldr-viewer), available on
     [Google Play](https://play.google.com/store/apps/details?id=de.gianasista.tldr_viewer)
   - [tldroid](https://github.com/hidroh/tldroid), available on
@@ -55,8 +56,7 @@ You can access these pages on your computer using one of the following clients:
 - [Ruby client](https://github.com/YellowApple/tldrb): `gem install tldrb`
 - [R client](https://github.com/kirillseva/tldrrr): `devtools::install_github('kirillseva/tldrrr')`
 - [Dart client](https://github.com/hterkelsen/tldr): `pub global activate tldr`
-- [Web client](https://github.com/ostera/tldr.jsx): try tldr on your browser
-  [here](https://ostera.github.io/tldr.jsx)!
+- [Web client](https://github.com/ostera/tldr.jsx): https://ostera.github.io/tldr.jsx
 
 Let us know if you are building one and we can add it to this list!
 

From ba7b7861f64e340d90941eea4489609c7be768e3 Mon Sep 17 00:00:00 2001
From: Cvetomird91 <cvetomirdenchev@gmail.com>
Date: Thu, 31 Dec 2015 00:27:57 +0200
Subject: [PATCH 31/34] soft and hard file limits - edited descriptions

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

diff --git a/pages/linux/ulimit.md b/pages/linux/ulimit.md
new file mode 100644
index 000000000..b7973d1c9
--- /dev/null
+++ b/pages/linux/ulimit.md
@@ -0,0 +1,19 @@
+# ulimit
+
+> Get and set user limits
+
+- get the properties of all the user limits
+
+`ulimit -a`
+
+- get hard limit for the number of simultaneously opened files 
+
+`ulimit -H -n`
+
+- get soft limit for the number of simultaneously opened files 
+
+`ulimit -S -n` 
+
+- set max per-user process limit 
+
+`ulimit -u 30`

From dda6e37954fee455993c3b7689f96319a9be136b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DECOOL?= <contact@jdecool.fr>
Date: Sat, 2 Jan 2016 01:19:38 +0100
Subject: [PATCH 32/34] Add ssh-copy-id page

---
 pages/linux/ssh-copy-id.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 pages/linux/ssh-copy-id.md

diff --git a/pages/linux/ssh-copy-id.md b/pages/linux/ssh-copy-id.md
new file mode 100644
index 000000000..727764b53
--- /dev/null
+++ b/pages/linux/ssh-copy-id.md
@@ -0,0 +1,11 @@
+# ssh-copy-id
+
+> Install your public key in a remote machine's authorized_keys.
+
+- Copy the given public key to the remote
+
+`ssh-copy-id -i {{path/to/certificate}} {{username}}@{{remote_host}}`
+
+- Copy the given public key to the remote with specific port
+
+`ssh-copy-id -i {{path/to/certificate}} -p {{port}} {{username}}@{{remote_host}}`

From 652933225fca218ec724acd33e2b1d822462590f Mon Sep 17 00:00:00 2001
From: Katy Moe <katy@katy.moe>
Date: Fri, 1 Jan 2016 03:48:36 +0000
Subject: [PATCH 33/34] pkill: add page

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

diff --git a/pages/common/pkill.md b/pages/common/pkill.md
new file mode 100644
index 000000000..d6121443b
--- /dev/null
+++ b/pages/common/pkill.md
@@ -0,0 +1,12 @@
+# pkill
+
+> Signal process by name
+> Mostly used for stopping processes
+
+- kill all processes which match
+
+`pkill -9 {{process_name}}`
+
+- send SIGUSR1 signal to processes which match
+
+`pkill -USR1 {{process_name}}`

From e45b0d7198312bd0acf9063244c185399a0ce457 Mon Sep 17 00:00:00 2001
From: Igor Shubovych <igor.shubovych@gmail.com>
Date: Sat, 2 Jan 2016 03:09:44 +0200
Subject: [PATCH 34/34] Linting

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

diff --git a/pages/common/last.md b/pages/common/last.md
index c796082a5..90b44a63e 100644
--- a/pages/common/last.md
+++ b/pages/common/last.md
@@ -1,4 +1,4 @@
-# last 
+# last
 
 > View the last logged in users
 
@@ -10,7 +10,7 @@
 
 `last -n {{login_count}}`
 
-- view full login times and dates 
+- view full login times and dates
 
 `last -F`