aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-09 05:34:40 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-09 05:34:40 +0000
commitace6a60b1b4f3f4faaa5f50140e95adf796b5ec5 (patch)
tree54495e37968366155f72a89ed3166b30c660db73
parent3fec5486460819884aea38ec800d34e2eb6c0dfc (diff)
downloadikiwiki-ace6a60b1b4f3f4faaa5f50140e95adf796b5ec5.tar
ikiwiki-ace6a60b1b4f3f4faaa5f50140e95adf796b5ec5.tar.gz
* viewcvs is now viewvc (in Debian unstable), update everything to use the
new name.
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
-rw-r--r--doc/bugs/diff_links_to_backtrace.mdwn4
-rw-r--r--doc/download.mdwn2
-rw-r--r--doc/features.mdwn2
-rw-r--r--doc/pagehistory.mdwn2
-rw-r--r--doc/usage.mdwn4
7 files changed, 11 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index ca9a6c84b..d3ec481f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,10 @@ ikiwiki (1.42) UNRELEASED; urgency=low
* Add "reverse" option to inline to invert sort orders.
* Drop the BSD license for the templates and basewiki, and just allow them
to be used as close to public domain as possible.
+ * viewcvs is now viewvc (in Debian unstable), update everything to use the
+ new name.
- -- Joey Hess <joeyh@debian.org> Thu, 8 Feb 2007 14:46:17 -0500
+ -- Joey Hess <joeyh@debian.org> Fri, 9 Feb 2007 00:27:59 -0500
ikiwiki (1.41) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9da81b21c..66776391b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: ikiwiki
Architecture: all
Depends: ${perl:Depends}, libxml-simple-perl, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.02.02), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, gcc | c-compiler, libc6-dev | libc-dev, libhtml-parser-perl, liburi-perl
Recommends: subversion | git-core | tla | mercurial, hyperestraier
-Suggests: viewcvs, librpc-xml-perl, libtext-wikiformat-perl, python-docutils, polygen, tidy, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1)
+Suggests: viewvc | viewcvs, librpc-xml-perl, libtext-wikiformat-perl, python-docutils, polygen, tidy, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1)
Description: a wiki compiler
ikiwiki converts a directory full of wiki pages into html pages suitable
for publishing on a website. Unlike many wikis, ikiwiki does not have its
diff --git a/doc/bugs/diff_links_to_backtrace.mdwn b/doc/bugs/diff_links_to_backtrace.mdwn
index 16f84fafb..58ac8d795 100644
--- a/doc/bugs/diff_links_to_backtrace.mdwn
+++ b/doc/bugs/diff_links_to_backtrace.mdwn
@@ -1,5 +1,5 @@
-The diff links in RecentChanges go to a viewcvs backtrace if the rev in
-question is when the page was added. Is this a viewcvs bug, or a behavior
+The diff links in RecentChanges go to a viewvc backtrace if the rev in
+question is when the page was added. Is this a viewvc bug, or a behavior
ikiwiki needs to work around?
- As a special case, there should certianly be no history link for
pages generated from the underlaydir as it can never work for them.
diff --git a/doc/download.mdwn b/doc/download.mdwn
index a60cae04d..ca7b49f32 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -30,7 +30,7 @@ The current development version of ikiwiki can be accessed using subversion at
`svn://ikiwiki.kitenet.net/ikiwiki/trunk`
The source in subversion can be browsed
-[here](http://ikiwiki.kitenet.net/cgi-bin/viewcvs.cgi/trunk/?root=ikiwiki).
+[here](http://ikiwiki.kitenet.net/cgi-bin/viewvc.cgi/trunk/?root=ikiwiki).
Commits to ikiwiki's source code are now fed into
[CIA](http://cia.navi.cx/), and can be browsed, subscribed to etc on its
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 58d6d09cd..26a98295b 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -152,7 +152,7 @@ possibilities, since page edit controls can be changed via plugins.
### [[PageHistory]]
Well, sorta. Rather than implementing YA history browser, it can link to
-[[ViewCVS]] or the like to browse the history of a wiki page.
+[[ViewVC]] or the like to browse the history of a wiki page.
### Full text search
diff --git a/doc/pagehistory.mdwn b/doc/pagehistory.mdwn
index 12687f4bc..fc2a3f543 100644
--- a/doc/pagehistory.mdwn
+++ b/doc/pagehistory.mdwn
@@ -1,5 +1,5 @@
ikiwiki supports adding "History" links to the top of pages to browse the
revison history of a page. This is enabled by the `historyurl` setting,
-which is used to specify the URL to a web interface such as [[ViewCVS]]
+which is used to specify the URL to a web interface such as [[ViewVC]]
(for Subversion) or [[Gitweb]]. In that url, "\[[file]]" is replaced with
the name of the file to view.
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index afd699194..485198d61 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -186,7 +186,7 @@ configuration options of their own.
Specifies the url to link to for page history browsing. In the url,
"\[[file]]" is replaced with the file to browse. It's common to use
- [[ViewCVS]] for this.
+ [[ViewVC]] for this.
* --adminemail you@yourhost
@@ -197,7 +197,7 @@ configuration options of their own.
Specifies the url to link to for a diff of changes to a page. In the url,
"\[[file]]" is replaced with the file to browse, "\[[r1]]" is the old
revision of the page, and "\[[r2]]" is the new revision. It's common to use
- [[ViewCVS]] for this.
+ [[ViewVC]] for this.
* --exclude regexp