Merge branch 'main' into uninstall-libraries-updates

seaxwi · seaxwi · commit f929b1316baf · 2022-10-27T17:14:06.000+02:00
diff --git a/content/About Arduino/My Arduino Account/About-security-vulnerabilities-in-Apache-Log4j.md b/content/About Arduino/My Arduino Account/About-security-vulnerabilities-in-Apache-Log4j.md
@@ -3,9 +3,9 @@ title: "About security vulnerabilities in Apache Log4j"
 id: 4412377144338
 ---
 
-In late 2021 a series of security vulnerabilities were found in **Apache Log4j**, a logging utility used by Arduino IDE 1.8.x at the time. As of version 1.8.19, Log4j is no longer used by the IDE.
+In late 2021 a series of security vulnerabilities were found in **Apache Log4j**, a logging utility used by Arduino IDE 1.8 at the time. As of version 1.8.19, Log4j is no longer used by the IDE.
 
-> Arduino IDE 2.0.x and Cloud services do not use Log4j and were not affected.
+> Arduino IDE 2 and Cloud services do not use Log4j and were not affected.
 
 ---
 
diff --git a/content/Education and Kits/Make Your UNO Kit/img/.keep b/content/Education and Kits/Make Your UNO Kit/img/.keep
diff --git a/content/Education and Kits/Science Journal App/Upload-the-Science-Journal-firmware.md b/content/Education and Kits/Science Journal App/Upload-the-Science-Journal-firmware.md
@@ -63,13 +63,13 @@ Find and install the libraries by using the Library Manager (`Tools > Manage Lib
 
      IDE 1.x: `File > Examples > INCOMPATIBLE > Arduino_ScienceJournal > PhysicsLabFirmware`.
 
-     IDE 2.x: `File > Examples > Arduino_ScienceJournal > PhysicsLabFirmware`.
+     IDE 2: `File > Examples > Arduino_ScienceJournal > PhysicsLabFirmware`.
 
    - **Nano 33 BLE Sense:**
 
      IDE 1.x: `File > Examples > INCOMPATIBLE > Arduino_ScienceJournal > Nano33BLESenseFirmware`, depending on the IDE version.
 
-     IDE 2.x: `File > Examples > Arduino_ScienceJournal > Nano33BLESenseFirmware`
+     IDE 2: `File > Examples > Arduino_ScienceJournal > Nano33BLESenseFirmware`
 
 2. Click the ![Upload button](img/symbol_upload.png) **Upload** button.
 
diff --git a/content/Software Support/Compilation/If-your-sketch-doesnt-compile.md b/content/Software Support/Compilation/If-your-sketch-doesnt-compile.md
@@ -30,7 +30,7 @@ Arduino IDE displays compilation messages differently depending on the version:
 
 1. Check the IDE error message.
    * In IDE 1.x, it is displayed above the console window.
-   * In IDE 2.x, it is displayed in a bottom-right pop-up.
+   * In IDE 2, it is displayed in a bottom-right pop-up.
    Sometimes, preceding lines can be more informative — check the console output.
 
 2. Check the console output.
@@ -39,7 +39,7 @@ Arduino IDE displays compilation messages differently depending on the version:
 
 3. Look for highlights in the editor:
    * In IDE 1.x, the **line** where the error occurred is highlighted in red.
-   * In IDE 2.x, the **character** where the error occurred is underlined in red.
+   * In IDE 2, the **character** where the error occurred is underlined in red.
    * The line causing the error may be before the line where it was triggered. In the example above, line 28 is missing a semicolon (`;`), but the error will be triggered by the unexpected closing bracket (`}`) in line 29.
 
    <table class="img-captions">
@@ -49,7 +49,7 @@ Arduino IDE displays compilation messages differently depending on the version:
      </tr>
      <tr>
         <td>Error output in IDE 1.x.</td>
-        <td>Error output in IDE 2.x.</td>
+        <td>Error output in IDE 2.</td>
      </tr>
    </table>
 
diff --git a/content/Software Support/IDE Settings/Change-the-language-in-Arduino-IDE.md b/content/Software Support/IDE Settings/Change-the-language-in-Arduino-IDE.md
@@ -3,7 +3,7 @@ title: "Change the language in Arduino IDE"
 id: 4403365287826
 ---
 
-> **Note:** Community translations were added to Arduino IDE 2.0 in version **2.0.0-rc6**. You can find the latest version on the [Software page](https://www.arduino.cc/en/software). <!-- TEMP_NOTICE: 22-04-27 -->
+> **Note:** Community translations were added to Arduino IDE 2 in version **2.0.0-rc6**. You can find the latest version on the [Software page](https://www.arduino.cc/en/software). <!-- TEMP_NOTICE: 22-04-27 -->
 
 The original language for the Arduino IDE interface is English, but other languages are available.
 
@@ -53,18 +53,18 @@ Alternatively, you can edit the `preferences.txt` file directly.
 
 ## Troubleshooting
 
-### If only English is available in 2.0
+### If only English is available in IDE 2
 
-Community translations were added to Arduino IDE 2.0 in version **2.0.0-rc6**.
+Community translations were added to Arduino IDE 2 in version **2.0.0-rc6**.
 
 You can find the latest version on the [Software page](https://www.arduino.cc/en/software).
 
 ### Some text is not translated
 
 Arduino IDE translations have been made through community contributions, and not all of them are complete. You can see the status of each language at **Transifex**:
 
-* [Arduino IDE translation project](https://www.transifex.com/mbanzi/arduino-ide-15/)
-* [Arduino IDE 2.0 translation project](https://www.transifex.com/arduino-1/ide2/)
+* [Arduino IDE 1 translation project](https://www.transifex.com/mbanzi/arduino-ide-15/)
+* [Arduino IDE 2 translation project](https://www.transifex.com/arduino-1/ide2/)
 
 ### If the language isn't changing
 
diff --git a/content/Software Support/IDE Settings/Enable-autocomplete-in-IDE-2.md b/content/Software Support/IDE Settings/Enable-autocomplete-in-IDE-2.md
@@ -1,9 +1,9 @@
 ---
-title: "Enable autocomplete in IDE 2.0"
+title: "Enable autocomplete in IDE 2"
 id: 4406711538450
 ---
 
-Arduino IDE 2.0 introduces an autocomplete feature for writing your code. Follow these steps to enable the feature.
+Arduino IDE 2 introduces an autocomplete feature for writing your code. Follow these steps to enable the feature.
 
 1. Open the IDE.
 
diff --git a/content/Software Support/IDE Settings/Error-Could-not-create-the-Java-Virtual-Machine-Windows.md b/content/Software Support/IDE Settings/Error-Could-not-create-the-Java-Virtual-Machine-Windows.md
@@ -74,6 +74,6 @@ If the `_JAVA_OPTIONS` variable is not set, reinstalling Arduino IDE is likely t
 
 ---
 
-## Use Arduino IDE 2.0
+## Use Arduino IDE 2
 
 Newer versions of Arduino IDE runs without Java, avoiding the problem altogether. [Get it here](https://www.arduino.cc/en/software).
diff --git a/content/Software Support/IDE Settings/Find-sketches-libraries-board-cores-and-other-files-on-your-computer.md b/content/Software Support/IDE Settings/Find-sketches-libraries-board-cores-and-other-files-on-your-computer.md
@@ -29,7 +29,7 @@ Example sketches can be found in the _File > Examples_ menu.
 ![Arduino IDE File menu with Examples section selected](img/ide-menu-file-examples.png)
 
 * **Built-in Examples:** Examples packaged with Arduino IDE. They are located inside the application folder.
-  * In **Arduino IDE 2.x** they are stored in the `resources/app/node_modules/arduino-ide-extension/Examples` subfolder.
+  * In **Arduino IDE 2** they are stored in the `resources/app/node_modules/arduino-ide-extension/Examples` subfolder.
   * In **Arduino IDE 1.x** they are stored in the `libraries` subfolder for Windows and Linux, and `Contents/Java/libraries` on macOS.
 * **Examples for \<board name\>:** Stored inside the board platform's `libraries` subfolder, e.g. `Arduino15/packages/arduino/hardware/avr/1.8.4/libraries/Wire`. These are only accessible by Arduino IDE when one of the boards from that package is selected from the _Tools > Board_ menu.
 * **Examples from Custom Libraries:** Installed with the Library Manager or the _Sketch > Include Library > Add. ZIP Library_ dialog.
@@ -134,10 +134,10 @@ The application folder contains the executable files used when running Arduino.
 
 The default installations paths are:
 
-* **Windows (IDE 2.x):** `C:\Program Files\Arduino IDE`
+* **Windows (IDE 2):** `C:\Program Files\Arduino IDE`
 * **Windows (IDE 1.x):** `C:\Program Files (x86)\Arduino`
 * **Windows (Windows App Store):** `C:\Program Files\WindowsApps\ArduinoLLC.ArduinoIDE_<VERSION>`
-* **macOS (IDE 2.x):** `/Applications/Arduino IDE.app/Contents`
+* **macOS (IDE 2):** `/Applications/Arduino IDE.app/Contents`
 * **macOS (IDE 1.x):** `/Applications/Arduino.app/Contents/Java`
 * **Linux:** See [Open the Arduino IDE installation folder](https://support.arduino.cc/hc/en-us/articles/4412943340178-Open-the-Arduino-IDE-installation-folder#linux).
 
diff --git a/content/Software Support/IDE Settings/Modify-the-buffer-size-of-the-Wire-library.md b/content/Software Support/IDE Settings/Modify-the-buffer-size-of-the-Wire-library.md
@@ -11,7 +11,7 @@ To locate the `Wire.h` library in the Arduino installation path and modify its b
 
 2. Find the file `Wire.h`:
 
-   * **Windows (IDE 2.x):** `C:\Users\{username}\AppData\Local\Arduino15\packages\arduino\hardware\avr\{version}\libraries\Wire\src\Wire.h`
+   * **Windows (IDE 2):** `C:\Users\{username}\AppData\Local\Arduino15\packages\arduino\hardware\avr\{version}\libraries\Wire\src\Wire.h`
    * **Windows (IDE 1.x):** `C:\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\Wire\src\Wire.h`
    * **macOS:** `~/Library/Arduino15/hardware/arduino/avr/libraries/Wire/src/Wire.h`
    * **Linux:** `~/sketchbook/hardware/arduino/avr/libraries/Wire/src/Wire.h`
diff --git a/content/Software Support/IDE Settings/Open-the-Arduino-IDE-installation-folder.md b/content/Software Support/IDE Settings/Open-the-Arduino-IDE-installation-folder.md
@@ -17,7 +17,7 @@ Arduino IDE is installed in `C:\Program Files\Arduino IDE` by default.
 
 2. Navigate to the installation folder:
 
-   * **Windows (IDE 2.x):** `C:\Program Files\Arduino IDE`
+   * **Windows (IDE 2):** `C:\Program Files\Arduino IDE`
    * **Windows (IDE 1.x):** `C:\Program Files (x86)\Arduino`
    * **Windows (Windows App Store):** `C:\Program Files\WindowsApps\ArduinoLLC.ArduinoIDE_<VERSION>`
 
diff --git a/content/Software Support/IDE Settings/Use-a-custom-theme-for-Arduino-IDE-1.md b/content/Software Support/IDE Settings/Use-a-custom-theme-for-Arduino-IDE-1.md
@@ -1,11 +1,11 @@
 ---
-title: "Use a custom theme for Arduino IDE 1.8"
+title: "Use a custom theme for Arduino IDE 1"
 id: 4408893497362
 ---
 
-> Custom themes are currently not supported for Arduino IDE 2.0.x.
+> Custom themes are currently not supported for Arduino IDE 2.
 
-Learn how to install a .zip packaged theme for Arduino IDE 1.8.
+Learn how to install a .zip packaged theme for Arduino IDE 1.
 
 ---
 
diff --git a/content/Software Support/Installation/Add-boards-to-Arduino-IDE.md b/content/Software Support/Installation/Add-boards-to-Arduino-IDE.md
@@ -13,7 +13,7 @@ A **board core** (or just _board_ for short) is a collection of files needed to
 
 Official Arduino cores can be conveniently installed with the Boards Manager tool.
 
-1. In the menu bar, select _Tools > Board > Boards Manager_. In IDE 2.x you can also access it by clicking the button in the left-most sidebar.
+1. In the menu bar, select _Tools > Board > Boards Manager_. In IDE 2 you can also access it by clicking the button in the left-most sidebar.
 
 2. Either search for the package name (e.g. "megaAVR"), or the board (e.g. "Uno", "MKR1000", or "Portenta"), by typing in the search field.
 
@@ -31,8 +31,8 @@ Official Arduino cores can be conveniently installed with the Boards Manager too
           <figcaption><i>Boards Manager in Arduino IDE 1.x.</i></figcaption>
       </figure>
       <figure style="display: inline-block; margin: 0;">
-          <img src="img/board-manager-install-ide2.png" alt="Searching for 'Nano Every' and installing the resulting megaAVR Boards package in Board Manager in IDE 2.x."/>
-          <figcaption style><i>Boards Manager in Arduino IDE 2.x.</i></figcaption>
+          <img src="img/board-manager-install-ide2.png" alt="Searching for 'Nano Every' and installing the resulting megaAVR Boards package in Board Manager in IDE 2."/>
+          <figcaption style><i>Boards Manager in Arduino IDE 2.</i></figcaption>
       </figure>
     </div>
 
diff --git a/content/Software Support/Installation/Add-libraries-to-Arduino-IDE.md b/content/Software Support/Installation/Add-libraries-to-Arduino-IDE.md
@@ -14,7 +14,7 @@ Learn how to add libraries to Arduino IDE.
 1. **Open the Library Manager:**
 
    * In the menu bar, select _Tools > Manage Libraries..._
-   * In IDE 2.x, you can also click on the ![Library Manager icon](img/symbol_library.png) button in the sidebar.
+   * In IDE 2, you can also click on the ![Library Manager icon](img/symbol_library.png) button in the sidebar.
 
 2. Filter the available libraries by typing something (such as a library name) in the text field above the listed libraries.
 
@@ -26,7 +26,7 @@ Learn how to add libraries to Arduino IDE.
 
 4. Find a library you want to install. You can review the description and author. When you've found a library you want to install, click **Install**. The latest version is selected by default.
 
-   ![Installing libraries in the Library Manager for IDE 1.x and 2.x.](img/add-library.png)
+   ![Installing libraries in the Library Manager for IDE 1 and IDE 2.](img/add-library.png)
    _The Library Manager looks slightly different depending on what version of the IDE you are using._
 
 5. Wait for the installation to complete.
@@ -41,7 +41,7 @@ Learn how to add libraries to Arduino IDE.
 
 2. You will be prompted to select the library you want to add. Navigate to the .zip file's location and open it.
 
-3. If you're using Arduino IDE 2.x, you may need to restart it for the library to be available[^1].
+3. If you're using Arduino IDE 2, you may need to restart it for the library to be available[^1].
 
 [^1]: <https://github.com/arduino/arduino-ide/issues/659>
 
diff --git a/content/Software Support/Installation/Uninstall-boards-from-Arduino-IDE.md b/content/Software Support/Installation/Uninstall-boards-from-Arduino-IDE.md
@@ -18,17 +18,17 @@ The Boards Manager provides the most convenient way to remove unwanted or unused
 1. **Open the Boards Manager:**
 
    * In the menu bar, select _Tools > Board > Boards Manager..._
-   * In IDE 2.x, you can also click on the ![Boards Manager icon](img/symbol_board.png) button in the sidebar.
+   * In IDE 2, you can also click on the ![Boards Manager icon](img/symbol_board.png) button in the sidebar.
 
 2. Filter the results by typing in the text field, and find the board package you want to uninstall.
 
 3. **Uninstall the library:**
 
    * In Arduino IDE 1.x, click the **Remove** button.
 
-   * In Arduino IDE 2.x, hover over the "Installed" label to reveal the **Uninstall** button, and click it.
+   * In Arduino IDE 2, hover over the "Installed" label to reveal the **Uninstall** button, and click it.
 
-   ![Uninstalling the SAMD package in Arduino IDE 1.x and 2.x.](img/uninstall-board.png)
+   ![Uninstalling the SAMD package in Arduino IDE 1 and IDE 2.](img/uninstall-board.png)
    _The Library Manager looks slightly different depending on what version of the IDE you are using._
 
 4. Confirm that you want to uninstall the board package.
