Merge lp:~flacoste/launchpad/front-page-fix into lp:launchpad

[Francis J. Lacoste]

Update the copyright in footer. Remove the beta testers box on the front page. Drop the redundant links on the front page in the footer. Allow registry experts to change the featured projects.

[Francis J. Lacoste (flacoste)]

= Summary =

This branch cleans a couple of things related to the front page. As a bonus,
it also moves some files out of lib/canonical/

== Proposed fix ==

 * Update the footer copyright year to 2010.
 * Remove the beta redirection box from the front page.
 * Don't display the blue bar section in the footer on the home page (because
   the links there are redundant with the content.)

== Pre-implementation notes ==

These changes were suggested by Kiko and I discussed them with Martin. The
main drawback to this change is that it won't be possible anymore to control
the edge redirection from the edge home page. Both Kiko and Martin felt that
this wasn't a problem. Martin was also fine about not displaying the site
message on the edge front page.

== Implementation details ==

I also moved the root views into lp.app. I had to add the test fixture there.
I wasn't sure what to do with the FeaturedProjectView which are in
lp.registry. I didn't feel like moving the model and interfaces into lp.app)
So I left the view in lp.registry, even though the test and registrations for
the porlet are still in lp.app.

== Tests ==

bin/test -vvm lp.app

== Demo and Q/A ==

Browse to the front page and:

* Notice the copyright was updated.
* See that the blue box isn't there anymore.

Browse to any other page, see that the blue footer box is there.

Browse through the tour and see that the copyright dates are updated.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/zcml/launchpad.zcml
  lib/canonical/launchpad/tour/bugs
  lib/canonical/launchpad/tour/join-launchpad
  lib/canonical/launchpad/tour/community
  lib/lp/app/browser/root.py
  lib/lp/app/tests/test_doc.py
  lib/canonical/launchpad/tour/translation
  lib/canonical/launchpad/tour/feature-tracking
  lib/lp/app/stories/launchpad-root/xx-featuredprojects.txt
  lib/canonical/launchpad/tour/release-management
  lib/canonical/launchpad/tour/api
  lib/lp/app/templates/base-layout-macros.pt
  lib/canonical/launchpad/tour/branch-hosting-tracking
  lib/lp/app/templates/root-index.pt
  lib/lp/app/browser/tests/launchpad-search-pages.txt
  lib/lp/app/stories/__init__.py
  lib/canonical/configure.zcml
  lib/lp/app/browser/configure.zcml
  lib/canonical/launchpad/tour/index
  lib/canonical/launchpad/tour/ppa
  lib/lp/app/browser/tests/test_views.py
  lib/canonical/launchpad/tour/community-support
  lib/lp/app/stories/launchpad-root/front-pages.txt
  lib/lp/app/stories/basics/copyright.txt
  lib/lp/app/stories/basics/xx-beta-testers-redirection.txt
  lib/lp/app/browser/tests/root-views.txt

== Pyflakes notices ==

lib/lp/app/browser/root.py
    23: 'config' imported but unused

== Pylint notices ==

lib/lp/app/browser/root.py
    45: [F0401] Unable to import 'lazr.batchnavigator.z3batching' (No module
named batchnavigator)
    505: [E1002, WindowedListBatch.__iter__] Use super on an old style class
    23: [W0611] Unused import config

[Curtis Hovey (sinzui)]

> === modified file 'lib/lp/app/browser/configure.zcml'
> --- lib/lp/app/browser/configure.zcml 2009-11-23 03:10:04 +0000
> +++ lib/lp/app/browser/configure.zcml 2010-01-08 22:30:34 +0000

...

> + <browser:page
> + for="canonical.launchpad.interfaces.ILaunchpadRoot"
> + class="lp.registry.browser.featuredproject.FeaturedProjectsView"
> + name="+featuredprojects"
> + template="../templates/root-featuredprojects.pt"
> + permission="launchpad.Admin"
> + />

I was expecting you to change either the permission or redefine it in
security.py so that registry admins could access this page.

> === added file 'lib/lp/app/tests/test_doc.py'
> --- lib/lp/app/tests/test_doc.py 1970-01-01 00:00:00 +0000
> +++ lib/lp/app/tests/test_doc.py 2010-01-08 22:30:34 +0000
> @@ -0,0 +1,17 @@
> +# Copyright 2010 Canonical Ltd. This software is licensed under the
> +# GNU Affero General Public License version 3 (see the file LICENSE).
> +
> +"""
> +Run the doctests and pagetests.
> +"""
> +
> +import os
> +
> +from lp.services.testing import build_test_suite

All these tests run on LaunchpadFunctionalLayer. The tests in doc probably
want DatabaseFunctionalLayer.

review: Needs Information (code)

[Francis J. Lacoste (flacoste)]

