The branch, master has been updated
       via  2fb4c5fc288793ddc1bd5342bd0a117c14024f4a (commit)
       via  45b7038a29794a9592668772e5caf41dc7d3fe17 (commit)
      from  110925bb71a0c83cfcd247958eb0d7c22a7d63f7 (commit)


- Log -----------------------------------------------------------------
commit 2fb4c5fc288793ddc1bd5342bd0a117c14024f4a
Author:     Michael Niedermayer <mich...@niedermayer.cc>
AuthorDate: Tue May 17 14:35:08 2016 +0200
Commit:     Michael Niedermayer <mich...@niedermayer.cc>
CommitDate: Wed May 18 00:18:19 2016 +0200

    web: use https for forgotten trac wiki links
    
    Reviewed-by: Lou Logan <l...@lrcd.com>

diff --git a/src/documentation b/src/documentation
index 872206e..e6df56f 100644
--- a/src/documentation
+++ b/src/documentation
@@ -109,7 +109,7 @@
       <span class="pull-right"><i class="fa fa-5x fa-fw fa-users"></i></span>
       <h3><strong>Community Contributed Documentation</strong></h3>
       <ul>
-        <li><a href="http://trac.ffmpeg.org/wiki";>Official FFmpeg Wiki</a></li>
+        <li><a href="https://trac.ffmpeg.org/wiki";>Official FFmpeg 
Wiki</a></li>
         <li><a href="http://wiki.multimedia.cx/";>MultimediaWiki</a></li>
         <li><a href="http://dranger.com/ffmpeg/";>An FFmpeg and SDL Tutorial</a>
           by Stephen Dranger, explains how to write a video player based on 
FFmpeg
diff --git a/src/template_head2 b/src/template_head2
index 2e61b30..a0b11ab 100644
--- a/src/template_head2
+++ b/src/template_head2
@@ -27,7 +27,7 @@
               <li><a href="contact.html#IRCChannels">IRC</a></li>
               <li><a href="contact.html#Forums">Forums</a></li>
               <li><a href="bugreports.html">Bug Reports</a></li>
-              <li><a href="http://trac.ffmpeg.org";>Wiki</a></li>
+              <li><a href="https://trac.ffmpeg.org";>Wiki</a></li>
             </ul>
           </li>
           <li><a href="developer.html">Developers</a>

commit 45b7038a29794a9592668772e5caf41dc7d3fe17
Author:     Michael Niedermayer <mich...@niedermayer.cc>
AuthorDate: Tue May 17 14:27:45 2016 +0200
Commit:     Michael Niedermayer <mich...@niedermayer.cc>
CommitDate: Wed May 18 00:17:57 2016 +0200

    web/contact: Use https for external links where it works
    
    Reviewed-by: Lou Logan <l...@lrcd.com>

diff --git a/src/contact b/src/contact
index e84367b..9ee7392 100644
--- a/src/contact
+++ b/src/contact
@@ -8,7 +8,7 @@
       <div style="color: white">
         <p>
           Please follow the netiquette when posting on FFmpeg mailing lists, 
especially
-          avoid <a 
href="http://en.wikipedia.org/wiki/Top-posting";>top-posting</a> and
+          avoid <a 
href="https://en.wikipedia.org/wiki/Top-posting";>top-posting</a> and
           thread hijacking (that is, replying to a thread and changing the 
subject line to
           something completely unrelated that was not being discussed within 
the original
           thread).
@@ -98,7 +98,7 @@
         IRC Channels</h3>
       <div style="color: white">
         <p>
-          FFmpeg has two official channels on the <a 
href="http://freenode.net/";>freenode</a>
+          FFmpeg has two official channels on the <a 
href="https://freenode.net/";>freenode</a>
           IRC network. Both channels are open and unmoderated. Developers with 
commit
           rights have operator status, contributors with patches in FFmpeg
           have voice in the channels.
@@ -154,7 +154,7 @@
     </p>
   </div>
   <p class="text-center">
-    <a class="btn btn-success btn-lg" 
href="http://ffmpeg.zeranoe.com/forum/";>FFmpeg on Windows</a>
+    <a class="btn btn-success btn-lg" 
href="https://ffmpeg.zeranoe.com/forum/";>FFmpeg on Windows</a>
     &nbsp; &nbsp;
     <a class="btn btn-success btn-lg" 
href="http://ffmpeg.gusari.org/index.php";>FFmpeg Support Forum</a>
   </p>

-----------------------------------------------------------------------

Summary of changes:
 src/contact        | 6 +++---
 src/documentation  | 2 +-
 src/template_head2 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to