summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile9
-rw-r--r--doc/manifest_conf.mk2
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 4c81dfc..ebb086c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,7 +1,7 @@
1#Path to this subsystem's root directory 1#Path to this subsystem's root directory
2SUBSYSROOT := $(shell pwd) 2SUBSYSROOT := $(shell pwd)
3 3
4# NOTE: MANIFESTHASH in manifest_conf.mk needs to be updated with final release tag before a release 4# NOTE: MANIFESTHASH in manifest_conf.mk needs to be the final release tag before a release
5# The manifest_conf.mk defines MANIFESTHASH and MANIFESTURL and PROFILE_NAME 5# The manifest_conf.mk defines MANIFESTHASH and MANIFESTURL and PROFILE_NAME
6include manifest_conf.mk 6include manifest_conf.mk
7 7
@@ -76,8 +76,8 @@ export
76docusage: 76docusage:
77 @echo 'make docusage #Shows this help text' 77 @echo 'make docusage #Shows this help text'
78 @echo ' DOCBOOK_TOOLS_VERSIONS=yes #Displays DocBook tools versions in this machine' 78 @echo ' DOCBOOK_TOOLS_VERSIONS=yes #Displays DocBook tools versions in this machine'
79 @echo 'make doc #Builds the userdoc, does autoinit if needed' 79 @echo 'make doc #Builds the userdoc, does automatically also init if needed'
80 @echo 'make dist BOOK_DIST_DIR=xx/doc #Builds all and copies results to BOOK_DIST_DIR' 80 @echo 'make dist BOOK_DIST_DIR=xx/doc #Builds doc and copies results to BOOK_DIST_DIR'
81 @echo ' #Does not work with DOCBOOK_TO_BOOKDIR or BOOK_BUILD_DIR' 81 @echo ' #Does not work with DOCBOOK_TO_BOOKDIR or BOOK_BUILD_DIR'
82 @echo ' #Currently EclipseHelp formated doc will not be in BOOK_DIST_DIR' 82 @echo ' #Currently EclipseHelp formated doc will not be in BOOK_DIST_DIR'
83 @echo ' # unless BOOK_DIST_ECLIPSE is set to yes' 83 @echo ' # unless BOOK_DIST_ECLIPSE is set to yes'
@@ -88,7 +88,8 @@ docusage:
88 @echo 'make initbuildboot #Init build_boot chapter from READMEs and template in release info' 88 @echo 'make initbuildboot #Init build_boot chapter from READMEs and template in release info'
89 @echo ' DOCBOOK_CLEANTMP=no #Option to keep temp files in doc/ and tmp/' 89 @echo ' DOCBOOK_CLEANTMP=no #Option to keep temp files in doc/ and tmp/'
90 @echo ' BOOK_GLOBALCLONEROOT=yes #Option for all init above to clone all outside the doc directory' 90 @echo ' BOOK_GLOBALCLONEROOT=yes #Option for all init above to clone all outside the doc directory'
91 @echo ' BOOK_GLOBALCLONEROOT=otherpath #Option for all init above to clone all' 91 @echo ' BOOK_GLOBALCLONEROOT=otherpath #Option for all init above to clone all to given path'
92 @echo ' MANIFESTHASH=xxxxx #Option for all init above to use nondefault MANIFEST in repo cmd'
92 @echo 'make pullbuild #git pull in s_docbuild' 93 @echo 'make pullbuild #git pull in s_docbuild'
93 @echo 'make pulltargets #git pull in s_targets. You need also initpardoc initbuildboot' 94 @echo 'make pulltargets #git pull in s_targets. You need also initpardoc initbuildboot'
94 @echo 'make clean #Clean. Also clean s_* but not any external clones' 95 @echo 'make clean #Clean. Also clean s_* but not any external clones'
diff --git a/doc/manifest_conf.mk b/doc/manifest_conf.mk
index 991d81f..4738ad4 100644
--- a/doc/manifest_conf.mk
+++ b/doc/manifest_conf.mk
@@ -2,6 +2,6 @@
2# NOTE: MANIFESTHASH needs to be changed to final release tag in format refs/tags/ELnnn before a release 2# NOTE: MANIFESTHASH needs to be changed to final release tag in format refs/tags/ELnnn before a release
3# The values are shown in the release info 3# The values are shown in the release info
4# The manifest is used to fetch information into the release info from the distro files 4# The manifest is used to fetch information into the release info from the distro files
5MANIFESTHASH := refs/tags/EL6 5MANIFESTHASH ?= refs/tags/EL6
6MANIFESTURL := git://git.enea.se/linux/manifests/el_manifests-networking.git 6MANIFESTURL := git://git.enea.se/linux/manifests/el_manifests-networking.git
7PROFILE_NAME := Networking 7PROFILE_NAME := Networking