Tweak docs and upload

diff --git a/docs/home-page/en/pages/documentation.php b/docs/home-page/en/pages/documentation.php
index f3c9c5aa8cb349391b657d5f977221dd76498532..ee3692017641be34e835ad20f53440a0362950f6 100644 (file)
--- a/docs/home-page/en/pages/documentation.php
+++ b/docs/home-page/en/pages/documentation.php
@@ -4,7 +4,50 @@
 
    <tr>
      <td class="contentTopic">
-     Manuals for Released Version 5.2.x
+     Manuals for Previous Released Version 7.0.x
+     </td>
+   </tr>
+   <tr>
+     <td class="content">
+      <ul>
+      <li> News about Bacula 
+          <a href="<? echo $spath ?>/?page=news"> HTML</a>
+         </li>
+      <li>New Features in Released Version 7.0.x
+         <a href="/7.0.x-manuals/en/main/New_Features_in_7_0_0.html"> HTML</a>
+         </li><br>
+      <li>Bacula Main Reference Guide
+         <a href="/7.0.x-manuals/en/main/main.pdf"> PDF</a>
+         <a href="/7.0.x-manuals/en/main/index.html">/HTML </a>
+         </li>
+      <li>Console and Operators Guide
+         <a href="/7.0.x-manuals/en/console/console.pdf"> PDF</a>
+         <a href="/7.0.x-manuals/en/console/index.html">/HTML </a>
+         </li>
+      <li>Problem Resolution Guide
+         <a href="/7.0.x-manuals/en/problems/problems.pdf"> PDF</a>
+         <a href="/7.0.x-manuals/en/problems/index.html">/HTML </a>
+         </li>
+      <li>Utility Programs
+         <a href="/7.0.x-manuals/en/utility/utility.pdf"> PDF</a>
+         <a href="/7.0.x-manuals/en/utility/index.html">/HTML </a>
+         </li>
+      <li>Miscellaneous Guide
+         <a href="/7.0.x-manuals/en/misc/misc.pdf"> PDF</a>
+         <a href="/7.0.x-manuals/en/misc/index.html">/HTML </a>
+         </li>
+      <li>Developers' Guide
+         <a href="/7.0.x-manuals/en/developers/developers.pdf"> PDF</a>
+         <a href="/7.0.x-manuals/en/developers/Developer_s_Guide.html">/HTML </a>
+         </li>
+      <br>
+     </td>
+   </tr>
+
+
+   <tr>
+     <td class="contentTopic">
+     Manuals for Previous Released Version 5.2.x
      </td>
    </tr>
    <tr>

diff --git a/docs/upload b/docs/upload
index 391ca74e15ab9ebf35dff999429aa0dcbaa3d589..c02cb87d9b2f7e28bce36b25ace6290780cf2e46 100755 (executable)
--- a/docs/upload
+++ b/docs/upload
@@ -6,8 +6,8 @@ if [ $# != 1 ] ; then
 fi
 cwd=`pwd`
 lang=$1
-src=$cwd/manuals/${lang}
-ver=5.2.12
+src=$cwd/manuals/${lang}/pdf-and-html
+ver=7.0.0
 repo=release
 
 echo "ver=${ver}"
@@ -15,15 +15,19 @@ echo "ver=${ver}"
 # sendit src dest
 sendit()
 {
+  cp images/*.png $1/../images/
   for i in console developers main misc problems utility; do
     echo " "
     echo "Sending: $1/$i"
     echo "To:      $2/$i"
-    rsync -avz --delete --progress $1/$i/$i/     $2/$i/$i/
+    echo "Copy images/png to $1/$i/"
+#    cp images/png/* $1/$i/
+    rsync -avz --delete --progress $1/$i/        $2/$i/
     rsync -avz --delete --progress $1/$i/$i.pdf  $2/$i/
   done
+  rsync -avz --delete --progress $1/../images/ $2/images/
 }
 
-dest=bacula:/var/www/bacula/5.2.x-manuals/${lang}
+dest=bacula:/var/www/bacula/7.0.x-manuals/${lang}
 echo "Sending to $dest"
 sendit $src $dest