ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=be431a2fa963af1805c0d4c07aecddcd8689f804
commit be431a2fa963af1805c0d4c07aecddcd8689f804 Author: Andy Williams <a...@andywilliams.me> Date: Fri Oct 20 16:17:51 2017 +0100 Revert "Move all distro info into /docs/distros/" This reverts commit dd8e5cac13f0dbc00ba5e3330b0a47de93ec3a2b. --- pages/about.txt | 2 +- pages/contrib/efl-debug.txt | 2 +- pages/contrib/enlightenment_debugging.txt | 4 ++-- pages/develop/apps_efl_debugging.txt | 2 +- pages/{docs => }/distros/archlinux-start.txt | 2 +- pages/{docs => }/distros/debian-start.txt | 2 +- pages/{docs => }/distros/fedora-start.txt | 2 +- pages/{docs => }/distros/freebsd-start.txt | 0 pages/{docs => }/distros/opensuse-start.txt | 0 pages/{docs => }/distros/osx-start.txt | 0 pages/{docs => }/distros/ubuntu-start.txt | 2 +- pages/{docs => }/distros/yocto-start.txt | 0 pages/{docs/distros/start.txt => docs-efl-start.txt} | 4 ++-- pages/docs.txt | 18 +++++++++--------- pages/download.txt | 4 ++-- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pages/about.txt b/pages/about.txt index a0de3112..00bc9f77 100644 --- a/pages/about.txt +++ b/pages/about.txt @@ -73,7 +73,7 @@ of completeness here. For windows please see our page, or see [[http://win-builds.org|Win-Builds]] which ships EFL for Windows and even uses it for the package updater GUI. For MAC OS X -information, please refer to the [[docs/distros/osx-start]] page. +information, please refer to the [[distros/osx-start]] page. Enlightenment libraries already power millions of systems, from mobile phones to set top boxes, desktops, laptops, game systems and more. It diff --git a/pages/contrib/efl-debug.txt b/pages/contrib/efl-debug.txt index 6a2d5015..6182cef5 100644 --- a/pages/contrib/efl-debug.txt +++ b/pages/contrib/efl-debug.txt @@ -6,7 +6,7 @@ ==== Compilation ==== -Remember to build EFL, Enlightenment etc. with debugging compile flags. [[/docs/distrs/]] has a section on this for your build environment. Remember to have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all the debug information they need. If you didn't build with debugging, simply build again with these flags correctly set and debugging can begin. +Remember to build EFL, Enlightenment etc. with debugging compile flags. [[/docs-efl-start]] has a section on this for your build environment. Remember to have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all the debug information they need. If you didn't build with debugging, simply build again with these flags correctly set and debugging can begin. ---- diff --git a/pages/contrib/enlightenment_debugging.txt b/pages/contrib/enlightenment_debugging.txt index 7520ef73..f68da329 100644 --- a/pages/contrib/enlightenment_debugging.txt +++ b/pages/contrib/enlightenment_debugging.txt @@ -10,7 +10,7 @@ This tutorial aims at providing a comprehensive and reproducible documentation t * [[#Debugging_Enlightenment_using_GDB|GDB]] * [[#Valgrind|Valgrind]] -Before debugging make sure your debug symbols are enabled, if not, go to the [[/docs/distros/#Enable_debug_symbols_Optional|Enable debug symbols]] section. +Before debugging make sure your debug symbols are enabled, if not, go to the [[/docs-efl-start#Enable_debug_symbols_Optional|Enable debug symbols]] section. === Debugging Enlightenment using GDB === @@ -235,4 +235,4 @@ A black screen should now be displayed, and the interesting thing for us is that <code bash> DISPLAY=:1 enlightenment_start -valgrind -</code> +</code> \ No newline at end of file diff --git a/pages/develop/apps_efl_debugging.txt b/pages/develop/apps_efl_debugging.txt index 510aa011..3ae081a2 100644 --- a/pages/develop/apps_efl_debugging.txt +++ b/pages/develop/apps_efl_debugging.txt @@ -17,7 +17,7 @@ In this tutorial we'll cover log levels and tracing the sources of bugs: - [[apps_efl_debugging#Memory leak]] - [[apps_efl_debugging#Clouseau]] -Before debugging, make sure your debug symbols are enabled. If not, go to the [[/docs/distros/#Enable_debug_symbols_Optional|Enable debug symbols]] section. +Before debugging, make sure your debug symbols are enabled. If not, go to the [[/docs-efl-start#Enable_debug_symbols_Optional|Enable debug symbols]] section. You can also have a look at the [[https://phab.enlightenment.org/w/coding_convention/|EFL coding convention]] if you modify code and want to send patches. diff --git a/pages/docs/distros/archlinux-start.txt b/pages/distros/archlinux-start.txt similarity index 95% rename from pages/docs/distros/archlinux-start.txt rename to pages/distros/archlinux-start.txt index f554d2c8..5856489d 100644 --- a/pages/docs/distros/archlinux-start.txt +++ b/pages/distros/archlinux-start.txt @@ -34,7 +34,7 @@ pacman -S elementary pacman -R efl </code> -Then go to [[/docs/distros/|install]] tutorial, to install Enlightenment and/or EFL from source. +Then go to [[/docs-efl-start]] tutorial, to install Enlightenment and/or EFL from source. ==== Programs ==== diff --git a/pages/docs/distros/debian-start.txt b/pages/distros/debian-start.txt similarity index 98% rename from pages/docs/distros/debian-start.txt rename to pages/distros/debian-start.txt index f7361b22..3cca324a 100644 --- a/pages/docs/distros/debian-start.txt +++ b/pages/distros/debian-start.txt @@ -9,7 +9,7 @@ To start Enlightenment, see the run-time requirements below. ==== Install from the sources ==== -In this part, the installation for Debian is done from sources like in the [[/docs/distros/|Get EFL installed]] tutorial. +In this part, the installation for Debian is done from sources like in the [[/docs-efl-start|Get EFL installed]] tutorial. The following part provides a script and shows how to install Enlightenment and Terminology with their dependencies on Debian. The script below can be easily adapted for Elementary. diff --git a/pages/docs/distros/fedora-start.txt b/pages/distros/fedora-start.txt similarity index 95% rename from pages/docs/distros/fedora-start.txt rename to pages/distros/fedora-start.txt index a07f9090..cea88546 100644 --- a/pages/docs/distros/fedora-start.txt +++ b/pages/distros/fedora-start.txt @@ -21,7 +21,7 @@ xcb-util-keysyms-devel xine-lib-devel xorg-x11-server-Xephyr <note warning>You may need to install some wayland packages from the Rawhide repository in order to build the EFL with Wayland support. Please make sure you really know what you are doing before you start upgrading!</note> -Then go to [[/docs/distros/]] to learn how to install the whole thing ;-) +Then go to [[../docs-efl-start]] to learn how to install the whole thing ;-) ==== Packages ==== diff --git a/pages/docs/distros/freebsd-start.txt b/pages/distros/freebsd-start.txt similarity index 100% rename from pages/docs/distros/freebsd-start.txt rename to pages/distros/freebsd-start.txt diff --git a/pages/docs/distros/opensuse-start.txt b/pages/distros/opensuse-start.txt similarity index 100% rename from pages/docs/distros/opensuse-start.txt rename to pages/distros/opensuse-start.txt diff --git a/pages/docs/distros/osx-start.txt b/pages/distros/osx-start.txt similarity index 100% rename from pages/docs/distros/osx-start.txt rename to pages/distros/osx-start.txt diff --git a/pages/docs/distros/ubuntu-start.txt b/pages/distros/ubuntu-start.txt similarity index 96% rename from pages/docs/distros/ubuntu-start.txt rename to pages/distros/ubuntu-start.txt index 7ddfe7be..11a41908 100644 --- a/pages/docs/distros/ubuntu-start.txt +++ b/pages/distros/ubuntu-start.txt @@ -23,7 +23,7 @@ valgrind xserver-xephyr </code> -Then go to [[/docs/distros/]] to learn how to install the whole thing ;-) +Then go to [[../docs-efl-start]] to learn how to install the whole thing ;-) <note tip> Alternatively, if you do not want to delve into the many subtleties of the compilation process — while retaining a fully functional Ubuntu system after the build has finished — check out [[http://build-enlightenment.monsite-orange.fr/|batden's scripts]] (covering Ubuntu 16.04 LTS and 17.10).</note> diff --git a/pages/docs/distros/yocto-start.txt b/pages/distros/yocto-start.txt similarity index 100% rename from pages/docs/distros/yocto-start.txt rename to pages/distros/yocto-start.txt diff --git a/pages/docs/distros/start.txt b/pages/docs-efl-start.txt similarity index 93% rename from pages/docs/distros/start.txt rename to pages/docs-efl-start.txt index bdcb6c0e..31ac3b4d 100644 --- a/pages/docs/distros/start.txt +++ b/pages/docs-efl-start.txt @@ -64,7 +64,7 @@ For debugging you really want tools like these installed: * valgrind * perf -Please refer to our [[/develop/apps_efl_debugging|EFL application debugging]] page for full details on debugging with EFL. +Please refer to our [[docs-efl-debug]] page for full details on debugging with EFL. ---- @@ -82,4 +82,4 @@ instead of git clone https:// </code> -~~DISCUSSIONS~~ +~~DISCUSSIONS~~ \ No newline at end of file diff --git a/pages/docs.txt b/pages/docs.txt index 60efbab9..91ab63ee 100755 --- a/pages/docs.txt +++ b/pages/docs.txt @@ -23,15 +23,15 @@ course you can use stable packages for your distribution as well. === Getting EFL === - * [[docs/distros/|Get EFL installed from source]] - * [[docs/distros/ubuntu-start|EFL on Ubuntu]] - * [[docs/distros/archlinux-start|EFL on Arch Linux]] - * [[docs/distros/debian-start|EFL on Debian]] - * [[docs/distros/fedora-start|EFL on Fedora]] - * [[docs/distros/freebsd-start|EFL on FreeBSD]] - * [[docs/distros/opensuse-start|EFL on openSUSE]] - * [[docs/distros/yocto-start|EFL on Yocto]] - * [[docs/distros/osx-start|EFL on Mac OS X]] + * [[docs-efl-start|Get EFL installed from source]] + * [[distros/ubuntu-start|EFL on Ubuntu]] + * [[distros/archlinux-start|EFL on Arch Linux]] + * [[distros/debian-start|EFL on Debian]] + * [[distros/fedora-start|EFL on Fedora]] + * [[distros/freebsd-start|EFL on FreeBSD]] + * [[distros/opensuse-start|EFL on openSUSE]] + * [[distros/yocto-start|EFL on Yocto]] + * [[distros/osx-start|EFL on Mac OS X]] Go check the current available version of EFL on each distro/platform: [[https://phab.enlightenment.org/w/packaging_status/|Table of current version of EFL]] diff --git a/pages/download.txt b/pages/download.txt index 475941e2..530fe967 100644 --- a/pages/download.txt +++ b/pages/download.txt @@ -47,7 +47,7 @@ If ''configure'' fails, you are likely missing a dependency - provide it. It sho Our source code is developed collaboratively in a pretty typical open source manner. Our master branches in git are where all new development goes into as it happens, thus they are technically "unstable". We try and keep master working and usable daily, as developers generally are living off master themselves, so bugs affect developers directly and immediately. Sometimes issues happen, but they tend to get fixed rapidly. -If you want to track the latest and greatest, please see our git repositories below and follow the [[/docs/distros/]] guide on compiling from upstream source. If you have issues please refer to our [[contact]] page to get in touch with us. +If you want to track the latest and greatest, please see our git repositories below and follow the [[docs-efl-start]] guide on compiling from upstream source. If you have issues please refer to our [[contact]] page to get in touch with us. All our git repositories are listed on: @@ -57,4 +57,4 @@ All our git repositories are listed on: {{page>download-e16}} -~~DISCUSSIONS~~ +~~DISCUSSIONS~~ \ No newline at end of file --