From af806f0ba18ef263ee1a7eaf7c55a779e3db7bb3 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn@redhat.com>
Date: Sat, 9 Nov 2013 03:29:58 -0500
Subject: [PATCH] Incorporation of workbook into docs/Makefile
 - Updated product titles
 - Added RedHat theme
 - Updated Makefile to build the workbook

---
 docs/Makefile                                      |    9 ++-
 docs/SCAP_and_STIG_Workshop/.gitignore             |    3 +
 docs/SCAP_and_STIG_Workshop/en-US/Book_Info.xml    |    2 +-
 .../en-US/SCAP_and_STIG_Workshop.ent               |    2 +-
 docs/SCAP_and_STIG_Workshop/publican.cfg           |    4 +-
 docs/html/Sitemap                                  |   30 +++++-
 docs/html/en-US/Site_Statistics.html               |    6 +-
 docs/html/en-US/Site_Tech.html                     |    4 +-
 docs/html/en-US/toc.html                           |   13 +++
 docs/html/index.html                               |  104 ++++++++++----------
 docs/html/toc.html                                 |   13 +++
 docs/ssg-docs.db                                   |  Bin 5120 -> 5120 bytes
 12 files changed, 123 insertions(+), 67 deletions(-)
 create mode 100644 docs/SCAP_and_STIG_Workshop/.gitignore

diff --git a/docs/Makefile b/docs/Makefile
index 8eccdf5..5759d2b 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -26,7 +26,8 @@
 
 SITECONFIG="../ssg-docs.cfg"
 
-all: user_guide developer_guide
+all: user_guide developer_guide workshop
+	publican update_site --site_config ssg-docs.cfg
 
 user_guide:
 	cd User_Guide/ \
@@ -38,6 +39,12 @@ developer_guide:
 	&& publican build --publish --formats html,html-single,epub --embedtoc --langs en-US \
 	&& publican install_book --site_config $(SITECONFIG) --lang en-US
 
+workshop:
+	cd SCAP_and_STIG_Workshop/ \
+	&& publican build --publish --formats html,html-single,epub --embedtoc --langs en-US \
+	&& publican install_book --site_config $(SITECONFIG) --lang en-US
+
 clean:
 	cd User_Guide &&  publican clean 
 	cd Developer_Guide && publican clean 
+	cd SCAP_and_STIG_Workshop && publican clean
diff --git a/docs/SCAP_and_STIG_Workshop/.gitignore b/docs/SCAP_and_STIG_Workshop/.gitignore
new file mode 100644
index 0000000..9f2cceb
--- /dev/null
+++ b/docs/SCAP_and_STIG_Workshop/.gitignore
@@ -0,0 +1,3 @@
+# files not to track in git
+publish/
+tmp/
diff --git a/docs/SCAP_and_STIG_Workshop/en-US/Book_Info.xml b/docs/SCAP_and_STIG_Workshop/en-US/Book_Info.xml
index 376617d..b2ea612 100644
--- a/docs/SCAP_and_STIG_Workshop/en-US/Book_Info.xml
+++ b/docs/SCAP_and_STIG_Workshop/en-US/Book_Info.xml
@@ -6,7 +6,7 @@
 <bookinfo id="book-Documentation-SCAP_and_STIG_Workshop-SCAP_and_STIG_Workshop">
 	<title>SCAP and STIG Workshop</title>
 	<subtitle>An introduction into using and customizing SCAP content for Red Hat Enterprise Linux</subtitle>
-	<productname>Documentation</productname>
+	<productname>SCAP Security Guide</productname>
 	<productnumber>0.1</productnumber>
 	<edition>0</edition>
 	<pubsnumber>0</pubsnumber>
diff --git a/docs/SCAP_and_STIG_Workshop/en-US/SCAP_and_STIG_Workshop.ent b/docs/SCAP_and_STIG_Workshop/en-US/SCAP_and_STIG_Workshop.ent
index c2f5316..8607f00 100644
--- a/docs/SCAP_and_STIG_Workshop/en-US/SCAP_and_STIG_Workshop.ent
+++ b/docs/SCAP_and_STIG_Workshop/en-US/SCAP_and_STIG_Workshop.ent
@@ -1,4 +1,4 @@
-<!ENTITY PRODUCT "Documentation">
+<!ENTITY PRODUCT "SCAP Security Guide">
 <!ENTITY BOOKID "SCAP_and_STIG_Workshop">
 <!ENTITY YEAR "2013">
 <!ENTITY HOLDER "Red Hat, Inc.">
