Bug#522733: Debian Developer's Reference: FR instead of EN / broken links
Hello Matt, Can we get this fix applied soon ? I've been bugged multiple times already about the broken links. That document is important to many and we should not let the situation rot for so long. Even a temporary hack is ok until you have a complete solution. Cheers, On Tue, 14 Apr 2009, Simon Paillard wrote: Hello, On Wed, Apr 08, 2009 at 08:56:55AM +0200, Jens Seidel wrote: On Tue, Apr 07, 2009 at 02:36:40PM -0700, Matt Kraai wrote: On Tue, Apr 07, 2009 at 09:47:21PM +0200, Simon Paillard wrote: symlinks index.html.$lang - index.$lang.html can be created in the cron task that updates the doc. Most of the links on the Debian website don't use any extensions. Would it be possible to modify the developer's reference to do the same? A problem could be delivering offline documents which are readable without installed webserver. Agrees, here is a patch against the cron that creates for each file filename.html.$lang - filename.$lang.html (except for japanese, see below). If not, I think we'll have to have the symbolic links, but I think that would prevent language negotiation from working for other languages. Or simply adapt the build system to either respect a variable which expands to either .html or or to remove .html via sed/perl if build on www-master ... Concerning the devref, the files are taken from the packages (except concerning http://debian.org/doc/manuals/developers-reference/index.ja.html whose I don't understand the origin from the cron cvs). Can someone point the place where this copy/build is perfomered ? Regards. -- Simon Paillard --- cron.orig 2009-04-14 22:27:29.0 +0200 +++ cron 2009-04-14 22:38:23.0 +0200 @@ -74,9 +74,12 @@ for doc in dr/usr/share/doc/developers-reference/*.html do install -p -m 664 $doc $webdocdir/developers-reference/$(basename $doc .html).en.html + ln -sf $webdocdir/developers-reference/$(basename $doc .html).en.html $webdocdir/developers-reference/$(basename $doc .html).html.en done install -p -m 664 dr/usr/share/doc/developers-reference/developers-reference.pdf $webdocdir/developers-reference/developers-reference.en.pdf +ln -sf $webdocdir/developers-reference/developers-reference.en.pdf $webdocdir/developers-reference/developers-reference.pdf.en install -p -m 664 dr/usr/share/doc/developers-reference/developers-reference.txt.gz $webdocdir/developers-reference/developers-reference.en.txt.gz +ln -sf $webdocdir/developers-reference/developers-reference.en.txt.gz $webdocdir/developers-reference/developers-reference.txt.gz.en rm -rf dr drdeb=`ls -t1 $ftpdir/pool/main/d/developers-reference/developers-reference-fr_*.deb | head -1` @@ -85,9 +88,12 @@ for doc in dr/usr/share/doc/developers-reference-fr/*.html do install -p -m 664 $doc $webdocdir/developers-reference/$(basename $doc .html).fr.html + ln -sf $webdocdir/developers-reference/$(basename $doc .html).fr.html $webdocdir/developers-reference/$(basename $doc .html).html.fr done install -p -m 664 dr/usr/share/doc/developers-reference-fr/developers-reference.pdf $webdocdir/developers-reference/developers-reference.fr.pdf +ln -sf $webdocdir/developers-reference/developers-reference.fr.pdf $webdocdir/developers-reference/developers-reference.pdf.fr install -p -m 664 dr/usr/share/doc/developers-reference-fr/developers-reference.txt.gz $webdocdir/developers-reference/developers-reference.fr.txt.gz +ln -sf $webdocdir/developers-reference/developers-reference.fr.txt.gz $webdocdir/developers-reference/developers-reference.txt.gz.fr rm -rf dr echo -n maint-guide -- Raphaël Hertzog Contribuez à Debian et gagnez un cahier de l'admin Debian Lenny : http://www.ouaza.com/wp/2009/03/02/contribuer-a-debian-gagner-un-livre/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN / broken links
On Thu, Apr 16, 2009 at 08:23:28AM +0200, Raphael Hertzog wrote: Can we get this fix applied soon ? I've been bugged multiple times already about the broken links. That document is important to many and we should not let the situation rot for so long. Even a temporary hack is ok until you have a complete solution. Sure, done. I don't know why I didn't commit that patch when I first saw it. Should I leave the bug open? -- Matt http://ftbfs.org/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN / broken links
Hello, On Wed, Apr 08, 2009 at 08:56:55AM +0200, Jens Seidel wrote: On Tue, Apr 07, 2009 at 02:36:40PM -0700, Matt Kraai wrote: On Tue, Apr 07, 2009 at 09:47:21PM +0200, Simon Paillard wrote: symlinks index.html.$lang - index.$lang.html can be created in the cron task that updates the doc. Most of the links on the Debian website don't use any extensions. Would it be possible to modify the developer's reference to do the same? A problem could be delivering offline documents which are readable without installed webserver. Agrees, here is a patch against the cron that creates for each file filename.html.$lang - filename.$lang.html (except for japanese, see below). If not, I think we'll have to have the symbolic links, but I think that would prevent language negotiation from working for other languages. Or simply adapt the build system to either respect a variable which expands to either .html or or to remove .html via sed/perl if build on www-master ... Concerning the devref, the files are taken from the packages (except concerning http://debian.org/doc/manuals/developers-reference/index.ja.html whose I don't understand the origin from the cron cvs). Can someone point the place where this copy/build is perfomered ? Regards. -- Simon Paillard --- cron.orig 2009-04-14 22:27:29.0 +0200 +++ cron 2009-04-14 22:38:23.0 +0200 @@ -74,9 +74,12 @@ for doc in dr/usr/share/doc/developers-reference/*.html do install -p -m 664 $doc $webdocdir/developers-reference/$(basename $doc .html).en.html + ln -sf $webdocdir/developers-reference/$(basename $doc .html).en.html $webdocdir/developers-reference/$(basename $doc .html).html.en done install -p -m 664 dr/usr/share/doc/developers-reference/developers-reference.pdf $webdocdir/developers-reference/developers-reference.en.pdf +ln -sf $webdocdir/developers-reference/developers-reference.en.pdf $webdocdir/developers-reference/developers-reference.pdf.en install -p -m 664 dr/usr/share/doc/developers-reference/developers-reference.txt.gz $webdocdir/developers-reference/developers-reference.en.txt.gz +ln -sf $webdocdir/developers-reference/developers-reference.en.txt.gz $webdocdir/developers-reference/developers-reference.txt.gz.en rm -rf dr drdeb=`ls -t1 $ftpdir/pool/main/d/developers-reference/developers-reference-fr_*.deb | head -1` @@ -85,9 +88,12 @@ for doc in dr/usr/share/doc/developers-reference-fr/*.html do install -p -m 664 $doc $webdocdir/developers-reference/$(basename $doc .html).fr.html + ln -sf $webdocdir/developers-reference/$(basename $doc .html).fr.html $webdocdir/developers-reference/$(basename $doc .html).html.fr done install -p -m 664 dr/usr/share/doc/developers-reference-fr/developers-reference.pdf $webdocdir/developers-reference/developers-reference.fr.pdf +ln -sf $webdocdir/developers-reference/developers-reference.fr.pdf $webdocdir/developers-reference/developers-reference.pdf.fr install -p -m 664 dr/usr/share/doc/developers-reference-fr/developers-reference.txt.gz $webdocdir/developers-reference/developers-reference.fr.txt.gz +ln -sf $webdocdir/developers-reference/developers-reference.fr.txt.gz $webdocdir/developers-reference/developers-reference.txt.gz.fr rm -rf dr echo -n maint-guide
Bug#522733: Debian Developer's Reference: FR instead of EN
On Mon, Apr 06, 2009 at 03:40:17PM -0700, Matt Kraai wrote: On Mon, Apr 06, 2009 at 09:46:52PM +0200, Simon Paillard wrote: The names from the packages are not the ones expected by the content-negociation setup. Hence the change in the crontab. However, I guess the old files *html.* shoud be removed. That leaves all of the links broken, since they link to FILE.html. The links should not exist either, since request to filename.html is handled by apache content negociation which will display the relevant filaname.$lang.html to the user. I don't know where these symlinks come from.. -- Simon Paillard -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN
On Tue, Apr 07, 2009 at 10:09:09AM +0200, Simon Paillard wrote: On Mon, Apr 06, 2009 at 03:40:17PM -0700, Matt Kraai wrote: On Mon, Apr 06, 2009 at 09:46:52PM +0200, Simon Paillard wrote: The names from the packages are not the ones expected by the content-negociation setup. Hence the change in the crontab. However, I guess the old files *html.* shoud be removed. That leaves all of the links broken, since they link to FILE.html. The links should not exist either, since request to filename.html is handled by apache content negociation which will display the relevant filaname.$lang.html to the user. I don't know where these symlinks come from.. Sorry, I used some misleading terminology. The links to the Scope ofx This Document section in the Table of Contents at http://www.debian.org/doc/developers-reference/ and http://www.debian.org/doc/developers-reference/index.fr.html both point to http://www.debian.org/doc/developers-reference/scope.html Since the only scope files are scope.en.html scope.fr.html scope.jp.html none of these files are served up. I think that the links in the Developer's Reference need to be changed to remove the .html suffix, in which case they'll work with the content negotiation. -- Matt http://ftbfs.org/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN
On Tue, Apr 07, 2009 at 07:12:48AM -0700, Matt Kraai wrote: On Tue, Apr 07, 2009 at 10:09:09AM +0200, Simon Paillard wrote: On Mon, Apr 06, 2009 at 03:40:17PM -0700, Matt Kraai wrote: Sorry, I used some misleading terminology. The links to the Scope ofx This Document section in the Table of Contents at http://www.debian.org/doc/developers-reference/ and http://www.debian.org/doc/developers-reference/index.fr.html both point to http://www.debian.org/doc/developers-reference/scope.html Since the only scope files are scope.en.html scope.fr.html scope.jp.html none of these files are served up. I think that the links in the Developer's Reference need to be changed to remove the .html suffix, in which case they'll work with the content negotiation. http://httpd.apache.org/docs/2.0/content-negotiation.html#naming tells the content negociation with multiview could not display scope.$lang.html when scope.html is requested. However, http://debian.org/releases/stable/index.fr.html and http://debian.org/releases/stable/index.html do display french while http://debian.org/releases/stable/index.html.fr doesn't work, hence my doubts. http://debian.org/doc/devel-manuals#devref hardcodes the file.$lang.format. Is there a multiviews configuration which would not apply to /doc/ ? What do I miss ? symlinks index.html.$lang - index.$lang.html can be created in the cron task that updates the doc. -- Simon Paillard -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN
On Tue, Apr 07, 2009 at 09:47:21PM +0200, Simon Paillard wrote: On Tue, Apr 07, 2009 at 07:12:48AM -0700, Matt Kraai wrote: On Tue, Apr 07, 2009 at 10:09:09AM +0200, Simon Paillard wrote: On Mon, Apr 06, 2009 at 03:40:17PM -0700, Matt Kraai wrote: Sorry, I used some misleading terminology. The links to the Scope ofx This Document section in the Table of Contents at http://www.debian.org/doc/developers-reference/ and http://www.debian.org/doc/developers-reference/index.fr.html both point to http://www.debian.org/doc/developers-reference/scope.html Since the only scope files are scope.en.html scope.fr.html scope.jp.html none of these files are served up. I think that the links in the Developer's Reference need to be changed to remove the .html suffix, in which case they'll work with the content negotiation. http://httpd.apache.org/docs/2.0/content-negotiation.html#naming tells the content negociation with multiview could not display scope.$lang.html when scope.html is requested. However, http://debian.org/releases/stable/index.fr.html and http://debian.org/releases/stable/index.html do display french while http://debian.org/releases/stable/index.html.fr doesn't work, hence my doubts. http://debian.org/doc/devel-manuals#devref hardcodes the file.$lang.format. Is there a multiviews configuration which would not apply to /doc/ ? What do I miss ? symlinks index.html.$lang - index.$lang.html can be created in the cron task that updates the doc. Most of the links on the Debian website don't use any extensions. Would it be possible to modify the developer's reference to do the same? If not, I think we'll have to have the symbolic links, but I think that would prevent language negotiation from working for other languages. -- Matt http://ftbfs.org/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN
Package: www.debian.org Main page of Debian Developer's Reference at: http://www.debian.org/doc/developers-reference/ or http://www.debian.org/doc/manuals/developers-reference/index.en.html is in EN language, but several sublinks are pointing to pages in FR language, e.g.: http://www.debian.org/doc/manuals/developers-reference/scope.html http://www.debian.org/doc/manuals/developers-reference/new-maintainer.html http://www.debian.org/doc/manuals/developers-reference/developer-duties.html etc. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN
On Mon, Apr 06, 2009 at 09:26:39AM +0200, Dominik Smatana wrote: Main page of Debian Developer's Reference at: http://www.debian.org/doc/developers-reference/ or http://www.debian.org/doc/manuals/developers-reference/index.en.html is in EN language, but several sublinks are pointing to pages in FR language, e.g.: http://www.debian.org/doc/manuals/developers-reference/scope.html http://www.debian.org/doc/manuals/developers-reference/new-maintainer.html http://www.debian.org/doc/manuals/developers-reference/developer-duties.html etc. Here are excerpts from the ls -l output of that directory: -rw-r--r-- 1 debwww debwww 27579 2009-04-06 15:38 index.en.html -rw-r--r-- 1 debwww debwww 28287 2009-04-06 15:38 index.fr.html lrwxrwxrwx 1 debwww debwww 13 2009-04-06 15:38 index.html - index.en.html lrwxrwxrwx 1 debwww debwww 10 2008-08-30 11:08 index.html.en - index.html -rw-rw-r-- 1 debwww debwww 28030 2008-06-13 12:31 index.html.fr -rw-r--r-- 1 debwww debwww 29127 2009-04-06 15:38 index.ja.html ... -rw-r--r-- 1 debwww debwww 4771 2009-04-06 15:38 scope.en.html -rw-r--r-- 1 debwww debwww 5110 2009-04-06 15:38 scope.fr.html lrwxrwxrwx 1 debwww debwww 10 2008-08-30 11:08 scope.html.en - scope.html -rw-rw-r-- 1 debwww debwww 5128 2008-06-13 12:31 scope.html.fr -rw-r--r-- 1 debwww debwww 5726 2009-04-06 15:38 scope.ja.html Was the developer's reference build process changed to not create the NAME.html symbolic links for files other than index.html? -- Matt http://ftbfs.org/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN
On Mon, Apr 06, 2009 at 11:41:01AM -0700, Matt Kraai wrote: Here are excerpts from the ls -l output of that directory: -rw-r--r-- 1 debwww debwww 27579 2009-04-06 15:38 index.en.html -rw-r--r-- 1 debwww debwww 28287 2009-04-06 15:38 index.fr.html lrwxrwxrwx 1 debwww debwww 13 2009-04-06 15:38 index.html - index.en.html lrwxrwxrwx 1 debwww debwww 10 2008-08-30 11:08 index.html.en - index.html -rw-rw-r-- 1 debwww debwww 28030 2008-06-13 12:31 index.html.fr -rw-r--r-- 1 debwww debwww 29127 2009-04-06 15:38 index.ja.html ... -rw-r--r-- 1 debwww debwww 4771 2009-04-06 15:38 scope.en.html -rw-r--r-- 1 debwww debwww 5110 2009-04-06 15:38 scope.fr.html lrwxrwxrwx 1 debwww debwww 10 2008-08-30 11:08 scope.html.en - scope.html -rw-rw-r-- 1 debwww debwww 5128 2008-06-13 12:31 scope.html.fr -rw-r--r-- 1 debwww debwww 5726 2009-04-06 15:38 scope.ja.html Was the developer's reference build process changed to not create the NAME.html symbolic links for files other than index.html? See http://cvs.debian.org/cron/parts/7doc?root=webwmlr1=1.16r2=1.18 The names from the packages are not the ones expected by the content-negociation setup. Hence the change in the crontab. However, I guess the old files *html.* shoud be removed. -- Simon Paillard -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522733: Debian Developer's Reference: FR instead of EN
On Mon, Apr 06, 2009 at 09:46:52PM +0200, Simon Paillard wrote: The names from the packages are not the ones expected by the content-negociation setup. Hence the change in the crontab. However, I guess the old files *html.* shoud be removed. That leaves all of the links broken, since they link to FILE.html. -- Matt http://ftbfs.org/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
