Re: RFC: navbar changes...

2001-05-29 Thread peter karlsson
Josip Rodin:

> I hope the translations for "site map" in various languages aren't overly
> long?

I'm only at 14 characters, but for the button, I could settle for
having just "Map" and appropriate translations.

-- 
\\//
peter - http://www.softwolves.pp.se/

  Statement concerning unsolicited e-mail according to Swedish law:
  http://www.softwolves.pp.se/peter/reklampost.html



Re: minor breakage in international/l10n

2001-05-29 Thread Martin Schulze
Martin Quinson wrote:
> > 
> >  my $regexp_for_lang_code = 
> > "(([a-zA-Z]{2})([-_][a-zA-Z]{2})?(@[^\.]*)?)(\.[^\.]*)?";
> > 
> > It's not perfect but it is better.
> 
> I've put this regexp in the script and removed the DB from my machine, so
> that it is completly regenerated this night. Will see if it works.

Seems that made it.

Regards,

Joey

-- 
We all know Linux is great... it does infinite loops in 5 seconds.
-- Linus Torvalds



Re: Stale pages.

2001-05-29 Thread Martin Schulze
David Martinez CSIC RedIRIS wrote:
> El Lun 28 May 2001 11:40, Martin Schulze escribió:
> > David Martinez CSIC RedIRIS wrote:
> > >   Hello. Joey, can you please look over the HTML tree and remove
> > > international/chinese? It remains in that dir, but it was removed days
> > > ago.
> >
> > Remove it *where*?  I only find it on my personal working copy
> > which should not matter at all.
> >
> > >   Also, can you fix webwml-stattrans for not displaying
> > > international/chinese/index and international/killme/index (:-?) ?
> > > killme/index doesn't even exist...
> >
> > I don't understand:
> >
> > klecker!joey(pts/4):~/public_html/webwml> grep international/chinese *
> > grep: debs: Is a directory
> > klecker!joey(pts/4):~/public_html/webwml> grep international/killme *
> > grep: debs: Is a directory
> > klecker!joey(pts/4):~/public_html/webwml>
> 
>   I don't understand too...I think I'm going insane. I'd swore that I saw 
> international/killme/index and international/chinese/index in 
> http://people.debian.org/~joey/webwml/es.html while reviewing untranslated 
> pages...

