diff options
Diffstat (limited to 'et/index.html')
| -rw-r--r-- | et/index.html | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/et/index.html b/et/index.html index f477ea3..984548c 100644 --- a/et/index.html +++ b/et/index.html @@ -28,8 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Sissejuhatus</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Andmekandjad</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Andmekandja allalaadimine ja kontrollimine</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">ISO kirjutamine</a></span></dt> + <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Andmekandja allalaadimine ja kontrollimine</a></span></dt> + <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">ISO kirjutamine</a></span></dt> </dl> </dd> <dt><span class="section"><a href="installer.html">Mageia paigaldusprogramm DrakX</a></span></dt> @@ -75,6 +75,16 @@ <dt><span class="section"><a href="setupBootloader.html">Alglaaduri põhiseadistused</a></span></dt> <dd> <dl> +<<<<<<< HEAD + <dt><span class="section"><a href="setupBootloader.html#d5e904">Alglaaduri liides</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e932">Mageia alglaaduri kasutamine</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e948">Olemasoleva alglaaduri kasutamine</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e951">Ahellaadimise kasutamine</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e967">Valikud</a></span></dt> + </dl> + </dd> + <dt><span class="section"><a href="setupBootloaderAddEntry.html">Alglaadimismenüü kirje lisamine või muutmine</a></span></dt> +======= <dt><span class="section"><a href="setupBootloader.html#d5e910">BIOS-e süsteemiga</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e947">UEFI süsteemiga</a></span></dt> </dl> @@ -86,6 +96,7 @@ <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e979">UEFI süsteemiga</a></span></dt> </dl> </dd> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <dt><span class="section"><a href="misc-params.html">Seadistuste kokkuvõte</a></span></dt> <dd> <dl> @@ -116,7 +127,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Mageia eemaldamine</a></span></dt> <dd> <dl> - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1218">Õpetus</a></span></dt> + <dt><span class="section"><a href="uninstall-Mageia.html#d5e1274">Õpetus</a></span></dt> </dl> </dd> </dl> |