Merge git://projects.archlinux.org/archweb

Conflicts:
	templates/public/index.html
	urls.py

2 files changed, 20 insertions, 18 deletions

diff --git a/templates/public/index.html b/templates/public/index.html
index 708c5347..6555debc 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -75,10 +75,10 @@
         {% for update in pkg_updates %}
         {% with update|first as fpkg %}
         <tr>
-            <td class="pkg-name"><span class="{{ fpkg.repo.name|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
+            <td class="pkg-name"><span class="{{ fpkg.repo|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
             <td class="pkg-arch">
                 {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}"
-                    title="View package details for {{ pkg.pkgname }}">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
+                    title="Details for {{ pkg.pkgname }} [{{ pkg.repo|lower }}]">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
             </td>
         </tr>
         {% endwith %}
diff --git a/templates/public/svn.html b/templates/public/svn.html
index 7b084379..10a58ba6 100644
--- a/templates/public/svn.html
+++ b/templates/public/svn.html
@@ -7,27 +7,29 @@
     The PKGBUILD files can be fetched via the ABS utility. To learn more
     about ABS, see <a href="https://wiki.archlinux.org/index.php/ABS">the ABS wiki page</a>.
     </p>
-    <p>
-    You can view the history of all the PKGBUILD files from the Repository
-    <a href="http://repos.archlinux.org/">WebSVN</a> interface.
-    </p>
+	<p>The SVN repositories have been cloned into git repositories and can be
+	viewed via the cgit interface.
+	<a href="http://projects.archlinux.org/svntogit/packages.git/">All
+		packages</a> are available here except for
+	<a href="http://projects.archlinux.org/svntogit/community.git/">community
+		and multilib</a> which are available in a different repository.</p>
     <p>
     You can also get individual PKGBUILDs directly from SVN. This can be
     especially useful if you need to compile an older version of a package.
     <strong>DO NOT CHECK OUT THE ENTIRE SVN REPO</strong>. Your address may be
     blocked.  Use the following commands to check out a specific package:
-    </p>
-    <pre>
-        svn checkout --depth=empty svn://svn.archlinux.org/packages
-        cd packages
-        svn update &lt;your-package-name&gt;
-    </pre>
-    For the community repository, use the following commands instead:
-    <pre>
-        svn checkout --depth=empty svn://svn.archlinux.org/community
-        cd community
-        svn update &lt;your-package-name&gt;
-    </pre>
+	</p>
+
+    <pre>svn checkout --depth=empty svn://svn.archlinux.org/packages
+cd packages
+svn update &lt;your-package-name&gt;</pre>
+
+	For the community and multilib repositories, use the following commands
+	instead:
+    <pre>svn checkout --depth=empty svn://svn.archlinux.org/community
+cd community
+svn update &lt;your-package-name&gt;</pre>
+
     <p>
     Visit <a href="https://wiki.archlinux.org/index.php?title=Getting_PKGBUILDS_From_SVN">the wiki</a>
     for more tips on checking out and updating svn PKGBUILDs.