From d62463247f17da153fc268dae647fa24af52a4f4 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Fri, 11 Oct 2019 01:31:25 +0530 Subject: [PATCH] doc: Move English manual to manual/en directory Signed-off-by: Joseph Nuthalapati [sunil@medhas.org Have common top level makefile for building manual] Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- .gitignore | 7 +- debian/freedombox.doc-base | 2 +- debian/freedombox.docs | 3 - doc/Makefile | 75 +++++++++++++----- doc/manual-pages.list | 44 ---------- doc/{ => manual/en}/Apache_userdir.raw.xml | 0 doc/{ => manual/en}/Backups.raw.xml | 0 doc/{ => manual/en}/Cockpit.raw.xml | 0 doc/{ => manual/en}/Configure.raw.xml | 0 doc/{ => manual/en}/Coquelicot.raw.xml | 0 doc/{ => manual/en}/DateTime.raw.xml | 0 doc/{ => manual/en}/Deluge.raw.xml | 0 doc/{ => manual/en}/Diagnostics.raw.xml | 0 doc/{ => manual/en}/DynamicDNS.raw.xml | 0 doc/{ => manual/en}/Firewall.raw.xml | 0 doc/{ => manual/en}/I2P.raw.xml | 0 doc/{ => manual/en}/Ikiwiki.raw.xml | 0 doc/{ => manual/en}/Infinoted.raw.xml | 0 doc/{ => manual/en}/LetsEncrypt.raw.xml | 0 doc/{ => manual/en}/MLDonkey.raw.xml | 0 doc/{ => manual/en}/MatrixSynapse.raw.xml | 0 doc/{ => manual/en}/MediaWiki.raw.xml | 0 doc/{ => manual/en}/Minetest.raw.xml | 0 doc/{ => manual/en}/Monkeysphere.raw.xml | 0 doc/{ => manual/en}/Mumble.raw.xml | 0 doc/{ => manual/en}/NameServices.raw.xml | 0 doc/{ => manual/en}/Networks.raw.xml | 0 doc/{ => manual/en}/OpenVPN.raw.xml | 0 doc/{ => manual/en}/PageKite.raw.xml | 0 doc/{ => manual/en}/Power.raw.xml | 0 doc/{ => manual/en}/Privoxy.raw.xml | 0 doc/{ => manual/en}/Quassel.raw.xml | 0 doc/{ => manual/en}/Radicale.raw.xml | 0 doc/{ => manual/en}/Repro.raw.xml | 0 doc/{ => manual/en}/Roundcube.raw.xml | 0 doc/{ => manual/en}/Searx.raw.xml | 0 doc/{ => manual/en}/SecureShell.raw.xml | 0 doc/{ => manual/en}/Security.raw.xml | 0 doc/{ => manual/en}/ServiceDiscovery.raw.xml | 0 doc/{ => manual/en}/Shadowsocks.raw.xml | 0 doc/{ => manual/en}/Snapshots.raw.xml | 0 doc/{ => manual/en}/Storage.raw.xml | 0 doc/{ => manual/en}/Syncthing.raw.xml | 0 doc/{ => manual/en}/TinyTinyRSS.raw.xml | 0 doc/{ => manual/en}/Tor.raw.xml | 0 doc/{ => manual/en}/Transmission.raw.xml | 0 doc/{ => manual/en}/Upgrades.raw.xml | 0 doc/{ => manual/en}/Users.raw.xml | 0 doc/{ => manual/en}/ejabberd.raw.xml | 0 doc/{ => manual/en}/freedombox-manual.raw.xml | 0 .../en}/images/Backups_Step1_v49.png | Bin .../en}/images/Backups_Step2_v49.png | Bin .../en}/images/Backups_Step3_v49.png | Bin .../en}/images/Backups_Step4_v49.png | Bin .../en}/images/Backups_Step5_v49.png | Bin .../en}/images/Backups_Step6_v49.png | Bin .../en}/images/Backups_Step7_v49.png | Bin .../en}/images/DAVdroid-refresh.png | Bin .../en}/images/DAVdroid-setup-account.png | Bin .../en}/images/DAVdroid-sync-account.png | Bin doc/{ => manual/en}/images/DateTime.png | Bin doc/{ => manual/en}/images/Disks.png | Bin .../en}/images/DynamicDNS-Settings.png | Bin doc/{ => manual/en}/images/Firewall.png | Bin .../en}/images/LetsEncrypt-Certificate.png | Bin .../en}/images/LetsEncrypt-Configure.png | Bin .../en}/images/LetsEncrypt-NameServices.png | Bin doc/{ => manual/en}/images/LetsEncrypt.png | Bin doc/{ => manual/en}/images/OPML.png | Bin .../en}/images/Privoxy-BrowserSettings.png | Bin .../en}/images/Privoxy-Installation.png | Bin .../en}/images/Quassel_Installation.png | Bin .../en}/images/Quassel_PortForwarding.png | Bin doc/{ => manual/en}/images/Quasseldroid.png | Bin .../en}/images/Radicale-Evolution-Docu.png | Bin .../en}/images/Radicale-Plinth.png | Bin doc/{ => manual/en}/images/Security.png | Bin .../en}/images/Select-RSS-feed.png | Bin doc/{ => manual/en}/images/Storage.png | Bin .../en}/images/Subscribe-dialog.png | Bin .../en}/images/Subscribe-to-feed.png | Bin doc/{ => manual/en}/images/Syncthing_GUI.png | Bin doc/{ => manual/en}/images/Unsubscribe.png | Bin doc/{ => manual/en}/images/WikiNews-feed.png | Bin .../en}/images/a20-olinuxino-lime2.jpg | Bin .../en}/images/a20-olinuxino-lime2_thumb.jpg | Bin .../en}/images/a20-olinuxino-micro.jpg | Bin .../en}/images/a20-olinuxino-micro_thumb.jpg | Bin doc/{ => manual/en}/images/about.png | Bin .../en}/images/add_security_exception.png | Bin doc/{ => manual/en}/images/apps.png | Bin doc/{ => manual/en}/images/apu1d.jpg | Bin doc/{ => manual/en}/images/apu1d_thumb.jpg | Bin .../en}/images/banana-pro_thumb.jpg | Bin doc/{ => manual/en}/images/beagleboard.jpg | Bin .../en}/images/beagleboard_thumb.jpg | Bin doc/{ => manual/en}/images/checkmark.png | Bin .../en}/images/cockpit-admin-user.png | Bin doc/{ => manual/en}/images/cockpit-enable.png | Bin doc/{ => manual/en}/images/cockpit-login.png | Bin doc/{ => manual/en}/images/cockpit-logs.png | Bin doc/{ => manual/en}/images/cockpit-mobile.png | Bin .../en}/images/cockpit-network1.png | Bin .../en}/images/cockpit-network2.png | Bin .../en}/images/cockpit-network3.png | Bin .../en}/images/cockpit-services1.png | Bin .../en}/images/cockpit-services2.png | Bin .../en}/images/cockpit-storage1.png | Bin .../en}/images/cockpit-storage2.png | Bin doc/{ => manual/en}/images/cockpit-system.png | Bin .../en}/images/cockpit-terminal.png | Bin .../en}/images/cubieboard2_thumb.jpg | Bin doc/{ => manual/en}/images/danube_thumb.png | Bin doc/{ => manual/en}/images/debian_thumb.png | Bin doc/{ => manual/en}/images/deluge.png | Bin .../en}/images/deluge_connection_manager.png | Bin .../images/deluge_connection_manager_2.png | Bin doc/{ => manual/en}/images/deluge_login.png | Bin doc/{ => manual/en}/images/dreamplug.jpg | Bin .../en}/images/dreamplug_thumb.jpg | Bin doc/{ => manual/en}/images/emailclient.png | Bin .../en}/images/freedombox-danube.jpg | Bin .../freedombox-frontpage-2018-02-26.png | Bin .../freedombox-frontpage-2018-06-19.png | Bin .../freedombox-frontpage-2019-03-02.png | Bin .../images/freedombox-screenshot-about.png | Bin .../en}/images/freedombox-screenshot-apps.png | Bin .../en}/images/freedombox-screenshot-home.png | Bin .../images/freedombox-screenshot-manual.png | Bin .../freedombox-screenshot-roundcube.png | Bin .../images/freedombox-screenshot-system.png | Bin .../en}/images/freedombox-screenshot-tor.png | Bin .../images/freedombox-screenshot-ttrss.png | Bin doc/{ => manual/en}/images/frontpage.png | Bin doc/{ => manual/en}/images/help.png | Bin doc/{ => manual/en}/images/icon-error.png | Bin doc/{ => manual/en}/images/ikiwiki_create.png | Bin doc/{ => manual/en}/images/ikiwiki_manage.png | Bin doc/{ => manual/en}/images/mldonkey.jpg | Bin doc/{ => manual/en}/images/network_single.png | Bin doc/{ => manual/en}/images/newsfeed.png | Bin .../en}/images/openvpn_connect.png | Bin .../en}/images/openvpn_connected.png | Bin .../en}/images/openvpn_disconnect.png | Bin .../en}/images/openvpn_download_profile.png | Bin .../en}/images/openvpn_edit_domain_name.png | Bin .../en}/images/openvpn_import_profile.png | Bin .../en}/images/openvpn_install_app.png | Bin .../en}/images/openvpn_profile_created.png | Bin doc/{ => manual/en}/images/pcduino3s.jpg | Bin .../en}/images/pcduino3s_thumb.jpg | Bin doc/{ => manual/en}/images/pine64-plus.jpg | Bin .../en}/images/pine64-plus_thumb.jpg | Bin .../en}/images/pioneer-edition.jpg | Bin .../en}/images/pioneer-edition_thumb.jpg | Bin .../en}/images/plinth_all_apps_full_page.png | Bin .../en}/images/plinth_first_boot.png | Bin .../en}/images/plinth_firstboot_account.png | Bin .../en}/images/plinth_firstboot_complete.png | Bin .../en}/images/plinth_firstboot_welcome.png | Bin .../en}/images/plinth_frontpage.png | Bin .../en}/images/plinth_insecure_connection.png | Bin doc/{ => manual/en}/images/plinth_openvpn.png | Bin .../quassel-client-1-connect-to-core.png | Bin .../quassel-client-10-setup-identity.png | Bin ...sel-client-11-setup-network-connection.png | Bin .../images/quassel-client-12-server-info.png | Bin .../quassel-client-13-server-info-ssl.png | Bin ...sel-client-14-setup-network-connection.png | Bin .../images/quassel-client-15-quassel-main.png | Bin .../quassel-client-2-add-core-account.png | Bin .../quassel-client-3-connect-to-core.png | Bin ...client-4-untrusted-security-certficate.png | Bin ...lient-5-untrusted-security-certificate.png | Bin ...sel-client-6-core-configuration-wizard.png | Bin .../quassel-client-7-create-admin-user.png | Bin ...uassel-client-8-select-storage-backend.png | Bin .../quassel-client-9-welcome-wizard.png | Bin doc/{ => manual/en}/images/radicale_web.png | Bin .../en}/images/raspberry2_thumb.jpg | Bin .../en}/images/raspberry_thumb.jpg | Bin doc/{ => manual/en}/images/raspberrypi.jpg | Bin doc/{ => manual/en}/images/raspberrypi2.jpg | Bin doc/{ => manual/en}/images/raspberrypi3.jpg | Bin .../en}/images/raspberrypi3b_thumb.jpg | Bin .../en}/images/raspberrypi3bplus.jpg | Bin .../en}/images/raspberrypi3bplus_thumb.jpg | Bin doc/{ => manual/en}/images/repro_domains.png | Bin doc/{ => manual/en}/images/repro_users.png | Bin .../en}/images/roundcube-gmail.png | Bin .../en}/images/roundcube-riseup.png | Bin .../en}/images/searx-screenshot.png | Bin doc/{ => manual/en}/images/smile.png | Bin doc/{ => manual/en}/images/snapshots.png | Bin doc/{ => manual/en}/images/star_off.png | Bin doc/{ => manual/en}/images/star_on.png | Bin doc/{ => manual/en}/images/system.png | Bin .../en}/images/tor-bridge-configuration.png | Bin doc/{ => manual/en}/images/tor-bridge-db.png | Bin doc/{ => manual/en}/images/tor.png | Bin .../en}/images/tor_browser_plinth.png | Bin doc/{ => manual/en}/images/transmission.png | Bin doc/{ => manual/en}/images/ttrss.png | Bin doc/{ => manual/en}/images/ttrssapp1.png | Bin doc/{ => manual/en}/images/ttrssapp2.png | Bin doc/{ => manual/en}/images/ttrssapp3.png | Bin doc/{ => manual/en}/images/ttrssapp4.png | Bin doc/{ => manual/en}/images/ttrssapp5.png | Bin .../en}/images/ui_add_security_exception.png | Bin doc/{ => manual/en}/images/ui_apps.png | Bin .../en}/images/ui_firstboot_account.png | Bin .../en}/images/ui_firstboot_complete.png | Bin .../en}/images/ui_firstboot_welcome.png | Bin doc/{ => manual/en}/images/ui_frontpage.png | Bin .../en}/images/ui_frontpage_with_app.png | Bin doc/{ => manual/en}/images/ui_help.png | Bin .../en}/images/ui_insecure_connection.png | Bin doc/{ => manual/en}/images/ui_system.png | Bin doc/{ => manual/en}/images/ui_user_menu.png | Bin doc/{ => manual/en}/images/upgrades.png | Bin doc/{ => manual/en}/images/user.png | Bin doc/{ => manual/en}/images/virtualbox.png | Bin .../images/virtualbox_console_after_boot.png | Bin .../en}/images/virtualbox_harddisk_file.png | Bin .../en}/images/virtualbox_network_type.png | Bin .../en}/images/virtualbox_os_type.png | Bin .../en}/images/virtualbox_thumb.png | Bin doc/scripts/fetch-manual-pages | 59 -------------- 228 files changed, 60 insertions(+), 130 deletions(-) delete mode 100644 doc/manual-pages.list rename doc/{ => manual/en}/Apache_userdir.raw.xml (100%) rename doc/{ => manual/en}/Backups.raw.xml (100%) rename doc/{ => manual/en}/Cockpit.raw.xml (100%) rename doc/{ => manual/en}/Configure.raw.xml (100%) rename doc/{ => manual/en}/Coquelicot.raw.xml (100%) rename doc/{ => manual/en}/DateTime.raw.xml (100%) rename doc/{ => manual/en}/Deluge.raw.xml (100%) rename doc/{ => manual/en}/Diagnostics.raw.xml (100%) rename doc/{ => manual/en}/DynamicDNS.raw.xml (100%) rename doc/{ => manual/en}/Firewall.raw.xml (100%) rename doc/{ => manual/en}/I2P.raw.xml (100%) rename doc/{ => manual/en}/Ikiwiki.raw.xml (100%) rename doc/{ => manual/en}/Infinoted.raw.xml (100%) rename doc/{ => manual/en}/LetsEncrypt.raw.xml (100%) rename doc/{ => manual/en}/MLDonkey.raw.xml (100%) rename doc/{ => manual/en}/MatrixSynapse.raw.xml (100%) rename doc/{ => manual/en}/MediaWiki.raw.xml (100%) rename doc/{ => manual/en}/Minetest.raw.xml (100%) rename doc/{ => manual/en}/Monkeysphere.raw.xml (100%) rename doc/{ => manual/en}/Mumble.raw.xml (100%) rename doc/{ => manual/en}/NameServices.raw.xml (100%) rename doc/{ => manual/en}/Networks.raw.xml (100%) rename doc/{ => manual/en}/OpenVPN.raw.xml (100%) rename doc/{ => manual/en}/PageKite.raw.xml (100%) rename doc/{ => manual/en}/Power.raw.xml (100%) rename doc/{ => manual/en}/Privoxy.raw.xml (100%) rename doc/{ => manual/en}/Quassel.raw.xml (100%) rename doc/{ => manual/en}/Radicale.raw.xml (100%) rename doc/{ => manual/en}/Repro.raw.xml (100%) rename doc/{ => manual/en}/Roundcube.raw.xml (100%) rename doc/{ => manual/en}/Searx.raw.xml (100%) rename doc/{ => manual/en}/SecureShell.raw.xml (100%) rename doc/{ => manual/en}/Security.raw.xml (100%) rename doc/{ => manual/en}/ServiceDiscovery.raw.xml (100%) rename doc/{ => manual/en}/Shadowsocks.raw.xml (100%) rename doc/{ => manual/en}/Snapshots.raw.xml (100%) rename doc/{ => manual/en}/Storage.raw.xml (100%) rename doc/{ => manual/en}/Syncthing.raw.xml (100%) rename doc/{ => manual/en}/TinyTinyRSS.raw.xml (100%) rename doc/{ => manual/en}/Tor.raw.xml (100%) rename doc/{ => manual/en}/Transmission.raw.xml (100%) rename doc/{ => manual/en}/Upgrades.raw.xml (100%) rename doc/{ => manual/en}/Users.raw.xml (100%) rename doc/{ => manual/en}/ejabberd.raw.xml (100%) rename doc/{ => manual/en}/freedombox-manual.raw.xml (100%) rename doc/{ => manual/en}/images/Backups_Step1_v49.png (100%) rename doc/{ => manual/en}/images/Backups_Step2_v49.png (100%) rename doc/{ => manual/en}/images/Backups_Step3_v49.png (100%) rename doc/{ => manual/en}/images/Backups_Step4_v49.png (100%) rename doc/{ => manual/en}/images/Backups_Step5_v49.png (100%) rename doc/{ => manual/en}/images/Backups_Step6_v49.png (100%) rename doc/{ => manual/en}/images/Backups_Step7_v49.png (100%) rename doc/{ => manual/en}/images/DAVdroid-refresh.png (100%) rename doc/{ => manual/en}/images/DAVdroid-setup-account.png (100%) rename doc/{ => manual/en}/images/DAVdroid-sync-account.png (100%) rename doc/{ => manual/en}/images/DateTime.png (100%) rename doc/{ => manual/en}/images/Disks.png (100%) rename doc/{ => manual/en}/images/DynamicDNS-Settings.png (100%) rename doc/{ => manual/en}/images/Firewall.png (100%) rename doc/{ => manual/en}/images/LetsEncrypt-Certificate.png (100%) rename doc/{ => manual/en}/images/LetsEncrypt-Configure.png (100%) rename doc/{ => manual/en}/images/LetsEncrypt-NameServices.png (100%) rename doc/{ => manual/en}/images/LetsEncrypt.png (100%) rename doc/{ => manual/en}/images/OPML.png (100%) rename doc/{ => manual/en}/images/Privoxy-BrowserSettings.png (100%) rename doc/{ => manual/en}/images/Privoxy-Installation.png (100%) rename doc/{ => manual/en}/images/Quassel_Installation.png (100%) rename doc/{ => manual/en}/images/Quassel_PortForwarding.png (100%) rename doc/{ => manual/en}/images/Quasseldroid.png (100%) rename doc/{ => manual/en}/images/Radicale-Evolution-Docu.png (100%) rename doc/{ => manual/en}/images/Radicale-Plinth.png (100%) rename doc/{ => manual/en}/images/Security.png (100%) rename doc/{ => manual/en}/images/Select-RSS-feed.png (100%) rename doc/{ => manual/en}/images/Storage.png (100%) rename doc/{ => manual/en}/images/Subscribe-dialog.png (100%) rename doc/{ => manual/en}/images/Subscribe-to-feed.png (100%) rename doc/{ => manual/en}/images/Syncthing_GUI.png (100%) rename doc/{ => manual/en}/images/Unsubscribe.png (100%) rename doc/{ => manual/en}/images/WikiNews-feed.png (100%) rename doc/{ => manual/en}/images/a20-olinuxino-lime2.jpg (100%) rename doc/{ => manual/en}/images/a20-olinuxino-lime2_thumb.jpg (100%) rename doc/{ => manual/en}/images/a20-olinuxino-micro.jpg (100%) rename doc/{ => manual/en}/images/a20-olinuxino-micro_thumb.jpg (100%) rename doc/{ => manual/en}/images/about.png (100%) rename doc/{ => manual/en}/images/add_security_exception.png (100%) rename doc/{ => manual/en}/images/apps.png (100%) rename doc/{ => manual/en}/images/apu1d.jpg (100%) rename doc/{ => manual/en}/images/apu1d_thumb.jpg (100%) rename doc/{ => manual/en}/images/banana-pro_thumb.jpg (100%) rename doc/{ => manual/en}/images/beagleboard.jpg (100%) rename doc/{ => manual/en}/images/beagleboard_thumb.jpg (100%) rename doc/{ => manual/en}/images/checkmark.png (100%) rename doc/{ => manual/en}/images/cockpit-admin-user.png (100%) rename doc/{ => manual/en}/images/cockpit-enable.png (100%) rename doc/{ => manual/en}/images/cockpit-login.png (100%) rename doc/{ => manual/en}/images/cockpit-logs.png (100%) rename doc/{ => manual/en}/images/cockpit-mobile.png (100%) rename doc/{ => manual/en}/images/cockpit-network1.png (100%) rename doc/{ => manual/en}/images/cockpit-network2.png (100%) rename doc/{ => manual/en}/images/cockpit-network3.png (100%) rename doc/{ => manual/en}/images/cockpit-services1.png (100%) rename doc/{ => manual/en}/images/cockpit-services2.png (100%) rename doc/{ => manual/en}/images/cockpit-storage1.png (100%) rename doc/{ => manual/en}/images/cockpit-storage2.png (100%) rename doc/{ => manual/en}/images/cockpit-system.png (100%) rename doc/{ => manual/en}/images/cockpit-terminal.png (100%) rename doc/{ => manual/en}/images/cubieboard2_thumb.jpg (100%) rename doc/{ => manual/en}/images/danube_thumb.png (100%) rename doc/{ => manual/en}/images/debian_thumb.png (100%) rename doc/{ => manual/en}/images/deluge.png (100%) rename doc/{ => manual/en}/images/deluge_connection_manager.png (100%) rename doc/{ => manual/en}/images/deluge_connection_manager_2.png (100%) rename doc/{ => manual/en}/images/deluge_login.png (100%) rename doc/{ => manual/en}/images/dreamplug.jpg (100%) rename doc/{ => manual/en}/images/dreamplug_thumb.jpg (100%) rename doc/{ => manual/en}/images/emailclient.png (100%) rename doc/{ => manual/en}/images/freedombox-danube.jpg (100%) rename doc/{ => manual/en}/images/freedombox-frontpage-2018-02-26.png (100%) rename doc/{ => manual/en}/images/freedombox-frontpage-2018-06-19.png (100%) rename doc/{ => manual/en}/images/freedombox-frontpage-2019-03-02.png (100%) rename doc/{ => manual/en}/images/freedombox-screenshot-about.png (100%) rename doc/{ => manual/en}/images/freedombox-screenshot-apps.png (100%) rename doc/{ => manual/en}/images/freedombox-screenshot-home.png (100%) rename doc/{ => manual/en}/images/freedombox-screenshot-manual.png (100%) rename doc/{ => manual/en}/images/freedombox-screenshot-roundcube.png (100%) rename doc/{ => manual/en}/images/freedombox-screenshot-system.png (100%) rename doc/{ => manual/en}/images/freedombox-screenshot-tor.png (100%) rename doc/{ => manual/en}/images/freedombox-screenshot-ttrss.png (100%) rename doc/{ => manual/en}/images/frontpage.png (100%) rename doc/{ => manual/en}/images/help.png (100%) rename doc/{ => manual/en}/images/icon-error.png (100%) rename doc/{ => manual/en}/images/ikiwiki_create.png (100%) rename doc/{ => manual/en}/images/ikiwiki_manage.png (100%) rename doc/{ => manual/en}/images/mldonkey.jpg (100%) rename doc/{ => manual/en}/images/network_single.png (100%) rename doc/{ => manual/en}/images/newsfeed.png (100%) rename doc/{ => manual/en}/images/openvpn_connect.png (100%) rename doc/{ => manual/en}/images/openvpn_connected.png (100%) rename doc/{ => manual/en}/images/openvpn_disconnect.png (100%) rename doc/{ => manual/en}/images/openvpn_download_profile.png (100%) rename doc/{ => manual/en}/images/openvpn_edit_domain_name.png (100%) rename doc/{ => manual/en}/images/openvpn_import_profile.png (100%) rename doc/{ => manual/en}/images/openvpn_install_app.png (100%) rename doc/{ => manual/en}/images/openvpn_profile_created.png (100%) rename doc/{ => manual/en}/images/pcduino3s.jpg (100%) rename doc/{ => manual/en}/images/pcduino3s_thumb.jpg (100%) rename doc/{ => manual/en}/images/pine64-plus.jpg (100%) rename doc/{ => manual/en}/images/pine64-plus_thumb.jpg (100%) rename doc/{ => manual/en}/images/pioneer-edition.jpg (100%) rename doc/{ => manual/en}/images/pioneer-edition_thumb.jpg (100%) rename doc/{ => manual/en}/images/plinth_all_apps_full_page.png (100%) rename doc/{ => manual/en}/images/plinth_first_boot.png (100%) rename doc/{ => manual/en}/images/plinth_firstboot_account.png (100%) rename doc/{ => manual/en}/images/plinth_firstboot_complete.png (100%) rename doc/{ => manual/en}/images/plinth_firstboot_welcome.png (100%) rename doc/{ => manual/en}/images/plinth_frontpage.png (100%) rename doc/{ => manual/en}/images/plinth_insecure_connection.png (100%) rename doc/{ => manual/en}/images/plinth_openvpn.png (100%) rename doc/{ => manual/en}/images/quassel-client-1-connect-to-core.png (100%) rename doc/{ => manual/en}/images/quassel-client-10-setup-identity.png (100%) rename doc/{ => manual/en}/images/quassel-client-11-setup-network-connection.png (100%) rename doc/{ => manual/en}/images/quassel-client-12-server-info.png (100%) rename doc/{ => manual/en}/images/quassel-client-13-server-info-ssl.png (100%) rename doc/{ => manual/en}/images/quassel-client-14-setup-network-connection.png (100%) rename doc/{ => manual/en}/images/quassel-client-15-quassel-main.png (100%) rename doc/{ => manual/en}/images/quassel-client-2-add-core-account.png (100%) rename doc/{ => manual/en}/images/quassel-client-3-connect-to-core.png (100%) rename doc/{ => manual/en}/images/quassel-client-4-untrusted-security-certficate.png (100%) rename doc/{ => manual/en}/images/quassel-client-5-untrusted-security-certificate.png (100%) rename doc/{ => manual/en}/images/quassel-client-6-core-configuration-wizard.png (100%) rename doc/{ => manual/en}/images/quassel-client-7-create-admin-user.png (100%) rename doc/{ => manual/en}/images/quassel-client-8-select-storage-backend.png (100%) rename doc/{ => manual/en}/images/quassel-client-9-welcome-wizard.png (100%) rename doc/{ => manual/en}/images/radicale_web.png (100%) rename doc/{ => manual/en}/images/raspberry2_thumb.jpg (100%) rename doc/{ => manual/en}/images/raspberry_thumb.jpg (100%) rename doc/{ => manual/en}/images/raspberrypi.jpg (100%) rename doc/{ => manual/en}/images/raspberrypi2.jpg (100%) rename doc/{ => manual/en}/images/raspberrypi3.jpg (100%) rename doc/{ => manual/en}/images/raspberrypi3b_thumb.jpg (100%) rename doc/{ => manual/en}/images/raspberrypi3bplus.jpg (100%) rename doc/{ => manual/en}/images/raspberrypi3bplus_thumb.jpg (100%) rename doc/{ => manual/en}/images/repro_domains.png (100%) rename doc/{ => manual/en}/images/repro_users.png (100%) rename doc/{ => manual/en}/images/roundcube-gmail.png (100%) rename doc/{ => manual/en}/images/roundcube-riseup.png (100%) rename doc/{ => manual/en}/images/searx-screenshot.png (100%) rename doc/{ => manual/en}/images/smile.png (100%) rename doc/{ => manual/en}/images/snapshots.png (100%) rename doc/{ => manual/en}/images/star_off.png (100%) rename doc/{ => manual/en}/images/star_on.png (100%) rename doc/{ => manual/en}/images/system.png (100%) rename doc/{ => manual/en}/images/tor-bridge-configuration.png (100%) rename doc/{ => manual/en}/images/tor-bridge-db.png (100%) rename doc/{ => manual/en}/images/tor.png (100%) rename doc/{ => manual/en}/images/tor_browser_plinth.png (100%) rename doc/{ => manual/en}/images/transmission.png (100%) rename doc/{ => manual/en}/images/ttrss.png (100%) rename doc/{ => manual/en}/images/ttrssapp1.png (100%) rename doc/{ => manual/en}/images/ttrssapp2.png (100%) rename doc/{ => manual/en}/images/ttrssapp3.png (100%) rename doc/{ => manual/en}/images/ttrssapp4.png (100%) rename doc/{ => manual/en}/images/ttrssapp5.png (100%) rename doc/{ => manual/en}/images/ui_add_security_exception.png (100%) rename doc/{ => manual/en}/images/ui_apps.png (100%) rename doc/{ => manual/en}/images/ui_firstboot_account.png (100%) rename doc/{ => manual/en}/images/ui_firstboot_complete.png (100%) rename doc/{ => manual/en}/images/ui_firstboot_welcome.png (100%) rename doc/{ => manual/en}/images/ui_frontpage.png (100%) rename doc/{ => manual/en}/images/ui_frontpage_with_app.png (100%) rename doc/{ => manual/en}/images/ui_help.png (100%) rename doc/{ => manual/en}/images/ui_insecure_connection.png (100%) rename doc/{ => manual/en}/images/ui_system.png (100%) rename doc/{ => manual/en}/images/ui_user_menu.png (100%) rename doc/{ => manual/en}/images/upgrades.png (100%) rename doc/{ => manual/en}/images/user.png (100%) rename doc/{ => manual/en}/images/virtualbox.png (100%) rename doc/{ => manual/en}/images/virtualbox_console_after_boot.png (100%) rename doc/{ => manual/en}/images/virtualbox_harddisk_file.png (100%) rename doc/{ => manual/en}/images/virtualbox_network_type.png (100%) rename doc/{ => manual/en}/images/virtualbox_os_type.png (100%) rename doc/{ => manual/en}/images/virtualbox_thumb.png (100%) delete mode 100755 doc/scripts/fetch-manual-pages diff --git a/.gitignore b/.gitignore index 32b712637..8eac94986 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,10 @@ data/var/lib/plinth/*.sqlite3 data/var/lib/plinth/sessions/* data/var/lib/plinth/.ssh/ data/var/run/*.pid -doc/*.pdf -doc/*.html -doc/freedombox-manual.xml +doc/manual/*/*.pdf +doc/manual/*/*.html +doc/manual/*/*.xml +!doc/manual/*/*.raw.xml doc/plinth.1 \#* .#* diff --git a/debian/freedombox.doc-base b/debian/freedombox.doc-base index 1ce72d4b0..8ee348340 100644 --- a/debian/freedombox.doc-base +++ b/debian/freedombox.doc-base @@ -13,5 +13,5 @@ Abstract: easy to manage, privacy oriented home server Section: Network/Communication Format: HTML -Index: /usr/share/doc/freedombox/freedombox-manual.part.html +Index: /usr/share/doc/freedombox/manual/en/freedombox-manual.part.html Files: /usr/share/doc/freedombox/* diff --git a/debian/freedombox.docs b/debian/freedombox.docs index 86db8bce2..998caf3bc 100644 --- a/debian/freedombox.docs +++ b/debian/freedombox.docs @@ -1,5 +1,2 @@ README.md HACKING.md -doc/*.html -doc/*.pdf -doc/images diff --git a/doc/Makefile b/doc/Makefile index 343cf7f55..3470b7632 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -15,12 +15,21 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -MANUAL_URL="https://wiki.debian.org/FreedomBox/Manual?action=show&mimetype=text%2Fdocbook" OUTPUTS=freedombox-manual.pdf plinth.1 manual-pages +MANUAL_LANGUAGES=en + +MANUAL_URL="https://wiki.debian.org/{lang-fragment}FreedomBox/Manual?action=show&mimetype=text%2Fdocbook" +MANUAL_URL_RAW="https://wiki.debian.org/{lang-fragment}FreedomBox/Manual?action=raw" +MANUAL_PAGE_URL="https://wiki.debian.org/{lang-fragment}FreedomBox/Manual/{page}?action=show&mimetype=text%2Fdocbook" + SCRIPTS_DIR=scripts +manual-pdfs=$(foreach lang,$(MANUAL_LANGUAGES),manual/$(lang)/freedombox-manual.pdf) +manual-xmls=$(patsubst %.pdf,%.xml,$(manual-pdfs)) +OUTPUTS=$(manual-pdfs) plinth.1 manual-pages + # In order to debug various problems with the documents especially # intermediate LaTeX state, run make as follows: # @@ -33,6 +42,7 @@ ifneq ($(DEBUG),) XMLTO_DEBUG_FLAGS=--noclean -p '--debug' endif +.PHONY: all all: $(OUTPUTS) # Do not edit the manual page in this directory. The manual is @@ -48,37 +58,62 @@ all: $(OUTPUTS) # commit it to the repository. The wiki page is already reviewed, so # commits that update the manual just using the 'fetch' target do not # require further reviews. -.PHONY: fetch -fetch: - wget --quiet -O - $(MANUAL_URL) | \ - xmllint --format --output freedombox-manual.raw.xml - - xsltproc $(SCRIPTS_DIR)/fetch-images.xslt freedombox-manual.raw.xml | \ - sort -u | awk 'NF {print "wget --quiet -O images/" $$1 " " $$2}' | sh - $(SCRIPTS_DIR)/fetch-manual-pages +fetch-main-list:=$(foreach lang,$(MANUAL_LANGUAGES),fetch-main-$(lang)) +fetch-pages-list:=$(foreach lang,$(MANUAL_LANGUAGES),fetch-pages-$(lang)) + +.PHONY: fetch $(fetch-main-list) $(fetch-pages-list) +fetch: $(fetch-main-list) $(fetch-pages-list) + +fetch-main-%: lang = $* +fetch-main-%: lang-fragment = $(subst en/,,$*/) +$(fetch-main-list): fetch-main-%: + MANUAL_URL_LANG=$(subst {lang-fragment},$(lang-fragment),$(MANUAL_URL)) ; \ + wget --quiet -O - $${MANUAL_URL_LANG} | \ + xmllint --format --output manual/$(lang)/freedombox-manual.raw.xml - + mkdir -p manual/$(lang)/images/ + xsltproc $(SCRIPTS_DIR)/fetch-images.xslt manual/$(lang)/freedombox-manual.raw.xml | \ + sort -u | \ + awk 'NF {print "wget --quiet -O manual/$(lang)/images/" $$1 " " $$2}' | \ + sh + +fetch-pages-%: lang = $* +fetch-pages-%: lang-fragment = $(subst en/,,$*/) +$(fetch-pages-list): fetch-pages-%: + MANUAL_URL_LANG=$(subst {lang-fragment},$(lang-fragment),$(MANUAL_URL_RAW)) ; \ + MANUAL_PAGE_URL_LANG=$(subst {lang-fragment},$(lang-fragment),$(MANUAL_PAGE_URL)) ; \ + PAGES=$$(wget --quiet -U Firefox -O - $${MANUAL_URL_LANG} | \ + sed -n -e "s|.*FreedomBox/Manual/\([a-zA-Z0-9_-]*\).*|\1|p" | sort -u | \ + grep -v -e GettingHelp -e Developer -e QuickStart) ; \ + for PAGE in $${PAGES} ; do \ + FILE="manual/$(lang)/$${PAGE}.raw.xml" ; \ + URL=$$(echo $${MANUAL_PAGE_URL_LANG} | sed "s/{page}/$${PAGE}/") ; \ + echo "Downloading $(lang) $${PAGE}" ; \ + wget --quiet --user-agent=Firefox -O $${FILE} $${URL} ; \ + done + +manual-pages-raw:=$(foreach lang,$(MANUAL_LANGUAGES),$(filter-out manual/%/freedombox-manual.raw.xml,$(wildcard manual/$(lang)/*.raw.xml))) +manual-pages-part-html:=$(patsubst %.raw.xml, %.part.html, $(manual-pages-raw)) $(foreach lang,$(MANUAL_LANGUAGES),manual/$(lang)/freedombox-manual.part.html) +manual-pages-html:=$(patsubst %.part.html, %.html, $(manual-pages-part-html)) +manual-pages-xml:=$(patsubst %.raw.xml, %.xml, $(manual-pages-raw)) .PHONY: manual-pages -manual-pages-list:=$(shell cat manual-pages.list) freedombox-manual -manual-pages-part-html:=$(patsubst %, %.part.html, $(manual-pages-list)) -manual-pages-html:=$(patsubst %, %.html, $(manual-pages-list)) -manual-pages-xml:=$(patsubst %, %.xml, $(manual-pages-list)) - manual-pages: $(manual-pages-part-html) -%.pdf: %.xml - xmlto $(XMLTO_DEBUG_FLAGS) --with-dblatex pdf $< +$(manual-pdfs): %.pdf: %.xml + xmlto $(XMLTO_DEBUG_FLAGS) --with-dblatex pdf -o $(dir $@) $< -%.part.html: %.html +$(manual-pages-part-html): %.part.html: %.html perl -pe 'BEGIN {undef $$/} s/.*]*>(.*)<\/body\s*>.*/$$1/si' $< > $@ -freedombox-manual.xml: freedombox-manual.raw.xml $(SCRIPTS_DIR)/fixes.xslt +$(manual-xmls): %.xml: %.raw.xml $(SCRIPTS_DIR)/fixes.xslt xsltproc --output $@ $(SCRIPTS_DIR)/fixes.xslt $< -%.xml: %.raw.xml $(SCRIPTS_DIR)/manual-page-fixes.xslt +$(manual-pages-xml): %.xml: %.raw.xml $(SCRIPTS_DIR)/manual-page-fixes.xslt xsltproc --output $@ $(SCRIPTS_DIR)/manual-page-fixes.xslt $< $(SCRIPTS_DIR)/post-processor remove-footer $@ $(SCRIPTS_DIR)/post-processor fix-wiki-urls $@ -%.html: %.xml +$(manual-pages-html): %.html: %.xml xsltproc --output $@ /usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml5/docbook.xsl $< rm -f $(dir $@)docbook.css @@ -87,5 +122,5 @@ freedombox-manual.xml: freedombox-manual.raw.xml $(SCRIPTS_DIR)/fixes.xslt .PHONY: clean clean: - rm -f $(manual-pages-html) $(manual-pages-part-html) $(manual-pages-xml) + rm -f $(manual-pages-html) $(manual-pages-part-html) $(manual-pages-xml) $(manual-xmls) rm -f $(OUTPUTS) diff --git a/doc/manual-pages.list b/doc/manual-pages.list deleted file mode 100644 index 24db9344a..000000000 --- a/doc/manual-pages.list +++ /dev/null @@ -1,44 +0,0 @@ -Apache_userdir -Tor -Transmission -Deluge -Minetest -Radicale -ejabberd -MatrixSynapse -Roundcube -Coquelicot -MLDonkey -Syncthing -Infinoted -Quassel -TinyTinyRSS -Repro -Shadowsocks -OpenVPN -Mumble -Privoxy -Searx -MediaWiki -Ikiwiki -I2P -Backups -Configure -Cockpit -DateTime -Diagnostics -DynamicDNS -Firewall -LetsEncrypt -Monkeysphere -NameServices -Networks -Power -PageKite -SecureShell -Security -ServiceDiscovery -Snapshots -Storage -Upgrades -Users \ No newline at end of file diff --git a/doc/Apache_userdir.raw.xml b/doc/manual/en/Apache_userdir.raw.xml similarity index 100% rename from doc/Apache_userdir.raw.xml rename to doc/manual/en/Apache_userdir.raw.xml diff --git a/doc/Backups.raw.xml b/doc/manual/en/Backups.raw.xml similarity index 100% rename from doc/Backups.raw.xml rename to doc/manual/en/Backups.raw.xml diff --git a/doc/Cockpit.raw.xml b/doc/manual/en/Cockpit.raw.xml similarity index 100% rename from doc/Cockpit.raw.xml rename to doc/manual/en/Cockpit.raw.xml diff --git a/doc/Configure.raw.xml b/doc/manual/en/Configure.raw.xml similarity index 100% rename from doc/Configure.raw.xml rename to doc/manual/en/Configure.raw.xml diff --git a/doc/Coquelicot.raw.xml b/doc/manual/en/Coquelicot.raw.xml similarity index 100% rename from doc/Coquelicot.raw.xml rename to doc/manual/en/Coquelicot.raw.xml diff --git a/doc/DateTime.raw.xml b/doc/manual/en/DateTime.raw.xml similarity index 100% rename from doc/DateTime.raw.xml rename to doc/manual/en/DateTime.raw.xml diff --git a/doc/Deluge.raw.xml b/doc/manual/en/Deluge.raw.xml similarity index 100% rename from doc/Deluge.raw.xml rename to doc/manual/en/Deluge.raw.xml diff --git a/doc/Diagnostics.raw.xml b/doc/manual/en/Diagnostics.raw.xml similarity index 100% rename from doc/Diagnostics.raw.xml rename to doc/manual/en/Diagnostics.raw.xml diff --git a/doc/DynamicDNS.raw.xml b/doc/manual/en/DynamicDNS.raw.xml similarity index 100% rename from doc/DynamicDNS.raw.xml rename to doc/manual/en/DynamicDNS.raw.xml diff --git a/doc/Firewall.raw.xml b/doc/manual/en/Firewall.raw.xml similarity index 100% rename from doc/Firewall.raw.xml rename to doc/manual/en/Firewall.raw.xml diff --git a/doc/I2P.raw.xml b/doc/manual/en/I2P.raw.xml similarity index 100% rename from doc/I2P.raw.xml rename to doc/manual/en/I2P.raw.xml diff --git a/doc/Ikiwiki.raw.xml b/doc/manual/en/Ikiwiki.raw.xml similarity index 100% rename from doc/Ikiwiki.raw.xml rename to doc/manual/en/Ikiwiki.raw.xml diff --git a/doc/Infinoted.raw.xml b/doc/manual/en/Infinoted.raw.xml similarity index 100% rename from doc/Infinoted.raw.xml rename to doc/manual/en/Infinoted.raw.xml diff --git a/doc/LetsEncrypt.raw.xml b/doc/manual/en/LetsEncrypt.raw.xml similarity index 100% rename from doc/LetsEncrypt.raw.xml rename to doc/manual/en/LetsEncrypt.raw.xml diff --git a/doc/MLDonkey.raw.xml b/doc/manual/en/MLDonkey.raw.xml similarity index 100% rename from doc/MLDonkey.raw.xml rename to doc/manual/en/MLDonkey.raw.xml diff --git a/doc/MatrixSynapse.raw.xml b/doc/manual/en/MatrixSynapse.raw.xml similarity index 100% rename from doc/MatrixSynapse.raw.xml rename to doc/manual/en/MatrixSynapse.raw.xml diff --git a/doc/MediaWiki.raw.xml b/doc/manual/en/MediaWiki.raw.xml similarity index 100% rename from doc/MediaWiki.raw.xml rename to doc/manual/en/MediaWiki.raw.xml diff --git a/doc/Minetest.raw.xml b/doc/manual/en/Minetest.raw.xml similarity index 100% rename from doc/Minetest.raw.xml rename to doc/manual/en/Minetest.raw.xml diff --git a/doc/Monkeysphere.raw.xml b/doc/manual/en/Monkeysphere.raw.xml similarity index 100% rename from doc/Monkeysphere.raw.xml rename to doc/manual/en/Monkeysphere.raw.xml diff --git a/doc/Mumble.raw.xml b/doc/manual/en/Mumble.raw.xml similarity index 100% rename from doc/Mumble.raw.xml rename to doc/manual/en/Mumble.raw.xml diff --git a/doc/NameServices.raw.xml b/doc/manual/en/NameServices.raw.xml similarity index 100% rename from doc/NameServices.raw.xml rename to doc/manual/en/NameServices.raw.xml diff --git a/doc/Networks.raw.xml b/doc/manual/en/Networks.raw.xml similarity index 100% rename from doc/Networks.raw.xml rename to doc/manual/en/Networks.raw.xml diff --git a/doc/OpenVPN.raw.xml b/doc/manual/en/OpenVPN.raw.xml similarity index 100% rename from doc/OpenVPN.raw.xml rename to doc/manual/en/OpenVPN.raw.xml diff --git a/doc/PageKite.raw.xml b/doc/manual/en/PageKite.raw.xml similarity index 100% rename from doc/PageKite.raw.xml rename to doc/manual/en/PageKite.raw.xml diff --git a/doc/Power.raw.xml b/doc/manual/en/Power.raw.xml similarity index 100% rename from doc/Power.raw.xml rename to doc/manual/en/Power.raw.xml diff --git a/doc/Privoxy.raw.xml b/doc/manual/en/Privoxy.raw.xml similarity index 100% rename from doc/Privoxy.raw.xml rename to doc/manual/en/Privoxy.raw.xml diff --git a/doc/Quassel.raw.xml b/doc/manual/en/Quassel.raw.xml similarity index 100% rename from doc/Quassel.raw.xml rename to doc/manual/en/Quassel.raw.xml diff --git a/doc/Radicale.raw.xml b/doc/manual/en/Radicale.raw.xml similarity index 100% rename from doc/Radicale.raw.xml rename to doc/manual/en/Radicale.raw.xml diff --git a/doc/Repro.raw.xml b/doc/manual/en/Repro.raw.xml similarity index 100% rename from doc/Repro.raw.xml rename to doc/manual/en/Repro.raw.xml diff --git a/doc/Roundcube.raw.xml b/doc/manual/en/Roundcube.raw.xml similarity index 100% rename from doc/Roundcube.raw.xml rename to doc/manual/en/Roundcube.raw.xml diff --git a/doc/Searx.raw.xml b/doc/manual/en/Searx.raw.xml similarity index 100% rename from doc/Searx.raw.xml rename to doc/manual/en/Searx.raw.xml diff --git a/doc/SecureShell.raw.xml b/doc/manual/en/SecureShell.raw.xml similarity index 100% rename from doc/SecureShell.raw.xml rename to doc/manual/en/SecureShell.raw.xml diff --git a/doc/Security.raw.xml b/doc/manual/en/Security.raw.xml similarity index 100% rename from doc/Security.raw.xml rename to doc/manual/en/Security.raw.xml diff --git a/doc/ServiceDiscovery.raw.xml b/doc/manual/en/ServiceDiscovery.raw.xml similarity index 100% rename from doc/ServiceDiscovery.raw.xml rename to doc/manual/en/ServiceDiscovery.raw.xml diff --git a/doc/Shadowsocks.raw.xml b/doc/manual/en/Shadowsocks.raw.xml similarity index 100% rename from doc/Shadowsocks.raw.xml rename to doc/manual/en/Shadowsocks.raw.xml diff --git a/doc/Snapshots.raw.xml b/doc/manual/en/Snapshots.raw.xml similarity index 100% rename from doc/Snapshots.raw.xml rename to doc/manual/en/Snapshots.raw.xml diff --git a/doc/Storage.raw.xml b/doc/manual/en/Storage.raw.xml similarity index 100% rename from doc/Storage.raw.xml rename to doc/manual/en/Storage.raw.xml diff --git a/doc/Syncthing.raw.xml b/doc/manual/en/Syncthing.raw.xml similarity index 100% rename from doc/Syncthing.raw.xml rename to doc/manual/en/Syncthing.raw.xml diff --git a/doc/TinyTinyRSS.raw.xml b/doc/manual/en/TinyTinyRSS.raw.xml similarity index 100% rename from doc/TinyTinyRSS.raw.xml rename to doc/manual/en/TinyTinyRSS.raw.xml diff --git a/doc/Tor.raw.xml b/doc/manual/en/Tor.raw.xml similarity index 100% rename from doc/Tor.raw.xml rename to doc/manual/en/Tor.raw.xml diff --git a/doc/Transmission.raw.xml b/doc/manual/en/Transmission.raw.xml similarity index 100% rename from doc/Transmission.raw.xml rename to doc/manual/en/Transmission.raw.xml diff --git a/doc/Upgrades.raw.xml b/doc/manual/en/Upgrades.raw.xml similarity index 100% rename from doc/Upgrades.raw.xml rename to doc/manual/en/Upgrades.raw.xml diff --git a/doc/Users.raw.xml b/doc/manual/en/Users.raw.xml similarity index 100% rename from doc/Users.raw.xml rename to doc/manual/en/Users.raw.xml diff --git a/doc/ejabberd.raw.xml b/doc/manual/en/ejabberd.raw.xml similarity index 100% rename from doc/ejabberd.raw.xml rename to doc/manual/en/ejabberd.raw.xml diff --git a/doc/freedombox-manual.raw.xml b/doc/manual/en/freedombox-manual.raw.xml similarity index 100% rename from doc/freedombox-manual.raw.xml rename to doc/manual/en/freedombox-manual.raw.xml diff --git a/doc/images/Backups_Step1_v49.png b/doc/manual/en/images/Backups_Step1_v49.png similarity index 100% rename from doc/images/Backups_Step1_v49.png rename to doc/manual/en/images/Backups_Step1_v49.png diff --git a/doc/images/Backups_Step2_v49.png b/doc/manual/en/images/Backups_Step2_v49.png similarity index 100% rename from doc/images/Backups_Step2_v49.png rename to doc/manual/en/images/Backups_Step2_v49.png diff --git a/doc/images/Backups_Step3_v49.png b/doc/manual/en/images/Backups_Step3_v49.png similarity index 100% rename from doc/images/Backups_Step3_v49.png rename to doc/manual/en/images/Backups_Step3_v49.png diff --git a/doc/images/Backups_Step4_v49.png b/doc/manual/en/images/Backups_Step4_v49.png similarity index 100% rename from doc/images/Backups_Step4_v49.png rename to doc/manual/en/images/Backups_Step4_v49.png diff --git a/doc/images/Backups_Step5_v49.png b/doc/manual/en/images/Backups_Step5_v49.png similarity index 100% rename from doc/images/Backups_Step5_v49.png rename to doc/manual/en/images/Backups_Step5_v49.png diff --git a/doc/images/Backups_Step6_v49.png b/doc/manual/en/images/Backups_Step6_v49.png similarity index 100% rename from doc/images/Backups_Step6_v49.png rename to doc/manual/en/images/Backups_Step6_v49.png diff --git a/doc/images/Backups_Step7_v49.png b/doc/manual/en/images/Backups_Step7_v49.png similarity index 100% rename from doc/images/Backups_Step7_v49.png rename to doc/manual/en/images/Backups_Step7_v49.png diff --git a/doc/images/DAVdroid-refresh.png b/doc/manual/en/images/DAVdroid-refresh.png similarity index 100% rename from doc/images/DAVdroid-refresh.png rename to doc/manual/en/images/DAVdroid-refresh.png diff --git a/doc/images/DAVdroid-setup-account.png b/doc/manual/en/images/DAVdroid-setup-account.png similarity index 100% rename from doc/images/DAVdroid-setup-account.png rename to doc/manual/en/images/DAVdroid-setup-account.png diff --git a/doc/images/DAVdroid-sync-account.png b/doc/manual/en/images/DAVdroid-sync-account.png similarity index 100% rename from doc/images/DAVdroid-sync-account.png rename to doc/manual/en/images/DAVdroid-sync-account.png diff --git a/doc/images/DateTime.png b/doc/manual/en/images/DateTime.png similarity index 100% rename from doc/images/DateTime.png rename to doc/manual/en/images/DateTime.png diff --git a/doc/images/Disks.png b/doc/manual/en/images/Disks.png similarity index 100% rename from doc/images/Disks.png rename to doc/manual/en/images/Disks.png diff --git a/doc/images/DynamicDNS-Settings.png b/doc/manual/en/images/DynamicDNS-Settings.png similarity index 100% rename from doc/images/DynamicDNS-Settings.png rename to doc/manual/en/images/DynamicDNS-Settings.png diff --git a/doc/images/Firewall.png b/doc/manual/en/images/Firewall.png similarity index 100% rename from doc/images/Firewall.png rename to doc/manual/en/images/Firewall.png diff --git a/doc/images/LetsEncrypt-Certificate.png b/doc/manual/en/images/LetsEncrypt-Certificate.png similarity index 100% rename from doc/images/LetsEncrypt-Certificate.png rename to doc/manual/en/images/LetsEncrypt-Certificate.png diff --git a/doc/images/LetsEncrypt-Configure.png b/doc/manual/en/images/LetsEncrypt-Configure.png similarity index 100% rename from doc/images/LetsEncrypt-Configure.png rename to doc/manual/en/images/LetsEncrypt-Configure.png diff --git a/doc/images/LetsEncrypt-NameServices.png b/doc/manual/en/images/LetsEncrypt-NameServices.png similarity index 100% rename from doc/images/LetsEncrypt-NameServices.png rename to doc/manual/en/images/LetsEncrypt-NameServices.png diff --git a/doc/images/LetsEncrypt.png b/doc/manual/en/images/LetsEncrypt.png similarity index 100% rename from doc/images/LetsEncrypt.png rename to doc/manual/en/images/LetsEncrypt.png diff --git a/doc/images/OPML.png b/doc/manual/en/images/OPML.png similarity index 100% rename from doc/images/OPML.png rename to doc/manual/en/images/OPML.png diff --git a/doc/images/Privoxy-BrowserSettings.png b/doc/manual/en/images/Privoxy-BrowserSettings.png similarity index 100% rename from doc/images/Privoxy-BrowserSettings.png rename to doc/manual/en/images/Privoxy-BrowserSettings.png diff --git a/doc/images/Privoxy-Installation.png b/doc/manual/en/images/Privoxy-Installation.png similarity index 100% rename from doc/images/Privoxy-Installation.png rename to doc/manual/en/images/Privoxy-Installation.png diff --git a/doc/images/Quassel_Installation.png b/doc/manual/en/images/Quassel_Installation.png similarity index 100% rename from doc/images/Quassel_Installation.png rename to doc/manual/en/images/Quassel_Installation.png diff --git a/doc/images/Quassel_PortForwarding.png b/doc/manual/en/images/Quassel_PortForwarding.png similarity index 100% rename from doc/images/Quassel_PortForwarding.png rename to doc/manual/en/images/Quassel_PortForwarding.png diff --git a/doc/images/Quasseldroid.png b/doc/manual/en/images/Quasseldroid.png similarity index 100% rename from doc/images/Quasseldroid.png rename to doc/manual/en/images/Quasseldroid.png diff --git a/doc/images/Radicale-Evolution-Docu.png b/doc/manual/en/images/Radicale-Evolution-Docu.png similarity index 100% rename from doc/images/Radicale-Evolution-Docu.png rename to doc/manual/en/images/Radicale-Evolution-Docu.png diff --git a/doc/images/Radicale-Plinth.png b/doc/manual/en/images/Radicale-Plinth.png similarity index 100% rename from doc/images/Radicale-Plinth.png rename to doc/manual/en/images/Radicale-Plinth.png diff --git a/doc/images/Security.png b/doc/manual/en/images/Security.png similarity index 100% rename from doc/images/Security.png rename to doc/manual/en/images/Security.png diff --git a/doc/images/Select-RSS-feed.png b/doc/manual/en/images/Select-RSS-feed.png similarity index 100% rename from doc/images/Select-RSS-feed.png rename to doc/manual/en/images/Select-RSS-feed.png diff --git a/doc/images/Storage.png b/doc/manual/en/images/Storage.png similarity index 100% rename from doc/images/Storage.png rename to doc/manual/en/images/Storage.png diff --git a/doc/images/Subscribe-dialog.png b/doc/manual/en/images/Subscribe-dialog.png similarity index 100% rename from doc/images/Subscribe-dialog.png rename to doc/manual/en/images/Subscribe-dialog.png diff --git a/doc/images/Subscribe-to-feed.png b/doc/manual/en/images/Subscribe-to-feed.png similarity index 100% rename from doc/images/Subscribe-to-feed.png rename to doc/manual/en/images/Subscribe-to-feed.png diff --git a/doc/images/Syncthing_GUI.png b/doc/manual/en/images/Syncthing_GUI.png similarity index 100% rename from doc/images/Syncthing_GUI.png rename to doc/manual/en/images/Syncthing_GUI.png diff --git a/doc/images/Unsubscribe.png b/doc/manual/en/images/Unsubscribe.png similarity index 100% rename from doc/images/Unsubscribe.png rename to doc/manual/en/images/Unsubscribe.png diff --git a/doc/images/WikiNews-feed.png b/doc/manual/en/images/WikiNews-feed.png similarity index 100% rename from doc/images/WikiNews-feed.png rename to doc/manual/en/images/WikiNews-feed.png diff --git a/doc/images/a20-olinuxino-lime2.jpg b/doc/manual/en/images/a20-olinuxino-lime2.jpg similarity index 100% rename from doc/images/a20-olinuxino-lime2.jpg rename to doc/manual/en/images/a20-olinuxino-lime2.jpg diff --git a/doc/images/a20-olinuxino-lime2_thumb.jpg b/doc/manual/en/images/a20-olinuxino-lime2_thumb.jpg similarity index 100% rename from doc/images/a20-olinuxino-lime2_thumb.jpg rename to doc/manual/en/images/a20-olinuxino-lime2_thumb.jpg diff --git a/doc/images/a20-olinuxino-micro.jpg b/doc/manual/en/images/a20-olinuxino-micro.jpg similarity index 100% rename from doc/images/a20-olinuxino-micro.jpg rename to doc/manual/en/images/a20-olinuxino-micro.jpg diff --git a/doc/images/a20-olinuxino-micro_thumb.jpg b/doc/manual/en/images/a20-olinuxino-micro_thumb.jpg similarity index 100% rename from doc/images/a20-olinuxino-micro_thumb.jpg rename to doc/manual/en/images/a20-olinuxino-micro_thumb.jpg diff --git a/doc/images/about.png b/doc/manual/en/images/about.png similarity index 100% rename from doc/images/about.png rename to doc/manual/en/images/about.png diff --git a/doc/images/add_security_exception.png b/doc/manual/en/images/add_security_exception.png similarity index 100% rename from doc/images/add_security_exception.png rename to doc/manual/en/images/add_security_exception.png diff --git a/doc/images/apps.png b/doc/manual/en/images/apps.png similarity index 100% rename from doc/images/apps.png rename to doc/manual/en/images/apps.png diff --git a/doc/images/apu1d.jpg b/doc/manual/en/images/apu1d.jpg similarity index 100% rename from doc/images/apu1d.jpg rename to doc/manual/en/images/apu1d.jpg diff --git a/doc/images/apu1d_thumb.jpg b/doc/manual/en/images/apu1d_thumb.jpg similarity index 100% rename from doc/images/apu1d_thumb.jpg rename to doc/manual/en/images/apu1d_thumb.jpg diff --git a/doc/images/banana-pro_thumb.jpg b/doc/manual/en/images/banana-pro_thumb.jpg similarity index 100% rename from doc/images/banana-pro_thumb.jpg rename to doc/manual/en/images/banana-pro_thumb.jpg diff --git a/doc/images/beagleboard.jpg b/doc/manual/en/images/beagleboard.jpg similarity index 100% rename from doc/images/beagleboard.jpg rename to doc/manual/en/images/beagleboard.jpg diff --git a/doc/images/beagleboard_thumb.jpg b/doc/manual/en/images/beagleboard_thumb.jpg similarity index 100% rename from doc/images/beagleboard_thumb.jpg rename to doc/manual/en/images/beagleboard_thumb.jpg diff --git a/doc/images/checkmark.png b/doc/manual/en/images/checkmark.png similarity index 100% rename from doc/images/checkmark.png rename to doc/manual/en/images/checkmark.png diff --git a/doc/images/cockpit-admin-user.png b/doc/manual/en/images/cockpit-admin-user.png similarity index 100% rename from doc/images/cockpit-admin-user.png rename to doc/manual/en/images/cockpit-admin-user.png diff --git a/doc/images/cockpit-enable.png b/doc/manual/en/images/cockpit-enable.png similarity index 100% rename from doc/images/cockpit-enable.png rename to doc/manual/en/images/cockpit-enable.png diff --git a/doc/images/cockpit-login.png b/doc/manual/en/images/cockpit-login.png similarity index 100% rename from doc/images/cockpit-login.png rename to doc/manual/en/images/cockpit-login.png diff --git a/doc/images/cockpit-logs.png b/doc/manual/en/images/cockpit-logs.png similarity index 100% rename from doc/images/cockpit-logs.png rename to doc/manual/en/images/cockpit-logs.png diff --git a/doc/images/cockpit-mobile.png b/doc/manual/en/images/cockpit-mobile.png similarity index 100% rename from doc/images/cockpit-mobile.png rename to doc/manual/en/images/cockpit-mobile.png diff --git a/doc/images/cockpit-network1.png b/doc/manual/en/images/cockpit-network1.png similarity index 100% rename from doc/images/cockpit-network1.png rename to doc/manual/en/images/cockpit-network1.png diff --git a/doc/images/cockpit-network2.png b/doc/manual/en/images/cockpit-network2.png similarity index 100% rename from doc/images/cockpit-network2.png rename to doc/manual/en/images/cockpit-network2.png diff --git a/doc/images/cockpit-network3.png b/doc/manual/en/images/cockpit-network3.png similarity index 100% rename from doc/images/cockpit-network3.png rename to doc/manual/en/images/cockpit-network3.png diff --git a/doc/images/cockpit-services1.png b/doc/manual/en/images/cockpit-services1.png similarity index 100% rename from doc/images/cockpit-services1.png rename to doc/manual/en/images/cockpit-services1.png diff --git a/doc/images/cockpit-services2.png b/doc/manual/en/images/cockpit-services2.png similarity index 100% rename from doc/images/cockpit-services2.png rename to doc/manual/en/images/cockpit-services2.png diff --git a/doc/images/cockpit-storage1.png b/doc/manual/en/images/cockpit-storage1.png similarity index 100% rename from doc/images/cockpit-storage1.png rename to doc/manual/en/images/cockpit-storage1.png diff --git a/doc/images/cockpit-storage2.png b/doc/manual/en/images/cockpit-storage2.png similarity index 100% rename from doc/images/cockpit-storage2.png rename to doc/manual/en/images/cockpit-storage2.png diff --git a/doc/images/cockpit-system.png b/doc/manual/en/images/cockpit-system.png similarity index 100% rename from doc/images/cockpit-system.png rename to doc/manual/en/images/cockpit-system.png diff --git a/doc/images/cockpit-terminal.png b/doc/manual/en/images/cockpit-terminal.png similarity index 100% rename from doc/images/cockpit-terminal.png rename to doc/manual/en/images/cockpit-terminal.png diff --git a/doc/images/cubieboard2_thumb.jpg b/doc/manual/en/images/cubieboard2_thumb.jpg similarity index 100% rename from doc/images/cubieboard2_thumb.jpg rename to doc/manual/en/images/cubieboard2_thumb.jpg diff --git a/doc/images/danube_thumb.png b/doc/manual/en/images/danube_thumb.png similarity index 100% rename from doc/images/danube_thumb.png rename to doc/manual/en/images/danube_thumb.png diff --git a/doc/images/debian_thumb.png b/doc/manual/en/images/debian_thumb.png similarity index 100% rename from doc/images/debian_thumb.png rename to doc/manual/en/images/debian_thumb.png diff --git a/doc/images/deluge.png b/doc/manual/en/images/deluge.png similarity index 100% rename from doc/images/deluge.png rename to doc/manual/en/images/deluge.png diff --git a/doc/images/deluge_connection_manager.png b/doc/manual/en/images/deluge_connection_manager.png similarity index 100% rename from doc/images/deluge_connection_manager.png rename to doc/manual/en/images/deluge_connection_manager.png diff --git a/doc/images/deluge_connection_manager_2.png b/doc/manual/en/images/deluge_connection_manager_2.png similarity index 100% rename from doc/images/deluge_connection_manager_2.png rename to doc/manual/en/images/deluge_connection_manager_2.png diff --git a/doc/images/deluge_login.png b/doc/manual/en/images/deluge_login.png similarity index 100% rename from doc/images/deluge_login.png rename to doc/manual/en/images/deluge_login.png diff --git a/doc/images/dreamplug.jpg b/doc/manual/en/images/dreamplug.jpg similarity index 100% rename from doc/images/dreamplug.jpg rename to doc/manual/en/images/dreamplug.jpg diff --git a/doc/images/dreamplug_thumb.jpg b/doc/manual/en/images/dreamplug_thumb.jpg similarity index 100% rename from doc/images/dreamplug_thumb.jpg rename to doc/manual/en/images/dreamplug_thumb.jpg diff --git a/doc/images/emailclient.png b/doc/manual/en/images/emailclient.png similarity index 100% rename from doc/images/emailclient.png rename to doc/manual/en/images/emailclient.png diff --git a/doc/images/freedombox-danube.jpg b/doc/manual/en/images/freedombox-danube.jpg similarity index 100% rename from doc/images/freedombox-danube.jpg rename to doc/manual/en/images/freedombox-danube.jpg diff --git a/doc/images/freedombox-frontpage-2018-02-26.png b/doc/manual/en/images/freedombox-frontpage-2018-02-26.png similarity index 100% rename from doc/images/freedombox-frontpage-2018-02-26.png rename to doc/manual/en/images/freedombox-frontpage-2018-02-26.png diff --git a/doc/images/freedombox-frontpage-2018-06-19.png b/doc/manual/en/images/freedombox-frontpage-2018-06-19.png similarity index 100% rename from doc/images/freedombox-frontpage-2018-06-19.png rename to doc/manual/en/images/freedombox-frontpage-2018-06-19.png diff --git a/doc/images/freedombox-frontpage-2019-03-02.png b/doc/manual/en/images/freedombox-frontpage-2019-03-02.png similarity index 100% rename from doc/images/freedombox-frontpage-2019-03-02.png rename to doc/manual/en/images/freedombox-frontpage-2019-03-02.png diff --git a/doc/images/freedombox-screenshot-about.png b/doc/manual/en/images/freedombox-screenshot-about.png similarity index 100% rename from doc/images/freedombox-screenshot-about.png rename to doc/manual/en/images/freedombox-screenshot-about.png diff --git a/doc/images/freedombox-screenshot-apps.png b/doc/manual/en/images/freedombox-screenshot-apps.png similarity index 100% rename from doc/images/freedombox-screenshot-apps.png rename to doc/manual/en/images/freedombox-screenshot-apps.png diff --git a/doc/images/freedombox-screenshot-home.png b/doc/manual/en/images/freedombox-screenshot-home.png similarity index 100% rename from doc/images/freedombox-screenshot-home.png rename to doc/manual/en/images/freedombox-screenshot-home.png diff --git a/doc/images/freedombox-screenshot-manual.png b/doc/manual/en/images/freedombox-screenshot-manual.png similarity index 100% rename from doc/images/freedombox-screenshot-manual.png rename to doc/manual/en/images/freedombox-screenshot-manual.png diff --git a/doc/images/freedombox-screenshot-roundcube.png b/doc/manual/en/images/freedombox-screenshot-roundcube.png similarity index 100% rename from doc/images/freedombox-screenshot-roundcube.png rename to doc/manual/en/images/freedombox-screenshot-roundcube.png diff --git a/doc/images/freedombox-screenshot-system.png b/doc/manual/en/images/freedombox-screenshot-system.png similarity index 100% rename from doc/images/freedombox-screenshot-system.png rename to doc/manual/en/images/freedombox-screenshot-system.png diff --git a/doc/images/freedombox-screenshot-tor.png b/doc/manual/en/images/freedombox-screenshot-tor.png similarity index 100% rename from doc/images/freedombox-screenshot-tor.png rename to doc/manual/en/images/freedombox-screenshot-tor.png diff --git a/doc/images/freedombox-screenshot-ttrss.png b/doc/manual/en/images/freedombox-screenshot-ttrss.png similarity index 100% rename from doc/images/freedombox-screenshot-ttrss.png rename to doc/manual/en/images/freedombox-screenshot-ttrss.png diff --git a/doc/images/frontpage.png b/doc/manual/en/images/frontpage.png similarity index 100% rename from doc/images/frontpage.png rename to doc/manual/en/images/frontpage.png diff --git a/doc/images/help.png b/doc/manual/en/images/help.png similarity index 100% rename from doc/images/help.png rename to doc/manual/en/images/help.png diff --git a/doc/images/icon-error.png b/doc/manual/en/images/icon-error.png similarity index 100% rename from doc/images/icon-error.png rename to doc/manual/en/images/icon-error.png diff --git a/doc/images/ikiwiki_create.png b/doc/manual/en/images/ikiwiki_create.png similarity index 100% rename from doc/images/ikiwiki_create.png rename to doc/manual/en/images/ikiwiki_create.png diff --git a/doc/images/ikiwiki_manage.png b/doc/manual/en/images/ikiwiki_manage.png similarity index 100% rename from doc/images/ikiwiki_manage.png rename to doc/manual/en/images/ikiwiki_manage.png diff --git a/doc/images/mldonkey.jpg b/doc/manual/en/images/mldonkey.jpg similarity index 100% rename from doc/images/mldonkey.jpg rename to doc/manual/en/images/mldonkey.jpg diff --git a/doc/images/network_single.png b/doc/manual/en/images/network_single.png similarity index 100% rename from doc/images/network_single.png rename to doc/manual/en/images/network_single.png diff --git a/doc/images/newsfeed.png b/doc/manual/en/images/newsfeed.png similarity index 100% rename from doc/images/newsfeed.png rename to doc/manual/en/images/newsfeed.png diff --git a/doc/images/openvpn_connect.png b/doc/manual/en/images/openvpn_connect.png similarity index 100% rename from doc/images/openvpn_connect.png rename to doc/manual/en/images/openvpn_connect.png diff --git a/doc/images/openvpn_connected.png b/doc/manual/en/images/openvpn_connected.png similarity index 100% rename from doc/images/openvpn_connected.png rename to doc/manual/en/images/openvpn_connected.png diff --git a/doc/images/openvpn_disconnect.png b/doc/manual/en/images/openvpn_disconnect.png similarity index 100% rename from doc/images/openvpn_disconnect.png rename to doc/manual/en/images/openvpn_disconnect.png diff --git a/doc/images/openvpn_download_profile.png b/doc/manual/en/images/openvpn_download_profile.png similarity index 100% rename from doc/images/openvpn_download_profile.png rename to doc/manual/en/images/openvpn_download_profile.png diff --git a/doc/images/openvpn_edit_domain_name.png b/doc/manual/en/images/openvpn_edit_domain_name.png similarity index 100% rename from doc/images/openvpn_edit_domain_name.png rename to doc/manual/en/images/openvpn_edit_domain_name.png diff --git a/doc/images/openvpn_import_profile.png b/doc/manual/en/images/openvpn_import_profile.png similarity index 100% rename from doc/images/openvpn_import_profile.png rename to doc/manual/en/images/openvpn_import_profile.png diff --git a/doc/images/openvpn_install_app.png b/doc/manual/en/images/openvpn_install_app.png similarity index 100% rename from doc/images/openvpn_install_app.png rename to doc/manual/en/images/openvpn_install_app.png diff --git a/doc/images/openvpn_profile_created.png b/doc/manual/en/images/openvpn_profile_created.png similarity index 100% rename from doc/images/openvpn_profile_created.png rename to doc/manual/en/images/openvpn_profile_created.png diff --git a/doc/images/pcduino3s.jpg b/doc/manual/en/images/pcduino3s.jpg similarity index 100% rename from doc/images/pcduino3s.jpg rename to doc/manual/en/images/pcduino3s.jpg diff --git a/doc/images/pcduino3s_thumb.jpg b/doc/manual/en/images/pcduino3s_thumb.jpg similarity index 100% rename from doc/images/pcduino3s_thumb.jpg rename to doc/manual/en/images/pcduino3s_thumb.jpg diff --git a/doc/images/pine64-plus.jpg b/doc/manual/en/images/pine64-plus.jpg similarity index 100% rename from doc/images/pine64-plus.jpg rename to doc/manual/en/images/pine64-plus.jpg diff --git a/doc/images/pine64-plus_thumb.jpg b/doc/manual/en/images/pine64-plus_thumb.jpg similarity index 100% rename from doc/images/pine64-plus_thumb.jpg rename to doc/manual/en/images/pine64-plus_thumb.jpg diff --git a/doc/images/pioneer-edition.jpg b/doc/manual/en/images/pioneer-edition.jpg similarity index 100% rename from doc/images/pioneer-edition.jpg rename to doc/manual/en/images/pioneer-edition.jpg diff --git a/doc/images/pioneer-edition_thumb.jpg b/doc/manual/en/images/pioneer-edition_thumb.jpg similarity index 100% rename from doc/images/pioneer-edition_thumb.jpg rename to doc/manual/en/images/pioneer-edition_thumb.jpg diff --git a/doc/images/plinth_all_apps_full_page.png b/doc/manual/en/images/plinth_all_apps_full_page.png similarity index 100% rename from doc/images/plinth_all_apps_full_page.png rename to doc/manual/en/images/plinth_all_apps_full_page.png diff --git a/doc/images/plinth_first_boot.png b/doc/manual/en/images/plinth_first_boot.png similarity index 100% rename from doc/images/plinth_first_boot.png rename to doc/manual/en/images/plinth_first_boot.png diff --git a/doc/images/plinth_firstboot_account.png b/doc/manual/en/images/plinth_firstboot_account.png similarity index 100% rename from doc/images/plinth_firstboot_account.png rename to doc/manual/en/images/plinth_firstboot_account.png diff --git a/doc/images/plinth_firstboot_complete.png b/doc/manual/en/images/plinth_firstboot_complete.png similarity index 100% rename from doc/images/plinth_firstboot_complete.png rename to doc/manual/en/images/plinth_firstboot_complete.png diff --git a/doc/images/plinth_firstboot_welcome.png b/doc/manual/en/images/plinth_firstboot_welcome.png similarity index 100% rename from doc/images/plinth_firstboot_welcome.png rename to doc/manual/en/images/plinth_firstboot_welcome.png diff --git a/doc/images/plinth_frontpage.png b/doc/manual/en/images/plinth_frontpage.png similarity index 100% rename from doc/images/plinth_frontpage.png rename to doc/manual/en/images/plinth_frontpage.png diff --git a/doc/images/plinth_insecure_connection.png b/doc/manual/en/images/plinth_insecure_connection.png similarity index 100% rename from doc/images/plinth_insecure_connection.png rename to doc/manual/en/images/plinth_insecure_connection.png diff --git a/doc/images/plinth_openvpn.png b/doc/manual/en/images/plinth_openvpn.png similarity index 100% rename from doc/images/plinth_openvpn.png rename to doc/manual/en/images/plinth_openvpn.png diff --git a/doc/images/quassel-client-1-connect-to-core.png b/doc/manual/en/images/quassel-client-1-connect-to-core.png similarity index 100% rename from doc/images/quassel-client-1-connect-to-core.png rename to doc/manual/en/images/quassel-client-1-connect-to-core.png diff --git a/doc/images/quassel-client-10-setup-identity.png b/doc/manual/en/images/quassel-client-10-setup-identity.png similarity index 100% rename from doc/images/quassel-client-10-setup-identity.png rename to doc/manual/en/images/quassel-client-10-setup-identity.png diff --git a/doc/images/quassel-client-11-setup-network-connection.png b/doc/manual/en/images/quassel-client-11-setup-network-connection.png similarity index 100% rename from doc/images/quassel-client-11-setup-network-connection.png rename to doc/manual/en/images/quassel-client-11-setup-network-connection.png diff --git a/doc/images/quassel-client-12-server-info.png b/doc/manual/en/images/quassel-client-12-server-info.png similarity index 100% rename from doc/images/quassel-client-12-server-info.png rename to doc/manual/en/images/quassel-client-12-server-info.png diff --git a/doc/images/quassel-client-13-server-info-ssl.png b/doc/manual/en/images/quassel-client-13-server-info-ssl.png similarity index 100% rename from doc/images/quassel-client-13-server-info-ssl.png rename to doc/manual/en/images/quassel-client-13-server-info-ssl.png diff --git a/doc/images/quassel-client-14-setup-network-connection.png b/doc/manual/en/images/quassel-client-14-setup-network-connection.png similarity index 100% rename from doc/images/quassel-client-14-setup-network-connection.png rename to doc/manual/en/images/quassel-client-14-setup-network-connection.png diff --git a/doc/images/quassel-client-15-quassel-main.png b/doc/manual/en/images/quassel-client-15-quassel-main.png similarity index 100% rename from doc/images/quassel-client-15-quassel-main.png rename to doc/manual/en/images/quassel-client-15-quassel-main.png diff --git a/doc/images/quassel-client-2-add-core-account.png b/doc/manual/en/images/quassel-client-2-add-core-account.png similarity index 100% rename from doc/images/quassel-client-2-add-core-account.png rename to doc/manual/en/images/quassel-client-2-add-core-account.png diff --git a/doc/images/quassel-client-3-connect-to-core.png b/doc/manual/en/images/quassel-client-3-connect-to-core.png similarity index 100% rename from doc/images/quassel-client-3-connect-to-core.png rename to doc/manual/en/images/quassel-client-3-connect-to-core.png diff --git a/doc/images/quassel-client-4-untrusted-security-certficate.png b/doc/manual/en/images/quassel-client-4-untrusted-security-certficate.png similarity index 100% rename from doc/images/quassel-client-4-untrusted-security-certficate.png rename to doc/manual/en/images/quassel-client-4-untrusted-security-certficate.png diff --git a/doc/images/quassel-client-5-untrusted-security-certificate.png b/doc/manual/en/images/quassel-client-5-untrusted-security-certificate.png similarity index 100% rename from doc/images/quassel-client-5-untrusted-security-certificate.png rename to doc/manual/en/images/quassel-client-5-untrusted-security-certificate.png diff --git a/doc/images/quassel-client-6-core-configuration-wizard.png b/doc/manual/en/images/quassel-client-6-core-configuration-wizard.png similarity index 100% rename from doc/images/quassel-client-6-core-configuration-wizard.png rename to doc/manual/en/images/quassel-client-6-core-configuration-wizard.png diff --git a/doc/images/quassel-client-7-create-admin-user.png b/doc/manual/en/images/quassel-client-7-create-admin-user.png similarity index 100% rename from doc/images/quassel-client-7-create-admin-user.png rename to doc/manual/en/images/quassel-client-7-create-admin-user.png diff --git a/doc/images/quassel-client-8-select-storage-backend.png b/doc/manual/en/images/quassel-client-8-select-storage-backend.png similarity index 100% rename from doc/images/quassel-client-8-select-storage-backend.png rename to doc/manual/en/images/quassel-client-8-select-storage-backend.png diff --git a/doc/images/quassel-client-9-welcome-wizard.png b/doc/manual/en/images/quassel-client-9-welcome-wizard.png similarity index 100% rename from doc/images/quassel-client-9-welcome-wizard.png rename to doc/manual/en/images/quassel-client-9-welcome-wizard.png diff --git a/doc/images/radicale_web.png b/doc/manual/en/images/radicale_web.png similarity index 100% rename from doc/images/radicale_web.png rename to doc/manual/en/images/radicale_web.png diff --git a/doc/images/raspberry2_thumb.jpg b/doc/manual/en/images/raspberry2_thumb.jpg similarity index 100% rename from doc/images/raspberry2_thumb.jpg rename to doc/manual/en/images/raspberry2_thumb.jpg diff --git a/doc/images/raspberry_thumb.jpg b/doc/manual/en/images/raspberry_thumb.jpg similarity index 100% rename from doc/images/raspberry_thumb.jpg rename to doc/manual/en/images/raspberry_thumb.jpg diff --git a/doc/images/raspberrypi.jpg b/doc/manual/en/images/raspberrypi.jpg similarity index 100% rename from doc/images/raspberrypi.jpg rename to doc/manual/en/images/raspberrypi.jpg diff --git a/doc/images/raspberrypi2.jpg b/doc/manual/en/images/raspberrypi2.jpg similarity index 100% rename from doc/images/raspberrypi2.jpg rename to doc/manual/en/images/raspberrypi2.jpg diff --git a/doc/images/raspberrypi3.jpg b/doc/manual/en/images/raspberrypi3.jpg similarity index 100% rename from doc/images/raspberrypi3.jpg rename to doc/manual/en/images/raspberrypi3.jpg diff --git a/doc/images/raspberrypi3b_thumb.jpg b/doc/manual/en/images/raspberrypi3b_thumb.jpg similarity index 100% rename from doc/images/raspberrypi3b_thumb.jpg rename to doc/manual/en/images/raspberrypi3b_thumb.jpg diff --git a/doc/images/raspberrypi3bplus.jpg b/doc/manual/en/images/raspberrypi3bplus.jpg similarity index 100% rename from doc/images/raspberrypi3bplus.jpg rename to doc/manual/en/images/raspberrypi3bplus.jpg diff --git a/doc/images/raspberrypi3bplus_thumb.jpg b/doc/manual/en/images/raspberrypi3bplus_thumb.jpg similarity index 100% rename from doc/images/raspberrypi3bplus_thumb.jpg rename to doc/manual/en/images/raspberrypi3bplus_thumb.jpg diff --git a/doc/images/repro_domains.png b/doc/manual/en/images/repro_domains.png similarity index 100% rename from doc/images/repro_domains.png rename to doc/manual/en/images/repro_domains.png diff --git a/doc/images/repro_users.png b/doc/manual/en/images/repro_users.png similarity index 100% rename from doc/images/repro_users.png rename to doc/manual/en/images/repro_users.png diff --git a/doc/images/roundcube-gmail.png b/doc/manual/en/images/roundcube-gmail.png similarity index 100% rename from doc/images/roundcube-gmail.png rename to doc/manual/en/images/roundcube-gmail.png diff --git a/doc/images/roundcube-riseup.png b/doc/manual/en/images/roundcube-riseup.png similarity index 100% rename from doc/images/roundcube-riseup.png rename to doc/manual/en/images/roundcube-riseup.png diff --git a/doc/images/searx-screenshot.png b/doc/manual/en/images/searx-screenshot.png similarity index 100% rename from doc/images/searx-screenshot.png rename to doc/manual/en/images/searx-screenshot.png diff --git a/doc/images/smile.png b/doc/manual/en/images/smile.png similarity index 100% rename from doc/images/smile.png rename to doc/manual/en/images/smile.png diff --git a/doc/images/snapshots.png b/doc/manual/en/images/snapshots.png similarity index 100% rename from doc/images/snapshots.png rename to doc/manual/en/images/snapshots.png diff --git a/doc/images/star_off.png b/doc/manual/en/images/star_off.png similarity index 100% rename from doc/images/star_off.png rename to doc/manual/en/images/star_off.png diff --git a/doc/images/star_on.png b/doc/manual/en/images/star_on.png similarity index 100% rename from doc/images/star_on.png rename to doc/manual/en/images/star_on.png diff --git a/doc/images/system.png b/doc/manual/en/images/system.png similarity index 100% rename from doc/images/system.png rename to doc/manual/en/images/system.png diff --git a/doc/images/tor-bridge-configuration.png b/doc/manual/en/images/tor-bridge-configuration.png similarity index 100% rename from doc/images/tor-bridge-configuration.png rename to doc/manual/en/images/tor-bridge-configuration.png diff --git a/doc/images/tor-bridge-db.png b/doc/manual/en/images/tor-bridge-db.png similarity index 100% rename from doc/images/tor-bridge-db.png rename to doc/manual/en/images/tor-bridge-db.png diff --git a/doc/images/tor.png b/doc/manual/en/images/tor.png similarity index 100% rename from doc/images/tor.png rename to doc/manual/en/images/tor.png diff --git a/doc/images/tor_browser_plinth.png b/doc/manual/en/images/tor_browser_plinth.png similarity index 100% rename from doc/images/tor_browser_plinth.png rename to doc/manual/en/images/tor_browser_plinth.png diff --git a/doc/images/transmission.png b/doc/manual/en/images/transmission.png similarity index 100% rename from doc/images/transmission.png rename to doc/manual/en/images/transmission.png diff --git a/doc/images/ttrss.png b/doc/manual/en/images/ttrss.png similarity index 100% rename from doc/images/ttrss.png rename to doc/manual/en/images/ttrss.png diff --git a/doc/images/ttrssapp1.png b/doc/manual/en/images/ttrssapp1.png similarity index 100% rename from doc/images/ttrssapp1.png rename to doc/manual/en/images/ttrssapp1.png diff --git a/doc/images/ttrssapp2.png b/doc/manual/en/images/ttrssapp2.png similarity index 100% rename from doc/images/ttrssapp2.png rename to doc/manual/en/images/ttrssapp2.png diff --git a/doc/images/ttrssapp3.png b/doc/manual/en/images/ttrssapp3.png similarity index 100% rename from doc/images/ttrssapp3.png rename to doc/manual/en/images/ttrssapp3.png diff --git a/doc/images/ttrssapp4.png b/doc/manual/en/images/ttrssapp4.png similarity index 100% rename from doc/images/ttrssapp4.png rename to doc/manual/en/images/ttrssapp4.png diff --git a/doc/images/ttrssapp5.png b/doc/manual/en/images/ttrssapp5.png similarity index 100% rename from doc/images/ttrssapp5.png rename to doc/manual/en/images/ttrssapp5.png diff --git a/doc/images/ui_add_security_exception.png b/doc/manual/en/images/ui_add_security_exception.png similarity index 100% rename from doc/images/ui_add_security_exception.png rename to doc/manual/en/images/ui_add_security_exception.png diff --git a/doc/images/ui_apps.png b/doc/manual/en/images/ui_apps.png similarity index 100% rename from doc/images/ui_apps.png rename to doc/manual/en/images/ui_apps.png diff --git a/doc/images/ui_firstboot_account.png b/doc/manual/en/images/ui_firstboot_account.png similarity index 100% rename from doc/images/ui_firstboot_account.png rename to doc/manual/en/images/ui_firstboot_account.png diff --git a/doc/images/ui_firstboot_complete.png b/doc/manual/en/images/ui_firstboot_complete.png similarity index 100% rename from doc/images/ui_firstboot_complete.png rename to doc/manual/en/images/ui_firstboot_complete.png diff --git a/doc/images/ui_firstboot_welcome.png b/doc/manual/en/images/ui_firstboot_welcome.png similarity index 100% rename from doc/images/ui_firstboot_welcome.png rename to doc/manual/en/images/ui_firstboot_welcome.png diff --git a/doc/images/ui_frontpage.png b/doc/manual/en/images/ui_frontpage.png similarity index 100% rename from doc/images/ui_frontpage.png rename to doc/manual/en/images/ui_frontpage.png diff --git a/doc/images/ui_frontpage_with_app.png b/doc/manual/en/images/ui_frontpage_with_app.png similarity index 100% rename from doc/images/ui_frontpage_with_app.png rename to doc/manual/en/images/ui_frontpage_with_app.png diff --git a/doc/images/ui_help.png b/doc/manual/en/images/ui_help.png similarity index 100% rename from doc/images/ui_help.png rename to doc/manual/en/images/ui_help.png diff --git a/doc/images/ui_insecure_connection.png b/doc/manual/en/images/ui_insecure_connection.png similarity index 100% rename from doc/images/ui_insecure_connection.png rename to doc/manual/en/images/ui_insecure_connection.png diff --git a/doc/images/ui_system.png b/doc/manual/en/images/ui_system.png similarity index 100% rename from doc/images/ui_system.png rename to doc/manual/en/images/ui_system.png diff --git a/doc/images/ui_user_menu.png b/doc/manual/en/images/ui_user_menu.png similarity index 100% rename from doc/images/ui_user_menu.png rename to doc/manual/en/images/ui_user_menu.png diff --git a/doc/images/upgrades.png b/doc/manual/en/images/upgrades.png similarity index 100% rename from doc/images/upgrades.png rename to doc/manual/en/images/upgrades.png diff --git a/doc/images/user.png b/doc/manual/en/images/user.png similarity index 100% rename from doc/images/user.png rename to doc/manual/en/images/user.png diff --git a/doc/images/virtualbox.png b/doc/manual/en/images/virtualbox.png similarity index 100% rename from doc/images/virtualbox.png rename to doc/manual/en/images/virtualbox.png diff --git a/doc/images/virtualbox_console_after_boot.png b/doc/manual/en/images/virtualbox_console_after_boot.png similarity index 100% rename from doc/images/virtualbox_console_after_boot.png rename to doc/manual/en/images/virtualbox_console_after_boot.png diff --git a/doc/images/virtualbox_harddisk_file.png b/doc/manual/en/images/virtualbox_harddisk_file.png similarity index 100% rename from doc/images/virtualbox_harddisk_file.png rename to doc/manual/en/images/virtualbox_harddisk_file.png diff --git a/doc/images/virtualbox_network_type.png b/doc/manual/en/images/virtualbox_network_type.png similarity index 100% rename from doc/images/virtualbox_network_type.png rename to doc/manual/en/images/virtualbox_network_type.png diff --git a/doc/images/virtualbox_os_type.png b/doc/manual/en/images/virtualbox_os_type.png similarity index 100% rename from doc/images/virtualbox_os_type.png rename to doc/manual/en/images/virtualbox_os_type.png diff --git a/doc/images/virtualbox_thumb.png b/doc/manual/en/images/virtualbox_thumb.png similarity index 100% rename from doc/images/virtualbox_thumb.png rename to doc/manual/en/images/virtualbox_thumb.png diff --git a/doc/scripts/fetch-manual-pages b/doc/scripts/fetch-manual-pages deleted file mode 100755 index 073526e1f..000000000 --- a/doc/scripts/fetch-manual-pages +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/python3 -# -# This file is part of FreedomBox. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# - -import re -import urllib.request - -MANUAL_PAGE_URL = "https://wiki.debian.org/FreedomBox/Manual/{}?action=show&mimetype=text%2Fdocbook" - -MANUAL_INDEX_RAW_URL = "https://wiki.debian.org/FreedomBox/Manual?action=raw" - -manual_pages = [] - -to_remove = ['QuickStart', 'GettingHelp', 'Developer'] - - -def list_manual_pages(): - """Fetch the list of manual pages and write them to a file. - """ - pattern = 'FreedomBox/Manual/\w+' - lst = list(urllib.request.urlopen(MANUAL_INDEX_RAW_URL)) - global manual_pages - manual_pages = list(l[0].split('/')[-1] for l in filter( - None, map(lambda x: re.findall(pattern, x.decode()), lst))) - for entry in to_remove: - if entry in manual_pages: - manual_pages.remove(entry) - with open('manual-pages.list', 'w') as lst_file: - lst_file.write('\n'.join(manual_pages)) - - -def fetch_manual_pages_in_docbook_format(): - for page in manual_pages: - url = MANUAL_PAGE_URL.format(page) - filename = '{}.raw.xml'.format(page) - urllib.request.urlretrieve(url, filename) - - -def main(): - list_manual_pages() - fetch_manual_pages_in_docbook_format() - - -if __name__ == '__main__': - main()