From f5187ed0b50d363ad16c6273b986f7e4fccc6c5d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 14:08:20 -0400 Subject: clarify and add link --- doc/shortcuts.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index 14cd5ff2b..d9c2e1937 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -62,9 +62,9 @@ This page controls what shortcut links the wiki supports. To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "%s" is replaced with the -text passed to the named shortcut, after url-encoding it, and '%S' is -replaced with the raw, non-encoded text. The optional `desc` parameter -controls the description of the link. +text passed to the named shortcut, after [[!wikipedia url-encoding]] +it, and '%S' is replaced with the raw, non-encoded text. The optional +`desc` parameter controls the description of the link. Remember that the `name` you give the shortcut will become a new [[ikiwiki/directive]]. Avoid using a `name` that conflicts @@ -73,5 +73,5 @@ parameter that will override the one provided at definition time. If you come up with a shortcut that you think others might find useful, consider contributing it to the [shortcuts page on the ikiwiki -ikiwiki](http://ikiwiki.info/shortcuts/), so that future versions of +wiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include your shortcut in the standard underlay. -- cgit v1.2.3 From 004d460d9cc1fc6a691bc6eaa0d5cd2a9206c224 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 14:09:58 -0400 Subject: fix link --- doc/shortcuts.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index d9c2e1937..500146a31 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -62,7 +62,7 @@ This page controls what shortcut links the wiki supports. To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "%s" is replaced with the -text passed to the named shortcut, after [[!wikipedia url-encoding]] +text passed to the named shortcut, after [[!wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded text. The optional `desc` parameter controls the description of the link. -- cgit v1.2.3 From a48b59a4afd01f3f53466eae83bb2b52244ee8e1 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 7 Oct 2009 19:53:28 +0200 Subject: Use %S instead of %s for the debbug shortcut, so that things like [[!debbug 522689#38]] work as expected. --- doc/shortcuts.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index 500146a31..4213295ad 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -18,7 +18,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]] * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]] * [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]] -* [[!shortcut name=debbug url="http://bugs.debian.org/%s" desc="bug #%s"]] +* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="bug #%s"]] * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]] * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]] -- cgit v1.2.3 From 93ddca3e9c420f334cc0bebd53945633452513a3 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 7 Oct 2009 19:54:46 +0200 Subject: Make it obvious for the reader of the rendered page that the debbug shortcut links to Debian bug reports. --- doc/shortcuts.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index 4213295ad..ad3f2a890 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -18,7 +18,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]] * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]] * [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]] -* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="bug #%s"]] +* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]] * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]] * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]] -- cgit v1.2.3 From 79f3e32ea7adf3e5adbef0a8c9c68cd32a67cac4 Mon Sep 17 00:00:00 2001 From: "http://www.larted.org.uk/~dom/" Date: Thu, 8 Oct 2009 11:38:34 -0400 Subject: add cpanrt --- doc/shortcuts.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index ad3f2a890..b84d71c3d 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -59,6 +59,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]] * [[!shortcut name=man url="http://linux.die.net/man/%s"]] * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]] +* [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]] To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "%s" is replaced with the -- cgit v1.2.3 From 68433d82b88e93962561d6ddad8689984398def1 Mon Sep 17 00:00:00 2001 From: lnussel Date: Tue, 13 Oct 2009 05:09:37 -0400 Subject: add shortcut for novell bugzilla --- doc/shortcuts.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index b84d71c3d..54dd0fdb1 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -60,6 +60,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=man url="http://linux.die.net/man/%s"]] * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]] * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]] +* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]] To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "%s" is replaced with the -- cgit v1.2.3 From e71a912f0c64b1eb6ead8242868da6f5a9606c8b Mon Sep 17 00:00:00 2001 From: adrianna Date: Fri, 2 Apr 2010 12:07:42 +0000 Subject: --- doc/shortcuts.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index 54dd0fdb1..179cb89e6 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -49,7 +49,9 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]] * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]] * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]] -* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] +* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] +* [custom writing company](http://essaywritingservices.org/custom-essay-writing.php) +* [certified resume writer](http://cvresumewriters.com/onlineresume.php) * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]] * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]] * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]] -- cgit v1.2.3 From e0074b91c7d1a44c468bdbf554cbef07434b7dfe Mon Sep 17 00:00:00 2001 From: adrianna Date: Fri, 2 Apr 2010 12:18:36 +0000 Subject: --- doc/shortcuts.mdwn | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index 179cb89e6..f33dfb6b6 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -49,9 +49,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]] * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]] * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]] -* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] -* [custom writing company](http://essaywritingservices.org/custom-essay-writing.php) -* [certified resume writer](http://cvresumewriters.com/onlineresume.php) +* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]] * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]] * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]] @@ -67,13 +65,13 @@ This page controls what shortcut links the wiki supports. To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "%s" is replaced with the text passed to the named shortcut, after [[!wikipedia url_encoding]] -it, and '%S' is replaced with the raw, non-encoded text. The optional +it, and '%S' is replaced with the raw, non-encoded text [custom writing company](http://essaywritingservices.org/custom-essay-writing.php). The optional `desc` parameter controls the description of the link. Remember that the `name` you give the shortcut will become a new [[ikiwiki/directive]]. Avoid using a `name` that conflicts with an existing directive. These directives also accept a `desc` -parameter that will override the one provided at definition time. +parameter that will override [certified resume writer](http://cvresumewriters.com/onlineresume.php) the one provided at definition time. If you come up with a shortcut that you think others might find useful, consider contributing it to the [shortcuts page on the ikiwiki -- cgit v1.2.3 From 05b6e8ceee2bec4442727e2475abf8a8861d5e0a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 2 Apr 2010 18:28:34 +0100 Subject: Despam, again. Someone ban adrianna please? --- doc/features.mdwn | 4 ++-- doc/security.mdwn | 4 ++-- doc/setup.mdwn | 4 ++-- doc/shortcuts.mdwn | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'doc/shortcuts.mdwn') diff --git a/doc/features.mdwn b/doc/features.mdwn index c119dae97..3925d78ef 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -125,7 +125,7 @@ yours when you commit. In the rare cases where automatic merging fails due to the same part of a page being concurrently edited, regular commit conflict markers are shown in the file to resolve the conflict, so if you're already familiar -with that there's no new commit [order essays](http://custom-paper-writing.com/order) marker syntax to learn. +with that there's no new commit marker syntax to learn. ### [[RecentChanges]], editing pages in a web browser @@ -158,7 +158,7 @@ since page edit controls can be changed via plugins. ### [[PageHistory]] -Well, sorta. Rather than implementing YA history browser [essay writing companies](http://essaywritingservices.org/custom-essay-writing.php), it can link to +Well, sorta. Rather than implementing YA history browser, it can link to [[ViewVC]] or the like to browse the history of a wiki page. ### Full text search diff --git a/doc/security.mdwn b/doc/security.mdwn index a06f3a37f..21aef316b 100644 --- a/doc/security.mdwn +++ b/doc/security.mdwn @@ -376,7 +376,7 @@ parties. Cross Site Request Forging could be used to constuct a link that would change a logged-in user's password or other preferences if they clicked on the link. It could also be used to construct a link that would cause a wiki -page [order essay](http://custom-paper-writing.com/order) to be modified by a logged-in user. ([[!cve CVE-2008-0165]]) +page to be modified by a logged-in user. ([[!cve CVE-2008-0165]]) These holes were discovered on 10 April 2008 and fixed the same day with the release of ikiwiki 2.42. A fix was also backported to Debian etch, as @@ -415,7 +415,7 @@ can cause it to crash. This can potentially be used for a denial of service attack. intrigeri discovered this problem on 12 Nov 2008 and a patch put in place -later that day, in version 2.70. The fix was backported [write my essay](http://custom-essay-writing-service.org/faq.php) to testing as version +later that day, in version 2.70. The fix was backported to testing as version 2.53.3, and to stable as version 1.33.7. ## Insufficient blacklisting in teximg plugin diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 4ad64d73b..2d4da5536 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -105,7 +105,7 @@ After making changes to this file, you need to tell ikiwiki to use it: ## Customizing file locations As a wiki compiler, ikiwiki builds a wiki from files in a source directory, -and outputs the files to a destination directory [write my essay](http://custom-essay-writing-service.org/faq.php). The source directory is +and outputs the files to a destination directory. The source directory is a working copy checked out from the version control system repository. When you used `auto.setup`, ikiwiki put the source directory, destination @@ -118,7 +118,7 @@ First, move the destination directory and repository around. % mv public_html/foo /srv/web/foo.com % mv foo.git /srv/git/foo.git -If you moved the repository to a new location [buy reports](http://essaywritingservices.org/book-report.php), checkouts pointing at the +If you moved the repository to a new location, checkouts pointing at the old location won't work, and the easiest way to deal with this is to delete them and re-checkout from the new repository location. diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index f33dfb6b6..54dd0fdb1 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -49,7 +49,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]] * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]] * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]] -* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] +* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]] * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]] * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]] @@ -65,13 +65,13 @@ This page controls what shortcut links the wiki supports. To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "%s" is replaced with the text passed to the named shortcut, after [[!wikipedia url_encoding]] -it, and '%S' is replaced with the raw, non-encoded text [custom writing company](http://essaywritingservices.org/custom-essay-writing.php). The optional +it, and '%S' is replaced with the raw, non-encoded text. The optional `desc` parameter controls the description of the link. Remember that the `name` you give the shortcut will become a new [[ikiwiki/directive]]. Avoid using a `name` that conflicts with an existing directive. These directives also accept a `desc` -parameter that will override [certified resume writer](http://cvresumewriters.com/onlineresume.php) the one provided at definition time. +parameter that will override the one provided at definition time. If you come up with a shortcut that you think others might find useful, consider contributing it to the [shortcuts page on the ikiwiki -- cgit v1.2.3