X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/8e1328dc6aa3c2e832aba65f5b4cbc3faae6f77b..07e521db928dc7e8ae707e8e395dfade95d031f0:/LUFA/DoxygenPages/ExportingLibrary.txt

diff --git a/LUFA/DoxygenPages/ExportingLibrary.txt b/LUFA/DoxygenPages/ExportingLibrary.txt
index d4c1cbe1c..095184862 100644
--- a/LUFA/DoxygenPages/ExportingLibrary.txt
+++ b/LUFA/DoxygenPages/ExportingLibrary.txt
@@ -10,10 +10,15 @@
  *  it is possible to export the library into a form suitable for drop-in use inside of an
  *  IDE.
  *
+ *  \note <b>LUFA is also available as a native Atmel Studio 6.1 extension</b>, which integrates LUFA into
+ *        Atmel Studio including all demos and projects. If you are running Atmel Studio 6.1 or later, the
+ *        below instructions are not required; download and install the native LUFA extension from the
+ *        <a href="http://gallery.atmel.com">Atmel Gallery</a> instead.
+ *
  *  \section Sec_LibraryExport Exporting the Library
  *  An export of the library is at its most basic, a direct copy of the main "LUFA" source folder from the
  *  root download folder; this contains the library core which can be re-used within external projects.
- *  However, as many IDEs attempt to automatically compile all included source files, it is neccesary to
+ *  However, as many IDEs attempt to automatically compile all included source files, it is necessary to
  *  exclude some directories and files from the library core export to allow for easier integration into
  *  an IDE project.
  *
@@ -24,6 +29,7 @@
  *   - Documentation/
  *   - DoxygenPages/
  *   - CodeTemplates/
+ *   - StudioIntegration/
  *
  *  If required, files from the CodeTemplates/ subdirectory may be copied to your IDE project as needed.
  *
@@ -35,7 +41,7 @@
  *  command <b><code>make export_tar</code></b> from the command line. This will generate two .tar files in the
  *  current directory, named <code>LUFA_YYMMDD.tar</code> and <code>LUFA_YYMMDD_Code_Templates.tar</code> (where
  *  "YYMMDD" is the version of the library being exported). The first archive contains the exported LUFA core
- *  with the non-required files removed, while the second contains an archived copy of the code template files 
+ *  with the non-required files removed, while the second contains an archived copy of the code template files
  *  for the current LUFA version.
  *
  *  The resulting archived copy of the library may then be extracted to your chosen IDE project source directory
@@ -47,7 +53,7 @@
  *
  *  Specific instructions for importing an exported version of LUFA into various IDEs are listed below.
  *
- *  \subsection SSec_AS56_Import Importing into AVRStudio 5/Atmel Studio 6
+ *  \subsection SSec_AS56_Import Importing into AVRStudio 5.x/Atmel Studio 6.0
  *  To import LUFA into a new or existing project, the following steps must be followed.
  *
  *  \subsubsection SSSec_AS56_Import_Step1 Copy over the exported library
@@ -80,7 +86,7 @@
  *  assembler and linker options.
  *
  *  \image html Images/AS5_AS6_Import/AS5_AS6_Import_Step4.png
- * 
+ *
  *  Click the "Toolchain" tab on the left side of the Project Properties window.
  *
  *  \subsubsection SSSec_AS56_Import_Step5 Configure Project Toolchain Properties