Changeset 386 in MondoRescue for branches

Timestamp:

Feb 13, 2006, 1:15:40 AM (18 years ago)

Author:

bcornec

Message:

Most of Andree's remarks are now there

Location:

branches/stable

Files:

• tools/livwww (modified) (2 diffs)
• website/about.shtml (modified) (1 diff)
• website/docs.shtml (modified) (2 diffs)
• website/downloads.shtml (modified) (1 diff)
• website/feedback.shtml (deleted)
• website/images/hp.png (added)
• website/images/hpisc.png (added)
• website/images/protected-button_trans.png (moved) (moved from branches/stable/website/protected-button_trans.png )
• website/index.shtml (modified) (2 diffs)
• website/mondorescue.org.conf (added)
• website/support.shtml (modified) (1 diff)

branches/stable/tools/livwww

@@ -12 +12 @@
 DESTUSER=apache
 MONDODIR=/mondo/www/html/mondo
+TESTDIR=/mondo/www/html/test
 
 
@@ -29 +30 @@
 find $DESTDIR -type d | xargs chmod 755
 find $DESTDIR -type f | xargs chmod 644
+cd $DESTDIR
 if [ _"$1" == _"" ]; then
         exit 0
+else
+    if [ _"$1" == _"test" ]; then
+        DESTDIR=$TESTDIR
+    else
+        DESTDIR=$MONDODIR
+    fi
 fi
-cd $DESTDIR
 tar cfj /tmp/mondo-www.tz2 .
-ssh ${DESTUSER}@${DESTMACH} "rm -rf ${MONDODIR} ; mkdir ${MONDODIR}"
+ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR}"
 scp /tmp/mondo-www.tz2 ${DESTUSER}@${DESTMACH}:/tmp
-ssh ${DESTUSER}@${DESTMACH} "cd ${MONDODIR} ; tar xfj /tmp/mondo-www.tz2"
+ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfj /tmp/mondo-www.tz2"

branches/stable/website/about.shtml

@@ -62 +62 @@
       <P ALIGN=CENTER>
       <I><B>Andree Leidenfrost</B></I><BR>
-      co-development, maintenance, Debian packaging</P>
+      co-development, maintenance, Official Debian packager</P>
       <P ALIGN=CENTER>
       <I><B>Lars Rupp</B></I><BR>
-      Offical SuSE packaging</P>
+      Offical SuSE packager</P>
       <P ALIGN=CENTER>
       <I><B>Mike Roark</B></I><BR>
-      Contributor SuSE packaging</P>
+      Contributor SuSE packager</P>
       <p></p>
   <div class="h2-4">

branches/stable/website/docs.shtml

@@ -14 +14 @@
   <p>The Mondo Rescue HOWTO is available under various formats:</p>
   <ul>
-          <li>A <a href="/docs/mondorescue-howto.html">single HTML</a> page.</li>
-          <li>A <a href="/docs/mondorescue-howto.pdf">PDF</a> document.</li>
-          <li>A <a href="/docs/mondorescue-howto.rtf">RTF</a> document.</li>
-          <li>A <a href="/docs/mondorescue-howto.ps">PostScript</a> document.</li>
-          <li>A <a href="/docs/mondorescue-howto.txt">Text</a> document.</li>
-          <li><a href="/docs/mondorescue-howto/index.html">online</a>.</li>
+          <li>A <a href="/docs/mondorescue-howto.html" target="_blank">single HTML</a> page.</li>
+          <li>A <a href="/docs/mondorescue-howto.pdf" target="_blank">PDF</a> document.</li>
+          <li>A <a href="/docs/mondorescue-howto.rtf" target="_blank">RTF</a> document.</li>
+          <li>A <a href="/docs/mondorescue-howto.ps" target="_blank">PostScript</a> document.</li>
+          <li>A <a href="/docs/mondorescue-howto.txt" target="_blank">Text</a> document.</li>
+          <li><a href="/docs/mondorescue-howto/index.html" target="_blank">online</a>.</li>
   </ul>
 </p>
@@ -28 +28 @@
   <p>Here are some other documents seaking of Mondo Rescue:</p>
   <ul>
