merge

3 files changed, 6 insertions, 0 deletions

diff --git a/lib/face/48x48x8/.dict b/lib/face/48x48x8/.dict
index 1e803c36d..e7d603711 100644
--- a/lib/face/48x48x8/.dict
+++ b/lib/face/48x48x8/.dict
@@ -1,3 +1,4 @@
+9front.org/sl s/sl.1
 9fs.org/nigel n/nigel.1
 9netics.com/9nut f/fst.1
 9netics.com/fst f/fst.1
@@ -79,6 +80,7 @@ gmail.com/sstallion s/stallion.1
 gmail.com/unknown g/gmail.1
 gmail.com/uriel99 y/yipyip.1
 google.com/unknown g/google.1
+googlegroups.com/nix-dev n/nixie.1
 gr/unknown u/unknown.gr
 gsyc.escet.urjc.es/nemo n/nemo.1
 hamnavoe.com/9fans m/miller.1
@@ -103,6 +105,8 @@ lanl.gov/lionkov l/lionkov.1
 lsub.org/cespedes c/cespedes.1
 lsub.org/esoriano e/esoriano.1
 lsub.org/nemo n/nemo.1
+lsub.org/nix n/nixie.1
+lsub.org/nix-owner n/nixie.1
 lsub.org/paurea p/paurea.1
 lucent.com/plus p/plus.1
 lucent.com/unknown l/lucent.1
@@ -138,6 +142,7 @@ solnetworks.net/dlewis d/dlewis.1
 southern.edu/zfolkerts z/zfolkerts.1
 speakeasy.net/quanstro q/quanstro.1
 st.com/unknown s/st.1
+stanleylieber.com/sl s/sl.1
 starcenter.tn.org/sdavis s/sdavis.1
 strakt.com/boyd b/boyd.1
 su/unknown u/unknown.su
diff --git a/lib/face/48x48x8/n/nixie.1 b/lib/face/48x48x8/n/nixie.1
new file mode 100644
index 000000000..064755f19
--- /dev/null
+++ b/lib/face/48x48x8/n/nixie.1
diff --git a/lib/troll b/lib/troll
index cf3784762..536d9d1fb 100644
--- a/lib/troll
+++ b/lib/troll
@@ -90,3 +90,4 @@ The project has forked.
 what i can understand only is that 9front is better than plan9
 The majority of the work up until this point has been decoupling the Nix kernel from plan9 dependencies and separating adding bourne shell equivalents of rc only mkfile code.
 geoff has essentually forked ssh.
+I am coming back to Plan 9 after a couple of years away from the project -- should I be looking at Plan 9 again or 9 Front?