Index: english/template/debian/projectnews/boilerplates.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/projectnews/boilerplates.wml,v
retrieving revision 1.4
diff -u -r1.4 boilerplates.wml
--- english/template/debian/projectnews/boilerplates.wml	24 Dec 2012 17:00:21 -0000	1.4
+++ english/template/debian/projectnews/boilerplates.wml	9 Jan 2013 02:01:11 -0000
@@ -269,48 +269,72 @@
 <p><gettext domain="newsevents">There are several upcoming Debian-related events:</gettext></p>
 </define-tag>
 
-<define-tag events-ml-guide>
+<define-tag events-ml-guide-paragraph>
 <preserve events-section events-ml-eu events-ml-nl events-ml-ha events-ml-na />
 <set-var %attributes />
 <p><gettext domain="newsevents">You can find more information about Debian-related events and talks on the <a href="<get-var events-section />">events section</a> of the Debian web site, or subscribe to one of our events mailing lists for different regions: <a href="<get-var events-ml-eu />">Europe</a>, <a href="<get-var events-ml-nl />">Netherlands</a>, <a href="<get-var events-ml-ha />">Hispanic America</a>, <a href="<get-var events-ml-na />">North America</a>.</gettext></p>
 <restore events-section events-ml-eu events-ml-nl events-ml-ha events-ml-na />
 </define-tag>
 
-<define-tag events-info>
+<define-tag events-ml-guide>
+<preserve events-section events-ml-eu events-ml-nl events-ml-ha events-ml-na />
+<set-var %attributes />
+<ifeq <get-var events-section /> "" <set-var events-section="$(HOME)/events" /> />
+<ifeq <get-var events-ml-eu /> "" <set-var events-ml-eu="http://lists.debian.org/debian-events-eu" /> />
+<ifeq <get-var events-ml-nl /> "" <set-var events-ml-nl="http://lists.debian.org/debian-events-nl" /> />
+<ifeq <get-var events-ml-ha /> "" <set-var events-ml-ha="http://lists.debian.org/debian-events-ha" /> />
+<ifeq <get-var events-ml-na /> "" <set-var events-ml-na="http://lists.debian.org/debian-events-na" /> />
+<events-ml-guide-paragraph
+        events-section="<get-var events-section />"
+        events-ml-eu="<get-var events-ml-eu />"
+        events-ml-nl="<get-var events-ml-nl />"
+        events-ml-ha="<get-var events-ml-ha />"
+        events-ml-na="<get-var events-ml-na />"
+/>
+<restore events-section events-ml-eu events-ml-nl events-ml-ha events-ml-na />
+</define-tag>
+
+<define-tag events-info-paragraph>
 <preserve events-talks events-team />
 <set-var %attributes />
 <p><gettext domain="newsevents">Do you want to organise a Debian booth or a Debian install party? Are you aware of other upcoming Debian-related events? Have you delivered a Debian talk that you want to link on our <a href="<get-var events-talks />">talks page</a>? Send an email to the <a href="<get-var events-team />">Debian Events Team</a>.</gettext></p>
 <restore events-talks events-team />
 </define-tag>
 
+<define-tag events-info>
+<preserve events-talks events-team />
+<set-var %attributes />
+<ifeq <get-var events-talks /> "" <set-var events-talks="$(HOME)/events/talks" /> />
+<ifeq <get-var events-team /> "" <set-var events-team="mailto:events@debian.org" /> />
+<events-info-paragraph
+        events-talks="<get-var events-talks />"
+        events-team="<get-var events-team />"
+/>
+<restore events-talks events-team />
+</define-tag>
+
 #############################
 # "newcontributors": 3 vars (dd, dm, uploader) + if one of them ==0 just
 # skip it
 <define-tag newcontributors-dd>
 <ifeq %# 0 <return> >
-<preserve dd-num />
-<set-var dd-num=%#>
+<ifeq <get-var dd-num /> "" <set-var dd-num=%#> />
 <set-var dd-text="<gettext domain="newsevents"><get-var dd-num /> applicants have been <a href="<get-var dd-url />">accepted</a> as Debian Developers</gettext>">
 <set-var dd-name="%Aattributes">
-<restore dd-num />
 </define-tag>
 
 <define-tag newcontributors-dm>
 <ifeq %# 0 <return> >