On January 8, 2010, Curtis Hovey wrote:
> Review: Needs Information code
>
> > === modified file 'lib/lp/app/browser/configure.zcml'
> > --- lib/lp/app/browser/configure.zcml 2009-11-23 03:10:04 +0000
> > +++ lib/lp/app/browser/configure.zcml 2010-01-08 22:30:34 +0000
>
> ...
>
> > + <browser:page
> > + for="canonical.launchpad.interfaces.ILaunchpadRoot"
> > + class="lp.registry.browser.featuredproject.FeaturedProjectsView"
> > + name="+featuredprojects"
> > + template="../templates/root-featuredprojects.pt"
> > + permission="launchpad.Admin"
> > + />
>
> I was expecting you to change either the permission or redefine it in
> security.py so that registry admins could access this page.

That extends the scope of that branch, but why not. Done.

>
> > === added file 'lib/lp/app/tests/test_doc.py'
> > --- lib/lp/app/tests/test_doc.py 1970-01-01 00:00:00 +0000
> > +++ lib/lp/app/tests/test_doc.py 2010-01-08 22:30:34 +0000
> > @@ -0,0 +1,17 @@
> > +# Copyright 2010 Canonical Ltd. This software is licensed under the
> > +# GNU Affero General Public License version 3 (see the file LICENSE).
> > +
> > +"""
> > +Run the doctests and pagetests.
> > +"""
> > +
> > +import os
> > +
> > +from lp.services.testing import build_test_suite
>
> All these tests run on LaunchpadFunctionalLayer. The tests in doc probably
> want DatabaseFunctionalLayer.
>

Well, since I didn't add a doc subdirectory, it didn't matter. But I changed
the global default since I don't think it's a good idea to have each caller
override the default.

Here are the additional changes:

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py 2010-01-07 06:27:46 +0000
+++ lib/canonical/launchpad/security.py 2010-01-12 20:37:13 +0000
@@ -110,7 +110,8 @@
     ITranslator, IEditTranslator)

 from canonical.launchpad.webapp.authorization import check_permission
-from canonical.launchpad.webapp.interfaces import IAuthorization
+from canonical.launchpad.webapp.interfaces import (
+ IAuthorization, ILaunchpadRoot)

 from lp.answers.interfaces.faq import IFAQ
 from lp.answers.interfaces.faqtarget import IFAQTarget
@@ -190,6 +191,14 @@
                 or user.inTeam(celebrities.admin))

+class EditByRegistryExpertsOrAdmins(AuthorizationBase):
+ permission = 'launchpad.Edit'
+ usedfor = ILaunchpadRoot
+
+ def checkAuthenticated(self, user):
+ return is_admin_or_registry_expert(user)
+
+
 class ReviewByRegistryExpertsOrAdmins(AuthorizationBase):
     permission = 'launchpad.ProjectReview'
     usedfor = None

=== modified file 'lib/lp/app/browser/configure.zcml'
--- lib/lp/app/browser/configure.zcml 2010-01-08 21:23:15 +0000
+++ lib/lp/app/browser/configure.zcml 2010-01-12 20:51:44 +0000
@@ -60,7 +60,7 @@
         class="lp.registry.browser.featuredproject.FeaturedProjectsView"
         name="+featuredprojects"
         template="../templates/root-featuredprojects.pt"
- permission="launchpad.Admin"
+ permission="launchpad.Edit"
         />

   <browser:page

=== added file 'lib/lp/app/browser/tests/test_launchpadroot.py'
--- lib/lp/app/browser/tests/test_launchpadroot...

[Curtis Hovey (sinzui)]

Hi Francis.

Thank you for fixing the behaviour of the doc tests. As I said on IRC, you should change the permissions on the link to edit the featured projects since you changed the permission on the view. root-index.pt should use:
    <li tal:condition="context/required:launchpad.Edit">

Your branch is fine to land with this additional change.

review: Approve (code)

=== modified file 'lib/canonical/configure.zcml'
--- lib/canonical/configure.zcml	2009-11-17 11:27:51 +0000
+++ lib/canonical/configure.zcml	2010-01-13 02:21:17 +0000
@@ -71,26 +71,6 @@
         />
 
 
-    <!-- This is an index.html view on the root object.
-        The root object is not ever published itself.  Only its views are.
-        -->
-
-    <browser:page
-        for="canonical.launchpad.interfaces.ILaunchpadRoot"
-        class="lp.registry.browser.root.LaunchpadRootIndexView"
-        name="index.html"
-        template="launchpad/templates/root-index.pt"
-        permission="zope.Public"
-        />
-
-    <browser:page
-        for="canonical.launchpad.interfaces.ILaunchpadRoot"
-        class="lp.registry.browser.featuredproject.FeaturedProjectsView"
-        name="+featuredprojects"
-        template="launchpad/templates/root-featuredprojects.pt"
-        permission="launchpad.Admin"
-        />
-
     <!-- The following directives set up root front pages for the different
          virtual host layers.  The directives come in pairs.
          The separate registration for the resources namespace (@@) is needed

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-01-09 03:31:20 +0000
+++ lib/canonical/launchpad/security.py	2010-01-13 02:21:17 +0000
@@ -109,7 +109,8 @@
     ITranslator, IEditTranslator)
 
 from canonical.launchpad.webapp.authorization import check_permission
