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 /lib/xmerl/src/xmerl_xpath.erl | |
| 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 'lib/xmerl/src/xmerl_xpath.erl')
| -rw-r--r-- | lib/xmerl/src/xmerl_xpath.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl index e654a8ef1d..c803af3631 100644 --- a/lib/xmerl/src/xmerl_xpath.erl +++ b/lib/xmerl/src/xmerl_xpath.erl @@ -19,8 +19,8 @@ %% Description : Implements a search engine based on XPath -%% @doc The xmerl_xpath module handles the entire XPath 1.0 spec -%% XPath expressions typically occurs in XML attributes and are used to addres +%% @doc The xmerl_xpath module handles the entire XPath 1.0 spec. +%% XPath expressions typically occur in XML attributes and are used to address %% parts of an XML document. % The grammar is defined in <code>xmerl_xpath_parse.yrl</code>. % The core functions are defined in <code>xmerl_xpath_pred.erl</code>. |