Commit Graph

275 Commits

Author SHA1 Message Date
Luca Bruno
5dfb469faf doc: document .overrideDerivation 2015-07-30 17:56:39 +02:00
Domen Kožar
8ac9c708b9 Merge pull request #8703 from Profpatsch/python-docs
language-support python: propagatedBuildInputs
2015-07-20 10:47:16 +01:00
Matthias Beyer
15be920354 doc: gnu hello is much simpler than cpio
This patch changes the documentation about simple packages. cpio was
listed as simplest possible package, which is not true anymore, gnu
hello is much simpler.
2015-07-17 17:00:20 +02:00
Cillian de Róiste
8a1a97c35c Move the submitting-changes down, after coding conventions 2015-07-12 13:35:56 +02:00
Cillian de Róiste
3a0707f0c7 Move the details from CONTRIBUTING.md to the manual #8734 2015-07-12 13:33:55 +02:00
Profpatsch
b30cab15ea language support python docs wrong statement
Remove wrong line about propagatedBuildInputs.
2015-07-12 13:07:39 +02:00
Pascal Wittmann
cdd999baee doc: document dontMoveSbin variable 2015-07-09 12:43:34 +02:00
Profpatsch
ef5d158e83 language-support python: propagatedBuildInputs
Explain difference between buildInputs and propagatedBuildInputs.
Shamefully steal wording from Perl.
2015-07-08 14:21:51 +02:00
Kosyrev Serge
5fee7af3ba ghc: add haskell.compiler.ghcNokinds, for Richard Eisenberg's 'nokinds' branch 2015-07-06 11:09:28 +03:00
Luca Bruno
e7d81a371b doc: make it clear the Contributing section is for the docs 2015-06-30 12:25:55 +02:00
Luca Bruno
e06f494a81 doc: document lib.makeOverridable 2015-06-30 12:19:49 +02:00
Luca Bruno
01ce5ce050 doc: document .override 2015-06-30 11:26:27 +02:00
Luca Bruno
36cd08e374 nixpkgs-manual: fix callouts 2015-06-30 11:04:46 +02:00
Edward Tjörnhammar
c45b5aba92 Document the different license base cases 2015-06-28 12:42:43 +02:00
Luca Bruno
7f5f9072ad all-packages.nix: Add pkgs.overridePackages 2015-06-26 15:08:11 +02:00
Damien Cassou
8297a9eef9 Change where window managers should be
This patch reflects current practice.

Fixes issue #8364.
2015-06-18 10:44:27 +02:00
Peter Simons
fdc1887a6e doc: add user's guide for the Haskell infrastructure
Resolves https://github.com/NixOS/nixpkgs/issues/4941.
2015-06-05 00:14:58 +02:00
Eelco Dolstra
07b212b09d Strip indentation from programlistings 2015-06-03 17:05:14 +02:00
Eelco Dolstra
35ff30c73f Streamline contributing section 2015-06-03 17:05:10 +02:00
Pascal Wittmann
9c983ade4d doc: fix references 2015-06-02 11:22:19 +02:00
Pascal Wittmann
53b5d946e1 doc: add section ids
This commit also use enforces consistent use of the prefixes "sec" for
section and "ssec" for subsection.
2015-05-31 18:41:34 +02:00
Allen Nelson
d2cbcc68be added documentation for makeWrapperArgs 2015-05-24 22:22:20 -05:00
Arseniy Seroka
4e838ed303 Merge pull request #6539 from jagajaga/documentation
add information about git-based pkgs
2015-05-21 19:57:53 +03:00
Luca Bruno
d511369fcc go: document disabled flag 2015-05-18 12:55:02 +02:00
Edward Tjörnhammar
2bf516613d Add section on fetching sources 2015-05-15 14:10:01 +02:00
Luca Bruno
58b865cfc6 go: remove renameImports and use goPackageAliases 2015-05-15 11:16:59 +02:00
Linus Arver
62ad22b8ae doc: language-support: fix typo 2015-05-10 15:28:58 -07:00
Vladimír Čunát
75ebc3cf1d doc/stdenv: fix manual build after #7711 2015-05-09 14:58:40 +02:00
Ryan Scheel (Havvy)
0b94774479 Docs: non-empty value -> true 2015-05-05 20:12:37 +00:00
Ryan Scheel
df7b5b4ecb Doc dontDisableStatic variable to configure stage 2015-05-05 20:08:02 +00:00
Sebastian Jordan
018062529a Reduce verbosity of packageOverride docs further 2015-04-23 17:11:38 +02:00
Sebastian Jordan
20dadec264 Reduce verbosity of packageOverrides description. 2015-04-23 17:11:38 +02:00
Sebastian Jordan
8a78dcc00f Document about packageOverrides 2015-04-23 17:11:38 +02:00
Luca Bruno
18a6f52bc9 manual: Document buildFlags of buildGoPackage 2015-04-17 10:13:30 +02:00
Luca Bruno
5b538a6dd1 manual: Document buildGoPackage renameImports 2015-04-16 19:02:50 +02:00
Christian Theune
86d82df72b Update the ruby packaging docs to show how to bundle Ruby Gem-based
applications using bundix.

