From a3afcff92485b6a696e40359a7d0300d4661e9c1 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Fri, 13 May 2016 08:04:51 +0200 Subject: Make it possible to run xmllint target in system documentation --- system/doc/system_principles/versions.xml | 4 ++-- system/doc/top/Makefile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'system') diff --git a/system/doc/system_principles/versions.xml b/system/doc/system_principles/versions.xml index 3772d773fc..b9f7fa4bf6 100644 --- a/system/doc/system_principles/versions.xml +++ b/system/doc/system_principles/versions.xml @@ -57,11 +57,11 @@

In an OTP source code tree, the OTP version can be read from the text file <OTP source root>/OTP_VERSION. The absolute path to the file can be constructed by calling - filename:join([code:root_dir(), "OTP_VERSION"]).

+ filename:join([code:root_dir(), "OTP_VERSION"]).

In an installed OTP development system, the OTP version can be read from the text file <OTP installation root>/releases/<OTP release number>/OTP_VERSION. The absolute path to the file can by constructed by calling - filename:join([code:root_dir(), "releases", erlang:system_info(otp_release), "OTP_VERSION"]).

+ filename:join([code:root_dir(), "releases", erlang:system_info(otp_release), "OTP_VERSION"]).

If the version read from the OTP_VERSION file in a development system has a ** suffix, the system has been patched using the diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile index caae19a8d1..6aa9d8d340 100644 --- a/system/doc/top/Makefile +++ b/system/doc/top/Makefile @@ -74,6 +74,7 @@ XML_FILES = \ BOOK_FILES = book.xml +XMLLINT_SRCDIRS= ../installation_guide:../system_principles:../embedded:../getting_started:../reference_manual:../programming_examples:../efficiency_guide:../tutorial:../design_principles:../oam HTMLDIR= ../html PDFREFDIR= pdf -- cgit v1.2.3 From 3664cd6ae6671c04217070e3c5e9d5938e0423bf Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Tue, 17 May 2016 08:40:03 +0200 Subject: Correct usage of marker tag --- system/doc/design_principles/sup_princ.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'system') diff --git a/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml index a77b3964fc..0a24e97950 100644 --- a/system/doc/design_principles/sup_princ.xml +++ b/system/doc/design_principles/sup_princ.xml @@ -80,8 +80,8 @@ init(_Args) ->

- Supervisor Flags + Supervisor Flags

This is the type definition for the supervisor flags:

strategy(), % optional @@ -106,9 +106,8 @@ sup_flags() = #{strategy => strategy(), % optional
- + Restart Strategy -

The restart strategy is specified by the strategy key in the supervisor flags map returned by the callback function init:

-- cgit v1.2.3 From ac4db4074d33ecb86f433e032b8bcfc7883e8f36 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Wed, 25 May 2016 14:42:45 +0200 Subject: Remove usage of non dtd defined tag () --- system/doc/system_principles/create_target.xmlsrc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'system') diff --git a/system/doc/system_principles/create_target.xmlsrc b/system/doc/system_principles/create_target.xmlsrc index 8a463076f5..f9b27ffc35 100644 --- a/system/doc/system_principles/create_target.xmlsrc +++ b/system/doc/system_principles/create_target.xmlsrc @@ -374,10 +374,10 @@ os> /usr/local/erl-target/bin/to_erl /tmp/erlang.pipe.1 

 2> release_handler:install_release(Vsn).
-{continue_after_restart,"FIRST",[]}
+{continue_after_restart,"FIRST",[]}
 heart: Tue Apr  1 12:15:10 2014: Erlang has closed.
 heart: Tue Apr  1 12:15:11 2014: Executed "/usr/local/erl-target/bin/start /usr/local/erl-target/releases/new_start_erl.data" -> 0. Terminating.
-[End]
+[End]

The above return value and output after the call to release_handler:install_release/1 means that the @@ -398,12 +398,12 @@ os> /usr/local/erl-target/bin/to_erl /tmp/erlang.pipe.2 

 1> release_handler:which_releases().
-[{"MYSYSTEM","SECOND",
+[{"MYSYSTEM","SECOND",
   ["kernel-3.0","stdlib-2.0","sasl-2.4","pea-2.0"],
   current},
  {"MYSYSTEM","FIRST",
   ["kernel-2.16.4","stdlib-1.19.4","sasl-2.3.4","pea-1.0"],
-  permanent}]
+ permanent}]

Our new release, "SECOND", is now the current release, but we can also see that our "FIRST" release is still permanent. This @@ -420,12 +420,12 @@ os> /usr/local/erl-target/bin/to_erl /tmp/erlang.pipe.2 

 3> release_handler:which_releases().
-[{"MYSYSTEM","SECOND",
+[{"MYSYSTEM","SECOND",
   ["kernel-3.0","stdlib-2.0","sasl-2.4","pea-2.0"],
   permanent},
  {"MYSYSTEM","FIRST",
   ["kernel-2.16.4","stdlib-1.19.4","sasl-2.3.4","pea-1.0"],
-  old}]
+ old}]

We see that the new release version is permanent, so it would be safe to restart the node.

-- cgit v1.2.3