Skip to content

Commit

Permalink
Doc and bug fixes for 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@pudge
pudge committed May 9, 2001
1 parent b82aab6 commit b8b6419
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 56 deletions.
66 changes: 43 additions & 23 deletions INSTALL
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ NAME
INSTALL - Slash Installation

SYNOPSIS
This document describes how to install Slash 1.1.x / 2.0.x (code-named
"bender"). For instructions on installation of previous versions of
Slash, see the INSTALL document included with those distributions.
This document describes how to install Slash 2.0 (code-named "bender").
For instructions on installation of previous versions of Slash, see the
INSTALL document included with those distributions.

These instructions have only been tested on Linux. Installation under
BSD and other Unix OSes should work similarly. We've had reports of the
1.0.x version of Slash running on Windows, but have done no testing and
have no further information.

PostgreSQL support in Slash 1.1.x is currently alpha-quality, while
MySQL support is beta-quality.
PostgreSQL support in Slash 2.0 is currently alpha-quality, while MySQL
support is beta-quality.

Slash can always be downloaded from SourceForge, and from the Slashdot
FTP site.
Expand Down Expand Up @@ -101,23 +101,40 @@ UPGRADING
% template-tool -u VIRTUAL_USER -s LIST

Data
Currently, there are no differences in the schema or the database
data between versions of Slash 2.0.

Listed below are additions/deletions of templates from version to
version. Feel free to delete (or not) ones that are no longer used, but
please do add to your site templates that have been added to the
distribution. Add or delete, for your site, all the changes from your
current version up through the version you're upgrading to.

Slash 2.0.0-pre2
Added
plugins/Journal/templates/pagination;journal;default
plugins/Journal/templates/pagination;search;default
themes/slashcode/templates/dispLinkComment;misc;default
Deleted
plugins/Journal/templates/journalitem;journal;default
plugins/Search/templates/linksearch;search;default
Currently, there are no differences in the schema between versions
of Slash 2.0. There are a few data differences.

Slash 2.0.0-pre1 -> Slash-2.0.0 release
Journal Data
In the vars table, "journal_default_display" is set to "0".
It should default to "10".

Also, "journal_user_count" is no longer in use and may be
deleted.

See plugins/Journal/dump.

Search Data
"search_default_display" should be defined in the vars
table, with a default of "30".

See plugins/Search/dump.

Templates
Listed below are additions/deletions of templates from version to
version. Feel free to delete (or not) ones that are no longer used,
but please do add to your site templates that have been added to the
distribution. Add or delete, for your site, all the changes from
your current version up through the version you're upgrading to.

Slash 2.0.0-pre2 -> Slash 2.0.0
Added
plugins/Journal/templates/pagination;journal;default
plugins/Search/templates/pagination;search;default
themes/slashcode/templates/dispLinkComment;misc;default
Deleted
plugins/Journal/templates/journalitem;journal;default
plugins/Search/templates/linksearch;search;default

Slash 1.0 -> Slash 2.0

Expand Down Expand Up @@ -303,7 +320,8 @@ INSTALLATION
$SLASH_PREFIX/sites/sitename/sitename.conf more than once, or if
this file shares contents with directives in httpd.conf, that your
Slash site WILL break. The directives in $SLASH_PREFIX/slash.conf
should be run only ONCE in any any site context.
should be run only ONCE in any any site context. Read through
$SLASH_PREFIX/slash.conf to make sure it all looks proper.

6. Install your Slash site.

Expand All @@ -319,6 +337,8 @@ INSTALLATION
can put its contents unto your httpd.conf, or you can just "Include"
it in your httpd.conf.

Read the message printed at the end of running install_slashsite.

7. Start it up.

After installation of the site is done, and Apache has been stopped
Expand Down
7 changes: 0 additions & 7 deletions README
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
NAME
README - Slash Readme

WARNING
This release of Slash is PRERELEASE software. Run at your own risk.
There may be bugs, and documentation is not yet finished or wrong. We
feel this release is stable for production use, as we use it on
http://slashcode.com/, but it may have more problems than one would
expect from a final release.

