From cb24e182f85cb09557a980c674b45b3273d68a68 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Wed, 23 Jul 2014 08:17:24 -0400
Subject: Update aliases/anope.conf.example

---
 docs/conf/aliases/anope.conf.example | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/docs/conf/aliases/anope.conf.example b/docs/conf/aliases/anope.conf.example
index 406adc29a..4d1441473 100644
--- a/docs/conf/aliases/anope.conf.example
+++ b/docs/conf/aliases/anope.conf.example
@@ -6,9 +6,6 @@
 <alias text="HOSTSERV" replace="PRIVMSG HostServ :$2-" requires="HostServ" uline="yes">
 <alias text="BOTSERV" replace="PRIVMSG BotServ :$2-" requires="BotServ" uline="yes">
 
-# Note: We can't have a shorthand version of this, it conflicts with HS for helpserv
-<alias text="HELPSERV" replace="PRIVMSG HelpServ :$2-" requires="HelpServ" uline="yes">
-
 # Shorthand aliases for nickserv, chanserv, operserv, memoserv, hostserv, botserv
 <alias text="NS" replace="PRIVMSG NickServ :$2-" requires="NickServ" uline="yes">
 <alias text="CS" replace="PRIVMSG ChanServ :$2-" requires="ChanServ" uline="yes">
@@ -17,11 +14,7 @@
 <alias text="HS" replace="PRIVMSG HostServ :$2-" requires="HostServ" uline="yes">
 <alias text="BS" replace="PRIVMSG BotServ :$2-" requires="BotServ" uline="yes">
 
-
-# /id [channel] <password>
-# Identify for a channel or nickname
-<alias text="ID" format="#*" replace="PRIVMSG ChanServ :IDENTIFY $2 $3" requires="ChanServ" uline="yes">
-<alias text="ID" format="*" replace="PRIVMSG NickServ :IDENTIFY $2" requires="NickServ" uline="yes">
-<alias text="IDENTIFY" format="#*" replace="PRIVMSG ChanServ :IDENTIFY $2 $3" requires="ChanServ" uline="yes">
-<alias text="IDENTIFY" format="*" replace="PRIVMSG NickServ :IDENTIFY $2" requires="NickServ" uline="yes">
-
+# /id [account] <password>
+# Identify for a nickname
+<alias text="ID" format="*" replace="PRIVMSG NickServ :IDENTIFY $2-" requires="NickServ" uline="yes">
+<alias text="IDENTIFY" format="*" replace="PRIVMSG NickServ :IDENTIFY $2-" requires="NickServ" uline="yes">
-- 
cgit v1.2.3