Fixes #5985
2015-03-31 19:04:42 +02:00
Arseniy Seroka
83434becf0 add information about git-based pkgs 2015-02-23 23:55:15 +03:00
Domen Kožar
934f97281f doc: fix programlistin formatting 2015-02-15 18:29:52 +01:00
Domen Kožar
ef8aaa5571 fixes #5394 2015-02-15 18:22:26 +01:00
Emery Hemingway
faa5dccab8 new Go support function 'buildGoPackage'
add a setupHook to the Go compiler that builds a GOPATH
new buildGoPackage function that overides the phases of stdenv
2015-02-03 14:21:48 +01:00
Domen Kožar
35fa59f9ca garden 2015-01-26 12:12:14 +01:00
Domen Kožar
8408136da7 brevity of nixpkgs configuration documentation 2015-01-25 21:26:05 +01:00
Matthias Beyer
9a6d6155c2 Added paragraph about where to find licenses 2015-01-25 21:19:07 +01:00
Matthias Beyer
266a5128c3 Fixup white-/blacklisting examples to actually use real licenses 2015-01-25 21:19:07 +01:00
Matthias Beyer
f6b1d82836 Add paragraph about Nix vs. NixOS 2015-01-25 21:19:07 +01:00
Matthias Beyer
9bb80ffa2c Add documentation for nixpkgs.config settings (allowUnfree, allowUnfreePredicate, whitelistedLicenses, blacklistedLicenses) 2015-01-25 21:19:07 +01:00
Charles Strahan
dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Daniel Peebles
f458b6d05c Fix copy&paste typo 2015-01-18 14:57:04 -05:00
Charles Strahan
145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Robert Helgesson
8178fd285f Fix minor typo. 2014-12-19 16:30:45 +01:00
Domen Kožar
860035646d typos 2014-11-15 20:23:32 +01:00
Domen Kožar
e5eb8354d4 remove unused doc/quote-literals.xsl 2014-11-15 20:23:26 +01:00
Domen Kožar
07b6d3d2c6 Initial documentation for Python packaging. Feedback welcome.
cc @chaoflow @offlinehacker @garbas @goodwillcoding @brodul
@cillianderoiste @matejc

