aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docbook/developer-guide.xml3
-rw-r--r--docbook/edg_src/EDG_chapter_libraries.xml20
-rw-r--r--docbook/edg_src/EDG_preface.xml17
3 files changed, 11 insertions, 29 deletions
diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml
index 4d493202b9..0d019d8eeb 100644
--- a/docbook/developer-guide.xml
+++ b/docbook/developer-guide.xml
@@ -51,7 +51,8 @@ Ethereal Info
<!ENTITY EtherealAuthorsPage "&EtherealWebSite;/introduction.html#authors">
<!ENTITY EtherealFAQPage "&EtherealWebSite;/faq.html">
<!ENTITY EtherealDevMailList "ethereal-dev[AT]ethereal.com">
- <!ENTITY EtherealUsersGuidePage "&EtherealWebSite;/docs/#usersguide">
+ <!ENTITY EtherealDevsGuidePage "&EtherealWebSite;/docs">
+ <!ENTITY EtherealUsersGuidePage "&EtherealWebSite;/docs">
<!ENTITY EtherealWikiSite "http://wiki.ethereal.com">
<!ENTITY EtherealBugsSite "http://bugs.ethereal.com">
diff --git a/docbook/edg_src/EDG_chapter_libraries.xml b/docbook/edg_src/EDG_chapter_libraries.xml
index e274afdfd0..e1eb2d9ee2 100644
--- a/docbook/edg_src/EDG_chapter_libraries.xml
+++ b/docbook/edg_src/EDG_chapter_libraries.xml
@@ -88,29 +88,23 @@
<section id="ChLibsSetup">
<title>Win32: Automated library download</title>
+ <para>
+ You can download/install all required libraries by using the setup target
+ of the <filename>Makefile.nmake</filename> from the source package.
+ </para>
<tip><title>Tip!</title>
<para>
It's a really good idea to use the Win32 automated library download to
install the required libraries as it makes this download very easy.
</para>
</tip>
- <warning><title>Warning!</title>
- <para>
- The library zip files on the server and in the setup target will match
- only for the latest sources, as old zip files will be moved into the
- <filename>old</filename> folder on the server. So you cannot use the
- setup target for "old" (this may even include the released) sources!
- </para>
- </warning>
- <para>
- You can download/install all required libraries by using the setup target
- of the <filename>Makefile.nmake</filename> from the source package.
- </para>
+ <note><title>Note!</title>
<para>
Before you start the download, you must have installed both
the required tools (see <xref linkend="ChapterTools"/>) and also the
Ethereal sources (see <xref linkend="ChSrcObtain"/>).
</para>
+ </note>
<para>
By default the libraries will be downloaded and installed into
<filename>C:\ethereal-win32-libs</filename>.
@@ -176,7 +170,7 @@
<para>
Start the setup target described above. As wget will download only the
missing files, existing zip files in the ETHEREAL_LIBS dir won't be
- downloaded again. Outdated zip files shouldn't do any harm.
+ downloaded again. Remaining (outdated) zip files shouldn't do any harm.
</para>
</listitem>
</itemizedlist>
diff --git a/docbook/edg_src/EDG_preface.xml b/docbook/edg_src/EDG_preface.xml
index 26212a3e19..1961b265e2 100644
--- a/docbook/edg_src/EDG_preface.xml
+++ b/docbook/edg_src/EDG_preface.xml
@@ -114,22 +114,9 @@
<title>Where to get the latest copy of this document?</title>
<para>
The latest copy of this documentation can always be found at:
- <!-- <ulink url="&LatestVersionWebsite;">&LatestVersionWebsite;</ulink>;
- and at: -->
- <ulink url="&EtherealWikiSite;/Development"/> in PDF (A4 and US letter)
- and HTML (single and chunked) and CHM format.
+ <ulink url="&EtherealDevsGuidePage;">&EtherealDevsGuidePage;</ulink>
+ in PDF (A4 and US letter), HTML (single and chunked) and CHM format.
</para>
- <!-- <para>
- In addition, you can find a PDF version of the guide at:
- <ulink url="&LatestVersionPDFWebsiteA4;">
- &LatestVersionPDFWebsiteA4;
- </ulink>
- in A4 and
- <ulink url="&LatestVersionPDFWebsiteUSLetter;">
- &LatestVersionPDFWebsiteUSLetter
- </ulink>
- in US Letter.
- </para> -->
</section>
<section id="PreFeedback">