[Checkins] SVN: zope.app.apidoc/trunk/ MErge from 3.4 branch:

[Philipp von Weitershausen]

Log message for revision 81694:
  MErge from 3.4 branch:
  
  ------------------------------------------------------------------------
  r81682 | philikon | 2007-11-10 11:00:48 +0100 (Sat, 10 Nov 2007) | 4 lines
  
    Fix https://bugs.launchpad.net/zope3/+bug/161737: Misleading text in
    the interface viewer.
  
  
  ------------------------------------------------------------------------
  r81683 | philikon | 2007-11-10 11:02:33 +0100 (Sat, 10 Nov 2007) | 4 lines
  
    Fix https://bugs.launchpad.net/zope3/+bug/161190: The zope3-dev
    mailinglist has been retired, point to zope-dev.
  
  
  

Changed:
  U   zope.app.apidoc/trunk/CHANGES.txt
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/browser/README.txt
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/browser/notfound.pt
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/index.pt

-=-
Modified: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt	2007-11-10 10:14:22 UTC (rev 81693)
+++ zope.app.apidoc/trunk/CHANGES.txt	2007-11-10 10:17:28 UTC (rev 81694)
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+3.4.3 (2007-11-10)
+------------------
+
+- Fix https://bugs.launchpad.net/zope3/+bug/161737: Misleading text in
+  the interface viewer.
+
+- Fix https://bugs.launchpad.net/zope3/+bug/161190: The zope3-dev
+  mailinglist has been retired, point to zope-dev.
+
+
 3.4.2 (2007-10-30)
 ------------------
 
@@ -23,7 +33,7 @@
   want to handle eggs well.
 
 
-3.4.0a1 (2007-??-??)
+3.4.0a1 (2007-04-22)
 --------------------
 
 - Initial release independent of the main Zope tree.

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/README.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/README.txt	2007-11-10 10:14:22 UTC (rev 81693)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/README.txt	2007-11-10 10:17:28 UTC (rev 81694)
@@ -35,7 +35,7 @@
   <p>
     While broken links occur occassionally, they are considered bugs. Please
     report any broken link to
-    <a href="mailto:zope3-dev at zope.org">zope3-dev at zope.org</a>.
+    <a href="mailto:zope-dev at zope.org">zope-dev at zope.org</a>.
   </p>
   ...
 

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/notfound.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/notfound.pt	2007-11-10 10:14:22 UTC (rev 81693)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/notfound.pt	2007-11-10 10:17:28 UTC (rev 81694)
@@ -8,7 +8,7 @@
   <p i18n:translate="">
     While broken links occur occassionally, they are considered bugs. Please
     report any broken link to
-    <a href="mailto:zope3-dev at zope.org">zope3-dev at zope.org</a>.
+    <a href="mailto:zope-dev at zope.org">zope-dev at zope.org</a>.
  </p>
 
 </body>

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/index.pt	2007-11-10 10:14:22 UTC (rev 81693)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/index.pt	2007-11-10 10:17:28 UTC (rev 81694)
@@ -69,7 +69,7 @@
     <div class="indent"
          tal:condition="python: specific_adapters or generic_adapters">
 
-      <h3 i18n:translate="">Adapters where this interface is required:</h3>
+      <h3 i18n:translate="">Adapters for objects providing this interface:</h3>
 
       <div tal:define="
   elementId string:adapters.required.specific;