aboutsummaryrefslogtreecommitdiff
path: root/files/ca/conflicting/web
diff options
context:
space:
mode:
Diffstat (limited to 'files/ca/conflicting/web')
-rw-r--r--files/ca/conflicting/web/guide/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/boolean/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/dataview/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/date/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/error/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/evalerror/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/map/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/number/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/object/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/set/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/weakmap/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/global_objects/weakset/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/operators/index.html3
-rw-r--r--files/ca/conflicting/web/javascript/reference/operators_94c03c413a71df1ccff4c3ede275360c/index.html4
-rw-r--r--files/ca/conflicting/web/javascript/reference/operators_af596841c6a3650ee514088f0e310901/index.html4
16 files changed, 34 insertions, 16 deletions
diff --git a/files/ca/conflicting/web/guide/index.html b/files/ca/conflicting/web/guide/index.html
index ba6fb934f0..4debdf0059 100644
--- a/files/ca/conflicting/web/guide/index.html
+++ b/files/ca/conflicting/web/guide/index.html
@@ -1,12 +1,13 @@
---
title: Desenvolupament web
-slug: Web_Development
+slug: conflicting/Web/Guide
tags:
- NeedsTranslation
- TopicStub
- Web Development
translation_of: Web/Guide
translation_of_original: Web_Development
+original_slug: Web_Development
---
<p><strong>El desenvolupament web</strong> comprèn tots els aspectes de construir un portal o aplicació web.</p>
<p>Aprèn a crear qualsevol cosa des d'una simple web fins a una web complexa i altament interactiva emprant les darreres tecnologies web  fullejant els articles que et mostrem aquí.</p>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/boolean/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/boolean/index.html
index e0845eb102..1f032b041e 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/boolean/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/boolean/index.html
@@ -1,8 +1,9 @@
---
title: Boolean.prototype
-slug: Web/JavaScript/Referencia/Objectes_globals/Boolean/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Boolean
translation_of: Web/JavaScript/Reference/Global_Objects/Boolean
translation_of_original: Web/JavaScript/Reference/Global_Objects/Boolean/prototype
+original_slug: Web/JavaScript/Referencia/Objectes_globals/Boolean/prototype
---
<div>{{JSRef("Global_Objects", "Boolean")}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/dataview/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/dataview/index.html
index ebd6cbe729..7f75592b39 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/dataview/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/dataview/index.html
@@ -1,8 +1,9 @@
---
title: DataView.prototype
-slug: Web/JavaScript/Reference/Global_Objects/DataView/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/DataView
translation_of: Web/JavaScript/Reference/Global_Objects/DataView
translation_of_original: Web/JavaScript/Reference/Global_Objects/DataView/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/DataView/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/date/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/date/index.html
index 91e2dff38f..e9e2bb9c7d 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/date/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/date/index.html
@@ -1,8 +1,9 @@
---
title: Date.prototype
-slug: Web/JavaScript/Referencia/Objectes_globals/Date/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Date
translation_of: Web/JavaScript/Reference/Global_Objects/Date
translation_of_original: Web/JavaScript/Reference/Global_Objects/Date/prototype
+original_slug: Web/JavaScript/Referencia/Objectes_globals/Date/prototype
---
<div>{{JSRef("Global_Objects", "Date")}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/error/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/error/index.html
index 53e22669e9..96d7ea961e 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/error/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/error/index.html
@@ -1,8 +1,9 @@
---
title: Error.prototype
-slug: Web/JavaScript/Referencia/Objectes_globals/Error/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Error
translation_of: Web/JavaScript/Reference/Global_Objects/Error
translation_of_original: Web/JavaScript/Reference/Global_Objects/Error/prototype
+original_slug: Web/JavaScript/Referencia/Objectes_globals/Error/prototype
---
<div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/evalerror/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/evalerror/index.html
index 5f83d25a6f..e058929546 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/evalerror/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/evalerror/index.html
@@ -1,8 +1,9 @@
---
title: EvalError.prototype
-slug: Web/JavaScript/Reference/Global_Objects/EvalError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/EvalError
translation_of: Web/JavaScript/Reference/Global_Objects/EvalError
translation_of_original: Web/JavaScript/Reference/Global_Objects/EvalError/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/EvalError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/map/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/map/index.html
index 3a7508f042..bcab0afb8a 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/map/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/map/index.html
@@ -1,8 +1,9 @@
---
title: Map.prototype
-slug: Web/JavaScript/Referencia/Objectes_globals/Map/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Map
translation_of: Web/JavaScript/Reference/Global_Objects/Map
translation_of_original: Web/JavaScript/Reference/Global_Objects/Map/prototype
+original_slug: Web/JavaScript/Referencia/Objectes_globals/Map/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/number/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/number/index.html
index ae733e56ec..d5c2f282cd 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/number/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/number/index.html
@@ -1,8 +1,9 @@
---
title: Number.prototype
-slug: Web/JavaScript/Referencia/Objectes_globals/Number/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Number
translation_of: Web/JavaScript/Reference/Global_Objects/Number
translation_of_original: Web/JavaScript/Reference/Global_Objects/Number/prototype
+original_slug: Web/JavaScript/Referencia/Objectes_globals/Number/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/object/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/object/index.html
index 9451ccfefe..a5bfe248c9 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/object/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/object/index.html
@@ -1,8 +1,9 @@
---
title: Object.prototype
-slug: Web/JavaScript/Reference/Global_Objects/Object/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Object
translation_of: Web/JavaScript/Reference/Global_Objects/Object
translation_of_original: Web/JavaScript/Reference/Global_Objects/Object/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/Object/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/set/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/set/index.html
index 9d6f6e90ee..d4e6516f15 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/set/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/set/index.html
@@ -1,8 +1,9 @@
---
title: Set.prototype
-slug: Web/JavaScript/Referencia/Objectes_globals/Set/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Set
translation_of: Web/JavaScript/Reference/Global_Objects/Set
translation_of_original: Web/JavaScript/Reference/Global_Objects/Set/prototype
+original_slug: Web/JavaScript/Referencia/Objectes_globals/Set/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
index 35aea642bd..e2641c4057 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
@@ -1,8 +1,9 @@
---
title: SyntaxError.prototype
-slug: Web/JavaScript/Referencia/Objectes_globals/SyntaxError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/SyntaxError
translation_of: Web/JavaScript/Reference/Global_Objects/SyntaxError
translation_of_original: Web/JavaScript/Reference/Global_Objects/SyntaxError/prototype
+original_slug: Web/JavaScript/Referencia/Objectes_globals/SyntaxError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/weakmap/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/weakmap/index.html
index 40c3e72ff6..45313877ce 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/weakmap/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/weakmap/index.html
@@ -1,8 +1,9 @@
---
title: WeakMap.prototype
-slug: Web/JavaScript/Reference/Global_Objects/WeakMap/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WeakMap
translation_of: Web/JavaScript/Reference/Global_Objects/WeakMap
translation_of_original: Web/JavaScript/Reference/Global_Objects/WeakMap/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/WeakMap/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/global_objects/weakset/index.html b/files/ca/conflicting/web/javascript/reference/global_objects/weakset/index.html
index 4e86935904..f602febbc9 100644
--- a/files/ca/conflicting/web/javascript/reference/global_objects/weakset/index.html
+++ b/files/ca/conflicting/web/javascript/reference/global_objects/weakset/index.html
@@ -1,8 +1,9 @@
---
title: WeakSet.prototype
-slug: Web/JavaScript/Reference/Global_Objects/WeakSet/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WeakSet
translation_of: Web/JavaScript/Reference/Global_Objects/WeakSet
translation_of_original: Web/JavaScript/Reference/Global_Objects/WeakSet/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/WeakSet/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/operators/index.html b/files/ca/conflicting/web/javascript/reference/operators/index.html
index 9b6816c2d6..5f5221c244 100644
--- a/files/ca/conflicting/web/javascript/reference/operators/index.html
+++ b/files/ca/conflicting/web/javascript/reference/operators/index.html
@@ -1,8 +1,9 @@
---
title: Operadors aritmètics
-slug: Web/JavaScript/Referencia/Operadors/Arithmetic_Operators
+slug: conflicting/Web/JavaScript/Reference/Operators
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Arithmetic_Operators
+original_slug: Web/JavaScript/Referencia/Operadors/Arithmetic_Operators
---
<div>
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/operators_94c03c413a71df1ccff4c3ede275360c/index.html b/files/ca/conflicting/web/javascript/reference/operators_94c03c413a71df1ccff4c3ede275360c/index.html
index f7fbae7b47..73733f5188 100644
--- a/files/ca/conflicting/web/javascript/reference/operators_94c03c413a71df1ccff4c3ede275360c/index.html
+++ b/files/ca/conflicting/web/javascript/reference/operators_94c03c413a71df1ccff4c3ede275360c/index.html
@@ -1,8 +1,10 @@
---
title: Operadors de bits
-slug: Web/JavaScript/Referencia/Operadors/Bitwise_Operators
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_94c03c413a71df1ccff4c3ede275360c
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Bitwise_Operators
+original_slug: Web/JavaScript/Referencia/Operadors/Bitwise_Operators
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/ca/conflicting/web/javascript/reference/operators_af596841c6a3650ee514088f0e310901/index.html b/files/ca/conflicting/web/javascript/reference/operators_af596841c6a3650ee514088f0e310901/index.html
index 591e1fbc4f..3dc7af9899 100644
--- a/files/ca/conflicting/web/javascript/reference/operators_af596841c6a3650ee514088f0e310901/index.html
+++ b/files/ca/conflicting/web/javascript/reference/operators_af596841c6a3650ee514088f0e310901/index.html
@@ -1,8 +1,10 @@
---
title: Operadors Lògics
-slug: Web/JavaScript/Referencia/Operadors/Logical_Operators
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_af596841c6a3650ee514088f0e310901
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Logical_Operators
+original_slug: Web/JavaScript/Referencia/Operadors/Logical_Operators
---
<div>
<div>{{jsSidebar("Operators")}}</div>