Re: CVS conflicts on www-master

On Mon, Mar 31, 2008 at 08:16:38PM +0200, Florian Ernst wrote:
> I don't dare guessing how this came to pass, but apparently there are
> conflicts in the CVS checkout on www-master:
> | $ wget -qO- http://www-master.debian.org/build-logs/webwml/cvs_update.log | grep ^C
> | C french/devel/debian-med/microbio.wml
> | C german/CD/pik/index.wml
> | C german/News/2008/index.wml
> | C german/consultants/applepie-solutions.wml
> | C german/devel/debian-med/microbio.wml
> | C german/security/nonvulns-etch.wml
> | C german/security/nonvulns-sarge.wml
> | C german/security/nonvulns-woody.wml
> | C german/security/2008/dsa-1514.wml
> | C japanese/security/2008/dsa-1485.wml
> | C japanese/security/2008/dsa-1489.wml
> | C japanese/security/2008/dsa-1493.wml
> | C japanese/security/2008/dsa-1500.wml
> | C japanese/security/2008/dsa-1506.wml
> | C spanish/security/nonvulns-sarge.wml
> 
> As such, the conflict markers are shown on the corresponding web pages
> as noticed by Helge Kreutzmann.

I've fixed all these, but I don't know how they came into existence.
Sorry.

--

-- 
Matt

[Debian Wiki] Update of "DebianEdu/Meeting/VoteForDate" by RonnyAasen

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification.

The following page has been changed by RonnyAasen:
http://wiki.debian.org/DebianEdu/Meeting/VoteForDate

------------------------------------------------------------------------------
  ||<-2> Patrick Winnertz                               ||
  || '''Monday, Thursday'''     ||    '''20.00-22.00''' ||
  ||<-2> Morten Werner Olsen                            ||
