merge

.gitignore

@@ -0,0 +1 @@
+*.FCStd1

README.md

@@ -1,9 +1,42 @@
+![](images/readme-cover.jpg)
+
+
+
+
+
 # A FreeCAD manual
 
-An experiment at reorganizing the contents of the [FreeCAD wiki](http://www.freecadweb.org/wiki) in an easier, friendlier book-like manner, more based on examples. The contents of this manual is made from parts of the wiki, and parts of text directly written by me and hopefully through the power of git forking, others will contribute as well. All the contents of this manual are published under the [Creative Commons 4.0](http://creativecommons.org/licenses/by/4.0/) license, and can be freely used, downloaded, copied, and modified.
+**Important Note**: The manual has been moved to the [official FreeCAD wiki](https://wiki.freecadweb.org/Manual) which is now its new home. If you wish to propose edits, please do them there, as this repository will be kept only for generating the ebook versions and will not be directly edited anymore.
+
+
+
+## Introduction
+
+[FreeCAD](http://www.freecadweb.org) is a free, open-source parametric 3D modeling application. It is made primarily to model real-world objects, ranging from the small electronic components up to buildings and civil engineering projects, with a strong focus on 3D-printable objects. FreeCAD is free to download, use, distribute and modify, and its source code is open and published under the very permissive [LGPL](https://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License) license. The data you produce with FreeCAD is fully yours, and can be recovered without FreeCAD.
+
+FreeCAD is also fundamentally a social project, as it is developed and maintained by a community of developers and users united by their passion for FreeCAD.
+
+This manual is an experiment at taking the opposite way from the [official FreeCAD documentation wiki](http://www.freecadweb.org/wiki). The wiki is written collaboratively by dozens of community members and, like most wikis, it contains huge amounts of information, but is very hard to access and navigate by newcomers. This makes it a precious resource for reference, but not a very practical tool to learn FreeCAD. This manual will walk you through the same information available on the wiki. However, we hope that the more step-by-step pace, based on examples, and the more unified tone given by a smaller number of authors, will make it more suitable for a first contact with FreeCAD, and that it will become a perfect companion for the wiki.
+
+This manual has been originally written for the stable version of FreeCAD at that time, which was version **0.16**. It is now in the process of being updated to the upcoming **0.19**.
+
+PDF, EPUB and MOBI versions of the original editions can be found in the [Releases](../../Releases) section. You can also read it directly from [github pages](http://yorikvanhavre.github.io/FreeCAD-manual/)
+
+All the contents of this manual are published under the [Creative Commons 4.0](http://creativecommons.org/licenses/by/4.0/) license, and can be freely used, downloaded, copied, and modified. The source files of this manual are hosted on [github](https://github.com/yorikvanhavre/FreeCAD-manual). At this address, you can also find and download all the [files](https://github.com/yorikvanhavre/FreeCAD-manual/tree/master/files) that have been created during the different exercises that are part of this book.
+
+
+
+#### About the author(s)
+
+This book has been written originally by [Yorik van Havre](https://yorik.uncreated.net), (and corrected, proof-read or updated by [many other people](https://github.com/yorikvanhavre/FreeCAD-manual/graphs/contributors)) but using a lot of information built by FreeCAD users, mostly from the [FreeCAD wiki](https://wiki.freecadweb.org). The real author of this book is actually the whole FreeCAD community!
+
+
 
-Start with the [table of contents](SUMMARY.md). 
+### Contents
 
-If you are a book editor interested in publishing this book, drop me a note ;)
+* [Discovering FreeCAD](discovering_freecad/README.md)
+* [Working with FreeCAD](working_with_freecad/README.md)
+* [Python scripting](python_scripting/README.md)
+* [The community](the_community.md)
+* [summary](SUMMARY.md)
 
-This book is being tailored to be used with [gitbook](https://github.com/GitbookIO/gitbook).

SUMMARY.md

@@ -1,37 +1,47 @@
-* [Introduction](what_is_freecad.md)
-  * [What is FreeCAD](what_is_freecad.md#what-is-freecad)
-  * [Installing](installing.md)
-    * [Installing on Windows](installing.md#installing-on-windows)
-    * [Installing on Linux](installing.md#installing-on-linux)
-    * [Installing on Mac OS](installing.md#installing-on-mac-os)
-    * [Uninstalling](installing.md#uninstalling)
-    * [Setting basic preferences](installing.md#setting-basic-preferences)
-    * [Installing additional content](installing.md#installing-additional-content)
-  * [The FreeCAD interface](the_freecad_interface.md)
-    * [Workbenches](the_freecad_interface.md#workbenches)
-    * [Parts of the interface](the_freecad_interface.md#parts-of-the-interface)
-    * [Customizing the interface](the_freecad_interface.md#customizing-the-interface)
-  * [Navigating in the 3D view](navigating_in_the_3d_view.md)
-    * [A word about the 3D space](navigating_in_the_3d_view.md#a-word-about-the-3d-space)
-    * [The FreeCAD 3D view](navigating_in_the_3d_view.md#the-freecad-3d-view)
-    * [Selecting objects](navigating_in_the_3d_view.md#selecting-objects)
-  * [The FreeCAD document](the_freecad_document.md)
-  * [Parametric objects](parametric_objects.md)
-  * [Import and export to other filetypes](import_and_export_to_other_filetypes.md)
-* [Working with FreeCAD](all_workbenches_at_a_glance.md)
-  * [All workbenches at a glance](all_workbenches_at_a_glance.md)
-  * Traditional modeling, the CSG way
-  * Traditional 2D drafting
-  * Modeling for product design
-  * Generating 2D drawings
-  * Preparing models for 3D printing
-  * BIM modeling
-  * Using spreadsheets
-  * Creating FEM analyses
-  * Creating renderings
-* Python scripting
-  * A gentle introduction
-  * Creating and manipulating geometry
-  * Creating parametric objects
-  * Creating interface tools
-* The community
+* [Discovering FreeCAD](discovering_freecad/README.md)
+  * [What is FreeCAD?](discovering_freecad/what_is_freecad.md)
+  * [Installing](discovering_freecad/installing.md)
+    * [Installing on Windows](discovering_freecad/installing.md#installing-on-windows)
+    * [Installing on Linux](discovering_freecad/installing.md#installing-on-linux)
+    * [Installing on Mac OS](discovering_freecad/installing.md#installing-on-mac-os)
+    * [Uninstalling](discovering_freecad/installing.md#uninstalling)
+    * [Setting basic preferences](discovering_freecad/installing.md#setting-basic-preferences)
+    * [Installing additional content](discovering_freecad/installing.md#installing-additional-content)
+  * [The FreeCAD interface](discovering_freecad/the_freecad_interface.md)
+    * [Workbenches](discovering_freecad/the_freecad_interface.md#workbenches)
+    * [The interface](discovering_freecad/the_freecad_interface.md#the-interface)
+    * [Customizing the interface](discovering_freecad/the_freecad_interface.md#customizing-the-interface)
+  * [Navigating in the 3D view](discovering_freecad/navigating_in_the_3d_view.md)
+    * [A word about the 3D space](discovering_freecad/navigating_in_the_3d_view.md#a-word-about-the-3d-space)
+    * [The FreeCAD 3D view](discovering_freecad/navigating_in_the_3d_view.md#the-freecad-3d-view)
+    * [Selecting objects](discovering_freecad/navigating_in_the_3d_view.md#selecting-objects)
+  * [The FreeCAD document](discovering_freecad/the_freecad_document.md)
+  * [Parametric objects](discovering_freecad/parametric_objects.md)
+  * [Import and export to other filetypes](discovering_freecad/import_and_export_to_other_filetypes.md)
+* [Working with FreeCAD](working_with_freecad/README.md)
+  * [All workbenches at a glance](working_with_freecad/all_workbenches_at_a_glance.md)
+  * [Traditional modeling, the CSG way](working_with_freecad/traditional_modeling_the_csg_way.md)
+  * [Traditional 2D drafting](working_with_freecad/traditional_2d_drafting.md)
+  * [Modeling for product design](working_with_freecad/modeling_for_product_design.md)
+  * [BIM modeling](working_with_freecad/bim_modeling.md)
+  * [Preparing models for 3D printing](working_with_freecad/preparing_models_for_3d_printing.md)
+    * [Exporting to slicers](working_with_freecad/preparing_models_for_3d_printing.md#exporting-to-slicers)
+    * [Converting objects to meshes](working_with_freecad/preparing_models_for_3d_printing.md#converting-objects-to-meshes)
+    * [Using Slic3r](working_with_freecad/preparing_models_for_3d_printing.md#using-slicer)
+    * [Using the Cura addon](working_with_freecad/preparing_models_for_3d_printing.md#using-the-cura-addon)
+    * [Generating G-code](working_with_freecad/preparing_models_for_3d_printing.md#generating-g-code)
+  * [Generating 2D drawings](working_with_freecad/generating_2d_drawings.md)
+  * [Using spreadsheets](working_with_freecad/using_spreadsheets.md)
+    * [Reading properties](working_with_freecad/using_spreadsheets.md#reading-properties)
+    * [Writing properties](working_with_freecad/using_spreadsheets.md#writing-properties)
+  * [Creating FEM analyses](working_with_freecad/creating_fem_analyses.md)
+  * [Creating renderings](working_with_freecad/creating_renderings.md)
+* [Python scripting](python_scripting/README.md)
+  * [A gentle introduction](python_scripting/a_gentle_introduction.md)
+    * [Writing Python code](python_scripting/a_gentle_introduction.md#writing-python-code)
+    * [Manipulating FreeCAD objects](python_scripting/a_gentle_introduction.md#manipulating-freecad-objects)
+    * [Vectors and Placements](python_scripting/a_gentle_introduction.md#vectors-and-placements)
+  * [Creating and manipulating geometry](python_scripting/creating_and_manipulating_geometry.md)
+  * [Creating parametric objects](python_scripting/creating_parametric_objects.md)
+  * [Creating interface tools](python_scripting/creating_interface_tools.md)
+* [The community](the_community.md)

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal