diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-19 14:39:10 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-19 14:39:10 +0100 |
| commit | 4b53c65a82eaf2be3741a9551435432d051e2734 (patch) | |
| tree | 1d5a383bd19254fe376ae964d7ef5af75aff2eb4 | |
| parent | 36533bf6bfc01f56afd6a8cd7bd3dfa9de87297b (diff) | |
Update help text for "set oauth" with what's supported now. Also adding a
"make testhelp" target to easily see if the current helpfile is loadable.
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | doc/user-guide/commands.xml | 4 |
2 files changed, 14 insertions, 5 deletions
@@ -26,12 +26,14 @@ endif # Expansion of variables subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o) -all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) systemd - $(MAKE) -C doc +all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) doc systemd ifdef SKYPE_PI $(MAKE) -C protocols/skype doc endif +doc: + $(MAKE) -C doc + uninstall: uninstall-bin uninstall-doc @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n' @@ -42,7 +44,7 @@ install: install-bin install-doc install-plugins install-systemd .PHONY: install install-bin install-etc install-doc install-plugins install-systemd \ uninstall uninstall-bin uninstall-etc uninstall-doc \ - all clean distclean tar $(subdirs) + all clean distclean tar $(subdirs) doc Makefile.settings: @echo @@ -188,5 +190,12 @@ ctags: helloworld: @echo Hello World +# Check if we can load the helpfile. (This fails if some article is >1KB.) +# If print returns a NULL pointer, the file is unusable. +testhelp: doc + gdb --eval-command='b main' --eval-command='r' \ + --eval-command='print help_init(&global->helpfile, "doc/user-guide/help.txt")' \ + $(OUTFILE) < /dev/null + -include .depend/*.d # DO NOT DELETE diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 3329c9b3..9bb2b9c8 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -1125,11 +1125,11 @@ <description> <para> - This enables OAuth authentication for accounts that support it; right now Twitter and Google Talk (if you have 2-factor authentication enabled on your account) support it. + This enables OAuth authentication for an IM account; right now the Twitter (working for Twitter only) and Jabber (for Google Talk, Facebook and MSN Messenger) module support it. </para> <para> - With OAuth enabled, you shouldn't tell BitlBee your Twitter password. Just add your account with a bogus password and type <emphasis>account on</emphasis>. BitlBee will then give you a URL to authenticate with the service. If this succeeds, you will get a PIN code which you can give back to BitlBee to finish the process. + With OAuth enabled, you shouldn't tell BitlBee your account password. Just add your account with a bogus password and type <emphasis>account on</emphasis>. BitlBee will then give you a URL to authenticate with the service. If this succeeds, you will get a PIN code which you can give back to BitlBee to finish the process. </para> <para> |