- || '''not mondays during dc8 meetings''' || '''best between 10oo and 19oo on mo-fr, sa+su 10-16oo '' ||
+ || '''not mondays during dc8 meetings''' || '''best between 10oo and 19oo on mo-fr, sa+su 10-16oo ''' ||
  ||<-2> Holger Levsen                                  ||
  || '''Monday'''               ||    '''19.00-21.00''' ||
  ||<-2> KurtGramlich                                   ||
 <at>  <at>  -26, +26  <at>  <at> 

  ||<-2> Klaus Ade Johnstad                             ||
  || '''not first Tuesday or third Monday.''' || '''19.00-23.00''' ||
  ||<-2> Daniel Heß                                     ||
- || '''Weekdays'''    || '''20.00-23.00''' ||
+ || '''Wedensday,Thursday, friday'''    || '''19.00-22.00''' ||
  ||<-2> Ronny Aasen                                    ||

  BTW, GMT has [http://en.wikipedia.org/wiki/GMT ceased to exist] before most people here were born 

ISO Lenny (testing have a problems in installation)

During installation, of iso dvd linux debian lenny have a problem in step 4 
(load modules....). No have a modules, and is imposible install network.

Please... resolve this problem, for test the version of Lenny.
--

-- 
Juan Manuel Pardo García
Ingeniero de Sistemas
Cel: 658-899-48-54

Re: ISO Lenny (testing have a problems in installation)

On Tue, Apr 01, 2008 at 02:28:21PM +0200, Juan Manuel Pardo García wrote:
> During installation, of iso dvd linux debian lenny have a problem in step 4 
> (load modules....). No have a modules, and is imposible install network.
> 
> Please... resolve this problem, for test the version of Lenny.

You should contact debian-boot about this problem.  debian-www is used
for maintaining the website.

-- 
Matt

--

-- 
To UNSUBSCRIBE, email to debian-www-REQUEST <at> lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster <at> lists.debian.org

[Debian Wiki] Update of "DebianEdu/Meeting/20080331/log" by HolgerLevsen

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification.

The following page has been changed by HolgerLevsen:
http://wiki.debian.org/DebianEdu/Meeting/20080331/log

New page:
<pre>
--> pitagora (~pleira <at> 164.Red-81-37-248.dynamicIP.rima-tde.net) has joined #debian-edu
<Blankoworld> Hi andreas 
--> andi (~andi <at> dslb-084-056-057-041.pools.arcor-ip.net) has joined #debian-edu
--> H (~h <at> tor-irc.dnsbl.oftc.net) has joined #debian-edu
<andreas> Hi Blankoworld
<Blankoworld> The meeting starts at 09:00 PM, isn't it ?
<andreas> Yep, 2008-03-31 19:00 UTC (according to http://wiki.debian.org/DebianEdu/Meeting)
<andreas> Strange thing to change from CET to CEST
<Blankoworld> Hum, I come from France, so GMT +1, so 19:00 UTC means 20:00 here I think.
<Blankoworld> And it's 20:36 :s
<Blankoworld> I have forgotten something ?
<andreas> Didn't you switched to CEST last weekend?
<andreas> At least in Germany we did and this meand GMT+2
<Blankoworld> andreas, yes, I switch.
<andreas> Perhaps we should a the time which is valid in Central Europe next time
<andreas> I guess most participiants come from this time zone.
<Blankoworld> So  <at>  21:00 here ?
* Blankoworld have some problems to speak english. Argh !
<andreas> I have some problem to speak French. Argh! ))
<andreas> I guess we both have problems to speak Norge. )

[Debian Wiki] Update of "DebianEdu/Meeting/20080331/log" by HolgerLevsen

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification.

The following page has been changed by HolgerLevsen:
http://wiki.debian.org/DebianEdu/Meeting/20080331/log

The comment on the change is:
different wiki syntaxes are lovely

------------------------------------------------------------------------------
- <pre>
+ {{{
  --> pitagora (~pleira <at> 164.Red-81-37-248.dynamicIP.rima-tde.net) has joined #debian-edu
  <Blankoworld> Hi andreas 
  --> andi (~andi <at> dslb-084-056-057-041.pools.arcor-ip.net) has joined #debian-edu
 <at>  <at>  -218, +218  <at>  <at> 

  <andreas> And, BTW, to get this log stored inside the NSA archive so we need no summary writer:
  <andreas> Bin Laden is the 17th child of the family. 
  <andreas> Blankoworld, I now catch "H2G2" - never used this shortcut.  So I also took my time ...
- </pre>
+ }}}

Re: Debian DVD Verkauf

	Hi!

 [for the non-german speaking people on the -www list, Philip asked
about the wereabouts of some donation he did to SPI. I'm redirecting him
to the appropriate addresses]

Am Montag, den 31.03.2008, 14:54 +0200 schrieb Philip:
> Wir von der GFU in Köln haben vor längerer Zeit schon eine Mail 
> geschickt, daß wir hier bei uns an Kursteilnehmer Debian-DVDs 
> weiterverkaufen und das gerne auch unabhängig von Seminar-Teilnahmen 
> machen würden. Im Zuge dessen haben wir auch schon runde 100 Euro aus 
> den ersten Erlösen über SPI gespendet und wollen auch generell 10% an 
> Debian spenden.

 Wie habt ihr den Erlös an SPI gespendet? Direkt, oder über den FFIS?
Von letzterem könntet ihr nämlich eine Spendenquittung bekommen, siehe
auch: <http://www.ffis.de/Verein/spi-de.html>

 Je nachdem, ob ihr tatsächlich direkt an SPI oder aber an den FFIS
gespendet habt, wäre die richtige Adresse zum Nachfragen entweder
<treasurer <at> spi-inc.org> (hier bitte falls möglich in Englisch) oder aber
<donation <at> ffis.de>. Debian selbst ist hier nur sekundär involviert, und
insbesondere die debian-www-Mailingliste, die zur Koordinierung des
Webauftritts zuständig ist.

 Falls du dort wider erwarten niemanden erreichen kannst, melde dich
bitte einfach nochmal direkt bei mir, dann werde ich intern versuchen
herauszufinden, wo da was liegen geblieben sein könnte.

 Danke für deine Mail,

Bug#193106: I am a Fool for your Love

I am a Fool for your Love http://85.84.66.150

=?Windows-1251?b?z/Dl5Ovu5uXt6OUg7+4g7uHs5e3zIPHx++vq4Ozo?=!

Здравствуйте, в связи с последними изменениями
алгоритма поисковой системы Яндекс, хотелось бы
уточнить, меняетесь ли вы ссылками ?

Ваш почтовый адрес: debian-www <at> lists.debian.org, был найден на
сайте с предложениями о "ОБМЕНЕ ССЫЛКАМИ".

Если да, то пожалуйста вышлите HTML код вашей ссылки и я
размещу ее у себя на сайте наиболее близком к
тематике вашего ресурса!

ID: qNCcj(eap#4vm)^T8!)\VrU

--

-- 
To UNSUBSCRIBE, email to debian-www-REQUEST <at> lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster <at> lists.debian.org

Error de Ortografía (spelling mistake)