diff options
| author | Zandra Hird <[email protected]> | 2015-02-13 15:11:21 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-02-13 15:11:21 +0100 |
| commit | 8d5f78e2ea54df8d17863f5b5d531a93c28f0092 (patch) | |
| tree | 4d02b35bafb38a2464446a591c1b8fb317d3f0e7 | |
| parent | 8373b3dee3c44b9afda0bf7bf5793c81d1b62d55 (diff) | |
| parent | 61ba469b7c5aa2ea68eba3268544543be5d7b0d6 (diff) | |
| download | otp-8d5f78e2ea54df8d17863f5b5d531a93c28f0092.tar.gz otp-8d5f78e2ea54df8d17863f5b5d531a93c28f0092.tar.bz2 otp-8d5f78e2ea54df8d17863f5b5d531a93c28f0092.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/mnesia/doc/src/Mnesia_chap5.xmlsrc | 1 | ||||
| -rw-r--r-- | lib/mnesia/doc/src/mnesia.xml | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc index 65b950bd46..127c23e0f7 100644 --- a/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc +++ b/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc @@ -867,6 +867,7 @@ ok </section> <section> + <marker id="event_handling"></marker> <title>Mnesia Event Handling</title> <p>System events and table events are the two categories of events that Mnesia will generate in various situations. diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml index 3eeb6f0247..c094899111 100644 --- a/lib/mnesia/doc/src/mnesia.xml +++ b/lib/mnesia/doc/src/mnesia.xml @@ -2188,12 +2188,13 @@ mnesia:create_table(employee, </desc> </func> <func> - <name>subscribe(EventCategory)</name> + <name>subscribe(EventCategory) -> {ok, Node} | {error, Reason} </name> <fsummary>Subscribe to events of type <c>EventCategory</c>.</fsummary> <desc> <p>Ensures that a copy of all events of type <c>EventCategory</c> are sent to the caller. The event - types available are described in the Mnesia User's Guide.</p> + types available are described in the Mnesia User's Guide at <seealso marker="Mnesia_chap5#event_handling">Mnesia Event Handling</seealso>.</p> + <p><c>Node</c> is the local node. For table events to be subscribed, mnesia must have a readable local copy of the table on the node.</p> </desc> </func> <func> @@ -2861,11 +2862,12 @@ raise(Name, Amount) -> </desc> </func> <func> - <name>unsubscribe(EventCategory)</name> + <name>unsubscribe(EventCategory) -> {ok, Node} | {error, Reason} </name> <fsummary>Subscribe to events of type <c>EventCategory</c>.</fsummary> <desc> <p>Stops sending events of type <c>EventCategory</c> to the caller.</p> + <p><c>Node</c> is the local node.</p> </desc> </func> <func> |