-from canonical.launchpad.webapp.interfaces import IAuthorization
+from canonical.launchpad.webapp.interfaces import (
+    IAuthorization, ILaunchpadRoot)
 
 from lp.answers.interfaces.faq import IFAQ
 from lp.answers.interfaces.faqtarget import IFAQTarget
@@ -189,6 +190,15 @@
                 or user.inTeam(celebrities.admin))
 
 
+class EditByRegistryExpertsOrAdmins(AuthorizationBase):
+    permission = 'launchpad.Edit'
+    usedfor = ILaunchpadRoot
+
+    def checkAuthenticated(self, user):
+        user = IPersonRoles(user)
+        return user.in_admin or user.in_registry_experts
+
+
 class ReviewByRegistryExpertsOrAdmins(AuthorizationBase):
     permission = 'launchpad.ProjectReview'
     usedfor = None

=== modified file 'lib/canonical/launchpad/tour/api'
--- lib/canonical/launchpad/tour/api	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/tour/api	2010-01-13 02:21:17 +0000
@@ -131,7 +131,7 @@
                 <a href="feature-tracking" accesskey="g" tabindex="5">Next</a>
             </li>
              <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/branch-hosting-tracking'
--- lib/canonical/launchpad/tour/branch-hosting-tracking	2009-09-21 21:31:28 +0000
+++ lib/canonical/launchpad/tour/branch-hosting-tracking	2010-01-13 02:21:17 +0000
@@ -126,7 +126,7 @@
                 <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/bugs'
--- lib/canonical/launchpad/tour/bugs	2009-09-21 21:31:28 +0000
+++ lib/canonical/launchpad/tour/bugs	2010-01-13 02:21:17 +0000
@@ -132,7 +132,7 @@
                 <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/community'
--- lib/canonical/launchpad/tour/community	2009-09-21 21:31:28 +0000
+++ lib/canonical/launchpad/tour/community	2010-01-13 02:21:17 +0000
@@ -113,7 +113,7 @@
                 <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/community-support'
--- lib/canonical/launchpad/tour/community-support	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/tour/community-support	2010-01-13 02:21:17 +0000
@@ -106,7 +106,7 @@
                 <a href="api" tabindex="5" accesskey="g">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/feature-tracking'
--- lib/canonical/launchpad/tour/feature-tracking	2009-09-21 21:31:28 +0000
+++ lib/canonical/launchpad/tour/feature-tracking	2010-01-13 02:21:17 +0000
@@ -88,7 +88,7 @@
                 <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/index'
--- lib/canonical/launchpad/tour/index	2009-09-21 17:07:26 +0000
+++ lib/canonical/launchpad/tour/index	2010-01-13 02:21:17 +0000
@@ -174,7 +174,7 @@
                 <a href="bugs" accesskey="l" tabindex="10"  title="Read about bug tracking in Launchpad">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/join-launchpad'
--- lib/canonical/launchpad/tour/join-launchpad	2009-06-12 09:42:47 +0000
+++ lib/canonical/launchpad/tour/join-launchpad	2010-01-13 02:21:17 +0000
@@ -114,7 +114,7 @@
                 <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>
             </li>
              <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/ppa'
--- lib/canonical/launchpad/tour/ppa	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/tour/ppa	2010-01-13 02:21:17 +0000
@@ -115,7 +115,7 @@
                 <a href="community-support" accesskey="g" tabindex="5">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/release-management'
--- lib/canonical/launchpad/tour/release-management	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/tour/release-management	2010-01-13 02:21:17 +0000
@@ -96,7 +96,7 @@
                 <a href="join-launchpad" title="Read about commercial subscriptions and free access to Launchpad" accesskey="g" tabindex="5" title="Read about commercial subscriptions and free access to Launchpad">Next</a>
             </li>
              <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/tour/translation'
--- lib/canonical/launchpad/tour/translation	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/tour/translation	2010-01-13 02:21:17 +0000
@@ -113,7 +113,7 @@
                 <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>
             </li>
             <li class="copyright">
-                &copy; 2004-2009 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
+                &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
             </li>
         </ul>
     </div>

=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
--- lib/canonical/launchpad/zcml/launchpad.zcml	2010-01-06 10:34:01 +0000
+++ lib/canonical/launchpad/zcml/launchpad.zcml	2010-01-13 02:21:17 +0000
@@ -279,27 +279,6 @@
       class="canonical.launchpad.browser.OAuthAccessTokenView"
       permission="zope.Public" />
 
