Commit Graph

744 Commits (b5b682af7a33b9aeae7e82f257d1f3d2d9f1880d)

Author SHA1 Message Date
Waldir Pimenta b5b682af7a Merge pull request #531 from joelhy/convmv-page
add convmv to common page
2016-01-22 01:11:36 +00:00
Waldir Pimenta d3b8b8e51a without the dir example, "file" is redundant here 2016-01-22 01:00:04 +00:00
Waldir Pimenta dff2a308ac reword to prevent ambiguity
"original" can be associated with the origin of the link and lead to confusion if not read carefully.

Also, the third example seems to have been copied from the prior example but not fully adapted: "original/file" should have said (if I'm reading this correctly) "original/folder".
2016-01-22 00:56:04 +00:00
Igor Shubovych f38c34f484 Merge pull request #681 from notpeter/scp_sftp
SSH File Transfer (SCP, SFTP)
2016-01-21 19:05:03 +02:00
Ruben Vereecken cc4a1447e3 Formatted pkg-related pages. 2016-01-21 13:44:43 +01:00
Ruben Vereecken 74476c3800 Merge branch 'master' of git://github.com/ix/tldr into ix-master 2016-01-21 13:44:26 +01:00
Ruben Vereecken 537d9bc1b8 Merge branch 'master' of github.com:tldr-pages/tldr 2016-01-21 13:33:15 +01:00
Ruben Vereecken ea65d15a02 Merge branch 'env' of git://github.com/chuanconggao/tldr into chuanconggao-env
Conflicts:
	pages/common/env.md
2016-01-21 13:32:55 +01:00
Ruben Vereecken fed6542a0e Merge pull request #545 from Torild/patch-1
ufw: add page
2016-01-21 14:26:26 +02:00
Ruben Vereecken c1f7204e37 Formatted nmap 2016-01-21 13:21:22 +01:00
Ruben Vereecken 807c8d91d9 Merge branch 'patch-1' of git://github.com/d33tah/tldr into d33tah-patch-1
Conflicts:
	pages/common/nmap.md
2016-01-21 13:21:11 +01:00
Ruben Vereecken 7aaf8e383e Formatted axel page 2016-01-21 13:18:30 +01:00
Ruben Vereecken 4d06323826 Merge branch 'add_axel' of git://github.com/lizhuoli1126/tldr into lizhuoli1126-add_axel 2016-01-21 13:18:15 +01:00
Ruben Vereecken 0ba869a5fc Formatted find page 2016-01-21 13:12:53 +01:00
Ruben Vereecken 38068377be Merge branch 'find' of git://github.com/Cvetomird91/tldr into Cvetomird91-find 2016-01-21 13:12:28 +01:00
Ruben Vereecken d72dea7931 Formatted git pages 2016-01-21 13:08:45 +01:00
Ruben Vereecken d00c14960d Merge branch 'master' of git://github.com/sethwoodworth/tldr into sethwoodworth-master
Conflicts:
	pages/common/git-init.md
2016-01-21 13:08:07 +01:00
Ruben Vereecken 732c0529f5 Merge branch 'master' of github.com:tldr-pages/tldr 2016-01-21 13:02:21 +01:00
Ruben Vereecken 4a52a7006d Formatted sed page 2016-01-21 13:02:00 +01:00
Ruben Vereecken a454ee1a5d Merge branch 'patch-3' of git://github.com/waldyrious/tldr into waldyrious-patch-3
Conflicts:
	pages/common/sed.md
2016-01-21 13:01:04 +01:00
Ruben Vereecken e9d54eff3a Merge pull request #670 from steelywing/patch-2
Add `du -m`
2016-01-21 13:57:43 +02:00
Ruben Vereecken ad1a4076f1 Formatted arp and removed ip example 2016-01-21 12:56:22 +01:00
Ruben Vereecken c1a3fafd9b Merge branch 'arp-add-page' of git://github.com/Misch-/tldr into Misch--arp-add-page 2016-01-21 12:55:06 +01:00
Ruben Vereecken b470ee397b Formatted aria2c 2016-01-21 12:45:39 +01:00
Ruben Vereecken 5ae1cf6167 aria2c: Removed unneeded example and reworded 2016-01-21 12:45:07 +01:00
Ruben Vereecken 4bf8701b2f Merge branch 'add_aria2c' of git://github.com/lizhuoli1126/tldr into lizhuoli1126-add_aria2c 2016-01-21 12:42:08 +01:00
Ruben Vereecken 5782425234 Merge pull request #684 from notpeter/minor_cleanup
Minor cleanup: ping, zpool, zfs
2016-01-21 13:29:12 +02:00
Igor Shubovych eb6526a550 Merge pull request #699 from notpeter/single-command 2016-01-20 21:07:01 +02:00
Peter Tripp 750580dbe6 Single line text refinements. 2016-01-20 10:04:06 -08:00
Igor Shubovych 4155a473be Merge pull request #698 from lukeyeager/patch-1
Update docker description
2016-01-20 19:29:19 +02:00
Luke Yeager 7bfebeae66 Update docker description 2016-01-20 09:09:54 -08:00
Peter Tripp f36e121681 Linting fixes. 2016-01-20 03:52:51 -08:00
Peter Tripp 2399de4830 xed: Remove multi-file open example. 2016-01-20 03:48:16 -08:00
Peter Tripp 88b6cb879d systemsetup: combine the seperate examples. The options are super self-documenting and very helpful together. 2016-01-20 03:47:48 -08:00
Peter Tripp 35a697f99c Sysctl: Condense by removing explicit maxfiles example. 2016-01-20 03:46:22 -08:00
Peter Tripp 2e2390b1bd Condense SHA and MD5 examples. 2016-01-20 03:45:42 -08:00
Peter Tripp 246d490e6e which: Mention what a search path is. Remove explicit example. 2016-01-20 03:44:52 -08:00
Peter Tripp 93b96be95c touch: Remove hard coded date example. Reorder wording for -r. 2016-01-20 03:44:25 -08:00
Peter Tripp a53e772333 srm: Condense and reword. Remove 35-pass example cause it's crazy-town. 2016-01-20 03:42:47 -08:00
Peter Tripp 16549758f1 salt-key: split combined examples. 2016-01-20 03:41:38 -08:00
Peter Tripp 4c5b0ac222 Rename: Condense and remove flags which require a newer version of perl. (--nows and -c are available on Ubuntu14) 2016-01-20 03:41:12 -08:00
Peter Tripp 52560585f9 Redis-cli: Condense, add note about default port. 2016-01-20 03:39:49 -08:00
Peter Tripp c0dad323d9 LS: Condense examples to single line, removing glob and sorting examples. 2016-01-20 03:39:15 -08:00
Peter Tripp f1ecb9249e Cal: Condense examples to single line. 2016-01-20 03:38:37 -08:00
Igor Shubovych 0a7749efd0 Merge pull request #638 from notpeter/zfs-debugger
zdb - ZFS Debugger
2016-01-20 13:10:33 +02:00
Igor Shubovych 81fd1a436f Merge pull request #693 from dyng/master
Add page for socat
2016-01-20 12:31:55 +02:00
Peter Tripp 6979544948 ZFS Debugger 2016-01-20 02:23:17 -08:00
Waldir Pimenta 946f4fdca9 Merge pull request #683 from notpeter/zzzs
Zcat and zless.
2016-01-20 10:19:48 +00:00
Ye Ding ac5cc41148 Fix grammar mistake 2016-01-20 10:22:04 +09:00
Igor Shubovych 7e4ac4d8ef ltrace: linting 2016-01-20 02:37:56 +02:00