diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-01-25 03:27:22 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-01-25 03:27:22 +0000 |
| commit | 4a32b10948fdfd141e95ca780f22343767aebaf3 (patch) | |
| tree | 38b8f89588aeed0b747126f4a9b9128e1c6261b4 /docbook/wsdg_src | |
| parent | b326fe61c7de54b014e93596245c4d17e1cbcda3 (diff) | |
Comment out the "diff" section for now. We'll have to update it for "git
diff" at some point.
svn path=/trunk/; revision=54958
Diffstat (limited to 'docbook/wsdg_src')
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_tools.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.xml b/docbook/wsdg_src/WSDG_chapter_tools.xml index 2244ff1b7c..d6ba39055b 100644 --- a/docbook/wsdg_src/WSDG_chapter_tools.xml +++ b/docbook/wsdg_src/WSDG_chapter_tools.xml @@ -1542,6 +1542,7 @@ Copyright (C) 2000-2006 CollabNet. nicely integrate into the Windows Explorer window.</para> </section> </section> + <!-- <section id="ChToolsDiff"> <title>diff (optional)</title> <para>Diff is used to get a file of all differences between two @@ -1569,7 +1570,7 @@ Copyright (C) 2000-2006 CollabNet. bash command line prompt:</para> <para> <prompt>$</prompt> - <userinput>diff --version</userinput> + <userinput>diff - --><!-- -version</userinput> </para> <para>should result in something like: <programlisting> @@ -1595,6 +1596,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.]]> can use them.</para> </section> </section> + --> <section id="ChToolsPatch"> <title>patch (optional)</title> <para>The patch utility is used to merge a diff file into your |