Fixes #64
2014-11-13 21:31:27 +01:00
Charles Strahan
6e6ac35024 more rubyLibs renaming 2014-11-12 22:32:32 +00:00
Domen Kožar
cac40ad982 doc/contributing.xml: remove lies 2014-11-08 21:56:23 +01:00
Michael Raskin
eecd29dff6 Document meta.branch 2014-10-07 16:23:27 +04:00
Eelco Dolstra
4b072cfe08 Nixpkgs manual: Mention xz support
Issue #4393.
2014-10-07 00:22:10 +02:00
Vincent Laporte
a65767a0b4 nixpkgs manual: packaging coq libraries 2014-09-28 22:02:36 +01:00
wyvie
164e68c7d3 Added description to languages-support.xml 2014-09-23 13:56:45 +02:00
Domen Kožar
5247c11b4a manual: mention go2nix 2014-09-16 20:40:37 +02:00
Domen Kožar
aa162b388d package gim-nix and document it 2014-09-12 00:26:51 +02:00
Domen Kožar
b420eeba44 remove bittorrent package since it's obsolete 2014-09-05 22:49:31 +02:00
Michael Raskin
e39b1f4ec8 Add a few meta-attribute descriptions; rewrite the meta-attribure list description to mean that it is expected that all used meta-attributes are described in the manual. 2014-09-03 02:10:00 +04:00
Jaka Kranjc
de258456d8 meta.xml: fixed small omission 2014-08-24 16:36:46 +02:00
Eelco Dolstra
438b9c543d Nixpkgs manual: Add a Nix expression to build 2014-08-24 11:03:55 +02:00
Eelco Dolstra
14f48dd5c2 Nixpkgs manual: Drop author bla bla 2014-08-24 11:03:55 +02:00
Eelco Dolstra
76ac17d36b Nixpkgs manual: Fix validity 2014-08-24 11:03:55 +02:00
Vladimír Čunát
5cc2a142b0 doc/meta.xml: fix github links, clarify licensing section 2014-07-30 20:07:54 +02:00
Domen Kožar
64cd30518d doc: mention nix-prefetch-scripts package 2014-07-27 15:21:38 +02:00
Domen Kožar
380e8ad794 fix manual build 2014-07-27 15:21:27 +02:00
Domen Kožar
9471af0f8a doc: add section how to build the manual 2014-07-27 15:21:17 +02:00
Domen Kožar
6c219636da doc: remove obsolete step on quickstart 2014-07-27 14:58:31 +02:00
Domen Kožar
8590e39e01 doc: change one occurance of --xml to --json 2014-07-27 14:22:58 +02:00
Domen Kožar
e51dfc6bf6 doc: explain when hydra builds the package 2014-07-27 14:13:27 +02:00
Domen Kožar
cf5ec2f74b remove documentation on non-unfree licenses, nobody maintains it 2014-07-27 13:54:37 +02:00
Domen Kožar
e3319eb73d doc: modernize meta attributes documentation 2014-07-27 13:54:37 +02:00
Eelco Dolstra
2737291b5d Manual: html -> xhtml 2014-07-03 12:37:40 +02:00
Anders Claesson
1777724a33 Fix trivial spelling mistake in docs 2014-06-13 11:11:27 +01:00
Ramakrishnan Muthukrishnan
58b58903ba doc: quick-start.xml -- fix a typo in the link.
Chapter 2, gmp 5.1.1.nix url and filename has changed in the repo
to 5.1.x.nix.
2014-04-14 11:42:01 +05:30
Ramakrishnan Muthukrishnan
13137dbb46 doc: meta.xml -- fix a typo 2014-04-14 11:29:36 +05:30
Vladimír Čunát
1f6a15d7de Merge #1901: add preFixupPhases to stdenv; for gsettings
Without this stdenv change it seems difficult to fix some glib's gsettings issues,
as the folders in question may (not) be created in installPhase.
2014-04-02 19:06:41 +02:00
Domen Kožar
5d9040ee6b Merge pull request #1815 from vcunat/p/doc-package-naming
doc: document current conventions on package naming
2014-03-04 23:41:35 +01:00
Domen Kožar
1f822d3b5f fix tarball 2014-02-28 23:22:20 +01:00
Domen Kožar
0e58538fa8 doc: gstreamer setup-hook 2014-02-28 02:02:27 +01:00
Domen Kožar
5726600c04 doc: gdk-pixbuf setup-hook 2014-02-28 01:40:21 +01:00
Vladimír Čunát
1efb6e65d2 doc: document current conventions on package naming
Mostly: encourage using dashes instead of underscores.
2014-02-23 08:00:59 +01:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Eelco Dolstra
e060d9a2ff Remove obsolete file 2014-02-05 19:18:33 +01:00
Eelco Dolstra
cf4acab567 manual: Document Java support 2014-01-13 13:15:59 +01:00
Eelco Dolstra
5d6259a973 Add a setup hook that automatically sets up $CLASSPATH
All JARs in $pkg/share/java (for each $pkg in the build inputs) are
added to $CLASSPATH.  Thus, you can say

  buildInputs = [ setJavaClassPath someJavaDependency ];

and the JARs in someJavaDependency will be found automatically by
tools like javac or ant.

Note that the manual used to say that JARs should be installed in
lib/java; this is now share/java, following the Debian policy:

  http://www.debian.org/doc/packaging-manuals/java-policy/x110.html

The directory share/java makes more sense because JARs are
architecture-independent.  (Also, a quick grep shows that we were not
exactly consistent about this in Nixpkgs.)
2014-01-06 14:36:14 +01:00
Rob Vermaas
5aa6c546dc Clarify a step from the quick start section. 2013-12-30 13:45:46 +01:00
Eelco Dolstra
a2cbc77e4f Only show/build a package on the platforms listed in meta.platforms
The function ‘mkDerivation’ now checks whether the current platform
type is included in a package's meta.platform field.  If not, it
throws an exception:

  $ nix-build -A linux --argstr system x86_64-darwin
  error: user-thrown exception: the package ‘linux-3.10.15’ is not supported on ‘x86_64-darwin’

These packages also no longer show up in ‘nix-env -qa’ output.  This
means, for instance, that the number of packages shown on
x86_64-freebsd has dropped from 9268 to 4764.

