Merge FAQ

When I did a Google search on "mozilla calendar faq", I got these two 
places:
https://support.mozilla.org/en-US/kb/calendar-lightning-and-sunbird-faq
https://wiki.mozilla.org/Calendar:FAQ

It would be better to merge them into one place (and of course place a 
link in another place to point back).

I have a little spare time (about an hour per week :D ).  I could help 
to merge them if needed.  For this, I would need to know the procedure.

PS: The "official" FAQ at 
http://www.mozilla.org/projects/calendar/faq.htm no longer exists.