-          <li>A Mondo Rescue <a href="/docs/mondo-intro.pdf">introduction</a> (in French) made by Gallig Renaud.
-          <li>A Mondo Rescue <a href="/docs/mondo-presentation-v1.pdf">presentation</a> made by Bruno Cornec.
-          <li>A Mondo Rescue hardware migration <a href="/docs/HOWTO-_Deploy_Linux_from_SCSI_to_SATA.pdf">guide</a> made by François-Xavier Horel.
+          <li>A Mondo Rescue <a href="/docs/mondo-intro.pdf" target="_blank">introduction</a> (in French) made by Gallig Renaud.
+          <li>A Mondo Rescue <a href="/docs/mondo-presentation-v1.pdf target="_blank"">presentation</a> made by Bruno Cornec.
+          <li>A Mondo Rescue hardware migration <a href="/docs/HOWTO-_Deploy_Linux_from_SCSI_to_SATA.pdf target="_blank"">guide</a> made by François-Xavier Horel.
 
 <!--#include virtual="/bottom.shtml" -->

branches/stable/website/downloads.shtml

@@ -49 +49 @@
 <h3>Source code</h3>
 <ul>
-    <li>tarball available under <a href="http://ftp.mondorescue.org/src">http://ftp.mondorescue.org/src</a></li>
+    <li>tarball available under <a href="ftp://ftp.mondorescue.org/src">ftp://ftp.mondorescue.org/src</a></li>
     <li>Subversion browing available at <a href="http://svn.berlios.de/viewcvs/mondorescue">http://svn.berlios.de/viewcvs/mondorescue</a></li>
     <li>Anonymous HTTP Subversion check out of the project available with the following instruction set: <pre><tt>svn checkout http://svn.berlios.de/svnroot/repos/mondorescue/branches/stable</tt></pre></li>

branches/stable/website/index.shtml

@@ -27 +27 @@
   </div>
   <p><a href="http://www.hyper-linux.org/">Bruno Cornec</a>: lead development, maintenance, rpm packaging, web site, documentation<br>
-    <a href="http://www.desknow.com/desknow/directfiles/aleidenfrost/mr-debs-unofficial/index.html">Andree Leidenfrost</a>: co-development, maintenance, debian packaging<br>
+    <a href="http://www.desknow.com/desknow/directfiles/aleidenfrost/mr-debs-unofficial/index.html">Andree Leidenfrost</a>: co-development, maintenance, Official Debian packager<br>
   </p>
     <p>Original Author</p>
@@ -48 +48 @@
   <div class="c"><a href="http://www.73lab.com/"><img src="/images/icon-73lab.png" width="89" height="40" alt="73lab logo" title="Graphics by Ayo" /></a>
     <a href="http://www.mandriva.com/"><img src="/images/icon-mandriva.png" width="160" height="40" alt="Mandriva" title="Hosted on Mandriva Linux" /></a>
+    <a href="http://www.hpintelco.net"><img src="/images/hpisc.png" width="160" height="40" alt="HP/Intel Solution Center" title="Sponsored and hosted by the HP/Intel Solution Center" /></a>
+    <a href="http://www.hp.com/linux"><img src="/images/hp.png" width="120" height="40" alt="Linux at HP" title="Sponsored HP" /></a>
   </div>
   <div>
-  <p>This Web site is sponsored by <a href="http://www.hp.com/go/linux">HP</a> and the <a href="http://www.hpintelco.net">HP/Intel Solution Center</a>.</p>
   <p>This website has been designed according to the <a href="http://validator.w3.org/check?uri=http%3A%2F%2Fwww.mondorescue.org">W3C standards</a> in order to be viewable by most standard compliant browsers. Since it uses some CSS techniques, it may not render correctly on some non-free (as in <i>freedom</i>) widely used browser. If this is the case with your browser, you may want to try the latest version of <a href="http://www.mozilla.com/firefox/">Firefox</a>, a standards compliant free software browser.</p>
     <p>This site is best viewed with the free <a href="http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/">"Vera" True Type Font</a>&nbsp;&nbsp;from Bitstream.</p>

branches/stable/website/support.shtml

@@ -36 +36 @@
             <h2>Professional support services</h2>
     </div>
-    <p>If you're ready to pay for a support contract around Mondo Rescue, for your business, you may enter in contact with the following companies which have the structure to deliver it:
+    <p>For commercial support contracts for Mondo Rescue please contact one of the following companies:
     <ul>
             <li><b><a href="http://www.linagora.com/en">Linagora</a></b> - Contact: <a href="mailto:support_at_linagora.com">Support Service</a></li>
     </ul></p>
     <p>For commercial enhancement and consulting services around Mondo Rescue,
-    please contact one of the following companies which have the structure to deliver it:
+    please contact one of the following companies:
     <ul>
             <li><b><a href="http://www.hp.com/linux">Hewlett-Packard</a></b> - Contact: <a href="mailto:pingouin_at_hp.com">Free, Libre and Open Source Expertise Center</a></li>