[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7f79186

The following commit has been merged in the master branch:
commit 7f79186dac8a6f89e2ffa33b38c61be4a9fdf924
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Oct 13 02:13:04 2015 +0000

    #1111: Tweaked the menu items to stay on one line.
---
 website/master/manpage.html.in | 2 +-
 website/var/__navbar2__        | 4 ++--
 website/var/__navbar__         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/master/manpage.html.in b/website/master/manpage.html.in
index cad16c3..118927f 100644
--- a/website/master/manpage.html.in
+++ b/website/master/manpage.html.in
@@ -6,7 +6,7 @@ __navbar__
 
 <div class="container">
   <div class="page-header">
-    <h1>Exiv2 utility manual page</h1>
+    <h1>Exiv2 utility manual</h1>
   </div>
   <p class="lead">A Unix-style "manpage" for the Exiv2 command line utility.
   </p>
diff --git a/website/var/__navbar2__ b/website/var/__navbar2__
index ab026b1..b3da568 100644
--- a/website/var/__navbar2__
+++ b/website/var/__navbar2__
@@ -13,7 +13,7 @@
     </div>
     <div id="navbar" class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
-        <li><a href="../getting-started.html">Overview</a></li>
+        <li><a href="../getting-started.html">Getting started</a></li>
         <li><a href="../download.html">Download</a></li>
         <li><a href="../metadata.html">Metadata</a></li>
         <li><a href="../makernote.html">Makernote</a></li>
@@ -28,7 +28,7 @@
             <li><a href="../examples.html"><span class="glyphicon glyphicon-star-empty" aria-hidden="true"></span>  Examples</a></li>
           </ul>
         </li>
-        <li><a href="../manpage.html">Manpage</a></li>
+        <li><a href="../manpage.html">Manual</a></li>
 	<li class="dropdown">
           <a href="#" title="Links to the Exiv2 community website" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
           <ul class="dropdown-menu">
diff --git a/website/var/__navbar__ b/website/var/__navbar__
index 352ba65..24bd60d 100644
--- a/website/var/__navbar__
+++ b/website/var/__navbar__
@@ -13,12 +13,12 @@
     </div>
     <div id="navbar" class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
-        <li><a href="getting-started.html">Overview</a></li>
+        <li><a href="getting-started.html">Getting started</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="metadata.html">Metadata</a></li>
         <li><a href="makernote.html">Makernote</a></li>
         <li><a href="doc/index.html">API</a></li>
-        <li><a href="manpage.html">Manpage</a></li>
+        <li><a href="manpage.html">Manual</a></li>
 	<li class="dropdown">
           <a href="#" title="Links to the Exiv2 community website" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
           <ul class="dropdown-menu">

-- 
exiv2 packaging