Skip to content

Commit 6cadf19

Browse files
authored
Merge pull request #135 from arduino/IDE-2-naming
Ide 2 naming
2 parents 69997f1 + 50e5199 commit 6cadf19

14 files changed

+32
-32
lines changed

content/About Arduino/My Arduino Account/About-security-vulnerabilities-in-Apache-Log4j.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ title: "About security vulnerabilities in Apache Log4j"
33
id: 4412377144338
44
---
55

6-
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.
6+
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.
77

8-
> Arduino IDE 2.0.x and Cloud services do not use Log4j and were not affected.
8+
> Arduino IDE 2 and Cloud services do not use Log4j and were not affected.
99
1010
---
1111

content/Education and Kits/Make Your UNO Kit/img/.keep

Whitespace-only changes.

content/Education and Kits/Science Journal App/Upload-the-Science-Journal-firmware.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ Find and install the libraries by using the Library Manager (`Tools > Manage Lib
6363

6464
IDE 1.x: `File > Examples > INCOMPATIBLE > Arduino_ScienceJournal > PhysicsLabFirmware`.
6565

66-
IDE 2.x: `File > Examples > Arduino_ScienceJournal > PhysicsLabFirmware`.
66+
IDE 2: `File > Examples > Arduino_ScienceJournal > PhysicsLabFirmware`.
6767

6868
- **Nano 33 BLE Sense:**
6969

7070
IDE 1.x: `File > Examples > INCOMPATIBLE > Arduino_ScienceJournal > Nano33BLESenseFirmware`, depending on the IDE version.
7171

72-
IDE 2.x: `File > Examples > Arduino_ScienceJournal > Nano33BLESenseFirmware`
72+
IDE 2: `File > Examples > Arduino_ScienceJournal > Nano33BLESenseFirmware`
7373

7474
2. Click the ![Upload button](img/symbol_upload.png) **Upload** button.
7575

content/Software Support/Compilation/If-your-sketch-doesnt-compile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Arduino IDE displays compilation messages differently depending on the version:
3030

3131
1. Check the IDE error message.
3232
* In IDE 1.x, it is displayed above the console window.
33-
* In IDE 2.x, it is displayed in a bottom-right pop-up.
33+
* In IDE 2, it is displayed in a bottom-right pop-up.
3434
Sometimes, preceding lines can be more informative — check the console output.
3535

3636
2. Check the console output.
@@ -39,7 +39,7 @@ Arduino IDE displays compilation messages differently depending on the version:
3939

4040
3. Look for highlights in the editor:
4141
* In IDE 1.x, the **line** where the error occurred is highlighted in red.
42-
* In IDE 2.x, the **character** where the error occurred is underlined in red.
42+
* In IDE 2, the **character** where the error occurred is underlined in red.
4343
* 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.
4444

4545
<table class="img-captions">
@@ -49,7 +49,7 @@ Arduino IDE displays compilation messages differently depending on the version:
4949
</tr>
5050
<tr>
5151
<td>Error output in IDE 1.x.</td>
52-
<td>Error output in IDE 2.x.</td>
52+
<td>Error output in IDE 2.</td>
5353
</tr>
5454
</table>
5555

content/Software Support/IDE Settings/Change-the-language-in-Arduino-IDE.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Change the language in Arduino IDE"
33
id: 4403365287826
44
---
55

6-
> **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 -->
6+
> **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 -->
77
88
The original language for the Arduino IDE interface is English, but other languages are available.
99

@@ -53,18 +53,18 @@ Alternatively, you can edit the `preferences.txt` file directly.
5353

5454
## Troubleshooting
5555

56-
### If only English is available in 2.0
56+
### If only English is available in IDE 2
5757

58-
Community translations were added to Arduino IDE 2.0 in version **2.0.0-rc6**.
58+
Community translations were added to Arduino IDE 2 in version **2.0.0-rc6**.
5959

6060
You can find the latest version on the [Software page](https://www.arduino.cc/en/software).
6161

6262
### Some text is not translated
6363

6464
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**:
6565

66-
* [Arduino IDE translation project](https://www.transifex.com/mbanzi/arduino-ide-15/)
67-
* [Arduino IDE 2.0 translation project](https://www.transifex.com/arduino-1/ide2/)
66+
* [Arduino IDE 1 translation project](https://www.transifex.com/mbanzi/arduino-ide-15/)
67+
* [Arduino IDE 2 translation project](https://www.transifex.com/arduino-1/ide2/)
6868

6969
### If the language isn't changing
7070

content/Software Support/IDE Settings/Enable-autocomplete-in-IDE-2-0.md renamed to content/Software Support/IDE Settings/Enable-autocomplete-in-IDE-2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
title: "Enable autocomplete in IDE 2.0"
2+
title: "Enable autocomplete in IDE 2"
33
id: 4406711538450
44
---
55

6-
Arduino IDE 2.0 introduces an autocomplete feature for writing your code. Follow these steps to enable the feature.
6+
Arduino IDE 2 introduces an autocomplete feature for writing your code. Follow these steps to enable the feature.
77

88
1. Open the IDE.
99

content/Software Support/IDE Settings/Error-Could-not-create-the-Java-Virtual-Machine-Windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ If the `_JAVA_OPTIONS` variable is not set, reinstalling Arduino IDE is likely t
7474

7575
---
7676

77-
## Use Arduino IDE 2.0
77+
## Use Arduino IDE 2
7878

7979
Newer versions of Arduino IDE runs without Java, avoiding the problem altogether. [Get it here](https://www.arduino.cc/en/software).

content/Software Support/IDE Settings/Find-sketches-libraries-board-cores-and-other-files-on-your-computer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Example sketches can be found in the _File > Examples_ menu.
2929
![Arduino IDE File menu with Examples section selected](img/ide-menu-file-examples.png)
3030

3131
* **Built-in Examples:** Examples packaged with Arduino IDE. They are located inside the application folder.
32-
* In **Arduino IDE 2.x** they are stored in the `resources/app/node_modules/arduino-ide-extension/Examples` subfolder.
32+
* In **Arduino IDE 2** they are stored in the `resources/app/node_modules/arduino-ide-extension/Examples` subfolder.
3333
* In **Arduino IDE 1.x** they are stored in the `libraries` subfolder for Windows and Linux, and `Contents/Java/libraries` on macOS.
3434
* **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.
3535
* **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.
134134
135135
The default installations paths are:
136136
137-
* **Windows (IDE 2.x):** `C:\Program Files\Arduino IDE`
137+
* **Windows (IDE 2):** `C:\Program Files\Arduino IDE`
138138
* **Windows (IDE 1.x):** `C:\Program Files (x86)\Arduino`
139139
* **Windows (Windows App Store):** `C:\Program Files\WindowsApps\ArduinoLLC.ArduinoIDE_<VERSION>`
140-
* **macOS (IDE 2.x):** `/Applications/Arduino IDE.app/Contents`
140+
* **macOS (IDE 2):** `/Applications/Arduino IDE.app/Contents`
141141
* **macOS (IDE 1.x):** `/Applications/Arduino.app/Contents/Java`
142142
* **Linux:** See [Open the Arduino IDE installation folder](https://support.arduino.cc/hc/en-us/articles/4412943340178-Open-the-Arduino-IDE-installation-folder#linux).
143143

content/Software Support/IDE Settings/Modify-the-buffer-size-of-the-Wire-library.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ To locate the `Wire.h` library in the Arduino installation path and modify its b
1111

1212
2. Find the file `Wire.h`:
1313

14-
* **Windows (IDE 2.x):** `C:\Users\{username}\AppData\Local\Arduino15\packages\arduino\hardware\avr\{version}\libraries\Wire\src\Wire.h`
14+
* **Windows (IDE 2):** `C:\Users\{username}\AppData\Local\Arduino15\packages\arduino\hardware\avr\{version}\libraries\Wire\src\Wire.h`
1515
* **Windows (IDE 1.x):** `C:\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\Wire\src\Wire.h`
1616
* **macOS:** `~/Library/Arduino15/hardware/arduino/avr/libraries/Wire/src/Wire.h`
1717
* **Linux:** `~/sketchbook/hardware/arduino/avr/libraries/Wire/src/Wire.h`

content/Software Support/IDE Settings/Open-the-Arduino-IDE-installation-folder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Arduino IDE is installed in `C:\Program Files\Arduino IDE` by default.
1717

1818
2. Navigate to the installation folder:
1919

20-
* **Windows (IDE 2.x):** `C:\Program Files\Arduino IDE`
20+
* **Windows (IDE 2):** `C:\Program Files\Arduino IDE`
2121
* **Windows (IDE 1.x):** `C:\Program Files (x86)\Arduino`
2222
* **Windows (Windows App Store):** `C:\Program Files\WindowsApps\ArduinoLLC.ArduinoIDE_<VERSION>`
2323

0 commit comments

Comments
 (0)