-  <browser:page
-      for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
-      name="+search"
-      class="lp.registry.browser.root.LaunchpadSearchView"
-      template="../templates/launchpad-search.pt"
-      permission="zope.Public" />
-
-  <browser:page
-      for="*"
-      name="+search-form"
-      class="lp.registry.browser.root.LaunchpadSearchFormView"
-      template="../templates/launchpad-search-form.pt"
-      permission="zope.Public" />
-
-  <browser:page
-      for="*"
-      name="+primary-search-form"
-      class="lp.registry.browser.root.LaunchpadPrimarySearchFormView"
-      template="../templates/launchpad-search-form.pt"
-      permission="zope.Public" />
-
   <!-- Declare robots.txt file for the root -->
   <browser:page
       for="canonical.launchpad.interfaces.ILaunchpadRoot"

=== modified file 'lib/lp/app/browser/configure.zcml'
--- lib/lp/app/browser/configure.zcml	2009-11-23 03:10:04 +0000
+++ lib/lp/app/browser/configure.zcml	2010-01-13 02:21:17 +0000
@@ -44,6 +44,46 @@
         permission="zope.Public"
         />
 
+    <!-- This is an index.html view on the root object.
+        The root object is not ever published itself.  Only its views are.
+        -->
+    <browser:page
+        for="canonical.launchpad.interfaces.ILaunchpadRoot"
+        class="lp.app.browser.root.LaunchpadRootIndexView"
+        name="index.html"
+        template="../templates/root-index.pt"
+        permission="zope.Public"
+        />
+
+    <browser:page
+        for="canonical.launchpad.interfaces.ILaunchpadRoot"
+        class="lp.registry.browser.featuredproject.FeaturedProjectsView"
+        name="+featuredprojects"
+        template="../templates/root-featuredprojects.pt"
+        permission="launchpad.Edit"
+        />
+
+  <browser:page
+      for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
+      name="+search"
+      class="lp.app.browser.root.LaunchpadSearchView"
+      template="../templates/launchpad-search.pt"
+      permission="zope.Public" />
+
+  <browser:page
+      for="*"
+      name="+search-form"
+      class="lp.app.browser.root.LaunchpadSearchFormView"
+      template="../templates/launchpad-search-form.pt"
+      permission="zope.Public" />
+
+  <browser:page
+      for="*"
+      name="+primary-search-form"
+      class="lp.app.browser.root.LaunchpadPrimarySearchFormView"
+      template="../templates/launchpad-search-form.pt"
+      permission="zope.Public" />
+
     <!-- TALES watermark: namespace -->
     <adapter
         for="*"

=== renamed file 'lib/lp/registry/browser/root.py' => 'lib/lp/app/browser/root.py'
--- lib/lp/registry/browser/root.py	2009-11-17 16:24:54 +0000
+++ lib/lp/app/browser/root.py	2010-01-13 02:21:17 +0000
@@ -20,12 +20,11 @@
 from zope.schema.vocabulary import getVocabularyRegistry
 
 
-from canonical.config import config
 from canonical.cachedproperty import cachedproperty
 from lp.registry.browser.announcement import HasAnnouncementsView
 from canonical.launchpad.interfaces.launchpadstatistic import (
     ILaunchpadStatisticSet)
-from canonical.launchpad.utilities.celebrities import ILaunchpadCelebrities
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.webapp.publisher import canonical_url
 from lp.code.interfaces.branchcollection import IAllBranches
 from lp.bugs.interfaces.bug import IBugSet
@@ -57,6 +56,10 @@
     featured_projects = []
     featured_projects_top = None
 
