From bb52cd1f151a6863c32b27caefc5082e740e7cd1 Mon Sep 17 00:00:00 2001 From: Kunda Date: Wed, 8 Feb 2017 17:58:55 -0500 Subject: [PATCH 1/2] Replace new Short URLs with old wiki URLs Changing --- README.md | 24 ++++++++++++------------ src/Mod/Start/StartPage/StartPage.py | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 2a725d983..1f494d750 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Precompiled (installable) packages are available for Windows and Mac on the On most Linux distributions, FreeCAD is directly installable from the software center application. -Other options are described at the [wiki Download page](http://www.freecadweb.org/wiki/index.php?title=Download). +Other options are described at the [wiki Download page](http://www.freecadweb.org/wiki/Download). Build Status ------------ @@ -58,11 +58,11 @@ you will usually need to compile them yourself. The pages below contain up-to-date build instructions: -- [Linux](http://www.freecadweb.org/wiki/?title=CompileOnUnix) -- [Windows](http://www.freecadweb.org/wiki/?title=CompileOnWindows) -- [Mac OSX](http://www.freecadweb.org/wiki/?title=CompileOnMac) -- [Cygwin](http://www.freecadweb.org/wiki/?title=CompileOnCygwin) -- [MinGW](http://www.freecadweb.org/wiki/?title=CompileOnMinGW) +- [Linux](http://www.freecadweb.org/wiki/CompileOnUnix) +- [Windows](http://www.freecadweb.org/wiki/CompileOnWindows) +- [Mac OSX](http://www.freecadweb.org/wiki/CompileOnMac) +- [Cygwin](http://www.freecadweb.org/wiki/CompileOnCygwin) +- [MinGW](http://www.freecadweb.org/wiki/CompileOnMinGW) Usage & Getting help -------------------- @@ -73,12 +73,12 @@ The FreeCAD wiki contains documentation on general FreeCAD usage, Python scripting, and development. These pages might help you get started: -- [Getting started](http://www.freecadweb.org/wiki/?title=Getting_started) -- [Features list](http://www.freecadweb.org/wiki/?title=Feature_list) -- [Frequent questions](http://www.freecadweb.org/wiki/?title=FAQ) -- [Workbenches](http://www.freecadweb.org/wiki/?title=Workbench_Concept) -- [Scripting](http://www.freecadweb.org/wiki/?title=Power_users_hub) -- [Development](http://www.freecadweb.org/wiki/?title=Developer_hub) +- [Getting started](http://www.freecadweb.org/wiki/Getting_started) +- [Features list](http://www.freecadweb.org/wiki/Feature_list) +- [Frequent questions](http://www.freecadweb.org/wiki/FAQ) +- [Workbenches](http://www.freecadweb.org/wiki/Workbench_Concept) +- [Scripting](http://www.freecadweb.org/wiki/Power_users_hub) +- [Development](http://www.freecadweb.org/wiki/Developer_hub) The [FreeCAD forum](http://forum.freecadweb.org) is also a great place to find help and solve specific problems you might encounter when diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index 3591cf84f..980a38e84 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -104,7 +104,7 @@ text34 = translate("StartPage","creation time:") text35 = translate("StartPage","last modified:") text36 = translate("StartPage","location:") text37 = translate("StartPage","User manual") -text38 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc") +text38 = translate("StartPage","http://www.freecadweb.org/wiki/Online_Help_Toc") text39 = translate("StartPage","Tutorials") text40 = translate("StartPage","Python resources") text41 = translate("StartPage","File not found") @@ -117,13 +117,13 @@ text47 = translate("StartPage","The section of the FreeCAD website dedicated to text48 = translate("StartPage","A blog dedicated to teaching FreeCAD, maintained by members of the FreeCAD community") text49 = translate("StartPage","Getting started") text50 = translate("StartPage","The FreeCAD interface is divided in workbenches, which are sets of tools suited for a specific task. You can start with one of the workbenches in this list, or with the complete workbench, which presents you with some of the most used tools gathered from other workbenches. Click to read more about workbenches on the FreeCAD website.") -text51 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Workbenches") +text51 = translate("StartPage","http://www.freecadweb.org/wiki/Workbenches") text52 = translate("StartPage","Ship Design") text53 = translate("StartPage","Designing and calculating ships") text54 = translate("StartPage","The Ship Design module offers several tools to help ship designers to view, model and calculate profiles and other specific properties of ship hulls.") text55 = translate("StartPage","Load an Architectural example model") -text56 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Tutorials") -text57 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Power_users_hub") +text56 = translate("StartPage","http://www.freecadweb.org/wiki/Tutorials") +text57 = translate("StartPage","http://www.freecadweb.org/wiki/Power_users_hub") text58 = translate("StartPage","Your version of FreeCAD is up to date.") text59 = translate("StartPage","There is a new release of FreeCAD available.") text60 = translate("StartPage","Load an FEM 3D example analysis") From 364f53aa8998b9d05b6ff6f6e6f4523e7f9f7361 Mon Sep 17 00:00:00 2001 From: Kunda Date: Wed, 8 Feb 2017 23:38:54 -0500 Subject: [PATCH 2/2] Replace new Short URLs with old wiki URLs pt2 Continuing to replace URLS --- src/Doc/mainpage.dox | 10 +++++----- src/Doc/makingDocs.dox | 2 +- src/Doc/templates/footer.html | 12 ++++++------ src/Gui/CommandStd.cpp | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Doc/mainpage.dox b/src/Doc/mainpage.dox index 172d02e94..8c3fb28a1 100644 --- a/src/Doc/mainpage.dox +++ b/src/Doc/mainpage.dox @@ -34,19 +34,19 @@ first to the Wiki Documentation. Refer to the - general + general introduction to the FreeCAD source code page for a broad view of how the source code is organized, and browse the modules, classes and namespaces from the menu above. - The Developers section + The Developers section of the wiki also contains additional information for developers, and the - Powerusers / python scripting + Powerusers / python scripting section contains coding documentation that is specifically aimed at python scripting, but that will also be useful to C++ coders, as most of the APIs are identical or very similar. For space reasons, this on-line version doesn't include the source code headers nor the full inheritance graphics. But you can build a full version yourself with everything included, - as explained in building + as explained in building the source code documentation. You can also browse through the source code on github. @@ -68,7 +68,7 @@ utility to browse through the sources. If you seek informations on FreeCAD at large, please consult our - Wiki + Wiki FreeCAD being a fast moving target, don't hesitate to rebuild an up to date doc from source as often as needed (\ref makingdocs "more info"). CPU cycles are cheap diff --git a/src/Doc/makingDocs.dox b/src/Doc/makingDocs.dox index 61357d999..15ba53999 100644 --- a/src/Doc/makingDocs.dox +++ b/src/Doc/makingDocs.dox @@ -1,7 +1,7 @@ /** \page makingdocs Building this source documentation After running cmake (as per build instructions on the -FreeCAD wiki, +FreeCAD wiki, run 'make DevDoc' in your build directory. HTML documentation will be built in doc/SourceDocu/html. diff --git a/src/Doc/templates/footer.html b/src/Doc/templates/footer.html index 92065215f..dce305712 100644 --- a/src/Doc/templates/footer.html +++ b/src/Doc/templates/footer.html @@ -36,7 +36,7 @@ $generatedby  
Learn @@ -44,17 +44,17 @@ $generatedby  
Help the project
Code
diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index 829b8d1e0..47d467b0e 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -461,7 +461,7 @@ StdCmdOnlineHelpWebsite::StdCmdOnlineHelpWebsite() void StdCmdOnlineHelpWebsite::activated(int iMsg) { Q_UNUSED(iMsg); - std::string defaulturl = QCoreApplication::translate(this->className(),"http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc").toStdString(); + std::string defaulturl = QCoreApplication::translate(this->className(),"http://www.freecadweb.org/wiki/Online_Help_Toc").toStdString(); ParameterGrp::handle hURLGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Websites"); std::string url = hURLGrp->GetASCII("OnlineHelp", defaulturl.c_str()); hURLGrp->SetASCII("OnlineHelp", url.c_str()); @@ -517,7 +517,7 @@ StdCmdFreeCADUserHub::StdCmdFreeCADUserHub() void StdCmdFreeCADUserHub::activated(int iMsg) { Q_UNUSED(iMsg); - std::string defaulturl = QCoreApplication::translate(this->className(),"http://www.freecadweb.org/wiki/index.php?title=User_hub").toStdString(); + std::string defaulturl = QCoreApplication::translate(this->className(),"http://www.freecadweb.org/wiki/User_hub").toStdString(); ParameterGrp::handle hURLGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Websites"); std::string url = hURLGrp->GetASCII("Documentation", defaulturl.c_str()); hURLGrp->SetASCII("Documentation", url.c_str()); @@ -545,7 +545,7 @@ StdCmdFreeCADPowerUserHub::StdCmdFreeCADPowerUserHub() void StdCmdFreeCADPowerUserHub::activated(int iMsg) { Q_UNUSED(iMsg); - std::string defaulturl = QCoreApplication::translate(this->className(),"http://www.freecadweb.org/wiki/index.php?title=Power_users_hub").toStdString(); + std::string defaulturl = QCoreApplication::translate(this->className(),"http://www.freecadweb.org/wiki/Power_users_hub").toStdString(); ParameterGrp::handle hURLGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Websites"); std::string url = hURLGrp->GetASCII("PowerUsers", defaulturl.c_str()); hURLGrp->SetASCII("PowerUsers", url.c_str()); @@ -601,7 +601,7 @@ StdCmdFreeCADFAQ::StdCmdFreeCADFAQ() void StdCmdFreeCADFAQ::activated(int iMsg) { Q_UNUSED(iMsg); - std::string defaulturl = QCoreApplication::translate(this->className(),"http://www.freecadweb.org/wiki/index.php?title=FAQ").toStdString(); + std::string defaulturl = QCoreApplication::translate(this->className(),"http://www.freecadweb.org/wiki/FAQ").toStdString(); ParameterGrp::handle hURLGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Websites"); std::string url = hURLGrp->GetASCII("FAQ", defaulturl.c_str()); hURLGrp->SetASCII("FAQ", url.c_str());