diff --git a/docs/SCAP_and_STIG_Workshop/publican.cfg b/docs/SCAP_and_STIG_Workshop/publican.cfg
index 0ea89a1..ad7b1e3 100644
--- a/docs/SCAP_and_STIG_Workshop/publican.cfg
+++ b/docs/SCAP_and_STIG_Workshop/publican.cfg
@@ -3,5 +3,5 @@
 
 xml_lang: "en-US"
 type: Book
-brand: common
-
+brand: RedHat
+web_type: product
diff --git a/docs/html/Sitemap b/docs/html/Sitemap
index bb3d126..6e4e84f 100644
--- a/docs/html/Sitemap
+++ b/docs/html/Sitemap
@@ -2,37 +2,55 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 <url>
 	<loc>./en-US/SCAP_Security_Guide/0.1/epub/Developer_Guide/SCAP_Security_Guide-0.1-Developer_Guide-en-US.epub</loc>
-	<lastmod>2013-11-06</lastmod>
+	<lastmod>2013-11-09</lastmod>
 	<changefreq>monthly</changefreq>
 	<priority>0.8</priority>
 </url>
 <url>
 	<loc>./en-US/SCAP_Security_Guide/0.1/html/Developer_Guide/index.html</loc>
-	<lastmod>2013-11-06</lastmod>
+	<lastmod>2013-11-09</lastmod>
 	<changefreq>monthly</changefreq>
 	<priority>0.8</priority>
 </url>
 <url>
 	<loc>./en-US/SCAP_Security_Guide/0.1/html-single/Developer_Guide/index.html</loc>
-	<lastmod>2013-11-06</lastmod>
+	<lastmod>2013-11-09</lastmod>
+	<changefreq>monthly</changefreq>
+	<priority>0.8</priority>
+</url>
+<url>
+	<loc>./en-US/SCAP_Security_Guide/0.1/epub/SCAP_and_STIG_Workshop/SCAP_Security_Guide-0.1-SCAP_and_STIG_Workshop-en-US.epub</loc>
+	<lastmod>2013-11-09</lastmod>
+	<changefreq>monthly</changefreq>
+	<priority>0.8</priority>
+</url>
+<url>
+	<loc>./en-US/SCAP_Security_Guide/0.1/html/SCAP_and_STIG_Workshop/index.html</loc>
+	<lastmod>2013-11-09</lastmod>
+	<changefreq>monthly</changefreq>
+	<priority>0.8</priority>
+</url>
+<url>
+	<loc>./en-US/SCAP_Security_Guide/0.1/html-single/SCAP_and_STIG_Workshop/index.html</loc>
+	<lastmod>2013-11-09</lastmod>
 	<changefreq>monthly</changefreq>
 	<priority>0.8</priority>
 </url>
 <url>
 	<loc>./en-US/SCAP_Security_Guide/0.1/epub/User_Guide/SCAP_Security_Guide-0.1-User_Guide-en-US.epub</loc>
-	<lastmod>2013-11-06</lastmod>
+	<lastmod>2013-11-09</lastmod>
 	<changefreq>monthly</changefreq>
 	<priority>0.8</priority>
 </url>
 <url>
 	<loc>./en-US/SCAP_Security_Guide/0.1/html/User_Guide/index.html</loc>
-	<lastmod>2013-11-06</lastmod>
+	<lastmod>2013-11-09</lastmod>
 	<changefreq>monthly</changefreq>
 	<priority>0.8</priority>
 </url>
 <url>
 	<loc>./en-US/SCAP_Security_Guide/0.1/html-single/User_Guide/index.html</loc>
