diff --git a/README.md b/README.md index 4a6b9df..643d9a7 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,6 @@ Smeagol is a simple Wiki engine inspired by [Gollum](https://github.com/gollum/g So at this stage Smeagol is a Wiki engine written in Clojure which uses Markdown as its text format, which does have user authentication, and which uses Git as its versioning and backup system. -## DLL Hell - -Unfortunately, Smeagol currently uses **[clj-jgit](https://github.com/clj-jgit/clj-jgit)** for Git integration, and **clj-jgit** depends on an obsolete version (0.5.3) of **org.clojure/core.memoize**, whereas other components of the system rely on the current (0.5.6) version. This conflict currently makes it tricky to do an out-of-the-box build of Smeagol. You need to check out clj-jgit and build a custom build, depending on the current, not the obsolete, version of memoize. I'm working to fix this problem. - ## Markup syntax Smeagol uses the Markdown format as provided by [markdown-clj](https://github.com/yogthos/markdown-clj), with the addition that anything enclosed in double square brackets, \[\[like this\]\], will be treated as a link into the wiki. diff --git a/project.clj b/project.clj index 446a496..5456758 100644 --- a/project.clj +++ b/project.clj @@ -1,6 +1,6 @@ -(defproject smeagol "0.2.0-SNAPSHOT" +(defproject smeagol "0.3.0-SNAPSHOT" :description "A simple Git-backed Wiki inspired by Gollum" - :url "http://example.com/FIXME" + :url "https://github.com/simon-brooke/smeagol" :dependencies [[org.clojure/clojure "1.6.0"] [org.clojure/core.memoize "0.5.6"] [lib-noir "0.9.4" :exclusions [org.clojure/tools.reader]] @@ -9,7 +9,7 @@ [com.taoensso/timbre "3.3.1" :exclusions [org.clojure/tools.reader]] [com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]] [markdown-clj "0.9.55" :exclusions [com.keminglabs/cljx]] - [clj-jgit "0.8.2-SNAPSHOT"] + [clj-jgit "0.8.2"] [environ "1.0.0"] [im.chit/cronj "1.4.2"] [noir-exception "0.2.2"] diff --git a/resources/public/content/Internal Link.md b/resources/public/content/Internal Link.md new file mode 100644 index 0000000..af3e85c --- /dev/null +++ b/resources/public/content/Internal Link.md @@ -0,0 +1 @@ +This is the page linked to from the left bar. \ No newline at end of file diff --git a/resources/public/content/Introduction.md b/resources/public/content/Introduction.md index fd1e9fc..f0088a1 100644 --- a/resources/public/content/Introduction.md +++ b/resources/public/content/Introduction.md @@ -4,10 +4,6 @@ Smeagol is a simple Wiki engine inspired by [Gollum](https://github.com/gollum/g So at this stage Smeagol is a Wiki engine written in Clojure which uses Markdown as its text format, which does have user authentication, and which uses Git as its versioning and backup system. -## DLL Hell - -Unfortunately, Smeagol currently uses **[clj-jgit](https://github.com/clj-jgit/clj-jgit)** for Git integration, and **clj-jgit** depends on an obsolete version (0.5.3) of **org.clojure/core.memoize**, whereas other components of the system rely on the current (0.5.6) version. This conflict currently makes it tricky to do an out-of-the-box build of Smeagol. You need to check out clj-jgit and build a custom build, depending on the current, not the obsolete, version of memoize. I'm working to fix this problem. - ## Markup syntax Smeagol uses the Markdown format as provided by [markdown-clj](https://github.com/yogthos/markdown-clj), with the addition that anything enclosed in double square brackets, \[\[like this\]\], will be treated as a link into the wiki.