DESCRIPTION
Slash -- Slashdot Like Automated Storytelling Homepage -- is the code
that runs Slashdot. More than that, however, Slash is an architecture
Expand Down
39 changes: 30 additions & 9 deletions docs/INSTALL.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ <H1><A NAME="name">NAME</A></H1>
<P>
<HR>
<H1><A NAME="synopsis">SYNOPSIS</A></H1>
<P>This document describes how to install Slash 1.1.x / 2.0.x
<P>This document describes how to install Slash 2.0
(code-named "bender"). For instructions on installation
of previous versions of Slash, see the INSTALL document
included with those distributions.</P>
<P>These instructions have only been tested on Linux. Installation under
BSD and other Unix OSes should work similarly. We've had reports of the
1.0.x version of Slash running on Windows, but have done no testing and
have no further information.</P>
<P>PostgreSQL support in Slash 1.1.x is currently alpha-quality,
<P>PostgreSQL support in Slash 2.0 is currently alpha-quality,
while MySQL support is beta-quality.</P>
<P>Slash can always be downloaded from SourceForge, and from the
Slashdot FTP site.</P>
Expand Down Expand Up @@ -148,24 +148,43 @@ <H2><A NAME="slash_2.0.x___slash_2.0.y">Slash 2.0.x -&gt; Slash 2.0.y</A></H2>
<P></P></DL>
<DT><STRONG><A NAME="item_Data">Data</A></STRONG><BR>
<DD>
Currently, there are no differences in the schema or the database data
between versions of Slash 2.0.
Currently, there are no differences in the schema between versions of Slash 2.0.
There are a few data differences.
<DL>
<DT><STRONG><A NAME="item_Slash">Slash 2.0.0-pre1 -&gt; Slash-2.0.0 release</A></STRONG><BR>
<DD>
<DL>
<DT><STRONG><A NAME="item_Journal_Data">Journal Data</A></STRONG><BR>
<DD>
In the vars table, "journal_default_display" is set to "0". It should default
to "10".
<P>Also, "journal_user_count" is no longer in use and may be deleted.</P>
<P>See <EM>plugins/Journal/dump</EM>.</P>
<P></P>
<DT><STRONG><A NAME="item_Search_Data">Search Data</A></STRONG><BR>
<DD>
"search_default_display" should be defined in the vars table, with a default
of "30".
<P>See <EM>plugins/Search/dump</EM>.</P>
<P></P></DL>
<P>Listed below are additions/deletions of templates from version to version.
</DL>
<DT><STRONG>Templates</STRONG><BR>
<DD>
Listed below are additions/deletions of templates from version to version.
Feel free to delete (or not) ones that are no longer used, but please do
add to your site templates that have been added to the distribution. Add
or delete, for your site, all the changes from your current version up
through the version you're upgrading to.</P>
through the version you're upgrading to.
<DL>
<DT><STRONG><A NAME="item_Slash_2%2E0%2E0%2Dpre2">Slash 2.0.0-pre2</A></STRONG><BR>
<DT><STRONG>Slash 2.0.0-pre2 -&gt; Slash 2.0.0</STRONG><BR>
<DD>
<DL>
<DT><STRONG><A NAME="item_Added">Added</A></STRONG><BR>
<DD>
<DL>
<DT><STRONG><A NAME="item_plugins%2FJournal%2Ftemplates%2Fpagination%3Bjourn">plugins/Journal/templates/pagination;journal;default</A></STRONG><BR>
<DD>
<DT><STRONG><A NAME="item_plugins%2FJournal%2Ftemplates%2Fpagination%3Bsearc">plugins/Journal/templates/pagination;search;default</A></STRONG><BR>
<DT><STRONG><A NAME="item_plugins%2FSearch%2Ftemplates%2Fpagination%3Bsearch">plugins/Search/templates/pagination;search;default</A></STRONG><BR>
<DD>
<DT><STRONG><A NAME="item_themes%2Fslashcode%2Ftemplates%2FdispLinkComment%3">themes/slashcode/templates/dispLinkComment;misc;default</A></STRONG><BR>
<DD>
Expand Down Expand Up @@ -351,7 +370,8 @@ <H2><A NAME="installation_procedure">Installation Procedure</A></H2>
or if this file shares contents with directives in httpd.conf,
that your Slash site WILL break. The directives in
<EM>$SLASH_PREFIX/slash.conf</EM> should be run only ONCE in any any
site context.</P>
site context. Read through <EM>$SLASH_PREFIX/slash.conf</EM> to make
sure it all looks proper.</P>
<P></P>
<LI>
<STRONG>Install your Slash site.</STRONG>
Expand All @@ -365,6 +385,7 @@ <H2><A NAME="installation_procedure">Installation Procedure</A></H2>
file will be created at <EM>$SLASH_PREFIX/$SITENAME/$SITENAME.conf</EM>.
You can put its contents unto your httpd.conf, or you can just <CODE>Include</CODE>
it in your httpd.conf.</P>
<P>Read the message printed at the end of running install_slashsite.</P>
<P></P>
<LI>
<STRONG>Start it up.</STRONG>
Expand Down
2 changes: 2 additions & 0 deletions docs/INSTALL.pod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ through the version you're upgrading to.

