summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-07-05 11:50:01 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-07-05 11:50:01 -0400
commit618fdd89517b6756e35e4b0f1b97557006114f28 (patch)
treece8c6c6e4389a4626327cfeff6627791572656dd
parent72d86f3edc73288031451089d237177372669f6f (diff)
move tumbleweed stuff to the openSUSE main page
-rw-r--r--doc/install.mdwn3
-rw-r--r--doc/install/openSUSE.mdwn8
-rw-r--r--doc/openSUSE__58__Tumbleweed.mdwn1
3 files changed, 7 insertions, 5 deletions
diff --git a/doc/install.mdwn b/doc/install.mdwn
index dbb975e26..dccd9e52e 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -15,8 +15,7 @@ detailed instructions | quick install
&nbsp;&nbsp;[[Gentoo]] | `emerge git-annex`
&nbsp;&nbsp;[[Void]] | `xbps-install git-annex`
&nbsp;&nbsp;[[ScientificLinux5]] |
-&nbsp;&nbsp;[[openSUSE:Tumbleweed]] | `zypper in git-annex`
-&nbsp;&nbsp;[[openSUSE]] |
+&nbsp;&nbsp;[[openSUSE]] | `zypper in git-annex`
&nbsp;&nbsp;[[Docker]] |
[[Windows]] | [download installer](https://downloads.kitenet.net/git-annex/windows/current/) **beta**
"""]]
diff --git a/doc/install/openSUSE.mdwn b/doc/install/openSUSE.mdwn
index b24f7df2e..cd5a8eef8 100644
--- a/doc/install/openSUSE.mdwn
+++ b/doc/install/openSUSE.mdwn
@@ -1,3 +1,7 @@
-From openSUSE:Leap:42.2 will be git-annex part of distribution
+There are [packages of git-annex](https://build.opensuse.org/project/show/devel:languages:haskell)
+available for openSUSE.
-At the time of writing, there are [packages of git-annex](https://build.opensuse.org/project/show/devel:languages:haskell) available for openSUSE. It should also be possible to build it via cabal or from source as described on the [[install]] page.
+From openSUSE:Leap:42.2 git-annex will be part of the distribution.
+
+git-annex is included in the openSUSE:Tumbleweed distribution
+and can be installed by running `zypper in git-annex`
diff --git a/doc/openSUSE__58__Tumbleweed.mdwn b/doc/openSUSE__58__Tumbleweed.mdwn
deleted file mode 100644
index 844dfa798..000000000
--- a/doc/openSUSE__58__Tumbleweed.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-*git annex* is included in openSUSE:Tumbleweed distribution