Gyani Ji,
Sat Sri Akal.I am faced with a difficulty when someone says 'Waheguru ji ka Khalsa,Waheguru ji ki Fateh' to me.I have not taken Amrit,so am I entitled to respond back with 'Waheguru ji ka Khalsa,Waheguru ji ki Fateh' ?--because then I am calling myself 'Waheguru ji ka Khalsa' which is not true.Hope you can resolve my difficulty.
Reference:: Sikh Philosophy Network http://www.sikhphilosophy.net/sidh-gosht/5308-sidh-gosht-pauri-1-guru-granth.html
I've just had a look at the website you mentioned.It would be better if someone could dedicate a few web-pages to explaining gurbani vyaakaran/grammar both in Punjabi and English for ready reference.Anyway,hope to pick up some grammar as you go on explaining more pauris of Sidh Goshth.
Reference:: Sikh Philosophy Network http://www.sikhphilosophy.net/showthread.php?t=5308
Regards and bhul chuk maaf,
Jagmeet