10 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Lance Stout	bd85e95398	Gah, too many branch conflicts.	2012-01-18 15:34:49 -08:00
Lance Stout	22cc194ed8	Merge branch 'docs' of github.com:fritzy/SleekXMPP into docs ... Conflicts: docs/index.rst	2012-01-18 15:34:12 -08:00
Lance Stout	79b71228c1	Fix some more merge conflicts.	2012-01-18 15:31:45 -08:00
Lance Stout	3575084640	Update home page to include bot example, and example of using a plugin.	2012-01-18 14:24:23 -08:00
Lance Stout	738ec92b8e	Fix a few typos.	2012-01-05 13:11:42 -05:00
Lance Stout	be9e26b4a3	Apply Te-Je's MUC guide patch.	2012-01-05 13:09:20 -05:00
Lance Stout	b345c227b2	More &yet branding	2012-01-05 13:07:44 -05:00
Lance Stout	c7e95c8dec	Add &yet contact info	2012-01-05 12:28:30 -05:00
Lance Stout	3a4e3d3f51	Update doc settings to new theme, add examples, use 1.0	2012-01-05 12:13:06 -05:00
Lance Stout	97378998a5	Break the docs out into their own branch.	2012-01-05 11:31:54 -05:00