aboutsummaryrefslogtreecommitdiff
path: root/doc/soc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-20 11:24:11 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-20 11:24:11 +0000
commit7eb97aa471286c7a9a06ff20e5c35c6713ae6267 (patch)
tree2709d3c3b82c19c309570d59c88e49d633c36b68 /doc/soc
parent164f235996c8bd3ecab405aa4318884fe9091ab8 (diff)
downloadikiwiki-7eb97aa471286c7a9a06ff20e5c35c6713ae6267.tar
ikiwiki-7eb97aa471286c7a9a06ff20e5c35c6713ae6267.tar.gz
web commit by JoshTriplett: s/makes use of/uses/
Diffstat (limited to 'doc/soc')
-rw-r--r--doc/soc/application.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/soc/application.mdwn b/doc/soc/application.mdwn
index 5db62289d..ef4fdc897 100644
--- a/doc/soc/application.mdwn
+++ b/doc/soc/application.mdwn
@@ -4,7 +4,7 @@ Based on ["What should a mentoring organization application look like?"](http://
The ikiwiki project aims to develop a general-purpose wiki engine, with particular emphasis on personal wikis, project wikis, blogs, and collaborative software development. We provide several features unique or uncommon amongst wikis:
- * Rather than inventing yet another simplistic, linear revision control system, ikiwiki makes use of standard version control systems such as [[Subversion]] and [[Git]]. You can edit a wiki by committing to your repository, as well as through a traditional web interface. This makes ikiwiki ideal for collaborative software development; just keep your wiki in version control next to your software. You can also take advantage of the features of these systems; for instance, you can keep a local branch of your wiki via [[Git]].
+ * Rather than inventing yet another simplistic, linear revision control system, ikiwiki uses a standard version control system such as [[Subversion]] or [[Git]]. You can edit a wiki by committing to your repository, as well as through a traditional web interface. This makes ikiwiki ideal for collaborative software development; just keep your wiki in version control next to your software. You can also take advantage of the features of these systems; for instance, you can keep a local branch of your wiki via [[Git]].
* You can turn any set of pages into an inline news feed, complete with RSS and Atom support. You can run your weblog on ikiwiki (and many people do), run a Planet-like aggregator for external feeds, or keep a TODO and bug list with tags for completed items.