Merge branch 'archweb' into archweb-genericarchweb-generic

# Conflicts:
#	templates/public/download.html

1 files changed, 6 insertions, 0 deletions

diff --git a/releng/urls.py b/releng/urls.py
index ca76eb25..57013291 100644
--- a/releng/urls.py
+++ b/releng/urls.py
@@ -22,9 +22,15 @@ releases_patterns = patterns('releng.views',
         'release_torrent', {}, 'releng-release-torrent'),
 )
 
+netboot_patterns = patterns('releng.views',
+    (r'^archlinux\.ipxe$', 'netboot_config', {}, 'releng-netboot-config'),
+    (r'^$', 'netboot_info', {}, 'releng-netboot-info')
+)
+
 urlpatterns = patterns('',
     (r'^feedback/', include(feedback_patterns)),
     (r'^releases/', include(releases_patterns)),
+    (r'^netboot/', include(netboot_patterns)),
 )
 
 # vim: set ts=4 sw=4 et: