OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Jan-2005 23:14:57
Branch: HEAD Handle: 2005011322145600
Added files:
openpkg-src/kwiki kwiki-rules.wiki
Modified files:
openpkg-src/kwiki kwiki.patch kwiki.spec
Log:
add a formatting rules page to the initial wiki so one can more easy
start working with the wiki
Summary:
Revision Changes Path
1.1 +162 -0 openpkg-src/kwiki/kwiki-rules.wiki
1.10 +37 -9 openpkg-src/kwiki/kwiki.patch
1.16 +7 -4 openpkg-src/kwiki/kwiki.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kwiki/kwiki-rules.wiki
============================================================================
$ cvs diff -u -r0 -r1.1 kwiki-rules.wiki
--- /dev/null 2005-01-13 23:14:56 +0100
+++ kwiki-rules.wiki 2005-01-13 23:14:56 +0100
@@ -0,0 +1,162 @@
+This page describes the Wiki markup language used by Kwiki.
+
+----
+
+= Level 1 Heading
+== Level 2 Heading
+=== Level 3 Heading
+==== Level 4 Heading
+===== Level 5 Heading
+====== Level 6 Heading
+
+ = Level 1 Heading
+ == Level 2 Heading
+ ==== Level 4 Heading
+ ===== Level 5 Heading
+ ====== Level 6 Heading
+
+----
+
+Horizontal lines are made with 4 or more dashes:
+
+ ----
+
+----
+
+Paragraphs are separated by a blank line.
+
+Like this. Another paragraph.
+
+ Paragraphs are separated by a blank line.
+ Like this. Another paragraph.
+
+----
+
+*Bold text*, /italic text/, _underscore text_, and -striked through text-.
+
+ *Bold text*, /italic text/, _underscore text_, and -striked through text-.
+
+/*Combination of bold and italics*/
+
+ /*Combination of bold and italics*/
+
+Inline code like [=/etc/passwd] or [=Kwiki::Theme::Basic]
+
+ Inline code like [=/etc/passwd] or [=Kwiki::Theme::Basic]
+
+----
+
+WikiLinks are formed by two or more words in /camel-case/.
+
+ WikiLinks are formed by two or more words in /camel-case/.
+
+External links begin with !http://, like http://www.freepan.org
+
+ External links begin with http://, like http://www.freepan.org
+
+On some cases links can appear as http://. This means that you entered an
address that is not whitelisted. Wait for an admin to whitelist it.
+
+Forced wiki [links] are a alphanumeric string surrounded by square brackets.
+
+ Forced wiki [links] are a alphanumeric string surrounded by square
brackets.
+
+Named http links have text with an http:// link inside, like [Kwiki
http://www.kwiki.org Site]
+
+ Named http links have text with an http:// link inside, like [FreePAN
+ http://www.freepan.org Site]
+
+Sometimes !WordsShouldNotMakeAWikiLink so put a '!' beforehand.
+
+ Sometimes !WordsShouldNotMakeAWikiLink so put a '!' beforehand.
+
+Same thing with !http://foobar.com
+
+ Same thing with !http://foobar.com
+
+Mailto links are just email addresses like [EMAIL PROTECTED]
+
+ Mailto links are just email addresses like [EMAIL PROTECTED]
+
+----
+
+Links to images display the image:
+http://www.google.com/images/logo.gif
+
+ http://www.google.com/images/logo.gif
+
+----
+
+Unordered lists begin with a '* '. The number of asterisks determines the
level:
+
+* foo
+* bar
+** boom
+** bam
+* baz
+
+ * foo
+ * bar
+ ** boom
+ ** bam
+ * baz
+
+Ordered lists begin with a '0 ' (zero):
+
+0 foo
+0 bar
+00 boom
+00 bam
+0 baz
+
+ 0 foo
+ 0 bar
+ 00 boom
+ 00 bam
+ 0 baz
+
+You can mix lists too:
+
+* Today:
+00 Eat icecream
+00 Buy a pony
+* Tomorrow:
+00 Eat more icecream
+00 Buy another pony
+
+ * Today:
+ 00 Eat icecream
+ 00 Buy a pony
+ * Tomorrow:
+ 00 Eat more icecream
+ 00 Buy another pony
+
+----
+
+Any text that does not begin in the first column is rendered as preformatted
text.
+
+ foo bar
+ x y
+ 1 2
+
+----
+
+Simple Tables:
+
+| | Dick | Jane |
+| height | 72" | 65" |
+| weight | 130lbs | 150lbs |
+
+ | | Dick | Jane |
+ | height | 72" | 65" |
+ | weight | 130lbs | 150lbs |
+
+----
+
+Inline HTML is escaped.
+
+ <hr> <bold>No?</bold> <i>Yes?</i> <hr/>
+
+Renders as: <hr> <bold>No?</bold> <i>Yes?</i> <hr/>
+
+Notice the '[=/]' character in the tags is being rendered as /italic/
markers.
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kwiki/kwiki.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 kwiki.patch
--- openpkg-src/kwiki/kwiki.patch 13 Jan 2005 21:35:00 -0000 1.9
+++ openpkg-src/kwiki/kwiki.patch 13 Jan 2005 22:14:56 -0000 1.10
@@ -1,6 +1,6 @@
Index: Kwiki-0.37/lib/Kwiki/Command.pm
--- Kwiki-0.37/lib/Kwiki/Command.pm.orig 2005-01-11 11:16:11 +0100
-+++ Kwiki-0.37/lib/Kwiki/Command.pm 2005-01-13 22:32:15 +0100
++++ Kwiki-0.37/lib/Kwiki/Command.pm 2005-01-13 23:01:53 +0100
@@ -114,7 +114,7 @@
next unless $self->is_kwiki_dir($dir);
$self->msg('Updating ', $dir->absolute->pathname, "\n");
@@ -12,7 +12,7 @@
Index: Kwiki-0.37/lib/Kwiki/Config.pm
--- Kwiki-0.37/lib/Kwiki/Config.pm.orig 2005-01-11 16:51:34 +0100
-+++ Kwiki-0.37/lib/Kwiki/Config.pm 2005-01-13 22:32:15 +0100
++++ Kwiki-0.37/lib/Kwiki/Config.pm 2005-01-13 23:01:53 +0100
@@ -174,11 +174,11 @@
# Put overrides in the top level config.yaml
# See: http://www.kwiki.org/?ChangingConfigDotYaml
@@ -29,7 +29,7 @@
# file. Do not modify any of the files under the config/ directory as
Index: Kwiki-0.37/lib/Kwiki/Display.pm
--- Kwiki-0.37/lib/Kwiki/Display.pm.orig 2005-01-11 11:16:46 +0100
-+++ Kwiki-0.37/lib/Kwiki/Display.pm 2005-01-13 22:32:15 +0100
++++ Kwiki-0.37/lib/Kwiki/Display.pm 2005-01-13 23:01:53 +0100
@@ -84,7 +84,7 @@
__template/tt2/display_changed_by.html__
[% IF self.preferences.display_changed_by.value %]
@@ -39,9 +39,37 @@
<em>
Last changed by [% page.edit_by_link %] at [% page.edit_time %]
</em>
+Index: Kwiki-0.37/lib/Kwiki/Pages.pm
+--- Kwiki-0.37/lib/Kwiki/Pages.pm.orig 2004-12-28 21:54:51 +0100
++++ Kwiki-0.37/lib/Kwiki/Pages.pm 2005-01-13 23:06:17 +0100
+@@ -287,17 +287,13 @@
+ __!database/HomePage__
+ === Welcome to Your New Kwiki!
+
+-You have successfully installed a new Kwiki. Now you should /edit this
page/ and start adding NewPages. For help on Kwiki syntax and other Kwiki
issues, visit http://www.kwiki.org/?KwikiHelpIndex.
++You have successfully installed a new Kwiki.
++Now you should /edit this page/ and start adding NewPages.
++For help on Kwiki syntax see KwikiFormattingRules.
++For help on other Kwiki issues, visit http://www.kwiki.org/?KwikiHelpIndex.
+
+-If this installation looks more mundane than you had expected after
visiting Kwiki sites like http://www.kwiki.org, you need to install some *Kwiki
plugins*. Some of the basic plugins you might want are:
+-
+-* Kwiki::!RecentChanges
+-* Kwiki::Search
+-* Kwiki::!UserPreferences
+-* Kwiki::!UserName
+-* Kwiki::Archive::Rcs
+-* Kwiki::Revisions
+-
+-These plugin modules are available on [CPAN
http://search.cpan.org/search?query=kwiki&mode=dist]. Visit
http://www.kwiki.org/?KwikiPluginInstallation to learn more about installing
plugins.
++If this installation looks more mundane than you had expected after
visiting Kwiki
++sites like http://www.kwiki.org/, you need to active more *Kwiki plugins* in
++the Kwiki [=plugins] file.
+
+ --[http://www.kwiki.org/?BrianIngerson Brian Ingerson]
Index: Kwiki-0.37/lib/Kwiki/Theme/Basic.pm
--- Kwiki-0.37/lib/Kwiki/Theme/Basic.pm.orig 2004-12-02 03:15:06 +0100
-+++ Kwiki-0.37/lib/Kwiki/Theme/Basic.pm 2005-01-13 22:32:52 +0100
++++ Kwiki-0.37/lib/Kwiki/Theme/Basic.pm 2005-01-13 23:01:53 +0100
@@ -42,6 +42,8 @@
</h1>
</div>
@@ -84,7 +112,7 @@
h1, h2, h3, h4, h5, h6 {
Index: Kwiki-Diff-0.01/lib/Kwiki/Diff.pm
--- Kwiki-Diff-0.01/lib/Kwiki/Diff.pm.orig 2004-08-25 18:01:20 +0200
-+++ Kwiki-Diff-0.01/lib/Kwiki/Diff.pm 2005-01-13 22:32:15 +0100
++++ Kwiki-Diff-0.01/lib/Kwiki/Diff.pm 2005-01-13 23:01:53 +0100
@@ -166,6 +166,11 @@
<img src="icons/gnome/image/diff.png" alt="Differences" />
<!-- END diff_button_icon.html -->
@@ -99,7 +127,7 @@
<a href="[% script_name %]?action=revisions&page_id=[% page_id
%]&revision_id=[% revision_id %]" accesskey="r" title="Revision [% revision_id
%]">
Index: Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm
--- Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm.orig 2005-01-11 17:03:22
+0100
-+++ Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm 2005-01-13 22:32:15
+0100
++++ Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm 2005-01-13 23:01:53
+0100
@@ -111,7 +111,7 @@
}
</script>
@@ -111,7 +139,7 @@
</form>
Index: Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm
--- Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm.orig 2004-09-01
02:11:53 +0200
-+++ Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm 2005-01-13 22:32:15
+0100
++++ Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm 2005-01-13 23:01:53
+0100
@@ -58,7 +58,7 @@
$msg->print(\*TEMPFILE);
close TEMPFILE;
@@ -123,7 +151,7 @@
Index: Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm
--- Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm.orig
2004-12-11 22:50:42 +0100
-+++ Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm
2005-01-13 22:32:15 +0100
++++ Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm
2005-01-13 23:01:53 +0100
@@ -312,6 +312,7 @@
rss_skipHours:
rss_skipDays:
@@ -143,7 +171,7 @@
eNpjdDdgQAX/Gd9+QBP6w8SAAYBC/1YzcBdYr2eYvYG7ACTEAhQ98JVb9vRvBoG/DD+gqhga2Jmd
Index: Kwiki-Search-0.12/lib/Kwiki/Search.pm
--- Kwiki-Search-0.12/lib/Kwiki/Search.pm.orig 2004-12-16 00:38:12
+0100
-+++ Kwiki-Search-0.12/lib/Kwiki/Search.pm 2005-01-13 22:32:15 +0100
++++ Kwiki-Search-0.12/lib/Kwiki/Search.pm 2005-01-13 23:01:53 +0100
@@ -72,7 +72,7 @@
=cut
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kwiki/kwiki.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 kwiki.spec
--- openpkg-src/kwiki/kwiki.spec 13 Jan 2005 20:55:13 -0000 1.15
+++ openpkg-src/kwiki/kwiki.spec 13 Jan 2005 22:14:56 -0000 1.16
@@ -149,6 +149,7 @@
Source53:
http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ForeignLinkGlyphs-%{V_kwiki_foreignlinkglyphs}.tar.gz
Source100: kwiki-apache.conf
Source101: kwiki-plugins.txt
+Source102: kwiki-rules.wiki
Patch0: kwiki.patch
# build information
@@ -575,12 +576,12 @@
-e 's; $;;' \
kwiki-update $RPM_BUILD_ROOT%{l_prefix}/bin/
- # install default plugin list
+ # install template files
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/kwiki
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE kwiki-plugins.txt} \
- $RPM_BUILD_ROOT%{l_prefix}/share/kwiki/plugins
+ %{SOURCE kwiki-plugins.txt} %{SOURCE kwiki-rules.wiki} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/kwiki/
# install Kwiki state directory
%{l_shtool} mkdir -f -p -m 755 \
@@ -612,8 +613,10 @@
echo "++ Generating new standard Kwiki in
$RPM_INSTALL_PREFIX/var/kwiki/"
$RPM_INSTALL_PREFIX/bin/kwiki -quiet -new
echo "++ Pre-configuring Kwiki in $RPM_INSTALL_PREFIX/var/kwiki/"
- cp $RPM_INSTALL_PREFIX/share/kwiki/plugins \
+ cp $RPM_INSTALL_PREFIX/share/kwiki/kwiki-plugins.txt \
$RPM_INSTALL_PREFIX/var/kwiki/plugins
+ cp $RPM_INSTALL_PREFIX/share/kwiki/kwiki-rules.wiki \
+ $RPM_INSTALL_PREFIX/var/kwiki/database/KwikiFormattingRules
echo "++ Generating administrator view of Kwiki in
$RPM_INSTALL_PREFIX/var/kwiki/admin/"
$RPM_INSTALL_PREFIX/bin/kwiki -quiet -new_view admin
( echo "+Kwiki::PagePrivacy"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