+
+    # Used by the footer to display the lp-arcana section.
+    is_root_page = True
+
     @staticmethod
     def _get_day_of_year():
         """Calculate the number of the current day.
@@ -83,12 +86,6 @@
             self.featured_projects_top = self.featured_projects.pop(
                 top_project)
 
-    def canRedirect(self):
-        """Return True if the beta server is available to the user."""
-        return bool(
-            config.launchpad.beta_testers_redirection_host is not None and
-            self.isBetaUser)
-
     @cachedproperty
     def apphomes(self):
         return {

=== renamed file 'lib/canonical/launchpad/doc/launchpad-search-pages.txt' => 'lib/lp/app/browser/tests/launchpad-search-pages.txt'
--- lib/canonical/launchpad/doc/launchpad-search-pages.txt	2009-04-17 10:32:16 +0000
+++ lib/lp/app/browser/tests/launchpad-search-pages.txt	2010-01-13 02:21:17 +0000
@@ -604,7 +604,7 @@
 matching pages. The WindowList claims to be 25 items in length, but
 the first 20 items are None. Only the last 5 items are PageMatches.
 
-    >>> from lp.registry.browser.root import WindowedList
+    >>> from lp.app.browser.root import WindowedList
     >>> from canonical.launchpad.utilities.searchservice import (
     ...     GoogleSearchService)
 
@@ -626,7 +626,7 @@
 the 'batch' parameter to 100 has no affect upon the Google search
 or on the navigator object.
 
-    >>> from lp.registry.browser.root import GoogleBatchNavigator
+    >>> from lp.app.browser.root import GoogleBatchNavigator
 
     >>> GoogleBatchNavigator.batch_variable_name
     'batch'

=== renamed file 'lib/lp/registry/browser/tests/root-views.txt' => 'lib/lp/app/browser/tests/root-views.txt'
--- lib/lp/registry/browser/tests/root-views.txt	2009-11-13 18:14:27 +0000
+++ lib/lp/app/browser/tests/root-views.txt	2010-01-13 02:21:17 +0000
@@ -6,7 +6,7 @@
 
     # The _get_day_of_year() method must be hacked to return a predicable day
     # to testing the view.
-    >>> from lp.registry.browser.root import LaunchpadRootIndexView
+    >>> from lp.app.browser.root import LaunchpadRootIndexView
     >>> def day():
     ...     return 4
     >>> LaunchpadRootIndexView._get_day_of_year = staticmethod(day)

=== added file 'lib/lp/app/browser/tests/test_launchpadroot.py'
--- lib/lp/app/browser/tests/test_launchpadroot.py	1970-01-01 00:00:00 +0000
+++ lib/lp/app/browser/tests/test_launchpadroot.py	2010-01-13 02:21:17 +0000
@@ -0,0 +1,80 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests related to ILaunchpadRoot."""
+
+__metaclass__ = type
+
+import unittest
+
+
+from BeautifulSoup import BeautifulSoup, SoupStrainer
+
+from zope.component import getUtility
+from zope.security.checker import selectChecker
+
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+from canonical.launchpad.webapp.interfaces import ILaunchpadRoot
+from canonical.launchpad.webapp.authorization import check_permission
+from canonical.testing.layers import DatabaseFunctionalLayer
+
+from lp.registry.interfaces.person import IPersonSet
+from lp.testing import login_person, TestCaseWithFactory
+from lp.testing.views import create_initialized_view, create_view
+
+
+class LaunchpadRootPermissionTest(TestCaseWithFactory):
+    """Test for the ILaunchpadRoot permission"""
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        TestCaseWithFactory.setUp(self)
+        self.root = getUtility(ILaunchpadRoot)
+        self.admin = getUtility(IPersonSet).getByEmail(
+            '[e-mail]')
+
+    def setUpRegistryExpert(self):
+        """Create a registry expert and logs in as them."""
+        login_person(self.admin)
+        self.expert = self.factory.makePersonNoCommit()
+        getUtility(ILaunchpadCelebrities).registry_experts.addMember(
+            self.expert, self.admin)
+        login_person(self.expert)
+
+    def test_anonymous_cannot_edit(self):
+        self.failIf(check_permission('launchpad.Edit', self.root),
+            "Anonymous user shouldn't have launchpad.Edit on ILaunchpadRoot")
+
+    def test_regular_user_cannot_edit(self):
+        login_person(self.factory.makePersonNoCommit())
+        self.failIf(check_permission('launchpad.Edit', self.root),
+            "Regular users shouldn't have launchpad.Edit on ILaunchpadRoot")
+
+    def test_registry_expert_can_edit(self):
+        self.setUpRegistryExpert()
+        self.failUnless(check_permission('launchpad.Edit', self.root),
+            "Registry experts should have launchpad.Edit on ILaunchpadRoot")
+
+    def test_admins_can_edit(self):
+        login_person(self.admin)
+        self.failUnless(check_permission('launchpad.Edit', self.root),
+            "Admins should have launchpad.Edit on ILaunchpadRoot")
+
+    def test_featured_projects_view_requires_edit(self):
+        view = create_view(self.root, '+featuredprojects')
+        checker = selectChecker(view)
+        self.assertEquals('launchpad.Edit', checker.permission_id('__call__'))
+
+    def test_featured_projects_manage_link_requires_edit(self):
+        self.setUpRegistryExpert()
+        view = create_initialized_view(
+            self.root, 'index.html', principal=self.expert)
+        content = BeautifulSoup(view(), parseOnlyThese=SoupStrainer('a'))
+        self.failUnless(
+            content.find('a', href='+featuredprojects'),
+            "Cannot find the +featuredprojects link on the first page")
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
+

=== modified file 'lib/lp/app/browser/tests/test_views.py'
--- lib/lp/app/browser/tests/test_views.py	2009-07-17 02:25:09 +0000
+++ lib/lp/app/browser/tests/test_views.py	2010-01-13 02:21:17 +0000
@@ -11,7 +11,8 @@
 
 from canonical.launchpad.testing.systemdocs import (
     LayeredDocFileSuite, setUp, tearDown)
-from canonical.testing import DatabaseFunctionalLayer
+from canonical.testing import (
+    DatabaseFunctionalLayer, LaunchpadFunctionalLayer)
 
 
 here = os.path.dirname(os.path.realpath(__file__))
@@ -19,7 +20,9 @@
 # The default layer of view tests is the DatabaseFunctionalLayer. Tests
 # that require something special like the librarian or mailman must run
 # on a layer that sets those services up.
