[FFmpeg-cvslog] [ffmpeg-web] branch master updated. ff09463 web: In the nav, Developers links to developer.html + new Contribute link

[gitolite]

The branch, master has been updated
       via  ff094635415c39c458a0d8c480d7ce2da582e41a (commit)
       via  af04cf330bda09a5ac5876ccae33cbbe8272e576 (commit)
       via  75006f46dcb9e054abd1015fc1c624eb4d2a31ab (commit)
      from  a1bef615b0dfb8bc769a97a43ab3b04a302ab178 (commit)


- Log -----------------------------------------------------------------
commit ff094635415c39c458a0d8c480d7ce2da582e41a
Author:     db0company <db0company at gmail.com>
AuthorDate: Sat Sep 6 14:37:13 2014 +0200
Commit:     Lou Logan <lou at lrcd.com>
CommitDate: Wed Sep 10 10:26:02 2014 -0800

    web: In the nav, Developers links to developer.html + new Contribute link

diff --git a/src/template_head2 b/src/template_head2
index a818fe2..2e61b30 100644
--- a/src/template_head2
+++ b/src/template_head2
@@ -30,9 +30,10 @@
               <li><a href="http://trac.ffmpeg.org">Wiki</a></li>
             </ul>
           </li>
-          <li><a href="#">Developers</a>
+          <li><a href="developer.html">Developers</a>
             <ul>
               <li><a href="download.html#get-sources">Source Code</a>
+              <li><a href="developer.html#Contributing">Contribute</a></li>
               <li><a href="http://fate.ffmpeg.org">FATE</a></li>
               <li><a href="http://coverage.ffmpeg.org">Code Coverage</a></li>
             </ul>

commit af04cf330bda09a5ac5876ccae33cbbe8272e576
Author:     db0company <db0company at gmail.com>
AuthorDate: Sat Sep 6 14:37:14 2014 +0200
Commit:     Lou Logan <lou at lrcd.com>
CommitDate: Wed Sep 10 10:25:59 2014 -0800

    web/documentation: Simplify Components Documentation links

diff --git a/src/documentation b/src/documentation
index a17725f..05408fd 100644
--- a/src/documentation
+++ b/src/documentation
@@ -29,15 +29,15 @@
       <span class="pull-right"><i class="fa fa-5x fa-fw fa-sitemap"></i></span>
       <h3><strong>Components Documentation</strong></h3>
       <ul>
-        <li><a href="ffmpeg-utils.html">ffmpeg-utils</a>: FFmpeg utilities</li>
-        <li><a href="ffmpeg-scaler.html">ffmpeg-scaler</a>: FFmpeg video scaling and pixel format converter</li>
-        <li><a href="ffmpeg-resampler.html">ffmpeg-resampler</a>: FFmpeg audio resampler</li>
-        <li><a href="ffmpeg-codecs.html">ffmpeg-codecs</a>: FFmpeg encoders and decoders (codecs)</li>
-        <li><a href="ffmpeg-bitstream-filters.html">ffmpeg-bitstream-filters</a>: FFmpeg bitstream filters</li>
-        <li><a href="ffmpeg-formats.html">ffmpeg-formats</a>: FFmpeg muxers and demuxers (formats)</li>
-        <li><a href="ffmpeg-protocols.html">ffmpeg-protocols</a>: FFmpeg protocols</li>
-        <li><a href="ffmpeg-devices.html">ffmpeg-devices</a>: FFmpeg input and output devices</li>
-        <li><a href="ffmpeg-filters.html">ffmpeg-filters</a>: FFmpeg filters</li>
+        <li><a href="ffmpeg-utils.html">Utilities</a></li>
+        <li><a href="ffmpeg-scaler.html">Video scaling and pixel format converter</a></li>
+        <li><a href="ffmpeg-resampler.html">Audio resampler</a></li>
+        <li><a href="ffmpeg-codecs.html">Encoders and decoders (codecs)</a></li>
+        <li><a href="ffmpeg-bitstream-filters.html">Bitstream filters</a></li>
+        <li><a href="ffmpeg-formats.html">Muxers and demuxers (formats)</a></li>
+        <li><a href="ffmpeg-protocols.html">Protocols</a></li>
+        <li><a href="ffmpeg-devices.html">Input and output devices</a></li>
+        <li><a href="ffmpeg-filters.html">Filters</a></li>
       </ul>
     </div>
   </div> <!-- col -->

commit 75006f46dcb9e054abd1015fc1c624eb4d2a31ab
Author:     db0company <db0company at gmail.com>
AuthorDate: Sat Sep 6 14:37:12 2014 +0200
Commit:     Lou Logan <lou at lrcd.com>
CommitDate: Wed Sep 10 10:25:52 2014 -0800

    web: In README, CSS generated for ffmpeg repo not merged anymore due to copyright requirements

diff --git a/README b/README
index ca70560..5076719 100644
--- a/README
+++ b/README
@@ -18,8 +18,9 @@ GENERATE THE DOCUMENTATION
 To generate the documentation pages, just `./generate-doc.sh <ffmpeg-src>`.
 
 In case of a major CSS update, please also update the `style.min.css` file in
-the main FFmpeg repo:
-  $ cat /path/to/ffmpeg-web/src/css_credit /path/to/ffmpeg-web/htdocs/css/{bootstrap.min.css,style.min.css} > /path/to/ffmpeg/doc/style.min.css
+the main FFmpeg repo
+  $ cp htdocs/css/{bootstrap.min.css,style.min.css} /path/to/ffmpeg/doc/
+
 
 
 WEBSITE DEVELOPERS INSTRUCTIONS

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

Summary of changes:
 README             |    5 +++--
 src/documentation  |   18 +++++++++---------
 src/template_head2 |    3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)


hooks/post-receive
--