summaryrefslogtreecommitdiffstats
path: root/winsup
diff options
context:
space:
mode:
Diffstat (limited to 'winsup')
-rw-r--r--winsup/doc/ChangeLog4
-rw-r--r--winsup/doc/faq-setup.xml32
2 files changed, 24 insertions, 12 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 27cf8f1be..93790e5e4 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-15 Christopher Faylor <me+cygwin@cgf.cx>
+
+ * faq-setup.xml: Add missing setup options. Sort options.
+
2010-01-12 Corinna Vinschen <corinna@vinschen.de>
* cygwinenv.sgml (cygwinenv-implemented-options): Try to make
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index 40ebcf240..8de529e32 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -52,22 +52,30 @@ For other options, search the mailing lists with terms such as
when you run <literal>setup.exe --help</literal>. The current options are:
<screen>
Command Line Options:
+ -A --disable-buggy-antivirus Disable known or suspected buggy anti
+ virus software packages during execution.
+ -C --categories Specify entire categories to install
-D --download Download from internet
- -L --local-install Install from local directory
- -s --site Download site
- -R --root Root installation directory
- -q --quiet-mode Unattended setup mode
+ -d --no-desktop Disable creation of desktop shortcut
-h --help print help
+ -K --pubkey Path to extra public key file (gpg format)
+ -L --local-install Install from local directory
-l --local-package-dir Local package directory
- -r --no-replaceonreboot Disable replacing in-use files on next
- reboot.
- -n --no-shortcuts Disable creation of desktop and start
- menu shortcuts
+ -n --no-shortcuts Disable creation of desktop and start menu
+ shortcuts
-N --no-startmenu Disable creation of start menu shortcut
- -d --no-desktop Disable creation of desktop shortcut
- -A --disable-buggy-antivirus Disable known or suspected buggy anti
- virus software packages during
- execution.
+ -O --only-site Ignore all sites except for -s
+ -P --packages Specify packages to install
+ -p --proxy HTTP/FTP proxy (host:port)
+ -q --quiet-mode Unattended setup mode
+ -r --no-replaceonreboot Disable replacing in-use files on next
+ reboot.
+ -R --root Root installation directory
+ -S --sexpr-pubkey Extra public key in s-expr format
+ -s --site Download site
+ -U --keep-untrusted-keys Use untrusted keys and retain all
+ -u --untrusted-keys Use untrusted keys from last-extrakeys
+ -X --no-verify Don't verify setup.ini signatures
</screen>
</para>
</answer></qandaentry>