From cf023a200e734a64a12d54ceda321d75ba04441f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 3 Apr 2016 22:50:32 +0200 Subject: [PATCH] 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 --- docs/header.txt | 5 ----- docs/index.txt | 7 +++++-- docs/menu.inc | 5 +++++ docs/ubus.txt | 5 ++++- docs/uci.txt | 5 ++++- pages/communication.txt | 5 ++++- pages/header.txt | 5 ----- pages/index.txt | 30 +++++++++++++++--------------- pages/meetings.txt | 10 +++++----- pages/menu.inc | 8 ++++++++ pages/rules.txt | 7 +++++-- pages/source.txt | 5 ++++- pages/todo.txt | 5 ++++- 13 files changed, 63 insertions(+), 39 deletions(-) delete mode 100644 docs/header.txt create mode 100644 docs/menu.inc delete mode 100644 pages/header.txt create mode 100644 pages/menu.inc diff --git a/docs/header.txt b/docs/header.txt deleted file mode 100644 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 765c5f0..4888801 100644 --- 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 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 9c57c0a..3118fd6 100644 --- 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 61887c3..a454d17 100644 --- 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 afc841b..82e08e8 100644 --- 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 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 03dd3d3..070ac88 100644 --- 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 706f62c..2d3e79f 100644 --- 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 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 13ad627..d900b6d 100644 --- 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 6cf337b..b44b659 100644 --- 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 11c0a8c..1b72e37 100644 --- a/pages/todo.txt +++ b/pages/todo.txt @@ -1,4 +1,7 @@ -include::header.txt[] +Project ToDos +============= + +include::menu.inc[] == TODO List -- 2.30.2