Rework pages

- Move h1 from menu include to the documents
- Rename header.txt to menu.inc
- Reword text on the main page

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/docs/header.txt b/docs/header.txt
deleted file mode 100644 (file)
index db06e3c..0000000
--- a/docs/header.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-== image:../logo/logo_small.png[width="39"] Linux Embedded Developement Environment
-
-|====
-^| link:index.html[Index] ^| link:uci.html[Configuration] ^| link:ubus.html[uBus] ^| link:procd.html[Procd]
-|====

diff --git a/docs/index.txt b/docs/index.txt
index 765c5f05c54125c3c9f12eb9eec2e6ae8973dc0a..4888801ebaa20ca730f55f584c265839a905e630 100644 (file)
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -1,6 +1,9 @@
-include::header.txt[]
+Documentation Index
+===================
 
-=== The Web Presence
+include::menu.inc[]
+
+== The Web Presence
 
 The documentation  you're reading is generated from text files using the
 http://www.methods.co.nz/asciidoc/[AsciiDoc] suite. Any changes made to the

diff --git a/docs/menu.inc b/docs/menu.inc
new file mode 100644 (file)
index 0000000..44766ed
--- /dev/null
+++ b/docs/menu.inc
@@ -0,0 +1,5 @@
+[role="menu"]
+. link:index.html[Index]
+. link:uci.html[Configuration]
+. link:ubus.html[uBus]
+. link:procd.html[Procd]

diff --git a/docs/ubus.txt b/docs/ubus.txt
index 9c57c0a3e225260ab7de863af4b509aa9b172a69..3118fd6da1df3c7d014067b44d417f0ec8d70b22 100644 (file)
--- a/docs/ubus.txt
+++ b/docs/ubus.txt
@@ -1,4 +1,7 @@
-include::header.txt[]
+uBus IPC/RPC System
+===================
+
+include::menu.inc[]
 
 == uBus - IPC/RPC
 

diff --git a/docs/uci.txt b/docs/uci.txt
index 61887c300bbc031eada71a1983677b08b14231b0..a454d17b6200d13af6b86d6998b114d62776bbcf 100644 (file)
--- a/docs/uci.txt
+++ b/docs/uci.txt
@@ -1,4 +1,7 @@
-include::header.txt[]
+The UCI Configuration System
+============================
+
+include::menu.inc[]
 
 == UCI - Unified Configuration Interface
 

diff --git a/pages/communication.txt b/pages/communication.txt
index afc841b0e7ded329d47f2898b9746efee5a76614..82e08e834a7556dec762971ef619da0c4d6d6f86 100644 (file)
--- a/pages/communication.txt
+++ b/pages/communication.txt
@@ -1,4 +1,7 @@
-include::header.txt[]
+Project Communication
+=====================
+
+include::menu.inc[]
 
 == Communication
 

diff --git a/pages/header.txt b/pages/header.txt
deleted file mode 100644 (file)
index a9a9453..0000000
--- a/pages/header.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-== image:logo/logo_small.png[width="39"] Linux Embedded Developement Environment
-
-|====
-^| link:index.html[About] ^| link:communication.html[Communication] ^| link:rules.html[Rules] ^| link:source.html[Source] ^| link:todo.html[Todo] ^| link:meetings.html[Meetings] ^| link:docs/index.html[Documentation]
-|====

diff --git a/pages/index.txt b/pages/index.txt
index 03dd3d37b2727e21aeb19ac085d420b333a7e019..070ac88fadcbd089d679dc0acffdb3d0440514c9 100644 (file)
--- a/pages/index.txt
+++ b/pages/index.txt
@@ -1,10 +1,21 @@
-include::header.txt[]
+Welcome to the LEDE project
+===========================
 
-== About LEDE
+include::menu.inc[]
+
+== About
 
 The LEDE project was founded in April 2016 as an OpenWrt based spin off with a
 strong focus on transparency, user collaboration and decentralised structures.
 
+For a long time the OpenWrt parent project experienced infrastructure issues
+and declining developer participation on the base system while the community
+driven package ecosystem around it continued to thrive. When the number of
+frequently active committers reached a new low in the beginning of 2016, some
+OpenWrt developers decided to start a new spin-off project in an attempt to
+change the development processes from the ground up and reboot the project in
+a new, community-driven way.
+
 === Goals
 
 LEDE's stated goals are:
