summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-03-19 10:45:32 -0400
committerJoey Hess2018-03-19 10:45:32 -0400
commit5eff411be00981ccbbab5838ecb13a7530a1d0d9 (patch)
treea3b0c4e77fddd6db36178bbde7b46c9878508596
parenta3a0e2fca25babea6c5b3ef0bb40f67806f97830 (diff)
parent96ece111cbeda931032cefc516c586c05af67b7d (diff)
Merge branch 'joeyconfig'
-rw-r--r--doc/README.mdwn2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/README.mdwn b/doc/README.mdwn
index 8bdb6c83..df1b8ada 100644
--- a/doc/README.mdwn
+++ b/doc/README.mdwn
@@ -56,4 +56,4 @@ see [configuration for the Haskell newbie](https://propellor.branchable.com/hask
7. Write some neat new properties and send patches!
(Want to get your feet wet with propellor before plunging in?
-[[try this|forum/Simple_quickstart_without_git__44___SSH__44___GPG]])
+[try this|http://propellor.branchable.com/forum/Simple_quickstart_without_git__44___SSH__44___GPG])
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 80677322..e45b1ffa 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1052,7 +1052,7 @@ laptopSoftware = Apt.installed
, "ttf-bitstream-vera"
, "mairix", "offlineimap", "mutt"
, "mtr", "nmap", "whois", "wireshark", "tcpdump", "iftop"
- , "udevil", "pmount", "tree", "pv"
+ , "pmount", "tree", "pv"
, "arbtt", "hledger", "bc"
, "apache2", "ikiwiki", "libhighlight-perl"
, "pal"