[PATCH 1/3] web: In README, CSS generated for ffmpeg repo not merged anymore due to copyright requirements
--- README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) 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 -- 1.7.0.4
--- src/template_head2 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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> -- 1.7.0.4
On Sat, Sep 6, 2014, at 04:37 AM, db0company wrote:
--- src/template_head2 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
LGTM, thanks. I can apply, but I'll be unable to until Monday. Anyone else can feel free to beat me to it.
On Sat, 06 Sep 2014 09:15:40 -0800, Lou wrote:
On Sat, Sep 6, 2014, at 04:37 AM, db0company wrote:
--- src/template_head2 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
LGTM, thanks.
I can apply, but I'll be unable to until Monday. Anyone else can feel free to beat me to it.
Pushed.
--- src/documentation | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) 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 --> -- 1.7.0.4
On Sat, Sep 6, 2014, at 04:37 AM, db0company wrote:
--- src/documentation | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
I don't have a strong opinion about this patch but there are two things I want to bikeshed: 1. One nice thing about the current format is that the link names (ffmpeg-*) are the same as the man page name for each component, such as "man ffmpeg-filters", but I'm unsure if many users make that connection. 2. It is more consistent with the "Command Line Tools Documentation" section if the ffmpeg-* are preserved. I agree that the "FFmpeg" is redundant and could go. I'm fine with the patch if anyone else wants to give the LGTM.
On Sat, Sep 06, 2014 at 09:12:47AM -0800, Lou Logan wrote:
On Sat, Sep 6, 2014, at 04:37 AM, db0company wrote:
--- src/documentation | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
I don't have a strong opinion about this patch but there are two things I want to bikeshed:
1. One nice thing about the current format is that the link names (ffmpeg-*) are the same as the man page name for each component, such as "man ffmpeg-filters", but I'm unsure if many users make that connection.
I doubt most users realize that by looking at the page. They can find the appropriate man-page by doing man ffm<tab> in the shell. Currently, the page index is really cluttered for no purpose, and I often see users ending up in "libavfilter" section instead of "filters", probably because the library section is easier to read, and the components just looks like a "FFmpeg words soup".
2. It is more consistent with the "Command Line Tools Documentation" section if the ffmpeg-* are preserved.
Maybe we should change that one as well. Something like: • ffmpeg (full help) • ffplay (full help) • ffprobe (full help) • ffserver (full help, sample configuration file)
I agree that the "FFmpeg" is redundant and could go. I'm fine with the patch if anyone else wants to give the LGTM.
-- Clément B.
Am 6. September 2014 19:23:25 MESZ, schrieb "Clément Bœsch" <u@pkh.me>:
On Sat, Sep 6, 2014, at 04:37 AM, db0company wrote:
--- src/documentation | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
I don't have a strong opinion about this patch but there are two
On Sat, Sep 06, 2014 at 09:12:47AM -0800, Lou Logan wrote: things
I want to bikeshed:
1. One nice thing about the current format is that the link names (ffmpeg-*) are the same as the man page name for each component, such as "man ffmpeg-filters", but I'm unsure if many users make that connection.
I doubt most users realize that by looking at the page. They can find the appropriate man-page by doing man ffm<tab> in the shell.
Currently, the page index is really cluttered for no purpose, and I often see users ending up in "libavfilter" section instead of "filters", probably because the library section is easier to read, and the components just looks like a "FFmpeg words soup".
I fear current situation is not very friendly for new (documentation) users :(
2. It is more consistent with the "Command Line Tools Documentation" section if the ffmpeg-* are preserved.
Maybe we should change that one as well.
Something like:
• ffmpeg (full help) • ffplay (full help) • ffprobe (full help) • ffserver (full help, sample configuration file)
Looks reasonable to me. [...] Alexander
Sorry, please ignore my previous mail! A quirk in my mail setup tricked me into thinking this was new mail. After looking at current documentation link layout I still think we could still avoid the double links (ffmpeg, ffmpeg-full) and just show one entry per tool always linking to full. Alexander Am 10. November 2015 10:01:23 MEZ, schrieb Alexander Strasser <eclipse7@gmx.net>:
Am 6. September 2014 19:23:25 MESZ, schrieb "Clément Bœsch" <u@pkh.me>:
On Sat, Sep 6, 2014, at 04:37 AM, db0company wrote:
--- src/documentation | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
I don't have a strong opinion about this patch but there are two
On Sat, Sep 06, 2014 at 09:12:47AM -0800, Lou Logan wrote: things
I want to bikeshed:
1. One nice thing about the current format is that the link names (ffmpeg-*) are the same as the man page name for each component, such as "man ffmpeg-filters", but I'm unsure if many users make that connection.
I doubt most users realize that by looking at the page. They can find the appropriate man-page by doing man ffm<tab> in the shell.
Currently, the page index is really cluttered for no purpose, and I often see users ending up in "libavfilter" section instead of "filters", probably because the library section is easier to read, and the components just looks like a "FFmpeg words soup".
I fear current situation is not very friendly for new (documentation) users :(
2. It is more consistent with the "Command Line Tools Documentation" section if the ffmpeg-* are preserved.
Maybe we should change that one as well.
Something like:
• ffmpeg (full help) • ffplay (full help) • ffprobe (full help) • ffserver (full help, sample configuration file)
Looks reasonable to me.
[...]
Alexander
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On Sat, 6 Sep 2014 14:37:14 +0200, db0company wrote:
--- src/documentation | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
Pushed, thanks!
On Sat, 6 Sep 2014 14:37:12 +0200, db0company wrote:
--- README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
Pushed, thanks!
participants (5)
-
Alexander Strasser -
Clément Bœsch -
db0company -
Lou -
Lou Logan