diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_file_discovery.png b/doc/org.eclipse.cdt.doc.user/images/cdt_file_discovery.png
new file mode 100644
index 00000000000..76aa422dacb
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_file_discovery.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_file_inc.png b/doc/org.eclipse.cdt.doc.user/images/cdt_file_inc.png
new file mode 100644
index 00000000000..61238b8ab9c
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_file_inc.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_file_steps.png b/doc/org.eclipse.cdt.doc.user/images/cdt_file_steps.png
new file mode 100644
index 00000000000..373e77abd02
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_file_steps.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_file_sym.png b/doc/org.eclipse.cdt.doc.user/images/cdt_file_sym.png
new file mode 100644
index 00000000000..85d8e348a2a
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_file_sym.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_file_tcedit.png b/doc/org.eclipse.cdt.doc.user/images/cdt_file_tcedit.png
new file mode 100644
index 00000000000..f9a9f5af1fa
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_file_tcedit.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_file_toolsett.png b/doc/org.eclipse.cdt.doc.user/images/cdt_file_toolsett.png
new file mode 100644
index 00000000000..c2b00b0d472
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_file_toolsett.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_fold_discovery.png b/doc/org.eclipse.cdt.doc.user/images/cdt_fold_discovery.png
new file mode 100644
index 00000000000..ad60927db3f
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_fold_discovery.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_fold_resource.png b/doc/org.eclipse.cdt.doc.user/images/cdt_fold_resource.png
new file mode 100644
index 00000000000..7f6a74e59ee
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_fold_resource.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_fold_tcedit.png b/doc/org.eclipse.cdt.doc.user/images/cdt_fold_tcedit.png
new file mode 100644
index 00000000000..9c2cf4cd184
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_fold_tcedit.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_fold_toolsett.png b/doc/org.eclipse.cdt.doc.user/images/cdt_fold_toolsett.png
new file mode 100644
index 00000000000..f397190d5ae
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_fold_toolsett.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_file.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_file.htm
deleted file mode 100644
index 135d8f6de18..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_file.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-C/C++ Project Properties, Managed Make Files
-
-
-
-
-
-C/C++ Project Properties, Managed Make Files
-This section describes properties for a Managed make project source file.
- Info
- C/C++ Build
-
- Tool Settings
-
- Custom Build Steps
-
-
-
-
-
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_proj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_proj.htm
deleted file mode 100644
index 335a27733bb..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_proj.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-C/C++ Project Properties, Managed Make Projects
-
-
-
-
-
-C/C++ Project Properties, Managed Make Project
-This section describes properties for a Managed make project.
- Info
- Builders
- C/C++ Build
-
-Tool Settings
-
-Build Settings
-
-Build Steps
-
-Error Parsers
-
-Binary Parser
-
-Environment
-
-Macros
- C/C++ Documentation
- C/C++ File Types
- C/C++ Indexer
- Project References
- Refactoring History
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_file.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_file.htm
new file mode 100644
index 00000000000..452a7f27627
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_file.htm
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+C/C++ File Properties
+
+
+
+
+
+C/C++ File Properties
+This section describes properties for a Source Files in CDT project
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_folder.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_folder.htm
new file mode 100644
index 00000000000..e1cac4f795f
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_folder.htm
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+C/C++ Folder Properties
+
+
+
+
+
+C/C++ Folder Properties
+This section describes properties for a CDT project Folder
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_proj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_proj.htm
new file mode 100644
index 00000000000..81c6d676a9d
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_prop_proj.htm
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+Project Properties
+
+
+
+
+
+Project Properties
+This section describes C/C++ Project Properties.
+To select project properties, right click a project and select Properties .
+
+
+CDT projects
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_smake_proj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_smake_proj.htm
deleted file mode 100644
index 39f4a0b5d68..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_smake_proj.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-C/C++ Project Properties, Standard Make Projects
-
-
-
-
-
-C/C++ Project Properties, Standard Make Project
-This section describes properties for a Standard make project.
- Info
- Builders
- File Types
- Include Paths and Symbols
- Indexer
- Make Project
- Make Builder
- Error Parser
- Binary Parser
- Discovery Options
- Project Paths
- Source
- Output
- Projects
- Libraries
- Path Containers
- Project References
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_sproj_make.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_sproj_make.htm
deleted file mode 100644
index 9cdba28e960..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_sproj_make.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-C/C++ Project Properties, Standard, Make Projects
-
-
-
-
-
-C/C++ Project Properties, Standard, Make Project
-This section describes C/C++ Make Project Properties for a Standard make project.
-
- Make Builder
- Error Parser
- Binary Parser
- Discovery Options
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_sproj_paths.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_sproj_paths.htm
deleted file mode 100644
index 821e88c8a9c..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_sproj_paths.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-C/C++ Project Properties, Standard, Project Paths
-
-
-
-
-
-C/C++ Project Properties, Standard, Project Paths
-This section describes C/C++ Project Path Properties of a Standard make project.
- Source
- Output
- Projects
- Libraries
- Path Containers
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_discovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_discovery.htm
new file mode 100644
index 00000000000..46400843944
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_discovery.htm
@@ -0,0 +1,69 @@
+
+
+
+
+
+ C/C++ File Properties, Discovery Options
+
+
+
+C/C++ File Properties, Discovery Options
+You can define the discovery options on the Discovery Options page
+of a C/C++ project's properties window.
+
+
+
+
+
+
+ Left pane (list)
+ Language related to given file is displayed here.
+
+
+ Automate scanner configuration discovery
+ Select this checkbox to configure the automatic discovery of
+paths and symbols. When unchecked, all controls below became disabled.
+
+ Report path detection problems
+ Enables or disables corresponding diagnostic messages.
+
+ Discovery profile
+ Select discovery profile from list.
+
+ Discovery profile options
+ This set of controls is profile-specific. It may vary from one profile to another.
+
+
+
+
+
+
+
+
+
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_inc.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_inc.htm
new file mode 100644
index 00000000000..76ab07c1c9b
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_inc.htm
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+ C/C++ File Properties, Paths and Symbols, Includes
+
+
+
+
+C/C++ File Properties, Paths and Symbols, Includes
+You can modify the list of included paths and change the order in which they are referenced.
+
+
+
+
+
+ Languages (left pane)
+ Displays language related to this file.
+
+ Include paths (right pane)
+ List of include paths related to given language.
+ Add
+ Add new include path
+ Edit
+ Modify selected include path
+ Delete
+ Remove selected include path
+ Export / Unexport
+ Toggle selected path exported or not
+ Move Up
+ Move the currently selected element up in the list.
+ Move Down
+ Move the currently selected element down in the list.
+ Show built-in values
+ Check to display system (built-in) includes.
+ Available for :
+ CDT projects, folders and files
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_steps.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_steps.htm
new file mode 100644
index 00000000000..4f4f12ad0ae
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_steps.htm
@@ -0,0 +1,69 @@
+
+
+
+
+
+ C/C++ File Properties, Build, Settings, Build Steps tab
+
+
+
+C/C++ File Properties, Build, Settings, Build Steps tab
+Customizes the selected build configuration allowing the specification
+of user defined build command steps, as well as a descriptive message
+to be displayed in the
+build output, immediately prior to and immediately after normal build
+processing executes.
+
+
+
+ Custom build step applicability
+ Select either 'Apply' or 'Disable' custom build step.
+In case of apply, custom build step would override standard one
+
+ Additional input file names
+ Define additional file names to be used in custom build step.
+ Output file name(s)
+ Define name(s) for output files generated by custom build step.
+ Command
+ Specifies a command, or a list of semicolon separated commands,
+to be executed during custom build step
+ Description
+ Specify optional descriptive text that is associated with the
+post-build step to be displayed in the build output immediately prior
+to execution of the post-build step command or commands.
+ Available for :
+ CDT source files
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_sym.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_sym.htm
new file mode 100644
index 00000000000..b0e9504e88e
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_sym.htm
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+ C/C++ File Properties, Paths and Symbols, Symbols
+
+
+
+
+C/C++ File Properties, Paths and Symbols, Symbols
+You can modify the list of preprocessor symbols.
+
+
+
+
+
+ Languages (left pane)
+ Displays language related to this file.
+
+ Symbol / Value
+ List of symbols related to given language.
+ Add
+ Add new symbol
+ Edit
+ Modify selected symbol value/dd>
+ Delete
+ Remove selected symbol
+ Export / Unexport
+ Toggle selected symbol exported or not
+ Show built-in values
+ Check to display system (built-in) includes.
+ Available for :
+ CDT projects, folders and files
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_toolsettings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_toolsettings.htm
new file mode 100644
index 00000000000..97d1215f4f4
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fileprop_toolsettings.htm
@@ -0,0 +1,54 @@
+
+
+
+
+
+ C/C++ File Properties, Build, Settings, Tool Settings tab
+
+
+
+C/C++ File Properties, Build, Settings, Tool Settings tab
+Customizes the tools and tool options used in your build configuration.
+
+
+
+ Left pane:
+ Displays list of tools and their option categories. Select required line to edit its options.
+ Right pane:
+ List of options for selected tool or category.
+
+ Available for :
+ CDT projects, folders and source files
+
+
+
+
+
+
+
+
+
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_discovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_discovery.htm
new file mode 100644
index 00000000000..64ca175ccd6
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_discovery.htm
@@ -0,0 +1,70 @@
+
+
+
+
+
+ C/C++ Folder Properties, Discovery Options
+
+
+
+C/C++ Folder Properties, Discovery Options
+You can define the discovery options on the Discovery Options page
+of a C/C++ project's properties window.
+
+
+
+
+
+
+ Left pane (list)
+ Select required language here.
+
+
+ Automate scanner configuration discovery
+ Select this checkbox to configure the automatic discovery of
+paths and symbols. When unchecked, all controls below became disabled.
+
+ Report path detection problems
+ Enables or disables corresponding diagnostic messages.
+
+ Discovery profile
+ Select discovery profile from list.
+
+ Discovery profile options
+ This set of controls is profile-specific. It may vary from one profile to another.
+
+
+
+
+
+
+
+
+
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_resource.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_resource.htm
new file mode 100644
index 00000000000..05c1b421182
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_resource.htm
@@ -0,0 +1,58 @@
+
+
+
+
+
+ C/C++ Folder Properties, Resource
+
+
+
+C/C++ Folder Properties, Resource
+
+
+ Resource
+ Shows resource information.
+ Read only
+ Set Read-only attribute for folder
+ Archive
+ Set Archive attribute for folder
+ Derived
+ Set Derived attribute for folder
+ Text file encoding
+ Sets an alternate text encoding.
+ Available for :
+ Any projects, folders and files regardless of project kind
+
+
+
+
+
+
+
+
+
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_toolsettings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_toolsettings.htm
new file mode 100644
index 00000000000..214889c55e2
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_fprop_toolsettings.htm
@@ -0,0 +1,55 @@
+
+
+
+
+
+ C/C++ Folder Properties, Build, Settings, Tool Settings tab
+
+
+
+C/C++ Folder Properties, Build, Settings, Tool Settings tab
+Customizes the tools and tool options used in your build configuration.
+
+
+
+ Left pane:
+ Displays list of tools and their option categories. Select required line to edit its options.
+ Right pane:
+ List of options for selected tool or category.
+
+ Available for :
+ CDT projects, folders and source files
+
+
+
+
+
+
+
+
+
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_pns_hier.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_pns_hier.htm
index 2b1d7c33db5..d254930c49b 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_pns_hier.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_pns_hier.htm
@@ -4,17 +4,17 @@
- C/C++ Project Properties, Include Paths and Symbols, Data hierarchy
+ C/C++ Properties, Include Paths and Symbols, Data hierarchy
-C/C++ Project Properties, Include Paths and Symbols, Data hierarchy tab
+C/C++ Properties, Include Paths and Symbols, Data hierarchy tab
Allows user to inspect all data related to Project/Configuration description.
This tab is optional, it can be enabled/disabled in Preferences.
+alt="C/C++ Properties, Include Paths and Symbols, Data hierarchy">
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_rundebug.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_rundebug.htm
index 710a57acc6d..5803793f4e8 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_rundebug.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_rundebug.htm
@@ -3,16 +3,16 @@
- C/C++ Project, Run and Debug settings
+ C/C++ Properties, Run and Debug settings
-C/C++ Project, Run and Debug settings
+C/C++ Properties Run and Debug settings
-Run/Debug settings are mostly applicable to Java projets, not to CDT ones.
+Run/Debug settings are mostly applicable to Java projects, not to CDT ones.
+ alt="C/C++ Properties, Run and Debug settings">
Available for :
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
index 83121a5a370..6522afd63fa 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
@@ -4,15 +4,16 @@
-Project Properties
+CDT Properties
-Project Properties
-This section describes C/C++ Project Properties.
-To select project properties, right click a project and select Properties .
+CDT Properties
+This section describes C/C++ Properties.
+Properties can be obtained for CDT projects, folders and separate files.
+To select object properties, right click on object in view and select Properties .
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index ff027087973..d2ab8f0510a 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -82,53 +82,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+