diff --git a/docs/contributing/how-to-add-new-sample.md b/docs/contributing/how-to-add-new-sample.md index bf746f7b02..aeaafe5705 100644 --- a/docs/contributing/how-to-add-new-sample.md +++ b/docs/contributing/how-to-add-new-sample.md @@ -5,9 +5,9 @@ To add a new sample "foo" under directory "samples/foo" you need to do the following: (note that all this applies also to demos: just replace samples/ with demos/ where needed). -1. Create the directory samples/foo locally and "svn add" it. +1. Create the directory samples/foo. -2. "svn add" the sample sources (usually based on minimal.cpp) as well. +2. "git add" the sample sources (usually based on minimal.cpp) as well. Note that unless your sample requires something special you shouldn't add foo.rc, foo.ico, ... any more, please just reuse the generic sample.* diff --git a/docs/contributing/how-to-release.md b/docs/contributing/how-to-release.md index 466f96661a..a53ad62283 100644 --- a/docs/contributing/how-to-release.md +++ b/docs/contributing/how-to-release.md @@ -17,16 +17,12 @@ Update the release announcement post in docs/publicity/announce.txt. Tag the release: - svn cp https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@123456 \ - https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_x_y_z -m 'Tag x.y.z release.' + git tag WX_x_y_z -m 'Tag x.y.z release.' Creating release files ---------------------- -The currently used release scripts need to be used from git-svn checkout and -rely on Git to avoid problems with using non-clean trees and such. - Follow these steps assuming the current working directory is the root of git working copy and you want to prepare distribution for the version x.y.z: diff --git a/docs/contributing/translators-guide.md b/docs/contributing/translators-guide.md index c5b4cabdce..dfd67544f8 100644 --- a/docs/contributing/translators-guide.md +++ b/docs/contributing/translators-guide.md @@ -28,8 +28,8 @@ First of all, here is what you will need: fine, but you'd have to use some kind of "for /s" loop with the command.com/cmd.exe. -3. (at least read) access to the subversion is not necessary strictly speaking, but - will make things a lot easier for you and others. +3. Access to the git repository is not necessary strictly speaking, but will + make things a lot easier for you and others. Now a brief overview of the process of translations (please refer to GNU diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index 7c9958897a..84d6ea57ad 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -212,7 +212,7 @@ ALIASES += rightCurly="}" #--------------------------------------------------------------------------- # For indicating a sample location -ALIASES += sampledir{1}="@e Location: @c samples/\1 subdirectory of your wxWidgets installation or http://svn.wxwidgets.org/viewvc/wx/wxWidgets/trunk/samples/\1" +ALIASES += sampledir{1}="@e Location: @c samples/\1 subdirectory of your wxWidgets installation or https://github.com/wxWidgets/wxWidgets/tree/master/samples/\1" # For refering to the corresponding sample in a class document or a overview # Usually placed in the queue of @see diff --git a/docs/doxygen/mainpages/introduction.h b/docs/doxygen/mainpages/introduction.h index c08cb581e9..28039e7b1c 100644 --- a/docs/doxygen/mainpages/introduction.h +++ b/docs/doxygen/mainpages/introduction.h @@ -114,8 +114,7 @@ configurations but at least 1GB and possibly more is required. The download links can be found at http://www.wxwidgets.org. The primary download location is https://sourceforge.net/downloads/wxwindows/ and there is also an FTP mirror at ftp://ftp.wxwidgets.org/pub/. Additionally, the latest -version can always be retrieved from our version control system using either -Subversion (http://svn.wxwidgets.org/svn/wx/wxWidgets/) or Git +version can always be retrieved from our version control system using Git (https://github.com/wxWidgets/wxWidgets). wxWidgets documentation that you are reading is also available online at diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h index 054856c9ee..f3efc78f91 100644 --- a/docs/doxygen/mainpages/samples.h +++ b/docs/doxygen/mainpages/samples.h @@ -46,7 +46,7 @@ subdirectory of the library distribution. When a @c foobar sample is mentioned below, its sources can be found in @c samples/foobar directory of your wxWidgets tree. If you installed wxWidgets from a binary package, you might not have this directory. In this case, you may view the samples online at -http://svn.wxwidgets.org/viewvc/wx/wxWidgets/trunk/samples/ but you need to +https://github.com/wxWidgets/wxWidgets/tree/master/samples/ but you need to download the source distribution in order to be able to build them (highly recommended). diff --git a/docs/doxygen/mainpages/translations.h b/docs/doxygen/mainpages/translations.h index d9465cf01c..a3604828e8 100644 --- a/docs/doxygen/mainpages/translations.h +++ b/docs/doxygen/mainpages/translations.h @@ -448,11 +448,10 @@ Here are the steps you should follow: -# Get the latest version of the file locale/wxstd.pot from the wxWidgets source tree: if you're using - Subversion - or the daily snapshots - you should already have it. - Otherwise you can always retrieve it directly from the Subversion repository via the - Web interface. + git + you should already have it. Otherwise you can always retrieve it directly + from the git repository: + locale/wxstd.pot. -# Rename it to XY.po where "XY" is the 2 letter ISO 639-2 language code for your language. diff --git a/docs/doxygen/overviews/xrc.h b/docs/doxygen/overviews/xrc.h index 83296bd975..900ace352c 100644 --- a/docs/doxygen/overviews/xrc.h +++ b/docs/doxygen/overviews/xrc.h @@ -52,14 +52,13 @@ specialised tool. Examples of these include: dialog editor. @e Free: -@li XRCed , a wxPython-based dialog editor that you - can find in the wxPython/tools subdirectory of the wxWidgets SVN archive. +@li XRCed , a wxPython-based dialog editor. @li wxFormBuilder , a C++-based form designer that can output C++, XRC or python. -@li wxCrafter (free version) , a C++-based form designer that - can output C++ or XRC. +@li wxCrafter (free version) , a C++-based + form designer that can output C++ or XRC. -There's a more complete list at +There's a more complete list at This small demonstration XRC file contains a simple dialog: @code diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 5a027c1f30..bb3143f2cd 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -246,8 +246,8 @@ are enabled by default. Normally, you won't have to choose a toolkit, because when you download wxGTK, it will default to --with-gtk etc. But -if you use all of our SVN repository you have to choose a -toolkit. You must do this by running configure with either of: +if you use the git repository you have to choose a toolkit. +You must do this by running configure with either of: --with-gtk=2 Use the GTK+ 2.0. Default. --with-gtk=3 Use the GTK+ 3. diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index a7429543d2..88df5b1aa9 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -19,12 +19,12 @@ If you get an error saying "wxUSE_FOO must be defined", it means that you are not using the correct up-to-date version of setup.h. This happens most - often when using svn or daily snapshots and a new symbol was added to - setup0.h and you haven't updated your local setup.h to reflect it. If - this is the case, you need to propagate the changes from setup0.h to your - setup.h and, if using makefiles under MSW, also remove setup.h under the - build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that - the new setup.h is copied there. + often when using git or snapshots and a new symbol was added to setup0.h + and you haven't updated your local setup.h to reflect it. If this is the + case, you need to propagate the changes from setup0.h to your setup.h and, + if using makefiles under MSW, also remove setup.h under the build directory + (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that the new setup.h is + copied there. If you get an error of the form "wxFoo requires wxBar", then the settings in your setup.h are inconsistent. You have the choice between correcting diff --git a/misc/languages/genlang.py b/misc/languages/genlang.py index 3665ade4d0..5cbfc390d1 100755 --- a/misc/languages/genlang.py +++ b/misc/languages/genlang.py @@ -4,7 +4,7 @@ # include/wx/intl.h and src/common/intl.cpp using information from langtabl.txt # # Warning: error detection and reporting here is rudimentary, check if the -# files were updated correctly with "svn diff" before committing them! +# files were updated correctly with "git diff" before committing them! import os import string diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 530d36b733..08c9d8592b 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -1535,7 +1535,7 @@ wxSize wxScrolledT_Helper::FilterBestSize(const wxWindow *win, // the window into sizer as expandable so that it can use all space // available to it. // - // See also http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=45864 + // See also https://github.com/wxWidgets/wxWidgets/commit/7e0f7539 wxSize minSize = win->GetMinSize(); diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index 3a0d3da982..accc755f96 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -1050,7 +1050,7 @@ bool XmlResApp::Validate() { wxLogError("Running RELAX NG validator failed."); wxLogError("Please install Jing (http://www.thaiopensource.com/relaxng/jing.html)."); - wxLogError("See http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk/misc/schema/README for more information."); + wxLogError("See https://github.com/wxWidgets/wxWidgets/blob/master/misc/schema/README for more information."); return false; }