chinese/* was removed by jt recently (saw it in a later mail)

>   Sorry if I was annoying.

s/annoying/confusing/

Regards,

Joey

-- 
We all know Linux is great... it does infinite loops in 5 seconds.
-- Linus Torvalds



Re: RFC: navbar changes...

2001-05-29 Thread Martin Quinson
On Mon, May 28, 2001 at 08:53:05PM +0200, Josip Rodin wrote:
> Hi, again,
> 
> In order to squeeze in a link to the site map onto the navigation bar (you
> know, the thing in navbar.wml) I'm going to remove the "Home" link which is
> pointless anyway, the Debian text/logo should be a link to the front page.

Agreed.

> I hope the translations for "site map" in various languages aren't overly
> long?

'Plan du site' in french.

What is 'overly long' for you ?

Mt



Re: Debian WWW CVS: joy

2001-05-29 Thread Martin Schulze
Debian WWW CVS wrote:
> CVSROOT:  /cvs/webwml
> Module name:  webwml
> Changes by:   joy 01/05/28 08:24:25
> 
> Modified files:
>   english: Makefile 
> 
> Log message:
> erm, actually removed sitemap from index deps, and added missing deps for 
> sitemap itself

You've added the calls to make to ensure that subscribe.wml and unsubscribe.wml
are in place.  Was that intentional?

Regards,

Joey

-- 
We all know Linux is great... it does infinite loops in 5 seconds.
-- Linus Torvalds



Re: webwml failed

2001-05-29 Thread Martin Schulze
Apparently it wasn't quite sane to remove chinese/template, I guess.

Build log from our web pages:

Debian Webmaster wrote:
> make[2]: Entering directory `/org/www.debian.org/webwml/chinese/doc'
> test -d ../../../debian.org/doc || mkdir -m g+w -p ../../../debian.org/doc
> make[2]: Leaving directory `/org/www.debian.org/webwml/chinese/doc'
> make -C intro install
> make[2]: Entering directory `/org/www.debian.org/webwml/chinese/intro'
> test -d ../../../debian.org/intro || mkdir -m g+w -p ../../../debian.org/intro
> make[2]: Leaving directory `/org/www.debian.org/webwml/chinese/intro'
> make -C international install
> make[2]: Entering directory `/org/www.debian.org/webwml/chinese/international'
> test -d ../../../debian.org/international || mkdir -m g+w -p 
> ../../../debian.org/international
> make -C Chinese install
> make[3]: Entering directory 
> `/org/www.debian.org/webwml/chinese/international/Chinese'
> test -d ../../../../debian.org/international/Chinese || mkdir -m g+w -p 
> ../../../../debian.org/international/Chinese
> make[3]: *** No rule to make target `../../template/debian-zh/macros.tmpl', 
> needed by `../../template/debian-zh/template.tmpl'.  Stop.
> make[3]: Leaving directory 
> `/org/www.debian.org/webwml/chinese/international/Chinese'
> make[2]: [Chinese-install] Error 2 (ignored)
> test -L ../../../debian.org/international/zh || ln -sf Chinese 
> ../../../debian.org/international/zh
> make[2]: Leaving directory `/org/www.debian.org/webwml/chinese/international'
> make -C releases install
> make[2]: Entering directory `/org/www.debian.org/webwml/chinese/releases'

Regards,

Joey

-- 
We all know Linux is great... it does infinite loops in 5 seconds.
-- Linus Torvalds



Re: minor breakage in international/l10n

2001-05-29 Thread Martin Quinson
On Tue, May 29, 2001 at 07:50:58AM +0200, Martin Schulze wrote:
> Martin Quinson wrote:
> > > 
> > >  my $regexp_for_lang_code = 
> > > "(([a-zA-Z]{2})([-_][a-zA-Z]{2})?(@[^\.]*)?)(\.[^\.]*)?";
> > > 
> > > It's not perfect but it is better.
> > 
> > I've put this regexp in the script and removed the DB from my machine, so
> > that it is completly regenerated this night. Will see if it works.
> 
> Seems that made it.

Well, not really I've maid a typo in the script as I edited it (forgot
a semicolomn), so the DB was not generated this night... I'll try to run it
right now, but if it consums all my resources, I'll stop it and we will
have to wait for tomorow.

Bye, Mt.



Bug#99130: search.d.o: contains cvs conflict

2001-05-29 Thread David Schmitt
Package: www.debian.org
Version: N/A; reported 2001-05-29
Severity: minor

Hi!

The subject says almost all:

On http://search.debian.org/ are some CVS conflict marks:

'<<< search.def === >>> 1.18'



Regards, David




Re: RFC: navbar changes...

2001-05-29 Thread Josip Rodin
On Tue, May 29, 2001 at 07:51:54AM +0200, Martin Quinson wrote:
> > I hope the translations for "site map" in various languages aren't overly
> > long?
> 
> 'Plan du site' in french.

Could you make it just "Plan"?

> What is 'overly long' for you ?

Anything that would make the navbar exceed 800 pixels and wrap, basically.
It already wraps for 640x480 users, I think, which is a waste of space and
doesn't look too good.

-- 
Digital Electronic Being Intended for Assassination and Nullification



Re: Debian WWW CVS: joy

2001-05-29 Thread Josip Rodin
On Tue, May 29, 2001 at 08:01:10AM +0200, Martin Schulze wrote:
> Debian WWW CVS wrote:
> > CVSROOT:/cvs/webwml
> > Module name:webwml
> > Changes by: joy 01/05/28 08:24:25
> > 
> > Modified files:
> > english: Makefile 
> > 
> > Log message:
> > erm, actually removed sitemap from index deps, and added missing deps for 
> > sitemap itself
> 
> You've added the calls to make to ensure that subscribe.wml and
> unsubscribe.wml are in place.  Was that intentional?

I _have_? The Makefile says:

sitemap.$(LANGUAGE).html: $(ENGLISHDIR)/sitemap.wml \
  $(TEMPLDIR)/links.tags.wml $(TEMPLDIR)/template.wml \
  $(ENGLISHDIR)/releases/info $(ENGLISHDIR)/MailingLists/mklist.tags
[three methods to build it]

What do you mean subscribe.wml and unsubscribe.wml?

-- 
Digital Electronic Being Intended for Assassination and Nullification



Re: RFC: navbar changes...

2001-05-29 Thread Martin Quinson
On Tue, May 29, 2001 at 12:22:37PM +0200, Josip Rodin wrote:
> On Tue, May 29, 2001 at 07:51:54AM +0200, Martin Quinson wrote:
> > > I hope the translations for "site map" in various languages aren't overly
> > > long?
> > 
> > 'Plan du site' in french.
> 
> Could you make it just "Plan"?

Yes, it's perfectly possible.
 
> > What is 'overly long' for you ?
> 
> Anything that would make the navbar exceed 800 pixels and wrap, basically.
> It already wraps for 640x480 users, I think, which is a waste of space and
> doesn't look too good.

Ok.

Mt



Re: Debian WWW CVS: joy

2001-05-29 Thread Martin Schulze
Josip Rodin wrote:
> On Tue, May 29, 2001 at 08:01:10AM +0200, Martin Schulze wrote:
> > Debian WWW CVS wrote:
> > > CVSROOT:  /cvs/webwml
> > > Module name:  webwml
> > > Changes by:   joy 01/05/28 08:24:25
> > > 
> > > Modified files:
> > >   english: Makefile 
> > > 
> > > Log message:
> > > erm, actually removed sitemap from index deps, and added missing deps for 
> > > sitemap itself
> > 
> > You've added the calls to make to ensure that subscribe.wml and
> > unsubscribe.wml are in place.  Was that intentional?
> 
> I _have_? The Makefile says:
> 
> sitemap.$(LANGUAGE).html: $(ENGLISHDIR)/sitemap.wml \
>   $(TEMPLDIR)/links.tags.wml $(TEMPLDIR)/template.wml \
>   $(ENGLISHDIR)/releases/info $(ENGLISHDIR)/MailingLists/mklist.tags
> [three methods to build it]
> 
> What do you mean subscribe.wml and unsubscribe.wml?

I was - no shit - talking about these files without which make would
break.  They are auto-generated and thus do not exist on a new checkout.

$(ENGLISHDIR)/MailingLists/subscribe.wml
$(ENGLISHDIR)/MailingLists/unsubscribe.wml

Here's the diff that shows what I missed in detail.

-ifeq "$(LANGUAGE)" "en"
-sitemap.$(LANGUAGE).html: $(ENGLISHDIR)/sitemap.wml
-   make -C MailingLists subscribe.$(LANGUAGE).html 
unsubscribe.$(LANGUAGE).html
-else
-sitemap.$(LANGUAGE).html: $(ENGLISHDIR)/sitemap.wml
-   make -C MailingLists subscribe.$(LANGUAGE).html 
unsubscribe.$(LANGUAGE).html

Regards,

Joey

-- 
We all know Linux is great... it does infinite loops in 5 seconds.
-- Linus Torvalds



Bug#99130: marked as done (search.d.o: contains cvs conflict)

2001-05-29 Thread Debian Bug Tracking System
Your message dated Tue, 29 May 2001 08:16:48 -0600
with message-id <[EMAIL PROTECTED]>
and subject line fixed
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Darren Benham
(administrator, Debian Bugs database)

--
Received: (at maintonly) by bugs.debian.org; 29 May 2001 08:15:11 +
>From [EMAIL PROTECTED] Tue May 29 03:15:10 2001
Return-path: <[EMAIL PROTECTED]>
Received: from p133.inode.at [195.58.160.3] (root)
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 154eek-0002Ys-00; Tue, 29 May 2001 03:15:10 -0500
Received: from diode.josefine.at (static213-229-11-199.adsl.inode.at 
[213.229.11.199])
by p133.inode.at (8.11.1/8.10.0.0) with ESMTP id f4T8F3128824;
Tue, 29 May 2001 10:15:03 +0200
Received: from zion.int.josefine.at ([192.168.1.10])
by diode.josefine.at with esmtp (Exim 3.22 #1 (Debian))
id 154eed-0007gf-00; Tue, 29 May 2001 10:15:03 +0200
Received: from david by zion.int.josefine.at with local (Exim 3.22 #1 (Debian))
id 154eg0-0002id-00; Tue, 29 May 2001 10:16:28 +0200
From: David Schmitt <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: search.d.o: contains cvs conflict
X-Reportbug-Version: 1.16
X-Mailer: reportbug 1.16
Date: Tue, 29 May 2001 10:16:28 +0200
Message-Id: <[EMAIL PROTECTED]>
Sender: David Schmitt <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]

Package: www.debian.org
Version: N/A; reported 2001-05-29
Severity: minor

Hi!

The subject says almost all:

On http://search.debian.org/ are some CVS conflict marks:

'<<< search.def === >>> 1.18'



Regards, David


---
Received: (at 99130-done) by bugs.debian.org; 29 May 2001 14:16:49 +
>From [EMAIL PROTECTED] Tue May 29 09:16:49 2001
Return-path: <[EMAIL PROTECTED]>
Received: from opensource.lineo.com [204.246.147.130] 
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 154kIj-qj-00; Tue, 29 May 2001 09:16:49 -0500
Received: by opensource.lineo.com (Postfix, from userid 1011)
id 6C438193392; Tue, 29 May 2001 08:16:48 -0600 (MDT)
Date: Tue, 29 May 2001 08:16:48 -0600
From: Matt Kraai <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: fixed
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
Delivered-To: [EMAIL PROTECTED]

Howdy,

This bug was already fixed by the time I read your mail.  Closing.

Matt



Re: webwml failed

2001-05-29 Thread James A. Treacy
On Tue, May 29, 2001 at 08:12:19AM +0200, Martin Schulze wrote:
> Apparently it wasn't quite sane to remove chinese/template, I guess.
> 
In our (the webmasters) defense, I did give the translations a days
warning before deleting the directory. They ended up getting a few
more than that before it was deleted from the build area. One of the
chinese translators should be able to readd the needed files.

If those files really are template files needed to build the chinese
pages, why do they need them? It they have created something that
will benefit all the translations, others may want to know about
them. If they are only needed to the international/Chinese pages,
then the scripts should go in there.

-- 
James (Jay) Treacy
[EMAIL PROTECTED]



Re: webwml failed

2001-05-29 Thread Martin Schulze
James A. Treacy wrote:
> On Tue, May 29, 2001 at 08:12:19AM +0200, Martin Schulze wrote:
> > Apparently it wasn't quite sane to remove chinese/template, I guess.
> > 
> In our (the webmasters) defense, I did give the translations a days
> warning before deleting the directory. They ended up getting a few
> more than that before it was deleted from the build area. One of the
> chinese translators should be able to readd the needed files.

There hasn't been much commit's by the chinese crew, if I'm not
mistaken, so that argument has some problem to stay alive...

> If those files really are template files needed to build the chinese
> pages, why do they need them? It they have created something that
> will benefit all the translations, others may want to know about
> them. If they are only needed to the international/Chinese pages,
> then the scripts should go in there.

Agreed.

Regards,

Joey

-- 
We all know Linux is great... it does infinite loops in 5 seconds.
-- Linus Torvalds



Re: Debian WWW CVS: joy

2001-05-29 Thread Josip Rodin
On Tue, May 29, 2001 at 03:02:30PM +0200, Martin Schulze wrote:
> Josip Rodin wrote:
> > On Tue, May 29, 2001 at 08:01:10AM +0200, Martin Schulze wrote:
> > > Debian WWW CVS wrote:
> > > > CVSROOT:/cvs/webwml
> > > > Module name:webwml
> > > > Changes by: joy 01/05/28 08:24:25
> > > > 
> > > > Modified files:
> > > > english: Makefile 
> > > > 
> > > > Log message:
> > > > erm, actually removed sitemap from index deps, and added missing deps 
> > > > for sitemap itself
> > > 
> > > You've added the calls to make to ensure that subscribe.wml and
> > > unsubscribe.wml are in place.  Was that intentional?
> > 
> > I _have_? The Makefile says:
> > 
> > sitemap.$(LANGUAGE).html: $(ENGLISHDIR)/sitemap.wml \
> >   $(TEMPLDIR)/links.tags.wml $(TEMPLDIR)/template.wml \
> >   $(ENGLISHDIR)/releases/info $(ENGLISHDIR)/MailingLists/mklist.tags
> > [three methods to build it]
> > 
> > What do you mean subscribe.wml and unsubscribe.wml?
> 
> I was - no shit - talking about these files without which make would
> break.  They are auto-generated and thus do not exist on a new checkout.
> 
> $(ENGLISHDIR)/MailingLists/subscribe.wml
> $(ENGLISHDIR)/MailingLists/unsubscribe.wml
> 
> Here's the diff that shows what I missed in detail.
> 
> -ifeq "$(LANGUAGE)" "en"
> -sitemap.$(LANGUAGE).html: $(ENGLISHDIR)/sitemap.wml
> -   make -C MailingLists subscribe.$(LANGUAGE).html 
> unsubscribe.$(LANGUAGE).html
> -else
> -sitemap.$(LANGUAGE).html: $(ENGLISHDIR)/sitemap.wml
> -   make -C MailingLists subscribe.$(LANGUAGE).html 
> unsubscribe.$(LANGUAGE).html

Oh, better catch up with the rest of your debian-www mail, you'll see how
that has been fixed :)

-- 
Digital Electronic Being Intended for Assassination and Nullification



sitemap rebuild

2001-05-29 Thread Aurelian Melinte

hello,

would that be acceptable to have sitemap forced rebuild every day? I ask 
because the last Romanian one is from 26 May and it does not reflect the 
subsequent changes


A.

--
  ame00(at@)altern(dot.)org
  ame01(at@)gmx(dot.)net



Preventing committing conflicts

2001-05-29 Thread Tommi Vainikainen
Here is a patch to commit_prep2 to check conflicts and prevent
commiting conflicts.  I don't dare to commit this myself, so if
someone wants to verify this is correct and commit_prep2 really works
after patching, (s)he can commit this one.  After committing also add
"-c" parameter to commit_prep2 in commitinfo so it really checks for
conflicts too.

Index: commit_prep2
===
RCS file: /cvs/webwml/CVSROOT/commit_prep2,v
retrieving revision 1.2
diff -u -r1.2 commit_prep2
--- commit_prep2	2001/04/08 17:16:25	1.2
+++ commit_prep2	2001/05/29 18:46:42
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#! /usr/bin/perl
 # -*-Perl-*-
 #
 #ident	"@(#)cvs/contrib:$Name:  $:$Id: commit_prep2,v 1.2 2001/04/08 17:16:25 joey Exp $"
@@ -9,20 +9,19 @@
 # existence of a RCS "Id" keyword in the first ten lines of the file.
 # For existing files, it checks version number in the "Id" line to
 # prevent losing changes because an old version of a file was copied
-# into the direcory.
+# into the direcory.  Also check for unresolved merge conflicts.
 #
 # Possible future enhancements:
 #
-#Check for cruft left by unresolved conflicts.  Search for
-#"^<<<$", "^---$", and "^>>>$".
-#
 #Look for a copyright and automagically update it to the
 #current year.  [[ bad idea!  -- woods ]]
 #
 #
 # Contributed by David Hampton <[EMAIL PROTECTED]>
-#
 # Hacked on lots by Greg A. Woods <[EMAIL PROTECTED]>
+# Conflict check by Charles M. Hannum <[EMAIL PROTECTED]>
+# Merged Hannum's conflict checks with RCS Id checking by Tommi
+# Vainikainen <[EMAIL PROTECTED]>
 
 #
 #	Configurable options
@@ -77,6 +76,22 @@
 close(FILE);
 }
 
+sub check_conflicts {
+local($directory, $filename) = @_;
+
+if (open(FILE, "<$filename")) {
+	while () {
+	if (/^<<<$/ || /^>>>$/) {
+		print $directory . "/" . $filename . ":\n";
+		print "  This file contains unresolved merge conflicts.\n";
+		return(1);
+	}
+	}
+}
+close(FILE);
+return(0);
+}
+
 sub check_version {
 local($i, $id, $rname, $version);
 local($filename, $cvsversion) = @_;
@@ -148,6 +163,10 @@
 
 $id = getpgrp();		# You *must* use a shell that does setpgrp()!
 
+# Check each file (except dot files)
+#
+$check_conflicts = 0;
+
 # Check each file (except dot files) for an RCS "Id" keyword.
 #
 $check_id = 0;
@@ -165,11 +184,13 @@
 	$debug = 1;
 	print STDERR "Debug turned on...\n";
 } elsif ($arg eq '-c') {
+	$check_conflicts = 1;
+} elsif ($arg eq '-i') {
 	$check_id = 1;
 } elsif ($arg eq '-r') {
 	$record_directory = 1;
 } else {
-	push(@files, $arg);
+	push(@files, split(' ', $arg));
 }
 }
 
@@ -181,6 +202,16 @@
 print STDERR "id- ", $id, "\n";
 }
 
+$failed = 0;
+
+# Now check each file name passed in for unresolved merge conflicts.
+#
+if ($check_conflicts != 0) {
+foreach $filename (@files) {
+	$failed += &check_conflicts($directory, $filename);
+}
+}
+
 # Suck in the CVS/Entries file
 #
 open(ENTRIES, $ENTRIES) || die("Cannot open $ENTRIES.\n");
@@ -193,17 +224,17 @@
 # are considered to be administrative files by this script.
 #
 if ($check_id != 0) {
-$failed = 0;
 foreach $arg (@files) {
 	if (index($arg, ".") == 0) {
 	next;
 	}
 	$failed += &check_version($arg);
-}
-if ($failed) {
-	print STDERR "\n";
-	exit(1);
 }
+}
+
+if ($failed) {
+print STDERR "\n";
+exit(1);
 }
 
 # Record this directory as the last one checked.  This will be used

-- 
Tommi Vainikainen


Re: sitemap rebuild

2001-05-29 Thread Josip Rodin
On Tue, May 29, 2001 at 03:25:25PM -0400, Aurelian Melinte wrote:
> would that be acceptable to have sitemap forced rebuild every day? I ask 
> because the last Romanian one is from 26 May and it does not reflect the 
> subsequent changes

Every day would be a lot, esp. considering it's a longer time to build and
titles almost never change. I agree the dependency mechanism is quite
lacking in this case, but forcing rebuilds all the time would be extreme.

Just drop a note to -www if you need it rebuilt. (I'll do it now.)

-- 
Digital Electronic Being Intended for Assassination and Nullification



Bug#99196: searching list archives doesn't work

2001-05-29 Thread Adam Di Carlo
Package: listarchives
Version: N/A; reported 2001-05-29
Severity: important

>From http://lists.debian.org/search.html>, doing
any search results in a page that tells me:

  You have to search for something!

Bad search system!  It seems really broken, in that list
searching doesn't work at all, thus the severity of this bug.

I tried different checkboxes on an off and different lists, 
no change.

-- System Information
Debian Release: testing/unstable
Architecture: sparc
Kernel: Linux arroz 2.2.18pre21 #1 Wed Nov 22 17:12:06 EST 2000 sparc64
Locale: LANG=C, LC_CTYPE=C




Re: Preventing committing conflicts

2001-05-29 Thread Matt Kraai
On Tue, May 29, 2001 at 11:10:09PM +0300, Tommi Vainikainen wrote:
> Here is a patch to commit_prep2 to check conflicts and prevent
> commiting conflicts.  I don't dare to commit this myself, so if
> someone wants to verify this is correct and commit_prep2 really works
> after patching, (s)he can commit this one.  After committing also add
> "-c" parameter to commit_prep2 in commitinfo so it really checks for
> conflicts too.

This won't work.  You are checking for ^<<<$ and ^>>>$,
which will only match if the angle brackets are the only
characters on the line (which they weren't in the conflict I fixed
earlier today).  I think you need to allow for the filename or the
version number to appear at the end of the line.

Matt



Re: Preventing committing conflicts

2001-05-29 Thread Tommi Vainikainen
On Tue, 29 May 2001, [EMAIL PROTECTED] wrote:
> This won't work.  You are checking for ^<<<$ and ^>>>$,
> which will only match if the angle brackets are the only
> characters on the line (which they weren't in the conflict I fixed
> earlier today).  I think you need to allow for the filename or the
> version number to appear at the end of the line.

That's true, I just copied/merged the code... :-)

But I think removing dollar signs from the end of lines is enough good
solution.

-- 
Tommi Vainikainen



the CGIs

2001-05-29 Thread Josip Rodin
Hi,

It looks like something's gone wrong with more than one CGI, I'm told by
Noel Koethe (through Joey) that the mailing list subscription CGI thinks
it's been passed no parameters, too.

None of these files (neither the HTMLs or the CGIs) were modified recently,
I don't think, so it's likely a problem with apache or perl or something.

Really puzzling...

-- 
Digital Electronic Being Intended for Assassination and Nullification



Re: RFC: navbar changes...

2001-05-29 Thread Josip Rodin
On Mon, May 28, 2001 at 08:53:05PM +0200, Josip Rodin wrote:
> In order to squeeze in a link to the site map onto the navigation bar (you
> know, the thing in navbar.wml) I'm going to remove the "Home" link which is
> pointless anyway, the Debian text/logo should be a link to the front page.
> 
> I hope the translations for "site map" in various languages aren't overly
> long?

Ok, here's what I'd like to do:

http://joy.gkvk.hr/mirr/

Please comment.

-- 
Digital Electronic Being Intended for Assassination and Nullification



Re: RFC: navbar changes...

2001-05-29 Thread Marcin Owsiany
On Wed, May 30, 2001 at 12:50:38AM +0200, Josip Rodin wrote:
> Ok, here's what I'd like to do:
> 
>   http://joy.gkvk.hr/mirr/
> 
> Please comment.

Please, not another button... The Polish ones barely fit on the
page now...

Marcin
-- 
Marcin Owsiany <[EMAIL PROTECTED]>
http://student.uci.agh.edu.pl/~porridge/
GnuPG: 1024D/60F41216  FE67 DA2D 0ACA FC5E 3F75  D6F6 3A0D 8AA0 60F4 1216



Re: RFC: navbar changes...

2001-05-29 Thread Josip Rodin
On Wed, May 30, 2001 at 03:09:24AM +0200, Marcin Owsiany wrote:
> > Ok, here's what I'd like to do:
> > 
> > http://joy.gkvk.hr/mirr/
> > 
> > Please comment.
> 
> Please, not another button... The Polish ones barely fit on the
> page now...

So even with "Home" gone, adding "Site map" button would wreck the Polish
version?

-- 
Digital Electronic Being Intended for Assassination and Nullification



Re: RFC: navbar changes...

2001-05-29 Thread James A. Treacy
On Wed, May 30, 2001 at 12:50:38AM +0200, Josip Rodin wrote:
> On Mon, May 28, 2001 at 08:53:05PM +0200, Josip Rodin wrote:
> > In order to squeeze in a link to the site map onto the navigation bar (you
> > know, the thing in navbar.wml) I'm going to remove the "Home" link which is
> > pointless anyway, the Debian text/logo should be a link to the front page.
> > 
> > I hope the translations for "site map" in various languages aren't overly
> > long?
> 
> Ok, here's what I'd like to do:
> 
>   http://joy.gkvk.hr/mirr/
> 
If you want to save some horizontal space, use 'About' instead of
'About Debian'. It is obvious that it's about Debian, since it is the
Debian homepage.

-- 
James (Jay) Treacy
[EMAIL PROTECTED]