Merge pull request #1 from adambard/master

update

1 files changed, 26 insertions, 22 deletions

diff --git a/tmux.html.markdown b/tmux.html.markdown
index 9eb96303..1214a5ba 100644
--- a/tmux.html.markdown
+++ b/tmux.html.markdown
@@ -2,13 +2,13 @@
 category: tool
 tool: tmux
 contributors:
-    - ["wzsk", "https://github.com/wzsk"]
+    - ["mdln", "https://github.com/mdln"]
 filename: LearnTmux.txt
 ---
 
 
-<a href="http://tmux.sourceforge.net/">
-tmux</a> is a terminal multiplexer: it enables a number of terminals
+[tmux](http://tmux.github.io)
+is a terminal multiplexer: it enables a number of terminals
 to be created, accessed, and controlled from a single screen. tmux
 may be detached from a screen and continue running in the background
 then later reattached.
@@ -38,7 +38,7 @@ then later reattached.
     lsp              # List panes
      -a              # List all panes
      -s              # List all panes in session
-     -t              # List app panes in target
+     -t              # List all panes in target
 
     kill-window      # Kill current window
      -t "#"          # Kill target window
@@ -50,13 +50,15 @@ then later reattached.
      -a              # Kill all sessions
      -a -t "#"       # Kill all sessions but the target
 
+```
 
 
-## Key Bindings
+### Key Bindings
 
-#   The method of controlling an attached tmux session is via key
-# combinations called 'Prefix' keys.
+The method of controlling an attached tmux session is via key
+combinations called 'Prefix' keys.
 
+```
 ----------------------------------------------------------------------
   (C-b) = Ctrl + b    # 'Prefix' combination required to use keybinds
 
@@ -109,22 +111,17 @@ then later reattached.
 
 ### Configuring ~/.tmux.conf
 
-  tmux.conf can be used to set options automatically on start up, much
+tmux.conf can be used to set options automatically on start up, much
 like how .vimrc or init.el are used.
 
-
 ```
 # Example tmux.conf
-# 2014.10
+# 2015.12
 
 
 ### General
 ###########################################################################
 
-# Enable UTF-8
-setw -g utf8 on
-set-option -g status-utf8 on
-
 # Scrollback/History limit
 set -g history-limit 2048
 
@@ -132,7 +129,7 @@ set -g history-limit 2048
 set -g base-index 1
 
 # Mouse
-set-option -g mouse-select-pane on
+set-option -g -q mouse on
 
 # Force reload of config file
 unbind r
@@ -207,8 +204,6 @@ setw -g window-status-bg black
 setw -g window-status-current-fg green
 setw -g window-status-bell-attr default
 setw -g window-status-bell-fg red
-setw -g window-status-content-attr default
-setw -g window-status-content-fg yellow
 setw -g window-status-activity-attr default
 setw -g window-status-activity-fg yellow
 
@@ -236,8 +231,17 @@ set -g status-right "#[fg=green] | #[fg=white]#(tmux-mem-cpu-load)#[fg=green] |
 
 ```
 
-<a href="http://tmux.sourceforge.net/">Tmux | Home</a><br>
-<a href="http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/tmux.1?query=tmux">Tmux Manual page</a><br>
-<a href="http://wiki.gentoo.org/wiki/Tmux">Gentoo Wiki</a><br>
-<a href="https://wiki.archlinux.org/index.php/Tmux">Archlinux Wiki</a><br>
-<a href="https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux">Display CPU/MEM % in statusbar</a><br>
+
+### References
+
+[Tmux | Home](http://tmux.github.io)
+
+[Tmux Manual page](http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man1/tmux.1?query=tmux)
+
+[Gentoo Wiki](http://wiki.gentoo.org/wiki/Tmux)
+
+[Archlinux Wiki](https://wiki.archlinux.org/index.php/Tmux)
+
+[Display CPU/MEM % in statusbar](https://stackoverflow.com/questions/11558907/is-there-a-better-way-to-display-cpu-usage-in-tmux)
+
+[tmuxinator - Manage complex tmux sessions](https://github.com/tmuxinator/tmuxinator)