[FFmpeg-cvslog] [ffmpeg-web] branch master updated. c51506d documentation: do not treat ffserver config file like the tools.

gitolite ffmpeg-cvslog at ffmpeg.org
Wed Jun 27 23:36:30 CEST 2012


The branch, master has been updated
       via  c51506d8f8650ca4ecc074c2cc68dcbb3ef33aba (commit)
       via  3d8605b99f787ac4668ed0f65b33065de5f28296 (commit)
       via  7e0694cacd3d7d80e2ba5179d463ef71a46ef905 (commit)
       via  b6479287e31d87b7e8412abe8f19919f5338ca17 (commit)
       via  0eef3e93c9f4a818eccc70404eff78d4817d9304 (commit)
       via  2173a4dbfa9a706fe44eefa5d56ab590ef8ff7a4 (commit)
      from  53cada7cee2042c142e4440e5ad4f0048c65ffb0 (commit)


- Log -----------------------------------------------------------------
commit c51506d8f8650ca4ecc074c2cc68dcbb3ef33aba
Author:     Clément Bœsch <ubitux at gmail.com>
AuthorDate: Mon Jun 25 22:42:24 2012 +0200
Commit:     Clément Bœsch <ubitux at gmail.com>
CommitDate: Wed Jun 27 23:35:41 2012 +0200

    documentation: do not treat ffserver config file like the tools.

diff --git a/src/documentation b/src/documentation
index e015bb4..88313e4 100644
--- a/src/documentation
+++ b/src/documentation
@@ -12,8 +12,7 @@ developers will be able to better diagnose the problem if you follow
 <li><a href="ffmpeg.html">FFmpeg</a></li>
 <li><a href="ffplay.html">FFplay</a></li>
 <li><a href="ffprobe.html">FFprobe</a></li>
-<li><a href="ffserver.html">FFserver</a></li>
-<li><a href="sample.html">Sample ffserver configuration file</a></li>
+<li><a href="ffserver.html">FFserver</a> and a <a href="sample.html">sample ffserver configuration file</a></li>
 </ul>
 
 <h2>Community contributed documentation</h2>

commit 3d8605b99f787ac4668ed0f65b33065de5f28296
Author:     Clément Bœsch <ubitux at gmail.com>
AuthorDate: Mon Jun 25 22:40:43 2012 +0200
Commit:     Clément Bœsch <ubitux at gmail.com>
CommitDate: Wed Jun 27 23:35:41 2012 +0200

    documentation: remove "Documentation" redundancy.

diff --git a/src/documentation b/src/documentation
index ab791e5..e015bb4 100644
--- a/src/documentation
+++ b/src/documentation
@@ -9,10 +9,10 @@ developers will be able to better diagnose the problem if you follow
 
 <h2>Command Line Interface (CLI) and Related Usage Documentation</h2>
 <ul>
-<li><a href="ffmpeg.html">FFmpeg Documentation</a></li>
-<li><a href="ffplay.html">FFplay Documentation</a></li>
-<li><a href="ffprobe.html">FFprobe Documentation</a></li>
-<li><a href="ffserver.html">FFserver Documentation</a></li>
+<li><a href="ffmpeg.html">FFmpeg</a></li>
+<li><a href="ffplay.html">FFplay</a></li>
+<li><a href="ffprobe.html">FFprobe</a></li>
+<li><a href="ffserver.html">FFserver</a></li>
 <li><a href="sample.html">Sample ffserver configuration file</a></li>
 </ul>
 

commit 7e0694cacd3d7d80e2ba5179d463ef71a46ef905
Author:     Clément Bœsch <ubitux at gmail.com>
AuthorDate: Mon Jun 25 22:39:12 2012 +0200
Commit:     Clément Bœsch <ubitux at gmail.com>
CommitDate: Wed Jun 27 23:35:40 2012 +0200

    documentation: change "Libavfilter" link to "Filtering".
    
    This is better from a user PoV.

diff --git a/src/documentation b/src/documentation
index 46f2c69..ab791e5 100644
--- a/src/documentation
+++ b/src/documentation
@@ -28,7 +28,7 @@ explains installing and using FFmpeg on Mac OS X.</li>
 <ul>
 <li><a href="faq.html">Frequently Asked Questions</a></li>
 <li><a href="general.html">Supported codecs, formats, protocols, ...</a></li>
-<li><a href="libavfilter.html">Libavfilter Documentation</a></li>
+<li><a href="libavfilter.html">Filtering Documentation</a></li>
 <li><a href="developer.html">Developer Documentation</a></li>
 </ul>
 

commit b6479287e31d87b7e8412abe8f19919f5338ca17
Author:     Clément Bœsch <ubitux at gmail.com>
AuthorDate: Mon Jun 25 22:38:28 2012 +0200
Commit:     Clément Bœsch <ubitux at gmail.com>
CommitDate: Wed Jun 27 23:35:40 2012 +0200

    documentation: reword general.html link.