-	<lastmod>2013-11-06</lastmod>
+	<lastmod>2013-11-09</lastmod>
 	<changefreq>monthly</changefreq>
 	<priority>0.8</priority>
 </url>
diff --git a/docs/html/en-US/Site_Statistics.html b/docs/html/en-US/Site_Statistics.html
index 2ee893d..9e3b0b1 100644
--- a/docs/html/en-US/Site_Statistics.html
+++ b/docs/html/en-US/Site_Statistics.html
@@ -26,9 +26,9 @@
 		<td>English</td>
 		<td>en-US</td>
 		<td>1</td>
-		<td>2</td>
+		<td>3</td>
 		<td>1</td>
-		<td>2</td>
+		<td>3</td>
 	</tr>
 	
 	<tr>
@@ -457,7 +457,7 @@
 </table>
 <div class="totals">
 	<b>Total Languages: </b>48<br />
-	<b>Total Packages: </b>2
+	<b>Total Packages: </b>3
 </div>
 </body>
 </html>
diff --git a/docs/html/en-US/Site_Tech.html b/docs/html/en-US/Site_Tech.html
index 9e5464c..8ea5310 100644
--- a/docs/html/en-US/Site_Tech.html
+++ b/docs/html/en-US/Site_Tech.html
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Site Tech</title><link rel="stylesheet" href="css/default.css" type="text/css" /><link rel="stylesheet" media="print" href="css/print.css" type="text/css" /><meta name="generator" content="publican 2.1" /><meta name="package" content="Documentation-Site_Tech-0.1-en-US-0-0" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="./toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div>
-
-<div xml:lang="en-US" class="article" title="Site Tech" id="id465112" lang="en-US"><div class="titlepage"><div><div><h1 id="id465112" class="title producttitle">Site Tech</h1></div><div><h2 class="subtitle">Technology used to create this site</h2></div></div><hr /></div><div class="mediaobject" align="center"><img src="images/publican_logo.png" align="middle" alt="Publican logo" /></div><div class="para">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Site Tech</title><link rel="stylesheet" href="Common_Content/css/default.css" type="text/css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.1" /><meta name="package" content="Documentation-Site_Tech-0.1-en-US-0-0" /></head><body class="toc_embeded "><div id="tocdiv" class="toc"><iframe id="tocframe" class="toc" src="./toc.html">This is an iframe, to view it upgrade your browser or enable iframe display.</iframe></div><p id="title"><a class="left" href="https://fedorahosted.org/publican"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="https://fedorahosted.org/publican"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><div xml:lang="en-US" class="article" title="Site Tech" id="id465112" lang="en-US"><div class="titlepage"><div><div><h1 id="id465112" class="title producttitle">Site Tech</h1></div><div><h2 class="subtitle">Technology used to create this site</h2></div></div><hr /></div><div class="mediaobject" align="center"><img src="images/publican_logo.png" align="middle" alt="Publican logo" /></div><div class="para">
 		This site is constructed with <span class="application"><strong>Publican</strong></span>, a free and open-source publishing tool developed by <a href="http://www.redhat.com/">Red Hat, Inc</a>.
 	</div><div class="para">
 		<span class="application"><strong>Publican</strong></span> takes content authored in DocBook XML and transforms it into a variety of formats such as HTML, PDF, and EPUB. It can also build RPM packages to ship the content and can build documentation websites to publish the content on the web.
diff --git a/docs/html/en-US/toc.html b/docs/html/en-US/toc.html
index 95effe6..b26312c 100644
--- a/docs/html/en-US/toc.html
+++ b/docs/html/en-US/toc.html
@@ -51,6 +51,19 @@
 						</div>
 					</div>
 	        		
