summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2022-02-02 12:35:22 +0100
committerkali kaneko (leap communications) <kali@leap.se>2022-02-02 12:38:17 +0100
commit0262f151baac44d3013c7df8d05d24408cf23e56 (patch)
tree2d45b071863207666b1dafaf5bd84299c5bc69f9
parent60b23efe8e571d8d80cf77ef9e64cd4fee27c864 (diff)
[docs] merge redundant docs
-rw-r--r--docs/contribution-ideas.md13
-rw-r--r--docs/discrete-ideas.md15
2 files changed, 13 insertions, 15 deletions
diff --git a/docs/contribution-ideas.md b/docs/contribution-ideas.md
index b263b0e..dadfeca 100644
--- a/docs/contribution-ideas.md
+++ b/docs/contribution-ideas.md
@@ -20,3 +20,16 @@
or otherwise (separate users in linux etc). This has the additional advantage
of allowing us to do a very early startup, and not to depend so much on
pkexec + ubuntu's quirks (portability!).
+
+# Other discrete projects
+
+* Secure, automated upgrade mechanism (look at TUF and the Qt Updater Framework).
+* Log viewer / log sender
+* VPN Traffic panel (statistics, ip, gw health, graph for upload/download speeds)
+* Migrate codebase to Qt6
+* Reduce the size of custom static builds
+* Apple + Windows stores
+* Convert snap to use a qt5 base (so that updates are kept small).
+* Provider-agnostic bitmask.
+* Private bridges mechanism.
+* QR-bootstrap
diff --git a/docs/discrete-ideas.md b/docs/discrete-ideas.md
deleted file mode 100644
index cdacd99..0000000
--- a/docs/discrete-ideas.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Discrete projects
-
-This is a list of independent projects if you're interested in hacking on bitmask-vpn.
-
-* Secure, automated upgrade mechanism (look at qt upgrade framework).
-* Log viewer / log sender
-* VPN Traffic panel (statistics, ip, gw health, graph for upload/download speeds)
-* Migrate codebase to Qt6
-* Reduce the size of custom static builds
-* Apple + Windows stores
-* Convert snap to use a qt5 base (so that updates are kept small).
-* Provider-agnostic bitmask.
-* Private bridges mechanism.
-* QR-bootstrap
-