summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2011-01-05 16:02:00 +0000
committerChristopher Faylor <me@cgf.cx>2011-01-05 16:02:00 +0000
commit969dd6dff9aae290ad5c64f9a0e4c07439d37586 (patch)
treeb3753ce641e411e415665ebe03d7ce7b3e8d0a7f
parente7c3f7aa6eb61ec1d32f3dd24126ec6806e90b80 (diff)
downloadcygnal-969dd6dff9aae290ad5c64f9a0e4c07439d37586.tar.gz
cygnal-969dd6dff9aae290ad5c64f9a0e4c07439d37586.tar.bz2
cygnal-969dd6dff9aae290ad5c64f9a0e4c07439d37586.zip
* faq-setup.xml (faq.setup.cli): Correct description of -pubkey option
-rw-r--r--winsup/doc/ChangeLog4
-rw-r--r--winsup/doc/faq-setup.xml2
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index c067992e7..0de298783 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-05 Jon TURNEY <jon.turney@dronecode.org.uk>
+
+ * faq-setup.xml (faq.setup.cli): Correct description of -pubkey option
+
2010-10-18 Andy Koppe <andy.koppe@gmail.com>
* setup2.sgml (setup-locale-ov): Document CJK ambiguous width change
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index 5ca832a2f..4daa39b37 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -58,7 +58,7 @@ Command Line Options:
-D --download Download from internet
-d --no-desktop Disable creation of desktop shortcut
-h --help print help
- -K --pubkey Path to extra public key file (gpg format)
+ -K --pubkey URL of extra public key file (gpg format)
-L --local-install Install from local directory
-l --local-package-dir Local package directory
-n --no-shortcuts Disable creation of desktop and start menu