From c8e0a4a33a54a770ba9a71524438cd321cd64937 Mon Sep 17 00:00:00 2001 From: Tim Bishop Date: Thu, 12 Jan 2012 16:14:40 +0000 Subject: [PATCH] Various website updates. Add links to new Git repositories. Removed mention of Laroona. That never happened. Add section on contributing. Various minor tweaks. --- www/contributing.xhtml | 51 +++++++++++++++++++++++++ www/cvs.xhtml | 12 ++++-- www/git.xhtml | 83 +++++++++++++++++++++++++++++++++++++++++ www/index.xhtml | 31 ++++++--------- www/laroona/index.xhtml | 64 ------------------------------- www/mailinglists.xhtml | 23 ++++++------ www/menu-static.inc | 5 ++- www/menu.inc | 5 ++- www/who.xhtml | 6 +-- 9 files changed, 175 insertions(+), 105 deletions(-) create mode 100644 www/contributing.xhtml create mode 100644 www/git.xhtml delete mode 100644 www/laroona/index.xhtml diff --git a/www/contributing.xhtml b/www/contributing.xhtml new file mode 100644 index 0000000..672bd11 --- /dev/null +++ b/www/contributing.xhtml @@ -0,0 +1,51 @@ + + + + Contributing to i-scream projects + + + + +
+
+ +
+

+ Contributing to i-scream projects +

+

+ We welcome contributions to our code so that everyone + can benefit from your changes. To make life easier we + have a few simple suggestions on how to go about doing + it. Please submit changes using one of the two methods + below. +

+

+ GitHub Pull Request +

+

+ If you've got changes for one of our active projects then + it'll almost certainly be available on our + GitHub page. If + you're familiar with Git the best way to send changes is + to fork our project on GitHub, commit your changes to your + copy, and then initiate a pull request. +

+

+ If you're a Git user but don't want to use GitHub, just + use Git to generate a patch and we'll merge it by hand. +

+

+ Unified Diff +

+

+ If you don't use Git at all you can send us your patches + as a plain text unified diff. We'll merge it by hand. +

+
+ +
+ +
+ + diff --git a/www/cvs.xhtml b/www/cvs.xhtml index 1797d68..64fd6d4 100644 --- a/www/cvs.xhtml +++ b/www/cvs.xhtml @@ -1,7 +1,7 @@ - i-scream cvs repository + i-scream CVS Repository @@ -14,13 +14,17 @@ i-scream CVS Repository

- The i-scream CVS Repository contains all code, + The i-scream CVS Repository contains code, documentation, and other files pertaining to all i-scream projects.

+

+ All new code with be found in our + Git repositories. +

All code available in the CVS Repository is - licensed under the GPL. + licensed under the GPL.

Web Access @@ -51,7 +55,7 @@

Anyone can access the i-scream CVS repository in anonymous - mode read-only mode. The following commands will allow you + read-only mode. The following commands will allow you to check out a portion of the CVS repository. To see what is available it is recommended that you first look at the web frontend. diff --git a/www/git.xhtml b/www/git.xhtml new file mode 100644 index 0000000..c4fb7e4 --- /dev/null +++ b/www/git.xhtml @@ -0,0 +1,83 @@ + + + + i-scream Git Repositories + + + + +

+
+ +
+

+ i-scream Git Repositories +

+

+ The i-scream Git repositories contain the currently + developed source code. All historic source code can be + found in CVS. +

+

+ All code available in the Git repositories is + licensed under the GPL. +

+

+ Web Access +

+

+ We use GitWeb to provide a visual frontend to the Git + repositories. It allows you to browse around each repository, + viewing any version of a file, and the differences between + different versions. There is also a link to download the + latest version of any section. +

+

+ http://git.i-scream.org/ +

+

+ Anonymous Git Access (read-only) +

+

+ Anyone can access the i-scream Git repositories in anonymous + read-only mode. The following commands will both allow you + to check out the libstatgrab repository. To see what other + repositories are available you can look at the web frontend. + Choose whichever protocol you prefer. +

+ 
+git clone http://git.i-scream.org/libstatgrab
+git clone git://git.i-scream.org/libstatgrab
+
+

