aboutsummaryrefslogtreecommitdiffstats
path: root/ca/addUser.html
diff options
context:
space:
mode:
Diffstat (limited to 'ca/addUser.html')
-rw-r--r--ca/addUser.html22
1 files changed, 11 insertions, 11 deletions
diff --git a/ca/addUser.html b/ca/addUser.html
index 83bdfbd..b53ddef 100644
--- a/ca/addUser.html
+++ b/ca/addUser.html
@@ -23,11 +23,16 @@
</div>
</div>
+<<<<<<< HEAD
+
+
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Estableix la contrasenya d'administrador (root):">
<div class="titlepage">
@@ -39,7 +44,6 @@
</div>
</div>
-
<p>Per a qualsevol instal&middot;laci&oacute; de <span class="application">Mageia</span> &eacute;s
aconsellable que establiu una contrasenya de superusuari o administrador,
@@ -50,7 +54,6 @@
repetir la mateixa contrasenya a la casella de sota, per a comprovar per
comparaci&oacute; que no heu teclejat malament la primera contrasenya.
</p>
-
<div class="note" title="Nota" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -72,7 +75,6 @@
</div>
</div>
-
<div class="section" title="Introdu&iuml;u un usuari">
<div class="titlepage">
@@ -84,14 +86,12 @@
</div>
</div>
-
<p>Afegiu aqu&iacute; un usuari. Un usuari t&eacute; menys permisos que el superusuari
(root), per&ograve; prou per a navegar per Internet, fer servir aplicacions
ofim&agrave;tiques o jugar, i fer qualsevol altra cosa que un usuari mitj&agrave; fa amb
el seu ordinador.
</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -133,7 +133,6 @@
</li>
</ul>
</div>
-
<div class="note" title="Nota" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -147,13 +146,19 @@
<p>Any user you add while installing Mageia, will have a both read and write
protected home directory (umask=0027).
</p>
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>You can add all extra needed users in the <span class="emphasis"><em>Configuration -
Summary</em></span> step during the install. Choose <span class="emphasis"><em>User
management</em></span>.
</p>
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Els permisos d'acc&eacute;s tamb&eacute; es poden modificar despr&eacute;s de la instal&middot;laci&oacute;.</p>
@@ -163,7 +168,6 @@
</div>
</div>
-
<div class="section" title="Gesti&oacute; avan&ccedil;ada d'usuaris">
<div class="titlepage">
@@ -175,15 +179,12 @@
</div>
</div>
-
<p>If the <span class="guibutton">advanced</span> button is clicked you are offered a
screen that allows you to edit the settings for the user you are adding.
</p>
-
<p>Additionally, you can disable or enable a guest account.</p>
-
<div class="warning" title="Av&iacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -204,7 +205,6 @@
</tr>
</table>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">