Since meta.platforms was also used to prevent Hydra from building some
packages, there now is a new attribute meta.hydraPlatforms listing the
platforms on which Hydra should build the package (which defaults to
meta.platforms).
2013-11-05 00:06:10 +01:00
Eelco Dolstra
754704ea18 Allow packages to be marked as "broken" by setting meta.broken
The effect is that they won't show up in "nix-env -qa" anymore.
2013-11-04 21:11:00 +01:00
Eelco Dolstra
041da5a6f9 Unify the Nixpkgs and NixOS version numbers 2013-10-10 13:28:22 +02:00
Eelco Dolstra
1ca98d7c09 Move some old docs 2013-10-01 10:53:21 +02:00
Eelco Dolstra
8a182718ca splashutils: Remove 2013-09-26 18:03:43 +02:00
Chris Van Vranken
e5b89fc601 Fix broken links 2013-09-25 19:53:47 -04:00
Ivan Kozik
1866619acc Fix a few typos 2013-08-11 10:55:53 +00:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Eelco Dolstra
629daa2102 Rewrite the CPAN generator to Perl
Also:

- It's now installable by doing "nix-env -i nix-generate-from-cpan".

- It maps dependencies to the correct attribute (e.g. HTML::HeadParser
  is mapped to HTMLParser).

- It automatically selects buildPerlPackage or buildPerlModule.

- It's documented in the manual.
2013-06-13 15:56:23 +02:00
Domen Kozar
9986457331 add dontBuild docs 2013-05-05 10:50:07 +02:00
Eelco Dolstra
cd5755845f Lots of Perl package updates 2013-01-19 00:02:51 +01:00
Eelco Dolstra
8165e2ddb0 Document that Java packages should install JARs in $out/lib/java 2012-11-08 16:31:08 +01:00
Eelco Dolstra
18c4b2180f Fix link 2012-10-18 10:10:49 -04:00
Rob Vermaas
b3c63a98f0 Remove all svn references 2012-09-04 16:14:01 +02:00
Eelco Dolstra
6a1d4504ad Fix duplicate ID 2012-06-25 11:24:05 -04:00
Eelco Dolstra
6ed8a76ac6 * Nixpkgs 0.14 release notes.
svn path=/nixpkgs/trunk/; revision=34333
2012-06-04 03:24:14 +00:00
Eelco Dolstra
09ab016c6c * Sync CSS with the Nix manual.
svn path=/nixpkgs/trunk/; revision=34062
2012-05-11 21:42:00 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Peter Simons
1abdc56a12 Synchronized stdenv-updates branch with trunk.
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
2011-10-06 09:37:22 +00:00
Yury G. Kudryashov
fa500dca25 Fix typo in release-notes
svn path=/nixpkgs/trunk/; revision=29558
2011-10-02 09:24:23 +00:00
Shea Levy
01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Nicolas Pierron
b14e107495 Doc: Fix location of thunderbird (2.x -> 3.x) expression.
svn path=/nixpkgs/trunk/; revision=28851
2011-08-27 15:29:18 +00:00
Shea Levy
4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Shea Levy
1eb378d0c4 Document substituteAllInPlace
svn path=/nixpkgs/branches/stdenv-updates/; revision=27994
2011-07-28 20:33:20 +00:00
Eelco Dolstra
7021e6ed6e * Typo (reported by Federico D. Sacerdoti).
svn path=/nixpkgs/trunk/; revision=27112
2011-05-03 08:51:02 +00:00
Shea Levy
f143784ae1 The configurePhase runs ./configure, not the unpackPhase
svn path=/nixpkgs/trunk/; revision=26655
2011-04-01 12:26:46 +00:00
Eelco Dolstra
e7906f26af * Make copy-tarballs.sh work on release.nix.
svn path=/nixpkgs/trunk/; revision=19834
2010-02-05 14:14:43 +00:00
Eelco Dolstra
a4984bd100 svn path=/nixpkgs/trunk/; revision=19664 2010-01-26 11:02:43 +00:00
Eelco Dolstra
84cfb9173e svn path=/nixpkgs/trunk/; revision=19663 2010-01-26 11:02:25 +00:00
Eelco Dolstra
1da5799ce4 * Release notes for Nixpkgs 0.13.
svn path=/nixpkgs/trunk/; revision=19518
2010-01-18 13:10:01 +00:00
Eelco Dolstra
35257ada4e * Updated gtk+, glib, pango.
svn path=/nixpkgs/trunk/; revision=19388
2010-01-13 12:11:06 +00:00
Eelco Dolstra
084a067288 * Added X11::GUITest.
svn path=/nixpkgs/trunk/; revision=19245
2010-01-05 22:48:22 +00:00
Eelco Dolstra
eb9ff07031 * Package naming / versioning guidelines.
svn path=/nixpkgs/trunk/; revision=18433
2009-11-18 15:05:09 +00:00
Eelco Dolstra
bab04acc3a svn path=/nixpkgs/trunk/; revision=18420 2009-11-18 13:58:59 +00:00
Eelco Dolstra
063f44d23c * Move classification.txt to the manual.
svn path=/nixpkgs/trunk/; revision=18419
2009-11-18 13:54:20 +00:00
Eelco Dolstra
e4d5933e0a * "with args" considered harmful.
svn path=/nixpkgs/trunk/; revision=18404
2009-11-18 10:52:37 +00:00
Eelco Dolstra
3f82d6c069 svn path=/nixpkgs/branches/xorg-7.5/; revision=18032 2009-10-29 15:28:43 +00:00
Eelco Dolstra
1024251d75 svn path=/nixpkgs/branches/xorg-7.5/; revision=18028 2009-10-29 14:20:11 +00:00
Eelco Dolstra
9301524c50 * Fontconfig updated to 2.7.3. Use /etc/fonts as the default
configuration directory so that users on other distributions don't
  need to set $FONTCONFIG_FILE (NIXPKGS-29).  Also use
  /var/cache/fontconfig for the cache to prevent programs run by root
  from writing into the Nix store.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18021
