diff options
| author | Darshit Shah <darnir@gmail.com> | 2014-09-14 16:57:15 +0530 |
|---|---|---|
| committer | Darshit Shah <darnir@gmail.com> | 2014-09-14 16:57:15 +0530 |
| commit | af702340a1f3b462d0224968602c2b2974f218d6 (patch) | |
| tree | a1d352f6d30505ecc856d5b7561d4dc001b3a891 /doc | |
| parent | 6140b1b6e3831a35fd2cf4536fda741a4dcc9019 (diff) | |
| parent | f8e9a64ec7445d22f67f1817043d5807c4766556 (diff) | |
| download | wget-parallel-wget.tar.gz | |
Merge remote-tracking branch 'origin/master' into parallel-wgetparallel-wget
Conflicts:
src/http.c
testenv/Makefile.am
testenv/Test--https.py
testenv/Test--spider-r.py
testenv/Test-Content-disposition-2.py
testenv/Test-Content-disposition.py
testenv/Test-Head.py
testenv/Test-O.py
testenv/Test-Parallel-Proto.py
testenv/Test-Post.py
testenv/Test-Proto.py
testenv/Test-auth-basic-fail.py
testenv/Test-auth-basic.py
testenv/Test-auth-both.py
testenv/Test-auth-digest.py
testenv/Test-auth-no-challenge-url.py
testenv/Test-auth-no-challenge.py
testenv/Test-auth-retcode.py
testenv/Test-auth-with-content-disposition.py
testenv/Test-c-full.py
testenv/Test-cookie-401.py
testenv/Test-cookie-domain-mismatch.py
testenv/Test-cookie-expires.py
testenv/Test-cookie.py
testenv/conf/__init__.py
testenv/conf/authentication.py
testenv/conf/expect_header.py
testenv/conf/expected_files.py
testenv/conf/expected_ret_code.py
testenv/conf/files_crawled.py
testenv/conf/hook_sample.py
testenv/conf/local_files.py
testenv/conf/reject_header.py
testenv/conf/response.py
testenv/conf/send_header.py
testenv/conf/server_files.py
testenv/conf/urls.py
testenv/conf/wget_commands.py
testenv/misc/colour_terminal.py
testenv/server/http/http_server.py
testenv/test/base_test.py
testenv/test/http_test.py
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/wget.texi | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index f9967dad..d5e74961 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2014-08-03 Giuseppe Scrivano <gscrivano@gnu.org> + + * wget.texi (Download Options): Fix texinfo warning. + 2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com> * Makefile.am: Remove @VAR@ with $FOO. diff --git a/doc/wget.texi b/doc/wget.texi index c487e1e1..9c2459c8 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -956,7 +956,8 @@ Don't use proxies, even if the appropriate @code{*_proxy} environment variable is defined. @c man end -@xref{Proxies} for more information about the use of proxies with Wget. +@xref{Proxies}, for more information about the use of proxies with +Wget. @c man begin OPTIONS @cindex quota @@ -1306,8 +1307,8 @@ really important, do not leave them lying in those files either---edit the files and delete them after Wget has started the download. @iftex -@xref{Security Considerations} for more information about security issues -with Wget. +@xref{Security Considerations}, for more information about security +issues with Wget. @end iftex @cindex Keep-Alive, turning off @@ -1843,8 +1844,8 @@ really important, do not leave them lying in those files either---edit the files and delete them after Wget has started the download. @iftex -@xref{Security Considerations} for more information about security issues -with Wget. +@xref{Security Considerations}, for more information about security +issues with Wget. @end iftex @cindex .listing files, removing |