+					<div id='SCAP_Security_Guide.0.1.SCAP_and_STIG_Workshop' class="book collapsed" onclick="toggle(event, 'SCAP_Security_Guide.0.1.SCAP_and_STIG_Workshop.types');">
+						<a class="type" href="SCAP_Security_Guide/0.1/html/SCAP_and_STIG_Workshop/index.html" onclick="window.top.location='./SCAP_Security_Guide/0.1/html/SCAP_and_STIG_Workshop/index.html'"><span class="book">SCAP and STIG Workshop</span></a> 
+						<div id='SCAP_Security_Guide.0.1.SCAP_and_STIG_Workshop.types' class="types hidden" onclick="work=0;">
+						
+							<a class="type" href="./SCAP_Security_Guide/0.1/epub/SCAP_and_STIG_Workshop/SCAP_Security_Guide-0.1-SCAP_and_STIG_Workshop-en-US.epub" >epub</a>
+			        		
+							<a class="type" href="./SCAP_Security_Guide/0.1/html/SCAP_and_STIG_Workshop/index.html" onclick="window.top.location='./SCAP_Security_Guide/0.1/html/SCAP_and_STIG_Workshop/index.html';return false;">html</a>
+			        		
+							<a class="type" href="./SCAP_Security_Guide/0.1/html-single/SCAP_and_STIG_Workshop/index.html" onclick="window.top.location='./SCAP_Security_Guide/0.1/html-single/SCAP_and_STIG_Workshop/index.html';return false;">html-single</a>
+			        		
+						</div>
+					</div>
+	        		
 					<div id='SCAP_Security_Guide.0.1.User_Guide' class="book collapsed" onclick="toggle(event, 'SCAP_Security_Guide.0.1.User_Guide.types');">
 						<a class="type" href="SCAP_Security_Guide/0.1/html/User_Guide/index.html" onclick="window.top.location='./SCAP_Security_Guide/0.1/html/User_Guide/index.html'"><span class="book">User Guide</span></a> 
 						<div id='SCAP_Security_Guide.0.1.User_Guide.types' class="types hidden" onclick="work=0;">
diff --git a/docs/html/index.html b/docs/html/index.html
index 60d0384..b25f91b 100644
--- a/docs/html/index.html
+++ b/docs/html/index.html
@@ -1,58 +1,62 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Documentation</title>
 	<link rel="stylesheet" href="interactive.css" type="text/css" />
-	<title>SCAP Security Guide Documentation</title>
 </head>
-<body class="tocnav">
-<div class="static_tocnavwrap">
-<center>
-<h1 class="producttitle">SSG Documentation</h1>
-</center>	
-	<div class="perlang" id="English">
-		<h2>English (en-US)</h2>
-		
-		<div class="product">
-			<span id="SCAP_Security_Guide" class="product">SCAP Security Guide</span>
-			<div class="versions">
-							<div class="version">
-					<span class="version">0.1</span>					<div class="books">
-					
-						<div class="book">
-							<span id="Developer_Guide" class="book"><a class="type" href="./en-US/SCAP_Security_Guide/0.1/html-single/Developer_Guide/index.html">Developer Guide</a></span> 
-							<div class="types">
-							
-								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/epub/Developer_Guide/SCAP_Security_Guide-0.1-Developer_Guide-en-US.epub">epub</a>
-			        			
-								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/html/Developer_Guide/index.html">html</a>
-			        			
-								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/html-single/Developer_Guide/index.html">html-single</a>
-			        			
-							</div>
-						</div>
-	        			
-						<div class="book">
-							<span id="User_Guide" class="book"><a class="type" href="./en-US/SCAP_Security_Guide/0.1/html-single/User_Guide/index.html">User Guide</a></span> 
-							<div class="types">
-							
-								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/epub/User_Guide/SCAP_Security_Guide-0.1-User_Guide-en-US.epub">epub</a>
-			        			
-								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/html/User_Guide/index.html">html</a>
-			        			
-								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/html-single/User_Guide/index.html">html-single</a>
-			        			
-							</div>
-						</div>
-	        			
-					</div>				</div>								
-			</div>					
-		</div>					
-       		
-	</div>
-	
-</div>					
+<body class="nojs">
+<h1>Documentation</h1>
+<script type="text/javascript">
+	var lang = "";
+	if(window.navigator.userLanguage)
+		lang = window.navigator.userLanguage;
+	else
+		lang = window.navigator.language;
+
+	var match = 0;
+	var locales = ["as-IN", "bn-IN", "de-DE", "es-ES", "fr-FR", "gu-IN", "hi-IN", "it-IT", "ja-JP", "kn-IN", "ko-KR", "ml-IN", "mr-IN", "or-IN", "pa-IN", "pt-BR", "ru-RU", "si-LK", "ta-IN", "te-IN", "zh-CN", "zh-TW"];
+
+	if(lang) {
+		// Try for full match of lang_LOC
+		for(locale in locales) {
+			if(lang == locales[locale]) {
+				match = 1;
+				break;
+			}
+		}
+
+		// Else try for match of lang
+		if(match == 0) {
+			for(locale in locales) {
+				var loc_lang = locales[locale].substring(0,2);
+				var language = lang.substring(0,2);
+
+				if(loc_lang == language) {
+					lang = locales[locale];
+					match = 1;
+					break;
+				}
+			}
+		}
+	}
+
+	// Else default to en-US
+	if(match == 0) {
+		lang = 'en-US';
+	}
+
+	window.location = lang + "/index.html";
+</script>
+<noscript>
+<p>
+This web site requires JavaScript and cookies to be enabled to function correctly.
+</p>
+<p>
+<a href="toc.html">Click here to view a static Table of Contents</a>
+</p>
+</noscript>
 </body>
