diff options
| author | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
| commit | 42ef7086abd717e7a428804fe387b782abab9827 (patch) | |
| tree | b4e8bab2dc224ee0d71bd522fbd0bc36a2b69550 /erts/doc/src/driver_entry.xml | |
| parent | 30a9f962d349f322f389ebc056e972f871e689a8 (diff) | |
| parent | 9022ef27b8628ca680654d542b4d520426480c2d (diff) | |
| download | otp-42ef7086abd717e7a428804fe387b782abab9827.tar.gz otp-42ef7086abd717e7a428804fe387b782abab9827.tar.bz2 otp-42ef7086abd717e7a428804fe387b782abab9827.zip | |
Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'erts/doc/src/driver_entry.xml')
| -rw-r--r-- | erts/doc/src/driver_entry.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml index dfddbb18ea..7860d83d83 100644 --- a/erts/doc/src/driver_entry.xml +++ b/erts/doc/src/driver_entry.xml @@ -121,7 +121,7 @@ typedef struct erl_drv_entry { the port */ void (*ready_input)(ErlDrvData drv_data, ErlDrvEvent event); /* called when we have input from one of - the driver's handles) */ + the driver's handles */ void (*ready_output)(ErlDrvData drv_data, ErlDrvEvent event); /* called when output is possible to one of the driver's handles */ |