Skip to content

Commit

Permalink
Merge pull request #511 from luzpaz/Short-urls
Browse files Browse the repository at this point in the history
Replace old wiki URLs with new Short URLs
  • Loading branch information
wwmayer committed Feb 9, 2017
2 parents 9925e90 + 364f53a commit 43a5483
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 32 deletions.
24 changes: 12 additions & 12 deletions README.md
Expand Up @@ -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 <img src="https://blog.travis-ci.com/images/travis-mascot-200px.png" height="30"/>
------------
Expand All @@ -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
--------------------
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/Doc/mainpage.dox
Expand Up @@ -34,19 +34,19 @@
first to the <a href=http//www.freecadweb.org/wiki>Wiki Documentation</a>.

Refer to the
<a href=http://www.freecadweb.org/wiki/index.php?title=The_FreeCAD_source_code>general
<a href=http://www.freecadweb.org/wiki/The_FreeCAD_source_code>general
introduction to the FreeCAD source code</a> page for a broad view of how the source
code is organized, and browse the modules, classes and namespaces from the menu above.

The <a href=http://www.freecadweb.org/wiki/index.php?title=Developer_hub>Developers section</a>
The <a href=http://www.freecadweb.org/wiki/Developer_hub>Developers section</a>
of the wiki also contains additional information for developers, and the
<a href=http://www.freecadweb.org/wiki/index.php?title=Power_users_hub>Powerusers / python scripting
<a href=http://www.freecadweb.org/wiki/Power_users_hub>Powerusers / python scripting
section</a> 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 <a href=http://freecadweb.org/wiki/index.php?title=Source_documentation>building
as explained in <a href=http://freecadweb.org/wiki/Source_documentation>building
the source code documentation</a>. You can also browse through the <a href=https://github.com/FreeCAD/FreeCAD>source
code on github</a>.

Expand All @@ -68,7 +68,7 @@
utility to browse through the sources.

If you seek informations on FreeCAD at large, please consult our
<a href="http://www.freecadweb.org/wiki/index.php?title=Main_Page">Wiki</a>
<a href="http://www.freecadweb.org/wiki/Main_Page">Wiki</a>

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
Expand Down
2 changes: 1 addition & 1 deletion src/Doc/makingDocs.dox
@@ -1,7 +1,7 @@
/** \page makingdocs Building this source documentation

After running cmake (as per build instructions on the
<a href="http://freecadweb.org/wiki/index.php?title=Main_Page">FreeCAD wiki</a>,
<a href="http://freecadweb.org/wiki/Main_Page">FreeCAD wiki</a>,
run 'make DevDoc' in your build directory. HTML documentation
will be built in doc/SourceDocu/html.

Expand Down
12 changes: 6 additions & 6 deletions src/Doc/templates/footer.html
Expand Up @@ -36,25 +36,25 @@
<div class="col-md-3">
Learn
<ul>
<li><a href="http://www.freecadweb.org/wiki/?title=Tutorials">Tutorials</a></li>
<li><a href="https://www.freecadweb.org/wiki/Tutorials">Tutorials</a></li>
<li><a href="https://www.youtube.com/results?search_query=freecad">Youtube videos</a></li>
<li><a href="http://area51.stackexchange.com/proposals/88434/freecad">Stack Exchange</a></li>
</ul>
</div>
<div class="col-md-3">
Help the project
<ul>
<li><a href="http://www.freecadweb.org/wiki/?title=Help_FreeCAD">How can I help?</a></li>
<li><a href="http://www.freecadweb.org/wiki/?title=Donate"><i class="fa fa-heart"></i> Donate!</a></li>
<li><a href="https://www.freecadweb.org/wiki/Help_FreeCAD">How can I help?</a></li>
<li><a href="https://www.freecadweb.org/wiki/Donate"><i class="fa fa-heart"></i> Donate!</a></li>
<li><a href="https://crowdin.com/project/freecad">Translate</a></li>
</ul>
</div>
<div class="col-md-3">
Code
<ul>
<li><a href="http://www.freecadweb.org/wiki/?title=Compiling">Building from source</a></li>
<li><a href="http://www.freecadweb.org/api/">C++ & Python API</a></li>
<li><a href="http://www.freecadweb.org/wiki/?title=Licence">License information</a></li>
<li><a href="https://www.freecadweb.org/wiki/Compiling">Building from source</a></li>
<li><a href="https://www.freecadweb.org/api/">C++ & Python API</a></li>
<li><a href="https://www.freecadweb.org/wiki/Licence">License information</a></li>
</ul>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/Gui/CommandStd.cpp
Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down
8 changes: 4 additions & 4 deletions src/Mod/Start/StartPage/StartPage.py
Expand Up @@ -104,7 +104,7 @@ def translate(context,text):
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")
Expand All @@ -117,13 +117,13 @@ def translate(context,text):
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 <b>Ship Design</b> 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")
Expand Down

0 comments on commit 43a5483

Please sign in to comment.