-</html>
 
+</html>
diff --git a/docs/html/toc.html b/docs/html/toc.html
index f900a16..9609456 100644
--- a/docs/html/toc.html
+++ b/docs/html/toc.html
@@ -38,6 +38,19 @@
 						</div>
 	        			
 						<div class="book">
+							<span id="SCAP_and_STIG_Workshop" class="book">SCAP and STIG Workshop</span> 
+							<div class="types">
+							
+								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/epub/SCAP_and_STIG_Workshop/SCAP_Security_Guide-0.1-SCAP_and_STIG_Workshop-en-US.epub">epub</a>
+			        			
+								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/html/SCAP_and_STIG_Workshop/index.html">html</a>
+			        			
+								<a class="type" href="./en-US/SCAP_Security_Guide/0.1/html-single/SCAP_and_STIG_Workshop/index.html">html-single</a>
+			        			
+							</div>
+						</div>
+	        			
+						<div class="book">
 							<span id="User_Guide" class="book">User Guide</span> 
 							<div class="types">
 							
diff --git a/docs/ssg-docs.db b/docs/ssg-docs.db
index 84d5a616fe61f26c4028fdaad9aa216a6cf4a263..2013d7b081ba106cb5a8c0b512bca6dc9f2dde48 100644
GIT binary patch
delta 492
zcmZqBXwaA-&A4@=%nN2QPR0rbW)tR}OkbEwm{u?)Gl?@EVXWA!$P&lM=_Sg|AZ{#d
zDLQ#0o4ii2vtvMfVqQvoaEPaSe0Y9Qc5z02L25y1l97R-v96(^u7PEs2t>!^gX{_>
z*fnI7<mTuWXXd5nq$2cr2_xC0i(4Z?hqC}!hc?J<dXs0d@p4*v@k4|_mQTLGrp#q&
z#{(8o1bbkzKR2H+!T>uiR5>njkjoJA&b$Z<j3%#V=VY{;yp!Ec+LDWbfq|3p8w1mJ
z<_S#i7{4)9GMO;zFvl?;2Zq`mMh;tcaF{VpW@MLE#_knRpozMG)hUD3X<=7~6jmb0
Y#!BN>E<AYxx6$U8Tw<(@qKgDr0I}SJnE(I)

delta 242
zcmZqBXwaA-%~-Zk<^{758&fg^vkCJ~rZ3DTOe>g@ndCPM@^CWoGJRq2WME)u6*m^v
z7M;A2O;0Gbpft(Iz|dINS%8}XE<AY_8!xAs7e7R3@<Dcm$rsp^InC^Nz#@v18(0-4
z`*ZUNfwdYM>Kd5YaiK_YiD#7L<{+e<c@f4NO<vE=$!IotC%c=t85ht!Y)so3n6@)d
xV0y=_!yLzaoOvqHx!FuS%sLF#K<P}NV;LtmvTIGAz-_eoC6^d0qrf5o761t;HTeJl

-- 
1.7.1