-<preserve dm-num />
-<set-var dm-num=%#>
+<ifeq <get-var dm-num /> "" <set-var dm-num=%#> />
 <set-var dm-text="<gettext domain="newsevents"><get-var dm-num /> applicants have been <a href="<get-var dm-url />">accepted</a> as Debian Maintainers</gettext>">
 <set-var dm-name="%Aattributes">
-<restore dm-num />
 </define-tag>
 
 <define-tag newcontributors-uploader>
 <ifeq %# 0 <return> >
-<preserve uploader-num />
-<set-var uploader-num=%#>
+<ifeq <get-var uploader-num /> "" <set-var uploader-num=%#> />
 <set-var uploader-text="<gettext domain="newsevents"><get-var uploader-num /> people have <a href="<get-var uploader-url />">started to maintain packages</a></gettext>">
 <set-var uploader-name="%Aattributes">
-<restore uploader-num />
 </define-tag>
 
 <define-tag newcontributors-name-list whitespace=delete>
@@ -346,8 +370,11 @@
 <preserve dd-url  dm-url  uploader-url />
 <preserve dd-text dm-text uploader-text />
 <preserve dd-name dm-name uploader-name />
+<preserve dd-num dm-num uploader-num />
 <preserve eval-newcontributors-text-list eval-newcontributors-name-list/>
 <set-var %attributes />
+<ifeq <get-var dd-url /> "" <set-var dd-url="https://nm.debian.org/public/nmlist#done" /> />
+<ifeq <get-var uploader-url /> "" <set-var uploader-url="http://udd.debian.org/cgi-bin/new-maintainers.cgi" /> />
 %body
 <set-var eval-newcontributors-text-list="<newcontributors-text-list />" />
 <set-var eval-newcontributors-name-list="<newcontributors-name-list />" />
@@ -357,6 +384,7 @@
 <restore dd-url  dm-url  uploader-url />
 <restore dd-text dm-text uploader-text />
 <restore dd-name dm-name uploader-name />
+<restore dd-num dm-num uploader-num />
 </define-tag>
 
 #############################
Index: english/News/weekly/2012/22/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/News/weekly/2012/22/index.wml,v
retrieving revision 1.3
diff -u -r1.3 index.wml
--- english/News/weekly/2012/22/index.wml	26 Nov 2012 04:15:03 -0000	1.3
+++ english/News/weekly/2012/22/index.wml	9 Jan 2013 02:01:11 -0000
@@ -64,7 +64,9 @@
 </p>
 
 <toc-add-entry name="events">Upcoming events</toc-add-entry>
-<p>There are several upcoming Debian-related events:</p>
+
+<events-intro />
+
 <ul>
  <li>November 14, Helsinki, Finland — <a href="http://lists.debian.org/debian-events-eu/2012/11/msg00008.html">mini Debian bug squashing party</a></li>
  <li>November 23-25, Essen, Germany — <a href="$(HOME)/events/2012/1123-essen-bsp">Debian bug squashing party at Linuxhotel</a></li>
@@ -72,22 +74,11 @@
  <li>November 24-25, Paris, France — <a href="$(HOME)/events/2012/1124-minidebconf-paris">Paris Mini-DebConf 2012</a></li>
  <li>November 24, Tokyo, Japan — <a href="$(HOME)/events/2012/1124-tokyo-bsp">Debian bug squashing party at Plat'Home Office</a></li>
 </ul>
-<p>
-You can find more information about Debian-related events and talks
-on the <a href="$(HOME)/events">events section</a> of the Debian web site,
-or subscribe to one of our events mailing lists for different regions:
-<a href="http://lists.debian.org/debian-events-eu">Europe</a>, 
-<a href="http://lists.debian.org/debian-events-nl">Netherlands</a>, 
-<a href="http://lists.debian.org/debian-events-ha">Hispanic America</a>, 
-<a href="http://lists.debian.org/debian-events-na">North America</a>.
-</p>
 
-<p>Do you want to organise a Debian booth or a Debian install party?
-Are you aware of other upcoming Debian-related events?
-Have you delivered a Debian talk that you want to link on our
-<a href="$(HOME)/events/talks">talks page</a>? 
-Send an email to the <a href="mailto:events@debian.org">Debian Events Team</a>.
-</p>
+<events-ml-guide />
+
+<events-info />
+
 
 <toc-add-entry name="newcontributors">New Debian Contributors</toc-add-entry>
 
