From cd02def632d01ca2f725955018bec7a311cdb985 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Tue, 25 Feb 2014 11:20:22 -0500 Subject: [PATCH] Clean up some more subversion references in the documentation. Change-Id: Id6cf1a617bff3e09e47933a69d505393502874d1 Reviewed-on: https://code.wireshark.org/review/370 Reviewed-by: Pascal Quantin Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte --- doc/README.dissector | 56 +++++-------------- doc/README.qt | 16 +++--- .../wsdg_src/WSDG_chapter_sources.asciidoc | 2 +- 3 files changed, 25 insertions(+), 49 deletions(-) diff --git a/doc/README.dissector b/doc/README.dissector index 2bc2d638cf..321f87288d 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -2000,40 +2000,11 @@ In addition to the above, you should add your dissector source file name to the DISSECTOR_SRC section of epan/CMakeLists.txt -1.9 Using the SVN source code tree. +1.9 Using the git source code tree. See -1.9a Using git with the SVN source code tree. - - Install git and the git-svn package. - A probably incomplete list for various OSes of git GUIs can be found at - "http://delicious.com/matthew.mccullough/git+gui". - Run "mkdir git; cd git; git svn clone ", e.g. if you are using - the anonymous svn tree, run - "git svn clone http://anonsvn.wireshark.org/wireshark/trunk/" - - After that, a typical workflow may look like this (from "man git-svn"): - - # Clone a repo (like git clone): - git svn clone http://svn.example.com/project/trunk - # Enter the newly cloned directory: - cd trunk - # You should be on master branch, double-check with ´git branch´ - git branch - # Do some work and commit locally to git: - git commit ... - # Something is committed to SVN, rebase your local changes against the - # latest changes in SVN: - git svn rebase - # Now commit your changes (that were committed previously using git) to SVN - # as well as automatically updating your working HEAD: - git svn dcommit - # Append svn:ignore settings to the default git exclude file: - git svn show-ignore >> .git/info/exclude - - 1.10 Submitting code for your new dissector. - VERIFY that your dissector code does not use prohibited or deprecated APIs @@ -2061,17 +2032,17 @@ to the DISSECTOR_SRC section of epan/CMakeLists.txt or visiting . - - 'svn add' all the files of your new dissector. + - 'git diff' to verify all your changes look good. - - 'svn diff' the workspace and save the result to a file. + - 'git add' all the files you changed. - - Edit the diff file - remove any changes unrelated to your new dissector, - e.g. changes in config.nmake + - 'git commit' to commit (locally) your changes. First line of commit message + should be a summary of the changes followed by an empty line and a more + verbose description. - - Submit a bug report to the Wireshark bug database, found at - , qualified as an enhancement and attach your - diff file there. Set the review request flag to '?' so it will pop up in - the patch review list. + - 'git push origin HEAD:refs/for/master' to push the changes to Gerrit. (If + you previously ran 'git config --add remote.origin.push HEAD:refs/for/master' + then only 'git push' is needed.) - Create a Wiki page on the protocol at . A template is provided so it is easy to setup in a consistent style. @@ -2082,9 +2053,12 @@ to the DISSECTOR_SRC section of epan/CMakeLists.txt . These files are used by the automated build system for fuzz testing. - - If you find that you are contributing a lot to wireshark on an ongoing - basis you can request to become a committer which will allow you to - commit files to subversion directly. + - If you don't think the wiki is the right place for your sample capture, + submit a bug report to the Wireshark bug database, found at + , qualified as an enhancement and attach your + sample capture there. Normally a new dissector won't be accepted without + a sample capture! If you open a bug be sure to cross-link your Gerrit + change and bug. 2. Advanced dissector topics. diff --git a/doc/README.qt b/doc/README.qt index 967dc41cbb..a9657c8e5d 100644 --- a/doc/README.qt +++ b/doc/README.qt @@ -199,16 +199,18 @@ http://www.parashift.com/c++-faq/mixing-c-and-cpp.html where appropriate. 3. Translations (i18n) -For make your own translation of QtShark ! it is easy ! + +Qt makes translating the Wireshark UI into different languages easy. - Add your translation (qtshark_XX.ts) in QtShark.pro, i18n.qrc, ui/qt/Makefile.common - and ui/qt/CMakeList.txt + and ui/qt/CMakeList.txt . - Add also in epan/prefs.c, in ui/qt/main.cpp add case in switch(prefs_p->gui_qt_language) - and in main_windows_preferences_frame.ui (use qt-design) to add in prefs -- Launch "lupdate QtShark.pro" to generate/update your translation file -- Translate with Qt Linguist -- Launch "lrelease QtShark.pro" to create/update qtshark_xx.qm file -- Attach your modification ("svn diff") in Wireshark Bug Tracker + and in main_windows_preferences_frame.ui (use qt-design) to add in prefs. +- Run "lupdate QtShark.pro" to generate/update your translation file. +- Translate with Qt Linguist. +- Run "lrelease QtShark.pro" to create/update qtshark_xx.qm file. +- Push your translation to Gerrit for review ("git push"). More information about Qt Linguist http://qt-project.org/doc/qt-4.8/linguist-manual.html + diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc index 8d36b40e4a..e77f98b172 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc @@ -885,7 +885,7 @@ built in or via an additional module. You might get one of the following responses to your patch request: -* Your patch is checked into the SVN repository. Congratulations! +* Your patch is checked into the repository. Congratulations! * You are asked to provide additional information, capture files, or other material. If you haven't fuzzed your code, you may be asked to do so.