+ Developer CVS Access (write) +

+

+ The i-scream development team have write access to the + required Git repositories. This is only available over SSH on + a non-standard port. You will need to have a SSH key + installed on the server first. Then just clone and push + using ssh. +

+ 
+git clone ssh://git@git.i-scream.org/libstatgrab
+
+

+ GitHub Mirror +

+

+ Our Git repositories are mirrored on GitHub. The master + repository that we'll push commits to is located here, but + we provide the GitHub mirrors to make it easier for you to + make changes and work with our code. +

+

+ http://github.com/i-scream +

+
+ +
+ +
+ + diff --git a/www/index.xhtml b/www/index.xhtml index fc10f74..5a2e21f 100644 --- a/www/index.xhtml +++ b/www/index.xhtml @@ -33,6 +33,17 @@

News

+

+ Thursday 12 January 2012 +

+

+ Source code moved to Git +

+

+ We've moved both libstatgrab and pystatgrab to their + own Git repositories. CVS will remain for everything + else for now. +

Sunday 21 February 2010

@@ -117,20 +128,6 @@ those of libstatgrab, and returns data in structures that logically map on to those of libstatgrab.

-

- Laroona -

- -

- Laroona is the new central monitoring system. It's still - very much in the early stages of development, and doesn't - have any code available for download yet. Look at the - project page for more on the development process. -

CMS - Central Monitoring System

@@ -145,11 +142,7 @@ have other related projects, as well as the CMS.

- The CMS is no longer being developed. We are now putting - our time into a new project redeveloping the CMS. We're - taking the good ideas from the old CMS, improving some of - the weaknesses, and we'll hopefully produce are far - superior product. + The CMS is no longer being developed.

About diff --git a/www/laroona/index.xhtml b/www/laroona/index.xhtml deleted file mode 100644 index c8a97dc..0000000 --- a/www/laroona/index.xhtml +++ /dev/null @@ -1,64 +0,0 @@ - - - - i-scream Laroona homepage - - - - -
-
- -
-

- i-scream Laroona homepage -

-
- -
- -

- News -

-

- Sunday 21 March 2004 -

-

- Laroona project page created. -

-

- What is Laroona? -

-

- Laroona is a rewrite of the CMS. -

-

- Development -

- -

- Laroona is currently in the early stages of development. - Much of our development work is being done on the i-scream - Wiki. -

-
- -
- -
- - diff --git a/www/mailinglists.xhtml b/www/mailinglists.xhtml index bfc6dd0..b717cbd 100644 --- a/www/mailinglists.xhtml +++ b/www/mailinglists.xhtml @@ -37,9 +37,10 @@ http://lists.i-scream.org/mailman/listinfo/commits
State: Open for subscription, but no posts should be sent here.
- Purpose: Daily commit logs from the i-scream CVS - repository are sent to this list. If you wish to keep up on - development, join this list. + Purpose: Emails are sent to this list whenever a + commit happens to the i-scream Git or CVS repositories. If + you want to be informed about commits as they happen, join + this list.

cvs-all@i-scream.org @@ -47,12 +48,9 @@

Information: http://lists.i-scream.org/mailman/listinfo/cvs-all
- State: Open for subscription, but no posts should be - sent here.
- Purpose: Emails are sent to this list whenever a - commit happens to the i-scream cvs repository. If you want - to be informed about commits as they happen, join this - list. + State: Retired.
+ Purpose: This list contained CVS commit emails, but + this has now been merged with the commits list above.

users@i-scream.org @@ -87,10 +85,11 @@

All lists are scanned using - MailScanner to + ClamAV and + SpamAssassin to remove viruses before they get sent out to list members. - We also use MailScanner to tag spam messages accordingly, - and ensure that such messages are moderated. + We also tag spam messages accordingly, and ensure that such + messages are moderated.

diff --git a/www/menu-static.inc b/www/menu-static.inc index dcbcd5d..6b8a939 100644 --- a/www/menu-static.inc +++ b/www/menu-static.inc @@ -15,7 +15,6 @@ +