Merge branch 'master' of https://github.com/sleeplessgeek/gollum into sleeplessgeek-master

This commit is contained in:
rick
2011-01-17 10:18:13 -08:00
+3 -3
View File
@@ -9,7 +9,7 @@ Gollum wikis are simply Git repositories that adhere to a specific format.
Gollum pages may be written in a variety of formats and can be edited in a Gollum pages may be written in a variety of formats and can be edited in a
number of ways depending on your needs. You can edit your wiki locally: number of ways depending on your needs. You can edit your wiki locally:
* With your favorite text editor or IDE. * With your favorite text editor or IDE (changes will be visible after committing).
* With the built-in web interface. * With the built-in web interface.
* With the Gollum Ruby API. * With the Gollum Ruby API.
@@ -268,8 +268,8 @@ This is useful for writing about the link syntax in your wiki pages.
## SYNTAX HIGHLIGHTING ## SYNTAX HIGHLIGHTING
In page files you can get automatic syntax highlighting for a wide range of In page files you can get automatic syntax highlighting for a wide range of
languages (courtesy of [Pygments](http://pygments.org/)) by using the languages (courtesy of [Pygments](http://pygments.org/) - must install
following syntax: separately) by using the following syntax:
```ruby ```ruby
def foo def foo