Merge branch 'archweb' into archweb-generic

Conflicts:
	templates/public/download.html
	templates/public/index.html

3 files changed, 8 insertions, 8 deletions

diff --git a/templates/public/download.html b/templates/public/download.html
index 9f67733e..80d636a2 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -29,7 +29,7 @@
         {% if release.version %}<li><strong>Current Release:</strong> {{ release.version }}</li>{% endif %}
         {% if release.kernel_version %}<li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>{% endif %}
         {% if release.torrent_data %}<li><strong>ISO Size:</strong> {{ release.torrent.file_length|filesizeformat }}</li>{% endif %}
-        <li><a href="{% wiki_url 'Installation_Guide' %}">Installation Guide</a></li>
+        <li><a href="{% wiki_url 'Installation_guide' %}">Installation Guide</a></li>
         <li><strong>Resources:</strong>
             <ul>
                 <li><a href="https://bugs.archlinux.org/index.php?project=6"
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index bb8e685a..9936944e 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -62,7 +62,7 @@
         </tbody>
     </table>
 
-    <p>A <a href="https://aur.archlinux.org/rss.php" class="rss" title="AUR newest packages feed">newest packages feed</a>
+    <p>A <a href="https://aur.archlinux.org/rss/" class="rss" title="AUR newest packages feed">newest packages feed</a>
     is also available from the <a href="https://aur.archlinux.org/" title="AUR Homepage">Arch User Repository (AUR)</a>.</p>
 
     <h3>Release Feed</h3>
diff --git a/templates/public/index.html b/templates/public/index.html
index d3cf797a..a6bd1fb1 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -113,9 +113,9 @@
     <ul>
         <li><a href="{% wiki_url %}"
             title="Community documentation">Wiki</a></li>
-        <li><a href="{% wiki_url 'Installation Guide' %}"
+        <li><a href="{% wiki_url 'Installation_guide' %}"
             title="Installation guide">Installation Guide</a></li>
-        <li><a href="{% wiki_url "Beginners'_Guide" %}"
+        <li><a href="{% wiki_url "Beginners'_guide" %}"
             title="A good place to start for beginners">Beginners' Guide</a></li>
     </ul>
 
@@ -124,11 +124,11 @@
     <ul>
         <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
-        <li><a href="{% wiki_url 'IRC_Channels' %}"
+        <li><a href="{% wiki_url 'IRC_channels' %}"
             title="Official and regional IRC communities">IRC Channels</a></li>
         <li><a href="https://planet.archlinux.org/"
             title="Arch in the blogosphere">Planet Arch</a></li>
-        <li><a href="{% wiki_url 'International_Communities' %}"
+        <li><a href="{% wiki_url 'International_communities' %}"
             title="{{DISTRO_SHORTNAME}} communities in your native language">International Communities</a></li>
     </ul>
 
@@ -182,12 +182,12 @@
     <ul>
         <li><a href="{% url 'page-keys' %}"
             title="Package/Database signing master keys">Signing Master Keys</a></li>
-        <li><a href="{% wiki_url 'Arch_Linux_Press_Review' %}"
+        <li><a href="{% wiki_url 'Arch_Linux_press_coverage %}"
             title="{{ BRANDING_DISTRONAME }} in the media">Press Coverage</a></li>
         <li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
         <li><a href="{% url 'news-list' %}" title="News Archives">News Archives</a></li>
         <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
-        <li><a href="{% url 'page-devs' %}" title="Active Developers">Developer Profiles</a></li>
+        <li><a href="{% url 'page-devs' %}" title="Active developers">Developer Profiles</a></li>
         <li><a href="{% url 'page-tus' %}" title="Active Trusted Users (TUs)">Trusted User Profiles</a></li>
         <li><a href="{% url 'page-fellows' %}" title="Retired Developers">Fellows Profiles</a></li>
     </ul>