From 3aaf31e7a31fbdc12b5864fe3a208a5e721a2869 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 17 May 2016 12:54:19 +0200 Subject: erl_docgen: Add anchors to datatypes without name attribute db_html.xsl generates anchors for data types referred to by strings (instead of 'name' attributes). For example: edge() generates:

edge()

--- lib/erl_docgen/priv/xsl/db_html.xsl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index a3c71fea15..c2d7d40446 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -383,9 +383,7 @@ - - - + @@ -1855,6 +1853,7 @@ + @@ -1911,7 +1910,14 @@ -
+ + +
+ + +
+ + -- cgit v1.2.3 From 29b7e1762d69d4173cba8edb273772f05a215083 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 17 May 2016 13:00:49 +0200 Subject: erts: Remove no longer needed anchors in documentation --- erts/doc/src/erlang.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index e0723127f2..8724139c01 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -52,7 +52,6 @@ ext_binary() -

A binary data object, structured according to the Erlang external term format.

 -- cgit v1.2.3 From b6842ff94eed329463cc9398ba788a61c864d71a Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 17 May 2016 13:01:47 +0200 Subject: stdlib: Remove no longer needed anchors in documentation --- lib/stdlib/doc/src/digraph.xml | 2 -- lib/stdlib/doc/src/digraph_utils.xml | 7 ------- lib/stdlib/doc/src/erl_anno.xml | 4 ++-- lib/stdlib/doc/src/erl_parse.xml | 12 ++++-------- lib/stdlib/doc/src/ets.xml | 3 +-- lib/stdlib/doc/src/sofs.xml | 3 +-- 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml index 16dd789caf..1bb8eef247 100644 --- a/lib/stdlib/doc/src/digraph.xml +++ b/lib/stdlib/doc/src/digraph.xml @@ -104,14 +104,12 @@ edge() -

vertex() -

diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml index 9bddee546f..e481711c50 100644 --- a/lib/stdlib/doc/src/digraph_utils.xml +++ b/lib/stdlib/doc/src/digraph_utils.xml @@ -120,13 +120,6 @@ considering all edges undirected.

- - - digraph() -

- A digraph as returned by digraph:new/0,1.

 - - diff --git a/lib/stdlib/doc/src/erl_anno.xml b/lib/stdlib/doc/src/erl_anno.xml index ddc8b8c765..9f775943c1 100644 --- a/lib/stdlib/doc/src/erl_anno.xml +++ b/lib/stdlib/doc/src/erl_anno.xml @@ -5,7 +5,7 @@
2015 - 2015 + 2016 Ericsson AB, All Rights Reserved @@ -103,7 +103,7 @@ anno() -

A collection of annotations.

+

A collection of annotations.

 diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index 13be488c33..32fce16d68 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -45,26 +45,22 @@ abstract_clause() -

- Abstract form of an Erlang clause.

+

Abstract form of an Erlang clause.

 abstract_expr() -

- Abstract form of an Erlang expression.

+

Abstract form of an Erlang expression.

 abstract_form() -

- Abstract form of an Erlang form.

+

Abstract form of an Erlang form.

 abstract_type() -

- Abstract form of an Erlang type.

+

Abstract form of an Erlang type.

 diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 2d69c201bc..0fdcf8282f 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -134,8 +134,7 @@ continuation() -

- Opaque continuation used by +

Opaque continuation used by select/1,3, select_reverse/1,3, diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml index cf0855bc85..1e5be367bd 100644 --- a/lib/stdlib/doc/src/sofs.xml +++ b/lib/stdlib/doc/src/sofs.xml @@ -399,8 +399,7 @@ fun(S) -> sofs:partition(1, S) end tuple_of(T) -

- A tuple where the elements are of type T.

 +

A tuple where the elements are of type T.

 -- cgit v1.2.3 From 348227049f0183854adea2d71d9555fda0ed19c8 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 17 May 2016 13:01:57 +0200 Subject: kernel: Remove no longer needed anchors in documentation --- lib/kernel/doc/src/application.xml | 3 +-- lib/kernel/doc/src/file.xml | 3 +-- lib/kernel/doc/src/gen_sctp.xml | 6 ++---- lib/kernel/doc/src/gen_tcp.xml | 3 +-- lib/kernel/doc/src/gen_udp.xml | 1 - lib/kernel/doc/src/inet.xml | 4 ++-- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml index 3928078932..8d33aa86e7 100644 --- a/lib/kernel/doc/src/application.xml +++ b/lib/kernel/doc/src/application.xml @@ -62,8 +62,7 @@ tuple_of(T) -

- A tuple where the elements are of type T.

 +

A tuple where the elements are of type T.

 diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml index a73038ac58..7d86c3ebcb 100644 --- a/lib/kernel/doc/src/file.xml +++ b/lib/kernel/doc/src/file.xml @@ -90,8 +90,7 @@ fd() -

- A file descriptor representing a file opened in +

A file descriptor representing a file opened in raw mode.

 diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml index 57307cd594..737800c6b1 100644 --- a/lib/kernel/doc/src/gen_sctp.xml +++ b/lib/kernel/doc/src/gen_sctp.xml @@ -72,8 +72,7 @@ assoc_id() -

- An opaque term returned in, for example, #sctp_paddr_change{}, +

An opaque term returned in, for example, #sctp_paddr_change{}, which identifies an association for an SCTP socket. The term is opaque except for the special value 0, which has a meaning such as "the whole endpoint" or "all future associations".

@@ -88,12 +87,11 @@ - sctp_socket() -

Socket identifier returned from +

Socket identifier returned from open/*.

 diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml index 919178195f..8bd94892ad 100644 --- a/lib/kernel/doc/src/gen_tcp.xml +++ b/lib/kernel/doc/src/gen_tcp.xml @@ -79,8 +79,7 @@ do_recv(Sock, Bs) -> socket() -

- As returned by +

As returned by accept/1,2 and connect/3,4.

diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml index 906883ed34..3db291600d 100644 --- a/lib/kernel/doc/src/gen_udp.xml +++ b/lib/kernel/doc/src/gen_udp.xml @@ -45,7 +45,6 @@ socket() -

As returned by open/1,2.

 diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index cfff393b8c..bca04aa244 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -4,7 +4,7 @@
- 19972015 + 19972016 Ericsson AB. All Rights Reserved. @@ -128,7 +128,7 @@ fe80::204:acff:fe17:bf38 socket() -

See +

See gen_tcp:type-socket and gen_udp:type-socket. -- cgit v1.2.3