On Mon, 21 Nov 2005, Michael Wechner wrote:

Jann Forrer wrote:


Hi

I tried for the first time to update the lenya website last Friday according to

http://lenya.apache.org/community/website-update.html

I had no probelm till point 3 on the "Roundtrip website update" section. I made a svn up in my local $lenya.apache.org and then copy the $lenya.docu/build/site/* to $lenya.apache.org. Before doing a svn ci i tried svn diff and got a bunch of differences. Any idea what the problem could be?


maybe someone has changed the content of site directly instead generating it through Forrest

Shall I nevertheless ci my changes?


well, it probably depends on the changes resp. differences


I only changed the live-sites.html page i.e. adding a new entry. However a svn diff live-sites.html leads to the above listed differences. Any hints what's wrong here or how i can ci my changes?

Jann


Index: live-sites.html
===================================================================
--- live-sites.html     (revision 348144)
+++ live-sites.html     (working copy)
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.6">
+<meta name="Forrest-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Lenya Live Sites</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -16,49 +16,22 @@
 <body onload="init()">
 <script type="text/javascript">ndeSetTextSize();</script>
 <div id="top">
-<!--+
-    |breadtrail
-    +-->
 <div class="breadtrail">
<a href="http://www.apache.org/";>apache</a> &gt; <a href="http://lenya.apache.org/";>lenya</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
 </div>
-<!--+
-    |header
-    +-->
 <div class="header">
-<!--+
-    |start group logo
-    +-->
 <div class="grouplogo">
<a href=""><img class="logoImage" alt="Lenya" src="../images/apache-lenya-light.png" title=""></a>
 </div>
-<!--+
-    |end group logo
-    +-->
-<!--+
-    |start Project Logo
-    +-->
 <div class="projectlogo">
 <a href=""></a>
 </div>
-<!--+
-    |end Project Logo
-    +-->
-<!--+
-    |start Search
-    +-->
 <div class="searchbox">
<form action="http://www.google.com/search"; method="get" class="roundtopsmall"> -<input value="lenya.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with :');" value="Search the site with :" size="25" name="q" id="query" type="text">&nbsp;
-                    <input name="Search" value="Search" type="submit">
+<input value="lenya.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with ');" size="25" name="q" id="query" type="text" value="Search the site with ">&nbsp; + <input attr="value" name="Search" value="Search" type="submit">
 </form>
 </div>
-<!--+
-    |end search
-    +-->
-<!--+
-    |start Tabs
-    +-->
 <ul id="tabs">
 <li>
 <a class="base-not-selected" href="../index.html">Project</a>
@@ -73,87 +46,59 @@
 <a class="base-selected" href="../community/index.html">Community</a>
 </li>
 </ul>
-<!--+
-    |end Tabs
-    +-->
 </div>
 </div>
 <div id="main">
 <div id="publishedStrip">
-<!--+
-    |start Subtabs
-    +-->
 <div id="level2tabs"></div>
-<!--+
-    |end Endtabs
-    +-->
-<script type="text/javascript" language="JavaScript"><!--
-              document.write("Published: " + document.lastModified);
-              //  --></script>
+<script type="text/javascript"><!--
+document.write("<text>Last Published:</text> " + document.lastModified);
+//  --></script>
 </div>
-<!--+
-    |breadtrail
-    +-->
 <div class="breadtrail">

              &nbsp;
            </div>
-<!--+
-    |start Menu, mainarea
-    +-->
-<!--+
-    |start Menu
-    +-->
 <div id="menu">
<div onclick="SwitchMenu('menu_selected_1.1', '../skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Community</div> <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a title="" href="../community/index.html">Contributing</a>
+<a href="../community/index.html">Contributing</a>
 </div>
 <div class="menuitem">
-<a title="" href="http://wiki.apache.org/lenya/";>Lenya Wiki</a>
+<a href="http://wiki.apache.org/lenya/";>Lenya Wiki</a>
 </div>
 <div class="menuitem">
-<a title="" href="../community/translations.html">Translations</a>
+<a href="../community/translations.html">Translations</a>
 </div>
 <div class="menuitem">
-<a title="" href="../community/acknowledgements.html">Credits</a>
+<a href="../community/acknowledgements.html">Credits</a>
 </div>
 <div class="menuitem">
-<a title="" href="http://svn.apache.org/viewcvs.cgi/lenya/#dirlist";>SVN Web</a>
+<a href="http://svn.apache.org/viewcvs.cgi/lenya/#dirlist";>SVN Web</a>
 </div>
 <div class="menuitem">
-<a title="" href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Lenya&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Importance";>Bug Tracker</a> +<a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Lenya&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Importance";>Bug Tracker</a>
 </div>
 <div class="menuitem">
-<a title="" href="../community/mailing-lists.html">Mailing Lists</a>
+<a href="../community/mailing-lists.html">Mailing Lists</a>
 </div>
 <div class="menuitem">
-<a title="" href="../community/irc.html">IRC</a>
+<a href="../community/irc.html">IRC</a>
 </div>
 <div class="menupage">
 <div class="menupagetitle">Live Sites</div>
-<div class="menupageitemgroup"></div>
 </div>
 <div class="menuitem">
-<a title="" href="../community/website-update.html">Website Update</a>
+<a href="../community/website-update.html">Website Update</a>
 </div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="../skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
-<!--+
-  |alternative credits
-  +-->
+<div id="credit2"></div>
 </div>
-<!--+
-    |end Menu
-    +-->
-<!--+
-    |start content
-    +-->
 <div id="content">
-<div id="skinconf-txtlink"></div>
 <div title="Portable Document Format" class="pdflink">
<a class="dida" href="live-sites.pdf"><img alt="PDF -icon" src="../skin/images/pdfdoc.gif" class="skin"><br>
         PDF</a>
@@ -311,7 +256,10 @@
 </li>

 <li>
-<a href="http://www.unipublic.unizh.ch";>Online Journal of the University of Zurich</a> +<a href="http://www.unicms.unizh.ch/docu/live-pubs.html";>University of Z&uuml;rich</a> (different publications are maintained whith lenya)</li>
+
+<li>
+<a href="http://www.unipublic.unizh.ch";>Online Journal of the University of Z&uuml;rich</a>
 </li>

 <li>
@@ -355,18 +303,22 @@
 </li>

 <li>
-<a href="http://www.univ-reunion.fr";>University of Reunion</a>
+<a href="http://www.vorlesungen.unizh.ch";>University of Zurich Course List</a>
 </li>

 <li>
-<a href="http://www.vorlesungen.unizh.ch";>University of Zurich Course List</a> +<a href="http://www.uniaktuell.unibe.ch/";>University of Bern Online Magazine</a>
 </li>

 <li>
-<a href="http://www.uniaktuell.unibe.ch/";>University of Bern Online Magazine</a>
+<a href="http://hcilab.uniud.it";>University of Udine - HCI Lab</a>
 </li>

 <li>
+<a href="http://www.fisica.uniud.it/ffp6/";>University of Udine - Sixth Int. Symp. of Frontiers of Fundamental and Comp. Physics</a>
+</li>
+
+<li>
 <a href="http://www.whitebearsolutions.com/";>White Bear Solutions</a>
 </li>

@@ -381,29 +333,22 @@
 </ul>

 </div>
-<!--+
-    |end content
-    +-->
 <div class="clearboth">&nbsp;</div>
 </div>
 <div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
 <div class="lastmodified">
 <script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
+document.write("<text>Last Published:</text> " + document.lastModified);
 //  --></script>
 </div>
 <div class="copyright">
- Copyright &copy; 2002-2005 The Apache Software Foundation.</div>
+        Copyright &copy;
+ 2002-2005 <a href="http://www.apache.org/licenses/LICENSE-2.0";>The Apache Software Foundation.</a>
+</div>
 <div id="feedback">
     Send feedback about the website to:
<a id="feedbackto" href="mailto:[EMAIL PROTECTED]/live-sites.html">[email protected]</a>
 </div>
-<!--+
-    |end bottomstrip
-    +-->
 </div>
 </body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to