aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src/ref_man.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-10 09:26:04 +0200
committerIngela Anderton Andin <[email protected]>2015-09-10 09:26:04 +0200
commitd8d05299cc1f6a172721ed056c19d5c8ed513ea8 (patch)
tree397d9df878fd865260877139e3d512d40ff1b4f4 /lib/inets/doc/src/ref_man.xml
parent45f29845fea2fa036e03f0faf451ca98813b3112 (diff)
parent628f8cff34f9784cfa34857bcd7133305acc3d27 (diff)
downloadotp-d8d05299cc1f6a172721ed056c19d5c8ed513ea8.tar.gz
otp-d8d05299cc1f6a172721ed056c19d5c8ed513ea8.tar.bz2
otp-d8d05299cc1f6a172721ed056c19d5c8ed513ea8.zip
Merge branch 'ia/tmanevik_inets/doc' into maint
* ia/tmanevik_inets/doc: inets: Fix broken links inets: Fix copy paste error inets: ftp - Remove information about alternative solutions inets: httpd - Add links and small corrections inets: httpc - Clarify/correct documentation inets: Align with alphabetical order and clean local anchor handling inets: ftp - add links and fix typos inets: Use ASSCI ' Inets Reference Manual Inets User Guide inets: sorted functions alphabetically inets: Remove documentation of legacy API
Diffstat (limited to 'lib/inets/doc/src/ref_man.xml')
-rw-r--r--lib/inets/doc/src/ref_man.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/inets/doc/src/ref_man.xml b/lib/inets/doc/src/ref_man.xml
index bcebcc0fd4..27021ea09a 100644
--- a/lib/inets/doc/src/ref_man.xml
+++ b/lib/inets/doc/src/ref_man.xml
@@ -30,16 +30,15 @@
<file>ref_man.xml</file>
</header>
<description>
- <p>Inets is a container for Internet clients and
- servers. Currently a FTP client, a HTTP client and server, and
- a tftp client and server has been incorporated in Inets.</p>
+ <p><c>Inets</c> is a container for Internet clients and
+ servers. An FTP client, an HTTP client and server, and
+ a TFTP client and server are incorporated in <c>Inets</c>.</p>
</description>
<xi:include href="inets.xml"/>
<xi:include href="ftp.xml"/>
<xi:include href="tftp.xml"/>
<xi:include href="httpc.xml"/>
<xi:include href="httpd.xml"/>
- <xi:include href="httpd_conf.xml"/>
<xi:include href="httpd_custom_api.xml"/>
<xi:include href="httpd_socket.xml"/>
<xi:include href="httpd_util.xml"/>