diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
| commit | 17370895fde2d210bb50dfaa1c89fe6601de3467 (patch) | |
| tree | 2797d5e061b7948a53f270f9ccfcc31b1c0ad6f5 /doc | |
| parent | fa141e676e82cd20082779c086d1fef6427fdc20 (diff) | |
| parent | 393416b170d6e4b2b7406418d63c7be2aefda70f (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 6 | ||||
| -rw-r--r-- | doc/audio-api.txt | 4 | ||||
| -rw-r--r-- | doc/input-api.txt | 2 | ||||
| -rw-r--r-- | doc/network-api.txt | 2 | ||||
| -rw-r--r-- | doc/serial-api.txt | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 561741e7..190ea3fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -26,5 +26,7 @@ else EXTRA_DIST = $(DOC_MAIN_SGML_FILE) $(content_files) endif -EXTRA_DIST += manager-api.txt adapter-api.txt device-api.txt agent-api.txt \ - serial-api.txt network-api.txt input-api.txt audio-api.txt +EXTRA_DIST += manager-api.txt adapter-api.txt device-api.txt \ + service-api.txt agent-api.txt \ + serial-api.txt network-api.txt \ + input-api.txt audio-api.txt diff --git a/doc/audio-api.txt b/doc/audio-api.txt index b9f0a920..59ef8354 100644 --- a/doc/audio-api.txt +++ b/doc/audio-api.txt @@ -11,7 +11,7 @@ Headset hierarchy Service org.bluez Interface org.bluez.Headset -Object path /{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX +Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX Methods void Connect() @@ -102,7 +102,7 @@ Sink hierarchy Service org.bluez Interface org.bluez.Sink -Object path /{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX +Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX Methods void Connect() diff --git a/doc/input-api.txt b/doc/input-api.txt index c0816eec..46de8387 100644 --- a/doc/input-api.txt +++ b/doc/input-api.txt @@ -9,7 +9,7 @@ Input hierarchy Service org.bluez Interface org.bluez.Input -Object path /{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX +Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX Methods void Connect() diff --git a/doc/network-api.txt b/doc/network-api.txt index 85171711..72958dff 100644 --- a/doc/network-api.txt +++ b/doc/network-api.txt @@ -9,7 +9,7 @@ Network hierarchy Service org.bluez Interface org.bluez.Network -Object path /{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX +Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX Methods string Connect(string uuid) diff --git a/doc/serial-api.txt b/doc/serial-api.txt index 21c4f220..ce933b64 100644 --- a/doc/serial-api.txt +++ b/doc/serial-api.txt @@ -9,7 +9,7 @@ Serial hierarchy Service org.bluez Interface org.bluez.Serial -Object path /{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX +Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX Methods string Connect(string uuid) |