-special_test_layer = {}
+special_test_layer = {
+    'launchpad-search-pages.txt': LaunchpadFunctionalLayer,
+    }
 
 
 def test_suite():

=== added directory 'lib/lp/app/stories'
=== added file 'lib/lp/app/stories/__init__.py'
=== added directory 'lib/lp/app/stories/basics'
=== renamed file 'lib/canonical/launchpad/pagetests/basics/xx-copyright.txt' => 'lib/lp/app/stories/basics/copyright.txt'
--- lib/canonical/launchpad/pagetests/basics/xx-copyright.txt	2009-09-18 18:04:16 +0000
+++ lib/lp/app/stories/basics/copyright.txt	2010-01-13 02:21:17 +0000
@@ -5,11 +5,11 @@
   >>> browser.open('http://launchpad.dev/')
   >>> browser.getLink('Take the tour').click()
   >>> print extract_text(find_tag_by_id(browser.contents, 'footer-navigation'))
-  Next...&copy; 2004-2009 Canonical Ltd...
+  Next...&copy; 2004-2010 Canonical Ltd...
 
 The main template.
 
   >>> browser.open('http://launchpad.dev')
   >>> print extract_text(find_tag_by_id(browser.contents, 'footer'))
-  &bull; ... &copy; 2004-2009 Canonical Ltd.
+  &copy; 2004-2010 Canonical Ltd.
   ...

=== renamed file 'lib/canonical/launchpad/pagetests/standalone/xx-beta-testers-redirection.txt' => 'lib/lp/app/stories/basics/xx-beta-testers-redirection.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-beta-testers-redirection.txt	2009-12-24 01:41:54 +0000
+++ lib/lp/app/stories/basics/xx-beta-testers-redirection.txt	2010-01-13 02:21:17 +0000
@@ -13,11 +13,10 @@
 
     >>> beta_browser = setupBrowser(auth='Basic [e-mail]:test')
 
-# XXX jamesh 2007-01-31:
+# XXX jamesh 2007-01-31 bug=98482:
 # zope.testbrowser does not handle redirects to remote sites, so we
 # disable the redirection handling at the mechanize layer.  We then need
 # to check the HTTPError directly.
-# See http://www.zope.org/Collectors/Zope3-dev/755
 
     >>> user_browser.mech_browser.set_handle_redirect(False)
     >>> beta_browser.mech_browser.set_handle_redirect(False)
@@ -108,29 +107,36 @@
     # Now retore our mainsite's hostname.
     >>> dummy = config.pop('mainsite_data')
 
-So that beta testers can still access the production site, the front
-page of Launchpad does not redirect.  They will also see a message
-explaining why they get redirected, and provide a link to disable the
-redirection for 2 hours:
+The front page of Launchpad does not redirect.
 
     >>> check(beta_browser.open, 'http://launchpad.dev/')
     >>> print beta_browser.url
     http://launchpad.dev/
-    >>> print find_tags_by_class(beta_browser.contents,
-    ...                          'informational message')[0]
-    <div class="informational message">
-    <p>As a member of the Launchpad Beta Testers team, you will be
-    redirected to the beta site when viewing Launchpad pages other
-    than the front page.</p>
-    <p><button onclick="setBetaRedirect(false)">Disable redirection
-    for 2 hours</button></p>
+
+On the beta site, a client side JS is available on every page (except
+the home page) in the footer that sets a cookie to inhibit
+the redirection.
+
+    # Configure the site as the beta site.
+    >>> config.push('fake_beta_site', """
+    ...     [launchpad]
+    ...     beta_testers_redirection_host = none
+    ...     is_edge: True
+    ...     site_message: This is the beta site
+    ...     """)
+
+    >>> check(beta_browser.open, 'http://launchpad.dev/ubuntu')
+    >>> print beta_browser.url
+    http://launchpad.dev/ubuntu
+    >>> print find_tags_by_class(beta_browser.contents, 'sitemessage')[0]
+    <div class="sitemessage">
+        This is the beta site
+        <a href="#" class="js-action" onclick="setBetaRedirect(false)">
+          Disable edge redirect.
+        </a>
     </div>
 
-This is so that the user can make use of some client side JS on that
-page that sets a cookie to inhibit the redirection.  When the
-redirection is inhibited, the info message changes to one that lets
-them inhibit the redirection (a lower cookie expiry is used, since the
-default is to redirect if no cookie exists):
+    >>> dummy = config.pop('fake_beta_site')
 
     # Workaround bug in mechanize where you cannot use the Cookie
     # header with the CookieJar
@@ -144,18 +150,6 @@
     ...         domain_specified=True, domain_initial_dot=True, path='/',
     ...         path_specified=True, secure=False, expires=None,
     ...         discard=None, comment=None, comment_url=None, rest={}))
