summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/app_meetme.c4
-rw-r--r--doc/tex/qos.tex4
-rw-r--r--doc/tex/realtime.tex3
3 files changed, 7 insertions, 4 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 9f7c14d91..3cc5b551e 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -249,8 +249,8 @@ static const char *descrip =
" 'I' -- announce user join/leave without review\n"
" 'l' -- set listen only mode (Listen only, no talking)\n"
" 'm' -- set initially muted\n"
-" 'M[(<class>]\n"
-" ' -- enable music on hold when the conference has a single caller.\n"
+" 'M[(<class>)]'\n"
+" -- enable music on hold when the conference has a single caller.\n"
" Optionally, specify a musiconhold class to use. If one is not\n"
" provided, it will use the channel's currently set music class,\n"
" or \"default\".\n"
diff --git a/doc/tex/qos.tex b/doc/tex/qos.tex
index 90ddc5244..acbf7f443 100644
--- a/doc/tex/qos.tex
+++ b/doc/tex/qos.tex
@@ -53,8 +53,8 @@ AF31, AF32, AF33, AF41, AF42, AF43 and ef (expedited forwarding),
The tos* parameters also take numeric values.
-NOTE, that on Linux system you can not use ef value if your asterisk running
-from user other then root.
+Note, that on Linux system you can use ef value in case your asterisk is running
+from a user other then root only when you have compiled asterisk with libcap.
The lowdelay, throughput, reliability, mincost, and none values are removed
in current releases.
diff --git a/doc/tex/realtime.tex b/doc/tex/realtime.tex
index 6753d325a..62349f60c 100644
--- a/doc/tex/realtime.tex
+++ b/doc/tex/realtime.tex
@@ -50,6 +50,9 @@ the ones in static configuration.
With caching, the device stays in memory for a specified time. More
information about this is to be found in the sip.conf sample file.
+If you specify a separate family called "sipregs" SIP registration
+data will be stored in that table and not in the "sippeers" table.
+
\subsubsection{Realtime H.323 friends}
Like SIP realtime friends, H.323 friends also can be configured using