2009-10-29 13:22:43 +00:00
Eelco Dolstra
4ec02700e3 * Typo.
svn path=/nixpkgs/trunk/; revision=17986
2009-10-28 12:07:35 +00:00
Eelco Dolstra
bfb4a0ccc8 * Moved the coding conventions from maintainers/docs to the Nixpkgs
manual.
* Removed some out-dated files from maintainers/docs.

svn path=/nixpkgs/trunk/; revision=17419
2009-09-25 14:27:26 +00:00
Eelco Dolstra
24da0cbad8 svn path=/nixpkgs/trunk/; revision=17416 2009-09-25 11:15:50 +00:00
Eelco Dolstra
c76f009dd9 svn path=/nixpkgs/trunk/; revision=16867 2009-08-26 16:55:07 +00:00
Eelco Dolstra
fd83f192d4 * Fixed some links.
svn path=/nixpkgs/trunk/; revision=16865
2009-08-26 16:52:02 +00:00
Eelco Dolstra
d877e7b40f * Build a PDF of the manual.
svn path=/nixpkgs/trunk/; revision=16316
2009-07-10 13:41:47 +00:00
Eelco Dolstra
5615f4d646 svn path=/nixpkgs/trunk/; revision=16257 2009-07-08 16:08:29 +00:00
Ludovic Courtès
c6e65bd1c6 doc: Mention `buildPythonPackage'.
svn path=/nixpkgs/trunk/; revision=15718
2009-05-25 00:10:20 +00:00
Eelco Dolstra
c718ec217b * X.org generator: specify overrides in a Nix expression rather than
in the generator script.  This makes it easier to change the X.org
  packages.
* Added xfs, twm.

svn path=/nixpkgs/trunk/; revision=15375
2009-04-28 13:58:35 +00:00
Eelco Dolstra
72f7747c68 svn path=/nixpkgs/trunk/; revision=15290 2009-04-24 20:51:51 +00:00
Eelco Dolstra
2c2f0d913c * Release notes.
svn path=/nixpkgs/trunk/; revision=15279
2009-04-23 15:02:09 +00:00
Eelco Dolstra
01f309e2d4 * Document the X.org generator.
svn path=/nixpkgs/trunk/; revision=15189
2009-04-20 16:00:40 +00:00
Eelco Dolstra
c61c9dc35b * Drop the "perl" prefix from Perl attribute names. It's redundant
now that Perl packages are in their own namespace
  (perlPackages.<pkg>).

svn path=/nixpkgs/trunk/; revision=15176
2009-04-20 12:49:35 +00:00
Eelco Dolstra
dd2e74e02b * Updated the Perl section of the manual.
svn path=/nixpkgs/trunk/; revision=15173
2009-04-20 12:23:01 +00:00
Eelco Dolstra
034248f57a * Document the generic Perl builder.
svn path=/nixpkgs/trunk/; revision=15124
2009-04-18 11:09:24 +00:00
Eelco Dolstra
94b0227aad svn path=/nixpkgs/trunk/; revision=14311 2009-03-03 13:47:46 +00:00
Eelco Dolstra
79d3e0926d * Started documenting the meta attributes, including a first
(very incomplete) attempt at standardising the license attribute.

svn path=/nixpkgs/trunk/; revision=14028
2009-02-10 23:29:42 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Eelco Dolstra
960fe643b8 * Stdenv functions.
svn path=/nixpkgs/trunk/; revision=12806
2008-09-05 11:23:49 +00:00