-    >>> check(beta_browser.open, 'http://launchpad.dev/')
-    >>> print beta_browser.url
-    http://launchpad.dev/
-    >>> print find_tags_by_class(beta_browser.contents,
-    ...                          'informational message')[0]
-    <div class="informational message">
-    <p>As a member of the Launchpad Beta Testers team, you would
-    normally be redirected to the beta site when viewing Launchpad
-    pages.  However, you currently have this disabled.</p>
-    <p><button onclick="setBetaRedirect(true)">Enable beta site
-    redirection</button></p>
-    </div>
 
 Now when they go to a page on the site, it loads as normal:
 

=== renamed directory 'lib/lp/registry/stories/launchpad-root' => 'lib/lp/app/stories/launchpad-root'
=== modified file 'lib/lp/app/stories/launchpad-root/front-pages.txt'
--- lib/lp/registry/stories/launchpad-root/front-pages.txt	2009-11-13 16:47:51 +0000
+++ lib/lp/app/stories/launchpad-root/front-pages.txt	2010-01-13 02:21:17 +0000
@@ -35,6 +35,11 @@
   Ubuntu
   ...
 
+The footer doesn't contain the links that are already present on the page.
+
+    >>> print find_tags_by_class(browser.contents, 'lp-arcana')
+    []
+
 The homepage looks different when the use is logged in:
 
   >>> user_browser = setupBrowser(auth="Basic [e-mail]:test")
@@ -50,6 +55,7 @@
   >>> people_link.url
   'http://launchpad.dev/people/+newteam'
 
+
 The front pages for the other applications, however, do have
 application tabs. On these pages, the tab normally named "Overview"
 is labelled "Launchpad Home" to make clear where it goes.
@@ -71,3 +77,10 @@
     * Blueprints - http://blueprints.launchpad.dev/
     * Translations - http://translations.launchpad.dev/
     * Answers (selected) - http://answers.launchpad.dev/
+
+The footer of those pages contains the link to the front page, tour
+and guide:
+
+    >>> print extract_text(
+    ...     find_tags_by_class(user_browser.contents, 'lp-arcana')[0])
+    &bull; Take the tour &bull; Read the guide

=== modified file 'lib/lp/app/stories/launchpad-root/xx-featuredprojects.txt'
--- lib/lp/registry/stories/launchpad-root/xx-featuredprojects.txt	2009-11-18 11:24:10 +0000
+++ lib/lp/app/stories/launchpad-root/xx-featuredprojects.txt	2010-01-13 02:21:17 +0000
@@ -16,7 +16,7 @@
 
     >>> def fake_get_day_of_year():
     ...     return 4
-    >>> from lp.registry.browser.root import LaunchpadRootIndexView
+    >>> from lp.app.browser.root import LaunchpadRootIndexView
     >>> LaunchpadRootIndexView._get_day_of_year = staticmethod(
     ...                                                 fake_get_day_of_year)
 

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2010-01-05 20:48:57 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2010-01-13 02:21:17 +0000
@@ -319,7 +319,7 @@
 
 <metal:footer define-macro="footer">
   <div id="footer" class="footer">
-    <div class="lp-arcana">
+    <div class="lp-arcana" tal:condition="not:view/is_root_page|nothing">
         <div class="lp-branding">
           <a tal:attributes="href string:${rooturl}"><img src="/@@/launchpad-logo-and-name-hierarchy.png" alt="Launchpad"/></a>
           &nbsp;&bull;&nbsp;
@@ -339,7 +339,7 @@
     </div>
 
     <div class="colophon">
-      &copy; 2004-2009
+      &copy; 2004-2010
       <a href="http://canonical.com/">Canonical&nbsp;Ltd.</a>
       &nbsp;&bull;&nbsp;
       <a href="/legal">Terms of use</a>

=== renamed file 'lib/canonical/launchpad/templates/launchpad-search-form.pt' => 'lib/lp/app/templates/launchpad-search-form.pt'
=== renamed file 'lib/canonical/launchpad/templates/launchpad-search.pt' => 'lib/lp/app/templates/launchpad-search.pt'
=== renamed file 'lib/canonical/launchpad/templates/root-featuredprojects.pt' => 'lib/lp/app/templates/root-featuredprojects.pt'
=== renamed file 'lib/canonical/launchpad/templates/root-index.pt' => 'lib/lp/app/templates/root-index.pt'
--- lib/canonical/launchpad/templates/root-index.pt	2009-12-14 17:27:45 +0000
+++ lib/lp/app/templates/root-index.pt	2010-01-13 02:21:17 +0000
@@ -68,23 +68,6 @@
   <body>
     <div metal:fill-slot="main">
 
