rework service database, pacth from uws (closes #117)

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1412 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/service-type-database/service-types b/service-type-database/service-types
index 45b4b189b33d25ea96905165d0f1d5d15b0da531..6ede09d856e4a471d5aca478d1c7c269f49780ea 100644 (file)
--- a/service-type-database/service-types
+++ b/service-type-database/service-types
@@ -30,32 +30,56 @@
 ### documentation. If you're looking for the correct service type to
 ### use for your application please refer to the URL mentioned above.
 
+
+# Devices
+
+_workstation._tcp:Workstation
+_workstation._tcp[de]:Arbeitsplatzrechner
+
+
+# Web
+
 _http._tcp:Web Site
 _http._tcp[de]:Web-Angebot
 
 _https._tcp:Secure Web Site
 _https._tcp[de]:Sicheres Web-Angebot
 
+_rss._tcp:Web Syndication RSS
+
+
+# Network
+
+_domain._udp:DNS Server
+_domain._udp[de]: DNS-Dienst
+
+_ntp._udp:NTP Time Server
+
+_smb._tcp:Microsoft Windows Network
+
+_airport._tcp:Apple AirPort
+
+
+# File and data access
+
 _ftp._tcp:FTP File Transfer
-_ftp._tcp[de]:FTP Dateifreigabe
+_ftp._tcp[de]:FTP-Dateifreigabe
 
-_h323._tcp:H.323 Telephony
-_h323._tcp[de]:H.323 Telefonie
+_webdav._tcp:WebDAV File Share
 
-_sip._udp:SIP Telephony
-_sip._udp[de]:SIP Telefonie
+_webdavs._tcp:Secure WebDAV File Share
 
-_ssh._tcp:SSH Remote Terminal
-_ssh._tcp[de]:SSH Fernzugriff
+_afpovertcp._tcp:Apple File Sharing
 
-_distcc._tcp:Distributed Compiler
-_distcc._tcp[de]:Verteilter Compiler
+_nfs._tcp:Network File System
 
-_daap._tcp:iTunes Audio Access
-_daap._tcp[de]:iTunes Audio-Zugriff
+_apt._tcp:APT Package Repository
 
-_domain._udp:DNS Server
-_domain._udp[de]: DNS Dienst
+
+# Remote access
+
+_ssh._tcp:SSH Remote Terminal
+_ssh._tcp[de]:SSH-Fernzugriff
 
 _imap._tcp:IMAP Mail Access
 
@@ -67,74 +91,86 @@ _sftp-ssh._tcp:SFTP File Transfer
 
 _telnet._tcp:Telnet Remote Terminal
 
-_presence._tcp:iChat Presence
+_timbuktu._tcp:Timbuktu Remote Desktop Control
 
-_webdav._tcp:WebDAV File Share
 
-_webdavs._tcp:Secure WebDAV File Share
-
-_workstation._tcp:Workstation
-_workstation._tcp[de]:Arbeitsplatzrechner
+# Printing
 
 _printer._tcp:UNIX Printer
 
-_afpovertcp._tcp:Apple File Sharing
-
 _pdl-datastream._tcp:PDL Printer
 
 _ipp._tcp:Internet Printer
 
-_rss._tcp:Web Syndication RSS
+
+# Multimedia
+
+_daap._tcp:iTunes Audio Access
+_daap._tcp[de]:iTunes Audio-Zugriff
 
 _dacp._tcp:iTunes Remote Control
 
 _realplayfavs._tcp:RealPlayer Shared Favorites
 
-_timbuktu._tcp:Timbuktu Remote Desktop Control
+_raop._tcp:AirTunes Remote Audio
 
-_see._tcp:SubEthaEdit Collaborative Text Editor
+_rtsp._tcp:RTSP Realtime Streaming Server
+_rtp._udp:RTP Realtime Streaming Server
 
-_postgresql._tcp:PostgreSQL Server
+_dpap._tcp:Digital Photo Sharing
 
-_ksysguard._tcp:KDE System Guard
+_pulse-server._tcp:PulseAudio Sound Server
+_pulse-sink._tcp:PulseAudio Sound Sink
+_pulse-source._tcp:PulseAudio Sound Source
 
-_omni-bookmark._tcp:OmniWeb Bookmark Sharing
+_mpd._tcp:Music Player Daemon
 
-_MacOSXDupSuppress._tcp:MacOS X Duplicate Machine Suppression
 
-_lobby._tcp:Gobby Collaborative Editor Session
+# Communication, presence, working together
 
-_dpap._tcp:Digital Photo Sharing
+_presence._tcp:iChat Presence
 
-_skype._tcp:Skype VoIP
+_sip._udp:SIP Telephony
+_sip._udp[de]:SIP-Telefonie
 
-_airport._tcp:Apple AirPort
+_h323._tcp:H.323 Telephony
+_h323._tcp[de]:H.323-Telefonie
 
-_pulse-server._tcp:PulseAudio Sound Server
-_pulse-sink._tcp:PulseAudio Sound Sink
-_pulse-source._tcp:PulseAudio Sound Source
+_presence_olpc._tcp:OLPC Presence
 
-_mpd._tcp:Music Player Daemon
-_smb._tcp:Microsoft Windows Network
+_iax._udp:Asterisk Exchange
 
-_pgpkey-hkp._tcp:GnuPG/PGP HKP Key Server
+_skype._tcp:Skype VoIP
 
-_ldap._tcp:LDAP Directory Server
+_see._tcp:SubEthaEdit Collaborative Text Editor
 
-_iax._udp:Asterisk Exchange
+_lobby._tcp:Gobby Collaborative Editor Session
 
-_nfs._tcp:Network File System
 
-_ntp._udp:NTP Time Server
+# Databases
 
-_raop._tcp:AirTunes Remote Audio
+_postgresql._tcp:PostgreSQL Server
 
-_rtsp._tcp:RTSP Realtime Streaming Server
-_rtp._udp:RTP Realtime Streaming Server
+
+# Development
 
 _svn._tcp:Subversion Revision Control
 
-_presence_olpc._tcp:OLPC Presence
+_distcc._tcp:Distributed Compiler
+_distcc._tcp[de]:Verteilter Compiler
 
-_apt._tcp:APT Package Repository
 
+# Vendor specific
+
+_MacOSXDupSuppress._tcp:MacOS X Duplicate Machine Suppression
+
+_ksysguard._tcp:KDE System Guard
+
+_omni-bookmark._tcp:OmniWeb Bookmark Sharing
+
+
+# Other
+
+_pgpkey-hkp._tcp:GnuPG/PGP HKP Key Server
+
+_ldap._tcp:LDAP Directory Server