=back

=back

=head2 Slash 1.0 -E<gt> Slash 2.0

Please read the complete documentation of F<utils/slash1toslash2>.
Expand Down
12 changes: 2 additions & 10 deletions docs/README.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<UL>

<LI><A HREF="#name">NAME</A></LI>
<LI><A HREF="#warning">WARNING</A></LI>
<LI><A HREF="#description">DESCRIPTION</A></LI>
<LI><A HREF="#documentation">DOCUMENTATION</A></LI>
<LI><A HREF="#links">LINKS</A></LI>
Expand All @@ -27,13 +26,6 @@ <H1><A NAME="name">NAME</A></H1>
<P>README - Slash Readme</P>
<P>
<HR>
<H1><A NAME="warning">WARNING</A></H1>
<P>This release of Slash is PRERELEASE software. Run at your own risk. There
may be bugs, and documentation is not yet finished or wrong. We feel this
release is stable for production use, as we use it on <A HREF="http://slashcode.com/">http://slashcode.com/</A>,
but it may have more problems than one would expect from a final release.</P>
<P>
<HR>
<H1><A NAME="description">DESCRIPTION</A></H1>
<P>Slash -- Slashdot Like Automated Storytelling Homepage -- is the code
that runs Slashdot. More than that, however, Slash is an architecture
Expand All @@ -49,10 +41,10 @@ <H1><A NAME="description">DESCRIPTION</A></H1>
<P>Through a plugin system, developers can add functionality to Slash.
Through themes and templates (which are written using Template Toolkit),
the look and feel of a Slash site can be customized.</P>
<P>See <EM>INSTALL</EM> for information about installing Slash, including hardware
<P>See <EM>INSTALL</EM> for information about <STRONG>installing</STRONG> Slash, including hardware
and software requirements. Read that document carefully, and follow the
instructions as precisely as possible.</P>
<P>Also see <EM>INSTALL</EM> for information on upgrading from previous versions
<P>Also see <EM>INSTALL</EM> for information on <STRONG>upgrading</STRONG> from previous versions
of Slash.</P>
<P>As noted in the FAQ, please send any bug reports, and subscribe to
mailing lists, at Slash's SourceForge site.</P>
Expand Down
6 changes: 2 additions & 4 deletions plugins/Search/templates/commentsearch;search;default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ each of the last 30,000 or so comments posted. Older comments
are removed and currently only visible as static HTML.<P>
[% IF comments %]
[% x = start ? start : 1 %]
[% FOREACH comment=comments;
# hm. don't point to PID (pid=[% comment.4 %]#[% comment.10 %]),
# too problematic. use cid=[% comment.10 %] instead. %]
[% user_email = Slash.db.getUser(comment.9, ['fakeemail', 'nickname']) %]
[% FOREACH comment=comments %]
[% user_email = Slash.db.getUser(comment.9, ['fakeemail', 'nickname']) %]
<BR><B>[% x %]</B>

<A HREF="[% constants.rootdir %]/comments.pl?sid=[% comment.1 %]&cid=[% comment.10 %]">[% comment.5 %]</A>
Expand Down
4 changes: 2 additions & 2 deletions themes/slashcode/sql/mysql/datadump.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ INSERT INTO sections (section, artcount, title, qid, isolate, issue, extras) VAL
# Dumping data for table 'stories'
#

INSERT INTO stories (sid, tid, uid, commentcount, title, dept, time, introtext, bodytext, writestatus, hits, section, displaystatus, commentstatus, hitparade, relatedtext, extratext) VALUES ('00/01/25/1236215','slash',2,0,'Now What?','where-do-you-go-from-here','2000-01-25 08:32:02','You should play around with the admin stuff. Configure things to\r\nyour tastes. You should also edit the slashdotrc.pl to define things like your websites name and slogan. You should also donate some money to the <A href=http://www.fsf.org>FSF</A> and <A href=http://slashdot.org>Read Slashdot</A>.\r\n','',1,0,'articles',0,0,'0,0,0,0,0,0,0','<LI><A href=http://www.fsf.org>FSF</A></LI>\n<LI><A href=http://slashdot.org>Read Slashdot</A></LI>\n<LI><A HREF=\"//www.example.com/search.pl?topic=slash\">More on Slash</A></LI>\r\n<LI><A HREF=\"//www.example.com/search.pl?author=God\">Also by God</A></LI>',NULL);
INSERT INTO stories (sid, tid, uid, commentcount, title, dept, time, introtext, bodytext, writestatus, hits, section, displaystatus, commentstatus, hitparade, relatedtext, extratext) VALUES ('00/01/25/1430236','slash',2,1,'You\'ve Installed Slash!','congratulations-dude','2000-08-28 20:47:46','So it took some doing, but it looks like you\'ve got Slash installed and ready to rock. You can now login using <A href=/admin.pl>backSlash</A>, the Slash Code Administration tool. The default account is God and whatever password you set during the install. And you might wanna start posting some stories too.','',0,0,'articles',0,0,'1,1,1,0,0,0,0','<LI><A href=/admin.pl>backSlash</A></LI>\n<LI><A HREF=\"//www.example.com/search.pl?topic=slash\">More on Slash</A></LI>\r\n<LI><A HREF=\"//www.example.com/search.pl?author=God\">Also by God</A></LI>',NULL);
INSERT INTO stories (sid, tid, uid, commentcount, title, dept, time, introtext, bodytext, writestatus, hits, section, displaystatus, commentstatus, hitparade, relatedtext, extratext) VALUES ('00/01/25/1236215','slash',2,0,'Now What?','where-do-you-go-from-here','2000-01-25 08:32:02','You should play around with the admin stuff. Configure things to\r\nyour tastes. You should also edit the variables (in the admin menu) to define things like your websites name and slogan. You should also donate some money to the <A href=http://www.fsf.org>FSF</A> and <A href=http://slashdot.org>Read Slashdot</A>.\r\n','',1,0,'articles',0,0,'0,0,0,0,0,0,0','<LI><A href=http://www.fsf.org>FSF</A></LI>\n<LI><A href=http://slashdot.org>Read Slashdot</A></LI>\n<LI><A HREF=\"//www.example.com/search.pl?topic=slash\">More on Slash</A></LI>\r\n<LI><A HREF=\"//www.example.com/search.pl?author=God\">Also by God</A></LI>',NULL);
INSERT INTO stories (sid, tid, uid, commentcount, title, dept, time, introtext, bodytext, writestatus, hits, section, displaystatus, commentstatus, hitparade, relatedtext, extratext) VALUES ('00/01/25/1430236','slash',2,1,'You\'ve Installed Slash!','congratulations-dude','2000-08-28 20:47:46','So it took some doing (hopefully not too much), and it looks like you\'ve got Slash installed and ready to rock. You can now use <A href="/admin.pl">backSlash</A>, the Slash Code Administration tool, if you are logged in as the admin user you set up during installation. And you might wanna start posting some stories too.','',0,0,'articles',0,0,'1,1,1,0,0,0,0','<LI><A href=/admin.pl>backSlash</A></LI>\n<LI><A HREF=\"//www.example.com/search.pl?topic=slash\">More on Slash</A></LI>\r\n<LI><A HREF=\"//www.example.com/search.pl?author=God\">Also by God</A></LI>',NULL);

#
# Dumping data for table 'storiestuff'
Expand Down
2 changes: 1 addition & 1 deletion themes/slashcode/templates/errors;comments;default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ __template__

# LOGIN ERROR.
CASE "login error" %]
<P><B>Login for "[% form.nickname %]" has failed</B>. Please try again. [% form.op %]<BR><P>
<P><B>Login for "[% form.unickname %]" has failed</B>. Please try again. [% form.op %]<BR><P>
[%

# NO ANONYMOUS POSTING.
Expand Down
2 changes: 2 additions & 0 deletions utils/slash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ case "$1" in
su - $USERNAME "-c 'TZ=GMT $SLASHD $SERVER_NAME'" &
elif [ "$OS" = "Linux" ] ; then
su - $USERNAME -c "TZ=GMT $SLASHD $SERVER_NAME" &
else
su - $USERNAME -c "TZ=GMT $SLASHD $SERVER_NAME" &
fi
echo $! > $RUNNING_PID/slashd.$SERVER_NAME.pid
echo "ok PID = $! "
Expand Down

0 comments on commit b8b6419

Please sign in to comment.