laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-mgw/+/14681 )
Change subject: doc: Add Osmux documentation to OsmoMGW User Manual
......................................................................
doc: Add Osmux documentation to OsmoMGW User Manual
Depends: osmo-gsm-manuals.git I182d94c63f7d74ef882b77be59a95b1b7d8a4e5e
Change-Id: Ie53f98777070fc00ed085646f698d20f8cf49553
---
M doc/manuals/chapters/mgcp_extensions.adoc
M doc/manuals/osmomgw-usermanual.adoc
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/doc/manuals/chapters/mgcp_extensions.adoc
b/doc/manuals/chapters/mgcp_extensions.adoc
index a68d785..df314bc 100644
--- a/doc/manuals/chapters/mgcp_extensions.adoc
+++ b/doc/manuals/chapters/mgcp_extensions.adoc
@@ -66,3 +66,7 @@
a=rtpmap:97 GSM-EFR/8000
a=ptime:40
----
+
+=== `X-Osmux`
+
+See <<mgcp-extension-osmux>>
diff --git a/doc/manuals/osmomgw-usermanual.adoc
b/doc/manuals/osmomgw-usermanual.adoc
index b0bc83d..0c26449 100644
--- a/doc/manuals/osmomgw-usermanual.adoc
+++ b/doc/manuals/osmomgw-usermanual.adoc
@@ -20,6 +20,8 @@
include::{srcdir}/chapters/mgcp_extensions.adoc[]
+include::./common/chapters/osmux/osmux.adoc[]
+
//include::{srcdir}/chapters/counters.adoc[]
include::./common/chapters/port_numbers.adoc[]
@@ -29,5 +31,3 @@
include::./common/chapters/glossary.adoc[]
include::./common/chapters/gfdl.adoc[]
-
-
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/14681
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ie53f98777070fc00ed085646f698d20f8cf49553
Gerrit-Change-Number: 14681
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged