aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/installation_guide
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2015-03-17 12:11:02 +0100
committerRickard Green <[email protected]>2015-03-17 12:11:02 +0100
commit281892c5d7b7b5e1ac2402390d83287913aefd94 (patch)
tree31958d050a5d1cad34295ecd324e4fbc470ff884 /system/doc/installation_guide
parent5389ac364e76593ab436e1597fe39d93af1caf3c (diff)
parentb3e72b5969a3dd7d22e67b2484e3ba390975a034 (diff)
downloadotp-281892c5d7b7b5e1ac2402390d83287913aefd94.tar.gz
otp-281892c5d7b7b5e1ac2402390d83287913aefd94.tar.bz2
otp-281892c5d7b7b5e1ac2402390d83287913aefd94.zip
Merge branch 'maint'
* maint: Add support for patching of individual applications Conflicts: system/doc/installation_guide/part.xml
Diffstat (limited to 'system/doc/installation_guide')
-rw-r--r--system/doc/installation_guide/Makefile6
-rw-r--r--system/doc/installation_guide/part.xml1
-rw-r--r--system/doc/installation_guide/xmlfiles.mk3
3 files changed, 7 insertions, 3 deletions
diff --git a/system/doc/installation_guide/Makefile b/system/doc/installation_guide/Makefile
index 83210bd21f..a4ef6c9d7c 100644
--- a/system/doc/installation_guide/Makefile
+++ b/system/doc/installation_guide/Makefile
@@ -58,7 +58,8 @@ XML_FILES = \
GENERATED_XML_FILES = \
INSTALL.xml \
INSTALL-CROSS.xml \
- INSTALL-WIN32.xml
+ INSTALL-WIN32.xml \
+ OTP-PATCH-APPLY.xml
# ----------------------------------------------------
@@ -73,7 +74,8 @@ REDIRECT_HTML_DIR = $(HTMLDIR)/source
REDIRECT_HTML_FILES = \
$(REDIRECT_HTML_DIR)/INSTALL.html \
$(REDIRECT_HTML_DIR)/INSTALL-CROSS.html \
- $(REDIRECT_HTML_DIR)/INSTALL-WIN32.html
+ $(REDIRECT_HTML_DIR)/INSTALL-WIN32.html \
+ $(REDIRECT_HTML_DIR)/OTP-PATCH-APPLY.html
# ----------------------------------------------------
# FLAGS
diff --git a/system/doc/installation_guide/part.xml b/system/doc/installation_guide/part.xml
index 96a43d744b..5b1b3833cd 100644
--- a/system/doc/installation_guide/part.xml
+++ b/system/doc/installation_guide/part.xml
@@ -36,4 +36,5 @@
<xi:include href="INSTALL.xml"/>
<xi:include href="INSTALL-CROSS.xml"/>
<xi:include href="INSTALL-WIN32.xml"/>
+ <xi:include href="OTP-PATCH-APPLY.xml"/>
</part>
diff --git a/system/doc/installation_guide/xmlfiles.mk b/system/doc/installation_guide/xmlfiles.mk
index c443334cd7..a18c82bc25 100644
--- a/system/doc/installation_guide/xmlfiles.mk
+++ b/system/doc/installation_guide/xmlfiles.mk
@@ -20,4 +20,5 @@ INST_GUIDE_CHAPTER_FILES = \
install-binary.xml \
INSTALL.xml \
INSTALL-CROSS.xml \
- INSTALL-WIN32.xml
+ INSTALL-WIN32.xml \
+ OTP-PATCH-APPLY.xml