Merge branches 'master' and 'master' of ssh://rootserver/home/lennart/git/public...

[catta] / avahi-common / alternative.h

diff --git a/avahi-common/alternative.h b/avahi-common/alternative.h
index fa45d96192abe76fb0afa9b02e58c0cac640acd4..f4216f6cff6543dd89902453d9aa11314a98d83e 100644 (file)
--- a/avahi-common/alternative.h
+++ b/avahi-common/alternative.h
@@ -26,24 +26,20 @@
 
 #include <avahi-common/cdecl.h>
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
-#endif
 
 /** Find an alternative for the specified host name. If called with an
- * original host name, "2" is appended, Afterwards the number is
- * increased on each call. (i.e. "foo" becomes "foo2" becomes "foo3"
+ * original host name, "-2" is appended, afterwards the number is
+ * increased on each call. (i.e. "foo" becomes "foo-2" becomes "foo-3"
  * and so on.) avahi_free() the result. */
 char *avahi_alternative_host_name(const char *s);
 
 /** Find an alternative for the specified service name. If called with
-    an original service name, " #2" is appended. Afterwards the number
-    is increased on each call (i.e. "foo" becomes "foo #2" becomes
-    "foo #3" and so on.) avahi_free() the result. */
+ * an original service name, " #2" is appended. Afterwards the number
+ * is increased on each call (i.e. "foo" becomes "foo #2" becomes "foo
+ * #3" and so on.) avahi_free() the result. */
 char *avahi_alternative_service_name(const char *s);
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_END
-#endif
 
 #endif