Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  Revert "automatic index generation"
  automatic index generation
  Revert "automatic index generation"
  automatic index generation
  add suggested change from kalle to breadcrumb
  move style.css to dsa.css
  add style.css
  Some init
  update documentation
  some more intro text

diff --git a/input/dsa.css b/input/dsa.css
new file mode 100644 (file)
index 0000000..23cf7b0
--- /dev/null
+++ b/input/dsa.css
@@ -0,0 +1,454 @@
+/* ikiwiki style sheet */
+
+/* Note that instead of modifying this style sheet, you can instead edit
+ * local.css and use it to override or change settings in this one.
+ */
+
+article,
+header,
+footer,
+nav {
+       display: block;
+}
+
+.header {
+       margin: 0;
+       font-size: 22px;
+       font-weight: bold;
+       line-height: 1em;
+       display: block;
+}
+
+.inlineheader .author {
+       margin: 0;
+       font-size: 18px;
+       font-weight: bold;
+       display: block;
+}
+
+.actions ul {
+       margin: 0;
+       padding: 6px;
+       list-style-type: none;
+}
+.actions li {
+       display: inline;
+       padding: .2em .4em;
+}
+.pageheader .actions ul {
+       border-bottom: 1px solid #000;
+}
+
+.inlinepage .actions ul {
+       border-bottom: 0;
+}
+
+#otherlanguages ul {
+       margin: 0;
+       padding: 6px;
+       list-style-type: none;
+}
+#otherlanguages li {
+       display: inline;
+       padding: .2em .4em;
+}
+.pageheader #otherlanguages {
+       border-bottom: 1px solid #000;
+}
+
+.inlinecontent {
+       margin-top: .4em;
+}
+
+.pagefooter {
+       clear: both;
+}
+.inlinefooter {
+       clear: both;
+}
+
+#pageinfo {
+       margin: 1em 0;
+       border-top: 1px solid #000;
+}
+
+.tags {
+       margin-top: 1em;
+}
+
+.inlinepage .tags {
+        display: inline;
+}
+
+.mapparent {
+       text-decoration: none;
+}
+
+.img caption {
+       font-size: 80%;
+       caption-side: bottom;
+       text-align: center;
+}
+
+.align-left {
+       float:left;
+}
+
+.align-right {
+       float:right;
+}
+
+#backlinks {
+       margin-top: 1em;
+}
+
+#searchform {
+       display: inline;
+       float: right;
+}
+
+#editcontent {
+       width: 100%;
+}
+
+img {
+       border-style: none;
+}
+
+div.recentchanges {
+       border-style: solid;
+       border-width: 1px;
+       overflow: auto;
+       clear: both;
+       width: 100%;
+       background: #eee;
+       color: black !important;
+}
+.recentchanges .metadata {
+       padding: 0px 0.5em;
+}
+.recentchanges .changelog {
+       font-style: italic;
+       clear: both;
+       display: block;
+       padding: 1px 2px;
+       background: white !important;
+       color: black !important;
+}
+.recentchanges .desc {
+       display: none;
+}
+.recentchanges .diff {
+       display: none;
+}
+.recentchanges .committer {
+       float: left;
+       margin: 0;
+       width: 40%;
+}
+.recentchanges .committype {
+       float: left;
+       margin: 0;
+       width: 5%;
+       font-size: small;
+}
+.recentchanges .changedate {
+       float: left;
+       margin: 0;
+       width: 35%;
+       font-size: small;
+}
+.recentchanges .pagelinks {
+       float: right;
+       margin: 0;
+       width: 60%;
+}
+
+/* Used for adding a blog page. */
+#blogform {
+       padding: 10px 10px;
+       border: 1px solid #aaa;
+       background: #eee;
+       color: black !important;
+}
+
+.inlinepage {
+       padding: 10px 10px;
+       border: 1px solid #aaa;
+}
+
+.pagedate,
+.pagelicense,
+.pagecopyright {
+       font-style: italic;
+       display: block;
+       margin-top: 1em;
+}
+
+.error {
+       color: #C00;
+}
+
+/* Used for invalid form fields. */
+.fb_invalid {
+       color: red;
+       background: white !important;
+}
+
+/* Used for required form fields. */
+.fb_required {
+       font-weight: bold;
+}
+
+/* Orange feed button. */
+.feedbutton {
+       background: #ff6600;
+       color: white !important;
+       border-left: 1px solid #cc9966;
+       border-top: 1px solid #ccaa99;
+       border-right: 1px solid #993300;
+       border-bottom: 1px solid #331100;
+       padding: 0px 0.5em 0px 0.5em;
+       font-family: sans-serif;
+       font-weight: bold;
+       font-size: small;
+       text-decoration: none;
+       margin-top: 1em;
+}
+.feedbutton:hover {
+       color: white !important;
+       background: #ff9900;
+}
+
+/* Tag cloud. */
+.pagecloud {
+       float: right;
+       width: 30%;
+       text-align: center;
+       padding: 10px 10px;
+       border: 1px solid #aaa;
+       background: #eee;
+       color: black !important;
+}
+.smallestPC { font-size: 70%; }
+.smallPC { font-size: 85%; }
+.normalPC { font-size: 100%; }
+.bigPC { font-size: 115%; }
+.biggestPC { font-size: 130%; }
+
+.sidebar {
+       width: 30ex;
+       float: right;
+       margin-left: 4px;
+       margin-bottom: 4px;
+       margin-top: -1px;
+       padding: 0ex 2ex;
+       background: white;
+       border: 1px solid black;
+       color: black !important;
+}
+
+/* outlines */
+li.L1 {
+       list-style: upper-roman;
+}
+li.L2 {
+       list-style: decimal;
+}
+li.L3 {
+       list-style: lower-alpha;
+}
+li.L4 {
+       list-style: disc;
+}
+li.L5 {
+       list-style: square;
+}
+li.L6 {
+       list-style: circle;
+}
+li.L7 {
+       list-style: lower-roman;
+}
+li.L8 {
+       list-style: upper-alpha;
+}
+
+hr.poll {
+       height: 10pt;
+       color: white !important;
+       background: #eee;
+       border: 2px solid black;
+}
+div.poll {
+       margin-top: 1ex;
+       margin-bottom: 1ex;
+       padding: 1ex 1ex;
+       border: 1px solid #aaa;
+}
+
+div.progress {
+       margin-top: 1ex;
+       margin-bottom: 1ex;
+       border: 1px solid #888;
+       width: 400px;
+       background: #eee;
+       color: black !important;
+       padding: 1px;
+}
+div.progress-done {
+       background: #ea6 !important;
+       color: black !important;
+       text-align: center;
+       padding: 1px;
+}
+
+input#openid_url {
+       background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+       background-color: #fff;
+       background-position: 0 50%;
+       color: #000;
+       padding-left: 18px;
+}
+
+input#searchbox {
+       background: url(wikiicons/search-bg.gif) no-repeat;
+       background-color: #fff;
+       background-position: 100% 50%;
+       color: #000;
+       padding-right: 16px;
+}
+
+/* Things to hide in printouts. */
+@media print {
+       .actions { display: none; }
+       .tags { display: none; }
+       .feedbutton { display: none; }
+       #searchform { display: none; }
+       #blogform { display: none; }
+       #backlinks { display: none; }
+}
+
+/* Provided for use by template plugin for floating info boxes. */
+.infobox {
+       float: right;
+       margin-left: 2ex;
+       margin-top: 1ex;
+       margin-bottom: 1ex;
+       padding: 1ex 1ex;
+       border: 1px solid #aaa;
+       background: white;
+       color: black !important;
+}
+
+/* Provided for use by template plugin for floating note boxes. */
+.notebox {
+       float: right;
+       margin-left: 2ex;
+       margin-top: 1ex;
+       margin-bottom: 1ex;
+       padding: 1ex 1ex;
+       border: 1px solid #aaa;
+       width: 25%;
+       background: white;
+       color: black !important;
+}
+
+/* Used by the popup template and for backlinks hiding. */
+.popup {
+       border-bottom: 1px dotted #366;
+       color: #366;
+}
+.popup .balloon,
+.popup .paren,
+.popup .expand {
+       display: none;
+}
+.popup:hover .balloon,
+.popup:focus .balloon {
+       position: absolute;
+       display: inline;
+       margin: 1em 0 0 -2em;
+       padding: 0.625em;
+       border: 2px solid;
+       background-color: #dee;
+       color: black;
+}
+
+/* Formbuilder styling */
+fieldset {
+       margin: 1ex 0;
+       border: 1px solid black;
+}
+legend {
+       padding: 0 1ex;
+}
+.fb_submit {
+       float: left;
+       margin: 2px 0;
+}
+#signin_openid_url_label {
+       float: left;
+       margin-right: 1ex;
+}
+#signin_openid {
+       padding: 10px 10px;
+       border: 1px solid #aaa;
+       background: #eee; 
+       color: black !important;
+}
+
+span.color {
+       padding: 2px;
+}
+
+.comment-header,
+.microblog-header {
+       font-style: italic;
+       margin-top: .3em;
+}
+.comment .author,
+.microblog .author {
+       font-weight: bold;
+}
+.comment-subject {
+       font-weight: bold;
+}
+.comment {
+       border: 1px solid #aaa;
+       padding: 3px;
+}
+
+/* Used by the highlight plugin. */
+pre.hl { color:#000000; background-color:#ffffff; }
+.hl.num { color:#2928ff; }
+.hl.esc { color:#ff00ff; }
+.hl.str { color:#ff0000; }
+.hl.dstr { color:#818100; }
+.hl.slc { color:#838183; font-style:italic; }
+.hl.com { color:#838183; font-style:italic; }
+.hl.dir { color:#008200; }
+.hl.sym { color:#000000; }
+.hl.line { color:#555555; }
+.hl.mark { background-color:#ffffbb; }
+.hl.kwa { color:#000000; font-weight:bold; }
+.hl.kwb { color:#830000; }
+.hl.kwc { color:#000000; font-weight:bold; }
+.hl.kwd { color:#010181; }
+
+/* For the calendar plugin. */
+.month-calendar-day-this-day { background-color: #eee; }
+.year-calendar-this-month { background-color: #eee; }
+.month-calendar-arrow A:link,
+.year-calendar-arrow A:link,
+.month-calendar-arrow A:visited,
+.year-calendar-arrow A:visited {
+       text-decoration: none;
+       font-weight: normal;
+       font-size: 150%;
+}
+
+div.page_header:before {
+       content: "/";
+}
+

diff --git a/input/howto/export-iscsi.creole b/input/howto/export-iscsi.creole
index 7a302a9..45c093a 100644 (file)
--- a/input/howto/export-iscsi.creole
+++ b/input/howto/export-iscsi.creole
@@ -1,3 +1,5 @@
+= Export iSCSI with gustini =
+This document describes how to add new new volumes on gustini and add them into the OS.
 {{{
 * Log into gustini via webfrontend
 * Manage

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index dfdeee6..9c03498 100644 (file)
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -54,7 +54,7 @@ adjusted.
     -----END PGP PUBLIC KEY BLOCK-----
     EOF
                 apt-get update &&
-                apt-get install --no-install-recommends puppet/lenny-backports libaugeas-ruby1.8/lenny-backports augeas-lenses/lenny-backports &&
+                apt-get install --no-install-recommends puppet/lenny-backports libaugeas-ruby1.8/lenny-backports augeas-lenses/lenny-backports libaugeas0/lenny-backports &&
                 /etc/init.d/puppet stop &&
                 puppetd -w 5 --debug -t --factsync
 

diff --git a/input/index.mdwn b/input/index.mdwn
index 4b2bd6b..344cd80 100644 (file)
--- a/input/index.mdwn
+++ b/input/index.mdwn
@@ -1,7 +1,10 @@
 # Debian System Administrators
 
-DSA is the team that keeps debian.org's infrastructure going.  To contact us,
-mail debian-admin@lists.debian.org.
+The Debian System Debian Administration Team (DSA) is the team that
+keeps debian.org's infrastructure going. This is the internal team wiki,
+which as some howto mainly targeted for the team members.  
+
+To contact us, mail debian-admin@lists.debian.org.
 
 To request installation of build dependencies please
 [mail us following some guidelines](doc/install-req).