>From 3d61331aea3bce38d6c9a6c44f3fe391c1db6d13 Mon Sep 17 00:00:00 2001
From: Shawn Wells <[email protected]>
Date: Sat, 9 Nov 2013 20:21:21 -0500
Subject: [PATCH 2/2] Updated Makefile * HTML index files
- New makefile target update_site which will auto clean up unused languages
- Added index.html files
- Added .gitignore for docs/html/en-US/SCAP_Security_Guide
---
docs/Makefile | 18 ++++--
docs/html/Sitemap | 18 +++---
docs/html/en-US/.gitignore | 1 +
docs/html/en-US/index.html | 93 +++++++++++++++++++++++++++++
docs/html/index.html | 139 +++++++++++++++++++++++++++-----------------
docs/ssg-docs.db | Bin 5120 -> 5120 bytes
6 files changed, 201 insertions(+), 68 deletions(-)
create mode 100644 docs/html/en-US/.gitignore
create mode 100644 docs/html/en-US/index.html
diff --git a/docs/Makefile b/docs/Makefile
index 5759d2b..4ebb8f9 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -24,25 +24,33 @@
# sqlite> .exit
-SITECONFIG="../ssg-docs.cfg"
+SITE_CONFIG="ssg-docs.cfg"
all: user_guide developer_guide workshop
- publican update_site --site_config ssg-docs.cfg
+
+update_site:
+ publican update_site --site_config $(SITE_CONFIG)
+ for lang in a*-* b*-* c*-* d*-* el-GR es-ES f*-* \
+ g*-* h*-* i*-* j*-* k*-* l*-* m*-* \
+ n*-* o*-* p*-* r*-* si-LK sk-SK \
+ sr-Latn-RS sr-RS sv-SE t*-* u*-* zh-* ; do \
+ rm -Rf html/$$lang ; \
+ done
user_guide:
cd User_Guide/ \
&& publican build --publish --formats html,html-single,epub --embedtoc
--langs en-US \
- && publican install_book --site_config $(SITECONFIG) --lang en-US
+ && publican install_book --site_config ../$(SITE_CONFIG) --lang en-US
developer_guide:
cd Developer_Guide/ \
&& publican build --publish --formats html,html-single,epub --embedtoc
--langs en-US \
- && publican install_book --site_config $(SITECONFIG) --lang en-US
+ && publican install_book --site_config ../$(SITE_CONFIG) --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
+ && publican install_book --site_config ../$(SITE_CONFIG) --lang en-US
clean:
cd User_Guide && publican clean
diff --git a/docs/html/Sitemap b/docs/html/Sitemap
index 6e4e84f..86c2444 100644
--- a/docs/html/Sitemap
+++ b/docs/html/Sitemap
@@ -2,55 +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-09</lastmod>
+ <lastmod>2013-11-10</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-09</lastmod>
+ <lastmod>2013-11-10</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-09</lastmod>
+ <lastmod>2013-11-10</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>
+ <lastmod>2013-11-10</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>
+ <lastmod>2013-11-10</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>
+ <lastmod>2013-11-10</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-09</lastmod>
+ <lastmod>2013-11-10</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-09</lastmod>
+ <lastmod>2013-11-10</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-09</lastmod>
+ <lastmod>2013-11-10</lastmod>
<changefreq>monthly</changefreq>
<priority>0.8</priority>
</url>
diff --git a/docs/html/en-US/.gitignore b/docs/html/en-US/.gitignore
new file mode 100644
index 0000000..8d961ac
--- /dev/null
+++ b/docs/html/en-US/.gitignore
@@ -0,0 +1 @@
+SCAP_Security_Guide/
diff --git a/docs/html/en-US/index.html b/docs/html/en-US/index.html
new file mode 100644
index 0000000..b26312c
--- /dev/null
+++ b/docs/html/en-US/index.html
@@ -0,0 +1,93 @@
+<?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";>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link rel="stylesheet" href="../interactive.css" type="text/css" />
+ <script type="text/javascript" src="../toc.js"></script>
+ <title>toc nav</title>
+</head>
+<body class="tocnav" onload="hideNoJS();getCookie();checkCookie();">
+<h1>
+ <a style="background-image:url(images/web_logo.png)" href="index.html"
onclick="window.top.location='index.html'" ><span>Welcome</span></a>
+</h1>
+<div class="tocnavwrap">
+ <form target="_top" method="get"
action="http://www.google.com/search";>
+ <div class="search">
+ <input class="searchtxt" type="text" name="q" value=""
/>
+ <input class="searchsub" type="submit" value="Search" />
+ </div>
+ </form>
+
+ <div class="lang">
+ <div class="reset">
+ <a href="#" title="collapse document navigation"
onclick="clearCookie();">collapse all</a>
+ </div>
+ <select id="langselect" class="langselect"
onchange="loadToc();">
+ <option disabled="disabled" value="">Language</option>
+
+ <option selected="selected"
value="en-US">English</option>
+
+ </select>
+ </div>
+ <div class="hidden" id="nocookie">The Navigation Menu below will
automatically collapse when pages are loaded. Enable cookies to fix the
Navigation Menu functionality.</div>
+
+ <div class="product collapsed" onclick="toggle(event,
'SCAP_Security_Guide');work=1;">
+ <span class="product">SCAP Security Guide</span>
+ <div id='SCAP_Security_Guide' class="versions hidden">
+ <div id='SCAP_Security_Guide.0.1'
class="version collapsed" onclick="toggle(event,
'SCAP_Security_Guide.0.1.books');">
+ <span class="version">0.1</span>
+ <div id='SCAP_Security_Guide.0.1.books'
class="books hidden">
+ <div
id='SCAP_Security_Guide.0.1.Developer_Guide' class="book collapsed"
onclick="toggle(event, 'SCAP_Security_Guide.0.1.Developer_Guide.types');">
+ <a class="type"
href="SCAP_Security_Guide/0.1/html/Developer_Guide/index.html"
onclick="window.top.location='./SCAP_Security_Guide/0.1/html/Developer_Guide/index.html'"><span
class="book">Developer Guide</span></a>
+ <div
id='SCAP_Security_Guide.0.1.Developer_Guide.types' class="types hidden"
onclick="work=0;">
+
+ <a class="type"
href="./SCAP_Security_Guide/0.1/epub/Developer_Guide/SCAP_Security_Guide-0.1-Developer_Guide-en-US.epub"
>epub</a>
+
+ <a class="type"
href="./SCAP_Security_Guide/0.1/html/Developer_Guide/index.html"
onclick="window.top.location='./SCAP_Security_Guide/0.1/html/Developer_Guide/index.html';return
false;">html</a>
+
+ <a class="type"
href="./SCAP_Security_Guide/0.1/html-single/Developer_Guide/index.html"
onclick="window.top.location='./SCAP_Security_Guide/0.1/html-single/Developer_Guide/index.html';return
false;">html-single</a>
+
+ </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;">
+
+ <a class="type"
href="./SCAP_Security_Guide/0.1/epub/User_Guide/SCAP_Security_Guide-0.1-User_Guide-en-US.epub"
>epub</a>
+
+ <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';return
false;">html</a>
+
+ <a class="type"
href="./SCAP_Security_Guide/0.1/html-single/User_Guide/index.html"
onclick="window.top.location='./SCAP_Security_Guide/0.1/html-single/User_Guide/index.html';return
false;">html-single</a>
+
+ </div>
+ </div>
+
+ </div> </div>
+ </div>
+ </div>
+
+ <div class="nocookie" id="nojs"><p>The Navigation Menu above requires
JavaScript to function.</p><p>Enable JavaScript to allow the Navigation Menu to
function.</p><p>Disable CSS to view the Navigation options without JavaScript
enabled</p></div>
+ <div class="bottom_links">
+ <a href="../toc.html"
onclick="window.top.location='../toc.html'" >Map</a>
+ <a href="./Site_Statistics.html"
onclick="window.top.location='./Site_Statistics.html'" >Statistics</a>
+ <a href="./Site_Tech.html"
onclick="window.top.location='./Site_Tech.html'" >Tech</a>
+ </div>
+</div>
+</body>
+</html>
+
diff --git a/docs/html/index.html b/docs/html/index.html
index b25f91b..a4a12a0 100644
--- a/docs/html/index.html
+++ b/docs/html/index.html
@@ -1,62 +1,93 @@
<?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>
+<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Documentation</title>
<link rel="stylesheet" href="interactive.css" type="text/css" />
+ <script type="text/javascript" src="toc.js"></script>
+ <title>toc nav</title>
</head>
-<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 class="tocnav" onload="hideNoJS();getCookie();checkCookie();">
+<h1>
+ <a style="background-image:url(images/web_logo.png)" href="index.html"
onclick="window.top.location='index.html'" ><span>Welcome</span></a>
+</h1>
+<div class="tocnavwrap">
+ <form target="_top" method="get"
action="http://www.google.com/search";>
+ <div class="search">
+ <input class="searchtxt" type="text" name="q" value=""
/>
+ <input class="searchsub" type="submit" value="Search" />
+ </div>
+ </form>
+
+ <div class="lang">
+ <div class="reset">
+ <a href="#" title="collapse document navigation"
onclick="clearCookie();">collapse all</a>
+ </div>
+ <select id="langselect" class="langselect"
onchange="loadToc();">
+ <option disabled="disabled" value="">Language</option>
+
+ <option selected="selected"
value="en-US">English</option>
+
+ </select>
+ </div>
+ <div class="hidden" id="nocookie">The Navigation Menu below will
automatically collapse when pages are loaded. Enable cookies to fix the
Navigation Menu functionality.</div>
+
+ <div class="product collapsed" onclick="toggle(event,
'SCAP_Security_Guide');work=1;">
+ <span class="product">SCAP Security Guide</span>
+ <div id='SCAP_Security_Guide' class="versions hidden">
+ <div id='SCAP_Security_Guide.0.1'
class="version collapsed" onclick="toggle(event,
'SCAP_Security_Guide.0.1.books');">
+ <span class="version">0.1</span>
+ <div id='SCAP_Security_Guide.0.1.books'
class="books hidden">
+ <div
id='SCAP_Security_Guide.0.1.Developer_Guide' class="book collapsed"
onclick="toggle(event, 'SCAP_Security_Guide.0.1.Developer_Guide.types');">
+ <a class="type"
href="en-US/SCAP_Security_Guide/0.1/html/Developer_Guide/index.html"
onclick="window.top.location='./en-US/SCAP_Security_Guide/0.1/html/Developer_Guide/index.html'"><span
class="book">Developer Guide</span></a>
+ <div
id='SCAP_Security_Guide.0.1.Developer_Guide.types' class="types hidden"
onclick="work=0;">
+
+ <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"
onclick="window.top.location='./en-US/SCAP_Security_Guide/0.1/html/Developer_Guide/index.html';return
false;">html</a>
+
+ <a class="type"
href="./en-US/SCAP_Security_Guide/0.1/html-single/Developer_Guide/index.html"
onclick="window.top.location='./en-US/SCAP_Security_Guide/0.1/html-single/Developer_Guide/index.html';return
false;">html-single</a>
+
+ </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="en-US/SCAP_Security_Guide/0.1/html/SCAP_and_STIG_Workshop/index.html"
onclick="window.top.location='./en-US/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="./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"
onclick="window.top.location='./en-US/SCAP_Security_Guide/0.1/html/SCAP_and_STIG_Workshop/index.html';return
false;">html</a>
+
+ <a class="type"
href="./en-US/SCAP_Security_Guide/0.1/html-single/SCAP_and_STIG_Workshop/index.html"
onclick="window.top.location='./en-US/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="en-US/SCAP_Security_Guide/0.1/html/User_Guide/index.html"
onclick="window.top.location='./en-US/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;">
+
+ <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"
onclick="window.top.location='./en-US/SCAP_Security_Guide/0.1/html/User_Guide/index.html';return
false;">html</a>
+
+ <a class="type"
href="./en-US/SCAP_Security_Guide/0.1/html-single/User_Guide/index.html"
onclick="window.top.location='./en-US/SCAP_Security_Guide/0.1/html-single/User_Guide/index.html';return
false;">html-single</a>
+
+ </div>
+ </div>
+
+ </div> </div>
+ </div>
+ </div>
+
+ <div class="nocookie" id="nojs"><p>The Navigation Menu above requires
JavaScript to function.</p><p>Enable JavaScript to allow the Navigation Menu to
function.</p><p>Disable CSS to view the Navigation options without JavaScript
enabled</p></div>
+ <div class="bottom_links">
+ <a href="toc.html" onclick="window.top.location='toc.html'"
>Map</a>
+ <a href="./Site_Statistics.html"
onclick="window.top.location='./Site_Statistics.html'" >Statistics</a>
+ <a href="./Site_Tech.html"
onclick="window.top.location='./Site_Tech.html'" >Tech</a>
+ </div>
+</div>
</body>
-
</html>
+
diff --git a/docs/ssg-docs.db b/docs/ssg-docs.db
index
2013d7b081ba106cb5a8c0b512bca6dc9f2dde48..72b3733ad32cf9fd1b370e8f98801308ce3c643a
100644
GIT binary patch
delta 190
zcmZqBXwaA-&3JsH%raIkLxVsOZU%8<Vav$}*%c-)U=^F3%f&sJmyLtP(7;Q0auutM
zct%NXj*)?(v96(^uAzam09d`Y=;V!TdXs0d@c_;6;)jTV&A7m(1QfF40ShTkZeUfI
n?9a_7gfPL53q^_x-2z^O1xAzCvvV*R8cg2F?h2$9aqs{DlUOSC
delta 190
zcmZqBXwaA-&A4@=%raIk1Is`WZU%8<Vav$}*%c-)U=^F3%f&sJmyLtPz|u>2auutM
zct%NXj*)?(v96(^u7Rbq09d`Y=;V!TdXs0d@c_;6;)jTV&A7m(1QfF40ShTkZeUfI
n?9a_7gfPL53q^_x-2z^O1xAzCvvV*RSWe!_?h2$9aqs{Do*^qM
--
1.7.1
_______________________________________________
scap-security-guide mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
