diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-01 22:44:34 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-01 22:44:34 +0000 |
| commit | 85a2885d4d8b0682d75f63ec7642c91509bc92bc (patch) | |
| tree | 54be8ef17eee6eca550e1c721f215084edc0c53e /main/manager.c | |
| parent | 499ccb7760af9f6c38d1729d0580faaa1f0252ca (diff) | |
Merged revisions 185912 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r185912 | tilghman | 2009-04-01 15:13:28 -0500 (Wed, 01 Apr 2009) | 4 lines
Merge changes from str_substitution that are unrelated to that branch.
Included is a small bugfix to an ast_str helper, but most of these changes
are simply doxygen fixes.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@185947 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index b5cc844bd..2282417c7 100644 --- a/main/manager.c +++ b/main/manager.c @@ -499,7 +499,7 @@ static struct ast_manager_user *get_manager_by_name_locked(const char *name) } /*! \brief Get displayconnects config option. - * \param s manager session to get parameter from. + * \param session manager session to get parameter from. * \return displayconnects config option value. */ static int manager_displayconnects (struct mansession_session *session) |