From 9e578aca6b0914443c95f8691fd3ba39522f28fc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 19 Apr 2014 01:28:46 -0400
Subject: rename aka to alias

---
 Propellor/Attr.hs            | 4 ++--
 Propellor/Property/Dns.hs    | 4 ++--
 Propellor/Property/Docker.hs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Propellor')

diff --git a/Propellor/Attr.hs b/Propellor/Attr.hs
index a54d8833..fb94dc34 100644
--- a/Propellor/Attr.hs
+++ b/Propellor/Attr.hs
@@ -42,8 +42,8 @@ ipv6 addr = pureAttrProperty ("ipv6 " ++ addr)
 	(addDNS $ Address $ IPv6 addr)
 
 -- | Indicates another name for the host in the DNS.
-aka :: Domain -> Property
-aka domain = pureAttrProperty ("aka " ++ domain)
+alias :: Domain -> Property
+alias domain = pureAttrProperty ("aka " ++ domain)
 	(addDNS $ CNAME $ AbsDomain domain)
 
 addDNS :: Record -> SetAttr
diff --git a/Propellor/Property/Dns.hs b/Propellor/Property/Dns.hs
index 90556d2d..e47d6c32 100644
--- a/Propellor/Property/Dns.hs
+++ b/Propellor/Property/Dns.hs
@@ -30,7 +30,7 @@ import Data.List
 --
 -- > host "foo.example.com"
 -- >   & ipv4 "192.168.1.1"
--- >   & aka "mail.exmaple.com"
+-- >   & alias "mail.exmaple.com"
 --
 -- Will cause that hostmame and its alias to appear in the zone file,
 -- with the configured IP address.
@@ -134,7 +134,7 @@ namedConfFile = "/etc/bind/named.conf.local"
 -- repository to the SerialNumber.
 --
 -- Handy trick: You don't need to list IPAddrs in the [Record],
--- just make some Host sets its `aka` to the root of domain.
+-- just make some Host sets its `alias` to the root of domain.
 mkSOA :: Domain -> SerialNumber -> [Record] -> SOA
 mkSOA d sn rs = SOA
 	{ sDomain = AbsDomain d
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index e05a8dd3..e5b8d64a 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -183,8 +183,8 @@ memory = runProp "memory"
 
 -- | Link with another container on the same host.
 link :: ContainerName -> ContainerAlias -> Property
-link linkwith alias = genProp "link" $ \hn ->
-	fromContainerId (ContainerId hn linkwith) ++ ":" ++ alias
+link linkwith calias = genProp "link" $ \hn ->
+	fromContainerId (ContainerId hn linkwith) ++ ":" ++ calias
 
 -- | A short alias for a linked container.
 -- Each container has its own alias namespace.
-- 
cgit v1.3-2-g0d8e