Index: english/News/weekly/2012/25/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/News/weekly/2012/25/index.wml,v
retrieving revision 1.4
diff -u -r1.4 index.wml
--- english/News/weekly/2012/25/index.wml	2 Jan 2013 23:05:31 -0000	1.4
+++ english/News/weekly/2012/25/index.wml	9 Jan 2013 02:01:11 -0000
@@ -69,10 +69,9 @@
 <toc-add-entry name="newcontributors">New Debian Contributors</toc-add-entry>
 
 <newcontributors
-	dd-url="http://nm.debian.org/public/nmlist#done"
 	dm-url="http://lists.debian.org/debian-project/2012/12/msg00072.html"
-	uploader-url="http://udd.debian.org/cgi-bin/new-maintainers.cgi"
-	post-name=""
+	dm-num="Two"
+	uploader-num="eight"
 >
 <newcontributors-dm
 	"Rahul Amaram" "Markus Frosch"
Index: japanese/News/weekly/2012/22/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/japanese/News/weekly/2012/22/index.wml,v
retrieving revision 1.1
diff -u -r1.1 index.wml
--- japanese/News/weekly/2012/22/index.wml	27 Nov 2012 02:11:32 -0000	1.1
+++ japanese/News/weekly/2012/22/index.wml	9 Jan 2013 02:01:12 -0000
@@ -52,6 +52,8 @@
 
 <toc-add-entry name="events">今後のイベント</toc-add-entry>
 
+<events-intro />
+
 <ul>
  <li>11 月 14 日、フィンランド、ヘルシンキ — <a href="http://lists.debian.org/debian-events-eu/2012/11/msg00008.html">ミニ Debian バグ潰しパーティー</a></li>
  <li>11 月 23 - 25 日、ドイツ、エッセン — <a href="$(HOME)/events/2012/1123-essen-bsp">Linuxhotel での Debian バグ潰しパーティー</a></li>
@@ -60,20 +62,9 @@
  <li>11 月 24 日、日本、東京 — <a href="$(HOME)/events/2012/1124-tokyo-bsp">Plat'Home のオフィスでの Debian バグ潰しパーティー</a></li>
 </ul>
 
-<p>Debian 関連のイベントや会議に関するより多くの情報を得るには、Debian
-ウェブサイトの<a href="$(HOME)/events">イベントセクション</a>を参照するか、
-いろいろな地域におけるイベント用メーリングリスト (<a
-href="http://lists.debian.org/debian-events-eu">ヨーロッパ</a>、<a
-href="http://lists.debian.org/debian-events-nl">オランダ</a>、<a
-href="http://lists.debian.org/debian-events-ha">ラテンアメリカ</a>、<a
-href="http://lists.debian.org/debian-events-na">北アメリカ</a>)
-を購読してください。</p>
-
-<p>Debian ブースを運営したり Debian インストールパーティーを開催しませんか?
-開催予定の Debian 関連のイベントについて知りませんか? <a
-href="$(HOME)/events/talks">講演のページ</a>にリンクを貼りたい Debian
-関連の講演を行いましたか? そのような場合は、<a href="mailto:events@debian.org">Debian
-イベントチーム</a>宛に電子メールを送信してください。</p>
+<events-ml-guide />
+
+<events-info />
 
 
 <toc-add-entry name="newcontributors">Debian の新しい協力者たち</toc-add-entry>
Index: japanese/News/weekly/2012/25/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/japanese/News/weekly/2012/25/index.wml,v
retrieving revision 1.2
diff -u -r1.2 index.wml
--- japanese/News/weekly/2012/25/index.wml	8 Jan 2013 21:32:23 -0000	1.2
+++ japanese/News/weekly/2012/25/index.wml	9 Jan 2013 02:01:12 -0000
@@ -56,9 +56,7 @@
 <toc-add-entry name="newcontributors">Debian の新しい協力者たち</toc-add-entry>
 
 <newcontributors
-	dd-url="http://nm.debian.org/public/nmlist#done"
 	dm-url="http://lists.debian.org/debian-project/2012/12/msg00072.html"
-	uploader-url="http://udd.debian.org/cgi-bin/new-maintainers.cgi"
 	post-name=" さん"
 >
 <newcontributors-dm
