Rev 4935: (mbp) miscellaneous doc tweaks in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4935 [merge]
revision-id: pqm at pqm.ubuntu.com-20100106074025-ga21h28spm91o1h8
parent: pqm at pqm.ubuntu.com-20100105165512-ip2jyuy8f999raxm
parent: mbp at sourcefrog.net-20100104081728-28nxrrnax1i9cgd9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-01-06 07:40:25 +0000
message:
  (mbp) miscellaneous doc tweaks
modified:
  bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
  doc/en/_templates/index.html   index.html-20090722133849-lus2rzwsmlhpgqhv-1
=== modified file 'bzrlib/bugtracker.py'
--- a/bzrlib/bugtracker.py	2009-06-10 03:31:01 +0000
+++ b/bzrlib/bugtracker.py	2010-01-04 08:17:28 +0000
@@ -56,10 +56,13 @@
 use this feature, you just need to know the tracker identifier to use.
 These are the bugtrackers that are built in:
 
-     URL                          | Abbreviation | Example
-     https://bugs.launchpad.net/  | lp           | lp:12345
-     http://bugs.debian.org/      | deb          | deb:12345
-     http://bugzilla.gnome.org/   | gnome        | gnome:12345
+    ============================= ============= ================
+    URL                           Abbreviation  Example
+    ============================= ============= ================
+    https://bugs.launchpad.net/   lp            lp:12345
+    http://bugs.debian.org/       deb           deb:12345
+    http://bugzilla.gnome.org/    gnome         gnome:12345
+    ============================= ============= ================
 
 For the bug trackers not listed above configuration is required.
 Support for generating the URLs for any project using Bugzilla or Trac

=== modified file 'doc/en/_templates/index.html'
--- a/doc/en/_templates/index.html	2009-12-08 01:15:55 +0000
+++ b/doc/en/_templates/index.html	2010-01-04 08:11:08 +0000
@@ -36,13 +36,17 @@
 
   <table class="contentstable" align="center" style="margin-left: 30px"><tr>
     <td width="50%">
-        <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/bzr">FAQ</a><br/>
+        <p class="biglink"><a class="biglink" href="https://answers.launchpad.net/bzr/+faqs">FAQ</a><br/>
       <span class="linkdescr">frequently asked questions</span>
       </p>
       <p class="biglink"><a class="biglink" href="http://bazaar-vcs.org/BzrGlossary/">Glossary</a><br/>
       <span class="linkdescr">help with terminology</span>
       </p>
-    </td><td width="50%">
+      <p class="biglink"><a class="biglink" "http://doc.bazaar.canonical.com/developers/">Developer Docs</a><br/>
+        <span class="linkdescr">improving and extending bzr</span>
+      </p>
+    </td>
+    <td width="50%">
       <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/migration/en/">Migration Docs</a><br/>
       <span class="linkdescr">for refugees of other tools</span>
       </p>
@@ -52,7 +56,4 @@
     </td></tr>
   </table>
 
-  <p>Keen to help? See the <a href="http://doc.bazaar-vcs.org/developers/">Developer Docs</a>
-      for policies and tools on contributing code, tests and documentation.</p>
-
 {% endblock %}