@@ -18,27 +29,16 @@ LEDE's stated goals are:
 
 === Name
 
+image:logo/logo.png["The LEDE logo",role="left"]
 The name _LEDE_ is an abbreviation for Linux Embedded Development Environment,
 a reference to its flexibility and embedded buildroot origins, making it a
 solid choice for embedded Linux applications far beyond the wireless router
 and network appliance realm.
 
-The word _LEDE_ is also an alternation of the phrase _to lead_, describing
+_LEDE_ is also an alternation of the phrase _to lead_, describing
 an introductory section of a news story that is intended to entice the reader
 to read the full story.
 
-=== Origin
-
-For a long time the OpenWrt parent project experienced infrastructure issues
-and declining developer participation on the base system while the community
-driven package ecosystem around it continued to thrive.
-
-When the number of frequently active committers reached a new low in the
-beginning of 2016, the three OpenWrt developers John Crispin, Felix Fietkau
-and Jo-Philipp Wich decided to start a new spin-off project in an attempt to
-radically change the development processes and reboot the project in better,
-community-driven manner.
-
 === Endorsement
 
 The *Wrt community is made up of many great communities all tinkering on their

diff --git a/pages/meetings.txt b/pages/meetings.txt
index 706f62c9796c731b6dabc898a9bac3f0143c9d54..2d3e79f14ed41222fb43bb2dc06b13582b0cddb0 100644 (file)
--- a/pages/meetings.txt
+++ b/pages/meetings.txt
@@ -1,9 +1,9 @@
-include::header.txt[]
+LEDE Project Meetings
+=====================
 
-== LEDE Project Meetings
+include::menu.inc[]
 
-
-=== Next Meeting
+== Next Meeting
 
 The next meeting will be held on Monday 4th April 2016 at 1pm CEST. The Agenda is as follows
 
@@ -23,6 +23,6 @@ The next meeting will be held on Monday 4th April 2016 at 1pm CEST. The Agenda i
  * Agree/Refuse: Project rule revision (rewording + typos): http://piratepad.net/CEJ5YLNPTY
  * Agree/Refuse: Put logo + documentation under CC BY-SA 4.0 unported: http://creativecommons.org/licenses/by-sa/4.0/
 
-=== Meeting Logs
+== 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
new file mode 100644 (file)
index 0000000..1794e12
--- /dev/null
+++ b/pages/menu.inc
@@ -0,0 +1,8 @@
+[role="menu"]
+. link:index.html[About]
+. link:communication.html[Communication]
+. link:rules.html[Rules]
+. link:source.html[Source]
+. link:todo.html[Todo]
+. link:meetings.html[Meetings]
+. link:docs/index.html[Documentation]

diff --git a/pages/rules.txt b/pages/rules.txt
index 13ad62790d69d92c4a24122d664dc498c750a005..d900b6dc9672100a806259e999570bd0e42a4d3c 100644 (file)
--- a/pages/rules.txt
+++ b/pages/rules.txt
@@ -1,6 +1,9 @@
-include::header.txt[]
+LEDE Project Rules
+==================
 
-== LEDE Project Rules
+include::menu.inc[]
+
+== Current Rules
 
 . There is two roles in the project: committer and non-committer
 . Committers have the right to vote on general project decisions

diff --git a/pages/source.txt b/pages/source.txt
index 6cf337b4ae10dce4e3be78ed189765e9bac5c09c..b44b659128b517d7cbd9836273462fbf7abda857 100644 (file)
--- a/pages/source.txt
+++ b/pages/source.txt
@@ -1,4 +1,7 @@
-include::header.txt[]
+Source Code Repositories
+========================
+
+include::menu.inc[]
 
 == The Source Code
 

diff --git a/pages/todo.txt b/pages/todo.txt
index 11c0a8c45fcb0e0c8b07f2f029b691f54e7c4bc7..1b72e3781804c5b11911f73513a2ec86b047cdd3 100644 (file)
--- a/pages/todo.txt
+++ b/pages/todo.txt
@@ -1,4 +1,7 @@
-include::header.txt[]
+Project ToDos
+=============
+
+include::menu.inc[]
 
 == TODO List