diff --git a/src/documentation b/src/documentation
index b3f7577..46f2c69 100644
--- a/src/documentation
+++ b/src/documentation
@@ -27,7 +27,7 @@ explains installing and using FFmpeg on Mac OS X.</li>
 <h2>General Documentation</h2>
 <ul>
 <li><a href="faq.html">Frequently Asked Questions</a></li>
-<li><a href="general.html">General Documentation</a></li>
+<li><a href="general.html">Supported codecs, formats, protocols, ...</a></li>
 <li><a href="libavfilter.html">Libavfilter Documentation</a></li>
 <li><a href="developer.html">Developer Documentation</a></li>
 </ul>

commit 0eef3e93c9f4a818eccc70404eff78d4817d9304
Author:     Clément Bœsch <ubitux at gmail.com>
AuthorDate: Mon Jun 25 22:35:59 2012 +0200
Commit:     Clément Bœsch <ubitux at gmail.com>
CommitDate: Wed Jun 27 23:35:40 2012 +0200

    documentation: introduce community contributed doc section.
    
    Add the Wiki URL, but remove the Forum one (we are in the documentation
    section, and the forum is already linked in the contact page).

diff --git a/src/documentation b/src/documentation
index 7ad23ea..b3f7577 100644
--- a/src/documentation
+++ b/src/documentation
@@ -16,18 +16,20 @@ developers will be able to better diagnose the problem if you follow
 <li><a href="sample.html">Sample ffserver configuration file</a></li>
 </ul>
 
+<h2>Community contributed documentation</h2>
+<ul>
+<li><a href="http://ffmpeg.org/trac/ffmpeg/wiki">Official FFmpeg Wiki</a></li>
+<li><a href="http://stephenjungels.com/jungels.net/articles/ffmpeg-howto.html">FFmpeg on Mac OS X HOWTO</a>
+explains installing and using FFmpeg on Mac OS X.</li>
+<li><a href="http://wiki.multimedia.cx/">MultimediaWiki</a></li>
+</ul>
+
 <h2>General Documentation</h2>
 <ul>
 <li><a href="faq.html">Frequently Asked Questions</a></li>
 <li><a href="general.html">General Documentation</a></li>
 <li><a href="libavfilter.html">Libavfilter Documentation</a></li>
 <li><a href="developer.html">Developer Documentation</a></li>
-<li><a href="http://ffmpeg.zeranoe.com/">FFmpeg Windows Help</a>
-discusses all issues regarding FFmpeg under Windows including a wiki
-and help forums.</li>
-<li><a href="http://stephenjungels.com/jungels.net/articles/ffmpeg-howto.html">FFmpeg on Mac OS X HOWTO</a>
-explains installing and using FFmpeg on Mac OS X.</li>
-<li><a href="http://wiki.multimedia.cx/">MultimediaWiki</a></li>
 </ul>
 
 <h2>API Documentation</h2>

commit 2173a4dbfa9a706fe44eefa5d56ab590ef8ff7a4
Author:     Clément Bœsch <ubitux at gmail.com>
AuthorDate: Mon Jun 25 22:32:33 2012 +0200
Commit:     Clément Bœsch <ubitux at gmail.com>
CommitDate: Wed Jun 27 23:35:40 2012 +0200

    documentation: move CLI docs above general secondary info.
    
    Users are likely looking for the tools documentation first.

diff --git a/src/documentation b/src/documentation
index b597f5f..7ad23ea 100644
--- a/src/documentation
+++ b/src/documentation
@@ -7,6 +7,15 @@ developers will be able to better diagnose the problem if you follow
 <a href="bugreports.html">these bug reporting guidelines</a>.
 </p>
 
+<h2>Command Line Interface (CLI) and Related Usage Documentation</h2>
+<ul>
+<li><a href="ffmpeg.html">FFmpeg Documentation</a></li>
+<li><a href="ffplay.html">FFplay Documentation</a></li>
+<li><a href="ffprobe.html">FFprobe Documentation</a></li>
+<li><a href="ffserver.html">FFserver Documentation</a></li>
+<li><a href="sample.html">Sample ffserver configuration file</a></li>
+</ul>
+
 <h2>General Documentation</h2>
 <ul>
 <li><a href="faq.html">Frequently Asked Questions</a></li>
@@ -21,15 +30,6 @@ explains installing and using FFmpeg on Mac OS X.</li>
 <li><a href="http://wiki.multimedia.cx/">MultimediaWiki</a></li>
 </ul>
 
-<h2>Command Line Interface (CLI) and Related Usage Documentation</h2>
-<ul>
-<li><a href="ffmpeg.html">FFmpeg Documentation</a></li>
-<li><a href="ffplay.html">FFplay Documentation</a></li>
-<li><a href="ffprobe.html">FFprobe Documentation</a></li>
-<li><a href="ffserver.html">FFserver Documentation</a></li>
-<li><a href="sample.html">Sample ffserver configuration file</a></li>
-</ul>
-
 <h2>API Documentation</h2>
 <ul>
 <li><a href="doxygen/trunk/index.html">Doxygen documentation</a> for current

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

Summary of changes:
 src/documentation |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)


hooks/post-receive
-- 



More information about the ffmpeg-cvslog mailing list