Fold meeting info into contact, add downloads page.

Signed-off-by: Jo-Philipp Wich <jo@wwsnet.net>

diff --git a/pages/communication.txt b/pages/communication.txt
index c236dbef4bf205fef05aa1416b4bfe2ee4b84481..1b9e36f4bec5518cb0bbba4924e092686aebd8f8 100644 (file)
--- a/pages/communication.txt
+++ b/pages/communication.txt
@@ -48,3 +48,18 @@ public. Ideally companies simply allow part of their R&D team to participate
 in the normal development process as normal community members. There will be
 no special treatment beyond the "first contact". Please see the project
 link:rules.html[rules] for further information.
+
+== Project Meetings
+
+We attempt to have regular IRC meetings to discuss and decide project matters.
+
+=== Next Meeting
+
+The next meeting date is yet to be decided.
+
+For the agenda of the upcoming meeting refer to the
+http://piratepad.net/ep/pad/view/ro.UdKV08dIlKx/latest[agenda pad].
+
+== Meeting Logs
+
+All meeting logs can be viewed under http://meetings.lede-project.org/lede-adm/[here]

diff --git a/pages/downloads.txt b/pages/downloads.txt
new file mode 100644 (file)
index 0000000..05c4e1a
--- /dev/null
+++ b/pages/downloads.txt
@@ -0,0 +1,25 @@
+Downloads
+=========
+
+include::menu.inc[]
+
+== Snapshot builds
+
+The current master branch is regularly processed by a buildbot setup and the
+resulting images can be found on https://downloads.lede-project.org/snapshots/targets/
+
+=== Mirrors
+
+The contents of the download server are available on several mirrors as well.
+Please refer to the list below for alternative locations.
+
+. http://mirrors.linux.ro/lede/
+. http://lede-project.tetaneutral.net/
+
+We'd like to thank http://www.rcs-rds.ro[RCS&RDS] and http://tetaneutral.net/[tetaneutral.net]
+for providing mirror space.
+
+=== Sources
+
+Any source code archives fetched by the buildbots during the build process are
+available at http://sources.lede-project.org/

diff --git a/pages/meetings.txt b/pages/meetings.txt
deleted file mode 100644 (file)
index 48699d6..0000000
--- a/pages/meetings.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Project Meetings
-================
-
-include::menu.inc[]
-
-== Next Meeting
-
-The next meeting date is yet to be decided.
-
-For the agenda of the upcoming meeting refer to the
-http://piratepad.net/ep/pad/view/ro.M3TfdfVpX1f/latest[agenda pad].
-
-== Meeting Logs
-
-All meeting logs can be viewed under http://meetings.lede-project.org/lede-adm/[here]

diff --git a/pages/menu.inc b/pages/menu.inc
index 8805ba7e734ff937edc5ce071b016b35e1b13e94..172625b698ea26e295cb51839b1117183fc4fd91 100644 (file)
--- a/pages/menu.inc
+++ b/pages/menu.inc
@@ -4,6 +4,6 @@
 . pass:attributes[<a href="rules.html" class="{docname@rules:active}">Rules</a>]
 . pass:attributes[<a href="development.html" class="{docname@development:active}">Development</a>]
 . pass:attributes[<a href="todo.html" class="{docname@todo:active}">Todo</a>]
-. pass:attributes[<a href="meetings.html" class="{docname@meetings:active}">Meetings</a>]
+. pass:attributes[<a href="downloads.html" class="{docname@downloads:active}">Downloads</a>]
 . pass:attributes[<a href="docs/index.html">Documentation</a>]
 . pass:attributes[<a href="about.html" class="{docname@about:active}">About</a>]