-      <div class="informational message" tal:condition="view/canRedirect">
-        <tal:redirect_inhibited condition="view/isRedirectInhibited">
-          <p>As a member of the Launchpad Beta Testers team, you would
-          normally be redirected to the beta site when viewing Launchpad
-          pages.  However, you currently have this disabled.</p>
-          <p><button onclick="setBetaRedirect(true)">Enable beta site
-          redirection</button></p>
-        </tal:redirect_inhibited>
-        <tal:redirect_enabled condition="not:view/isRedirectInhibited">
-          <p>As a member of the Launchpad Beta Testers team, you will be
-          redirected to the beta site when viewing Launchpad pages other
-          than the front page.</p>
-          <p><button onclick="setBetaRedirect(false)">Disable redirection
-          for 2 hours</button></p>
-        </tal:redirect_enabled>
-      </div>
-
       <tal:comment replace="nothing">
         Do not replace the line below: "Is your project registered yet?"
         without contacting the IS team. It's used by Nagios to verify
@@ -269,7 +252,7 @@
                     <tal:count content="view/project_count">42</tal:count>
                     projects</a>!</strong>
                 </li>
-                <li tal:condition="context/required:launchpad.Admin">
+                <li tal:condition="context/required:launchpad.Edit">
                   <a class="sprite edit" href="+featuredprojects">Manage
                   featured project list</a>
                 </li>

=== added file 'lib/lp/app/tests/test_doc.py'
--- lib/lp/app/tests/test_doc.py	1970-01-01 00:00:00 +0000
+++ lib/lp/app/tests/test_doc.py	2010-01-13 02:21:17 +0000
@@ -0,0 +1,17 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""
+Run the doctests and pagetests.
+"""
+
+import os
+
+from lp.services.testing import build_test_suite
+
+
+here = os.path.dirname(os.path.realpath(__file__))
+
+
+def test_suite():
+    return build_test_suite(here)

=== modified file 'lib/lp/blueprints/tests/test_doc.py'
--- lib/lp/blueprints/tests/test_doc.py	2009-10-27 19:30:59 +0000
+++ lib/lp/blueprints/tests/test_doc.py	2010-01-13 02:21:17 +0000
@@ -12,7 +12,6 @@
     LayeredDocFileSuite, setUp, tearDown)
 from canonical.launchpad.ftests.test_system_documentation import(
     ProcessMailLayer)
-from canonical.testing import DatabaseFunctionalLayer
 
 from lp.services.testing import build_test_suite
 
@@ -31,4 +30,4 @@
 
 
 def test_suite():
-    return build_test_suite(here, special, layer=DatabaseFunctionalLayer)
+    return build_test_suite(here, special)

=== modified file 'lib/lp/code/tests/test_doc.py'
--- lib/lp/code/tests/test_doc.py	2009-09-01 06:13:55 +0000
+++ lib/lp/code/tests/test_doc.py	2010-01-13 02:21:17 +0000
@@ -14,8 +14,7 @@
 from canonical.launchpad.ftests.test_system_documentation import (
     branchscannerSetUp)
 from canonical.launchpad.webapp.authorization import LaunchpadSecurityPolicy
-from canonical.testing import (
-    DatabaseFunctionalLayer, LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
+from canonical.testing import LaunchpadFunctionalLayer, LaunchpadZopelessLayer
 from lp.services.testing import build_test_suite
 
 
@@ -69,4 +68,4 @@
 
 
 def test_suite():
-    return build_test_suite(here, special, layer=DatabaseFunctionalLayer)
+    return build_test_suite(here, special)

=== modified file 'lib/lp/services/testing/__init__.py'
--- lib/lp/services/testing/__init__.py	2009-06-25 04:06:00 +0000
+++ lib/lp/services/testing/__init__.py	2010-01-13 02:21:17 +0000
@@ -19,24 +19,24 @@
 from canonical.launchpad.testing.pages import PageTestSuite
 from canonical.launchpad.testing.systemdocs import (
     LayeredDocFileSuite, setUp, tearDown)
-from canonical.testing import LaunchpadFunctionalLayer
+from canonical.testing import DatabaseFunctionalLayer
 from canonical.launchpad.testing.systemdocs import strip_prefix
 
 def build_test_suite(base_dir, special_tests={},
-                     layer=LaunchpadFunctionalLayer,
+                     layer=DatabaseFunctionalLayer,
                      setUp=setUp, tearDown=tearDown):
     """Build a test suite from a directory containing test files.
 
-    The 'stories' subdirectory will be checked for pagetests and the
-    'doc' subdirectory will be checked for doctests.
+    The parent's 'stories' subdirectory will be checked for pagetests and 
+    the parent's 'doc' subdirectory will be checked for doctests.
 
-    :param base_dir: The directory to check for tests.
+    :param base_dir: The tests subdirectory that.
 
     :param special_tests: A dict mapping filenames to TestSuite
-    objects. These files need special treatment (for instance, they
-    should be run in a different layer, or they need custom
-    setup/teardown). The given TestSuite object will be used for that
-    file, rather than a new one generated.
+        objects. These files need special treatment (for instance, they
+        should be run in a different layer, or they need custom
+        setup/teardown). The given TestSuite object will be used for that
+        file, rather than a new one generated.
 
     :param layer: The layer in which to run the tests.
     """