diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
| commit | a9db7d10b6e4e86fb2b87a4161db3b1f202002fd (patch) | |
| tree | 4a22481ab65447d8bc1cc307a76a884a7e7bbee9 /gnu/packages/gsasl.scm | |
| parent | e33d9d6f09874f83bb5a03f49cb969a84588e10e (diff) | |
| parent | 2b6bdf7eb3c95716ac107ea6caea2e0b7077ae77 (diff) | |
| download | patches-a9db7d10b6e4e86fb2b87a4161db3b1f202002fd.tar patches-a9db7d10b6e4e86fb2b87a4161db3b1f202002fd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
gnu/packages/autotools.scm
gnu/packages/guile.scm
gnu/packages/python.scm
gnu/packages/shishi.scm
guix/gnu-maintenance.scm
guix/scripts/build.scm
guix/scripts/gc.scm
guix/scripts/package.scm
guix/scripts/substitute-binary.scm
guix/ui.scm
nix/nix-daemon/guix-daemon.cc
test-env.in
tests/nar.scm
tests/store.scm
Diffstat (limited to 'gnu/packages/gsasl.scm')
| -rw-r--r-- | gnu/packages/gsasl.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 832ae0c2ff..fb5712a7b0 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -61,7 +61,7 @@ ("shishi" ,shishi) ("zlib" ,guix:zlib) )) - (synopsis "GNU GSS (Generic Security Service), a free implementatio of RFC 2743/2744") + (synopsis "Generic Security Service library") (description "GNU GSS is an implementation of the Generic Security Service Application Program Interface (GSS-API). GSS-API is used by network servers to provide @@ -87,7 +87,7 @@ SMTP/IMAP servers. GSS consists of a library and a manual.") ("gss" ,gss) ("zlib" ,guix:zlib) )) - (synopsis "GNU SASL, an implementation of the Simple Authentication and Security Layer framework") + (synopsis "Simple Authentication and Security Layer library") (description "GNU SASL is an implementation of the Simple Authentication and Security Layer framework and a few common SASL mechanisms. SASL is used by network |