Merge branch 'master' of github.com:hank/life

hank · Sep 19, 2017 · 81fcd4b · 81fcd4b
2 parents f8bc877 + df9c86b
commit 81fcd4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/system/freebsd/UPGRADING.md b/system/freebsd/UPGRADING.md
@@ -0,0 +1,14 @@
+# Normal updating
+Alias `locked` to `pkg info -ak|grep yes`
+
+* `freebsd-update fetch install`
+* `pkg upgrade`
+* `portsnap fetch update`
+* `locked`
+* `pkg unlock <pkgs>`
+* `portmaster -adG`
+* `pkg lock <pkgs>`
+
+# Upgrading releases
+
+* `freebsd-update upgrade -r 10.3-RELEASE`
diff --git a/system/tmux.conf b/system/tmux.conf
@@ -1,5 +1,5 @@
-set -g utf8
-set-window-option -g utf8 on
+#set -g utf8
+#set-window-option -g utf8 on
 set -sg escape-time 0
 
 unbind C-b
@@ -12,7 +12,7 @@ set -g history-limit 10000
 set -g default-terminal "xterm-256color"
 
 set-option -g status on
-set -g status-utf8 on
+#set -g status-utf8 on
 set -g status-justify left
 set -g status-bg colour234
 set -g status-fg colour191