Skip to content

Commit 51d8348

Browse files
pwizlastb13579maevalienardmeganelachenygpene
authored
Production hotfix: Temporarily revert to old logo (#1169)
* Update core store migration (#801) * Typescript documentation (#835) * Added TypeScript project structure * added links to JS files in TS project structure * Added admin-panel TS config * Added .ts file paths and TypeScript SQlite database config code snippet * Add TS server config * Add middlewares TS config * Add functions TS config * Add cron jobs TS config * Add API TS config * Add plugins TS config * Add SSO TS examples * Add AWS deploy. TS * Add Azure TS examples * Add Heroku TS * Add Caddy TS examples * Add DO AppPlatform TS * Add DO droplets TS * Add GA engine TS * Add admin custom TS examples * Add Error Handling TS examples * Add policies TS examples * add admin-panel ts config * add ts config * add ts config * add TypeScript to FAQ * Start dedicated TypeScript page * Added links to file structure page * added more project structure ts links * add TypeScript to sidebar * add version detail to FAQ * Add content to TypeScript page * add ts file path * fix GitHub .ts code snippet & add Okta js snippet * Project structure: Reword intro sentence + add link to TS doc * Project structure: Rename tabs * Simplify --quickstart callout * Fix casing * Rename h1 for TS intro doc * Fix two → 2 + add link to project structure doc * Comment out unfinished sections * Update RBAC with TS * Update functions config with TS * Fix AWS TS * Fix Azure TS * fix capitalization * fix lint * Remove comment * add ts config * add ts config * add ts config * add ts config * Restore beta logo * Comment out yarn setup command Co-authored-by: Pierre Wizla <[email protected]> Co-authored-by: Pierre Wizla <[email protected]> * add ts config to services * Add callout for alpha/beta migration scripts * Revert "Add callout for alpha/beta migration scripts" This reverts commit 8c525c9. Testing as auto-deploy does not seem to work 🤷 * Add callout for alpha/beta migration scripts (#878) * Typescript phase 2 (#864) * lint cleanup * lint cleanup * add ts config -controllers * add ts config --middlewares *check file path* * add ts config --models * add ts config --routes * add ts config --webhooks * update controllers code example * update ts config --routes * remove comments * ts config code fix --routes * fix ts config code --services * fix ts config code examples --routes * Force node just like on stable docs * update TypeScript dedicated page (#898) * update TypeScript dedicated page * fix punctuation * TypeScript plugin dev updates * TypeScript plugin dev updates * improved accessibility * improved text and table * added note * fix grammar * fixed grammar * fixed small wording issues * add span tags to project structure comments * fixed misc issues * updated file-structure --ts * Update docs/developer-docs/latest/development/plugins-development.md Co-authored-by: Pierre Wizla <[email protected]> * Update docs/developer-docs/latest/development/plugins-development.md Co-authored-by: Pierre Wizla <[email protected]> * Update docs/developer-docs/latest/development/plugins-development.md Co-authored-by: Pierre Wizla <[email protected]> * updated TypeScript directories and files table * Update plugin development page * Update docs/developer-docs/latest/development/plugins-development.md Co-authored-by: Pierre Wizla <[email protected]> * add link to Strapi Market Co-authored-by: Pierre Wizla <[email protected]> * Release 4.3.0-beta (#934) * Media Library and folders documentation (WIP) (#867) * Added content * Added content about plugins * added png files for plugins * added more logo png files * fixed missing file extension * Revised and added content * Revised text and table cleanup * Revised Gatsby preview plugin content * Add Media library to sidebar * Add draft of Media Library intro * Add media library to navbar * Add media library to TOC * Switch order of upload asset & create folder * Create 'adding asset' WIP skeleton * Move list of supported file types to 'adding assets' * Create 'folders' section skeleton * Add "managing assets" to TOC * Rework a bit "Adding assets" * Add comments to intro to media lib. * Add draft/todo for "organizing assets with folders" * Add "managing assets" skeleton * Reorganize files and draft structure * Improve introduction, add sorting & filtering * Update edit assets structure * Describe adding folders * Add note about deep folder hierarchy pitfalls * Refine introduction * Complete draft of "organizing assets with folders" * Add various improvements after a first re-read * Improve "adding assets" * Improve "introduction to media library" * Improve "organizing assets with folders" * Fix image files * Add draft for "editing and deleting assets" * Improve draft on editing assets * Delete superfluous word in folders description * Improve further the editing assets section * Add final draft for editing section * Rename the "editing" section file * Remove unnecessary heading cross-linking * Add screenshot todos * Rename (bis) * Make some tiny wording improvements * Convert alternative instructions for the folder deletion to a note * Delete strapi-plugins.md * Re-add original Strapi plugins file * Replace "Right" w/ "Just" * Remove some features from the screenshot * Fix improper grammar: allow to → allow +ing * Clean up some TODOs * Move supported media types out of details block and back to "adding assets" * Clean up one more TODO 😅 * Remove unnecessary link to ML + add link to CM * Fix wording * Fix icon name typo * Move "deleting assets" at end of file * Add TODO for sorting screenshot * Fix node engine (should ease Vercel deploy.) * Remove (again) supported types from intro * Fix list * Mention folder names are searchable * Fix button name for moving assets * Open folders by single-click * Replace default location for new sub-folder creation by the active folder * Fix 1st step of folder edition instructions * Fix editing folder instructions in note callout * Mention folders as well in sorting options in intro * Fix again folder editing instructions 😅 * Fix singular/plural for managing assets intro * drop-down → button * Mention batch move Co-authored-by: Maeva Lienard <[email protected]> * Document Media Library settings * Add link to Media Library from "Writing content" table * Update screenshots and text accordingly * Update wording: folder → subfolder in deeply nested hierarchy tip. Co-authored-by: Maeva Lienard <[email protected]> * Rework the sort section (adding screenshot) * Refine Media Library overview screenshot * Add SEO tags and remove TODOs Co-authored-by: Shaun Brown <[email protected]> Co-authored-by: Maeva Lienard <[email protected]> * TypeScript additions for release 4.3.0-beta (#935) * add TypeScript typings * add alt text * add raw TS content and code blocks * Add typings example and misc improvements * update programmatic use text * add programmatic examples + other fixes * Update docs/developer-docs/latest/setup-deployment-guides/typescript.md Co-authored-by: Pierre Wizla <[email protected]> * Update docs/developer-docs/latest/setup-deployment-guides/typescript.md Co-authored-by: Pierre Wizla <[email protected]> * Update docs/developer-docs/latest/setup-deployment-guides/typescript.md Co-authored-by: Pierre Wizla <[email protected]> * Update docs/developer-docs/latest/setup-deployment-guides/typescript.md Co-authored-by: meganelacheny <[email protected]> * Create dedicated TypeScript page in the Development section * Improve TypeScript support page (#932) * Remove TypeScript create section from TypeScript page * remove Understand Typescript from TypeScript page * create TypeScript config page * Edit TypeScript config introduction * Change title and add links for project, install and config * Add typescript config page to sidebar * fix spelling * delete typings and programmatic content * Update docs/developer-docs/latest/development/typescript.md Co-authored-by: Pierre Wizla <[email protected]> * update intro and add callout * Change table column order * add link * Update docs/developer-docs/latest/development/typescript.md Co-authored-by: meganelacheny <[email protected]> * Move development back to development page * update top matter Co-authored-by: Pierre Wizla <[email protected]> Co-authored-by: meganelacheny <[email protected]> * Improve TypeScript typings subsection (#930) * Improve TypeScript typings subsection * Fix grammar Co-authored-by: Gabriel <[email protected]> * Fix wording: interfaces → properties Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Fix snippet Co-authored-by: Gabriel <[email protected]> Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Fix canonicalUrl SEO tag * Improve wording * Fix broken links * Add "Start Strapi programmatically" subsection (#921) Co-authored-by: Pierre Wizla <[email protected]> Co-authored-by: Shaun Brown <[email protected]> Co-authored-by: Shaun Brown <[email protected]> Co-authored-by: meganelacheny <[email protected]> Co-authored-by: Gabriel <[email protected]> Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Delete autocomplete GIF * Bump version number to 4.3.0-beta * Remove mention to beta docs as we're already in there * Add warning callout about downgrading and folders (#942) Co-authored-by: Shaun Brown <[email protected]> Co-authored-by: Maeva Lienard <[email protected]> Co-authored-by: Shaun Brown <[email protected]> Co-authored-by: meganelacheny <[email protected]> Co-authored-by: Gabriel <[email protected]> Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Re-add missing --typescript flag in CLI install. guide * Add link to TypeScript development docs to CLI installation docs * Add missing word 😅 * Use production logo * Restore beta logo * typescript programmatic use (#980) (#1010) * add project structure link * revise programmatic use * Add table for directories and rework explanations * Fix email documentation that prevented hot reload * update code block * Update mixed codebase example * add note * rework programmatic content * rework combined JS + TS programmatic section * a link for public directory docs * rework programmatic section * remove non-TypeScript examples * remove utils * fixed compile method * revert directories code block * remove content * edit strapi.compile text and add code example back for this afternoon * Streamline the content of programmatic sections * reword `strapi.compile()` 1st sentence * Update docs/developer-docs/latest/development/typescript.md Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Update docs/developer-docs/latest/development/typescript.md Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Update docs/developer-docs/latest/development/typescript.md Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Update docs/developer-docs/latest/development/typescript.md Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * remove "install" from yarn install command * fix yarn and npm commands * add alternate text idea * add generate typings * update generate typings section * update CLI commands for TS generate typings * add schema typings callout to models documentation * clean up writing * Simplify cross-link wording * Simplify cross-link wording * Rename CLI command * Improve CLI docs: Add flags and remove TypeScript-only note * Improve rendering of CLI flags documentation * Add link to CLI docs * Fix typo + remove parenthesis Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Improve wording on CLI Co-authored-by: Jean-Sébastien Herbaux <[email protected]> Co-authored-by: Pierre Wizla <[email protected]> Co-authored-by: Jean-Sébastien Herbaux <[email protected]> Co-authored-by: Pierre Wizla <[email protected]> Co-authored-by: Shaun Brown <[email protected]> Co-authored-by: Jean-Sébastien Herbaux <[email protected]> * Mention folders in CM (#1009) * Keep official (not beta) logo * Add missing comma * Update TS (migration) callout title * Reword TS callout * Bump version number (alpha) * Fix code block ending * Mention that Global settings > API tokens is accessible only w/ permissions * Add API Tokens permissions to U&P table * Update procedure to create an API token for API tokens v2 * Properly format table + fix wording * Custom Fields - User Guide: All updates (#1039) * Keep old version number for now * Fix rendering issue caused by missing blank line after code block * [WIP] Custom Fields: Updates to Content-Type Builder documentation (#1018) * Add custom fields h2 * Replace field selection screenshot * Update "Configuring fields for content-types" * Add TODO for possible "managing custom fields" content * Reword marketplace mention and fix link * Fix rendering issue caused by missing blank line after code block * Delete deprecated comments * Mention custom fields in the Content Manager (#1051) * Update version number * Delete TODO as link now works * Mention custom fields in plugins introduction * Mention that custom fields can also be added to components * Update "Installing plugins via Marketplace" with custom fields * Mention custom fields in Global settings * Clean up completed TODOs * Exclude non-related content * Fix email closing (not-related to CF) * Update wording (removing "all") * Treat custom fields as part of plugins * Update description for "other plugins" settings * Revert screenshot change No custom fields tab in in-app Marketplace * Remove unused screenshot for "custom fields" settings * Fix what → which Co-authored-by: Shaun Brown <[email protected]> * Fix: filling up → filling out * Update built-in → pre-installed Co-authored-by: Shaun Brown <[email protected]> * Custom Fields - Dev docs: All updates (#1036) * Add custom fields to TOC * Fix unclosed array in TOC config * Prepare TOC for upcoming content * Custom fields - Dev docs: Add a new Development > Custom Fields page (#1035) * WIP * Add WIP reference and example guide for custom fields * Delete old file, now splitted into reference and guide * Improve reference guide * Add first draft of color picker custom fields guide * Improve reference documentation * Improve example guide * Mention custom fields in plugins development * Fix TOC casing * Remove tutorial and update sidebar and "main" doc file name * Temporarily remove callout for tutorial * Improve custom fields reference documentation * Further improve custom fields reference documentation * Update first note with a mention to app-specific custom fields * Add prerequisites (plugin) * Update `items` table * Add multimarkdown support + prepare for documenting all settings fields * Improve introduction * Improve `plugin` key description * Delete deprecated TODOs * Fix paths in example code * Update wording: settings → options * Improve `options` table * Update prerequisites to also mention enabling plugin * Remove callout from plugins dev, will be moved to another PR * Reword introduction sentence Co-authored-by: markkaylor <[email protected]> * Reword models attributes intro. description Co-authored-by: markkaylor <[email protected]> * Fix preposition and singular usage Co-authored-by: markkaylor <[email protected]> * Update text → string in color picker example * Mention `media` can't be used as a data type * Add `media` to the list of forbidden data types * Update validator code example Co-authored-by: markkaylor <[email protected]> * Remove question comment about inline components * Update string → text * Remove View component * Finish removing View component and update "Components" section * Improve mention of non-usable data types * Remove bootstrap() and mention src/admin/app.s * Add link to user guide + mention CF can be added to components * Remove some comments * Replace bootstrap() with register() * Mention yup * Improve settings items description * Remove note about not being able to import custom input components * Improve `options` description and code example * Fix user guide link (no #) * Update schema.json → schema * Remove non-relevant TODO * Update strapi code base links * Don't mention what happens if `plugin` is omitted in server * Simplify callouts * Fix CTB spelling Co-authored-by: Shaun Brown <[email protected]> * Move note about forbidden data types into the table * Fix 'can not' → 'cannot' * Fix: can't → cannot * Add tip for `Input` component props Co-authored-by: markkaylor <[email protected]> Co-authored-by: Shaun Brown <[email protected]> * Custom fields - Dev docs: Updates to Backend customization > Models (#1052) * Add a few draft lines about impact on models * Add custom fields section to models attributes docs * Add custom fields to the list of types availables in schema.json * Fix typo in customField parameter name * Replace `custom field` by `customField` in table * Fix uid for global field name * Fix gerundive Co-authored-by: Shaun Brown <[email protected]> * Improve description of plugin/global uids * Fix duplicate content Co-authored-by: Shaun Brown <[email protected]> * Custom fields - Dev docs: Minor updates and cross-links (#1053) * Mention custom fields in server and admin panel APIs for plugins * Mention custom fields in plugins development * Mention custom fields in the global register() and bootstrap() methods * Register a custom field in admin with register(), not bootstrap() * Add registering admin panel part of a CF to available actions * Fix: custom fields are registered in register(), not bootstrap() * Improve intro. sentence for bootstrap() Co-authored-by: markkaylor <[email protected]> Co-authored-by: Shaun Brown <[email protected]> * Remove multimarkdown plugin * Remove markdown-it dependency * Fix broken link * Add tip about publishing a plugin on npm * Restore beta logo * Revert #1071 Not implemented yet * Update new top navbar links * Implement simple rebranding on docs-next (#1079) * Add branding palette * Add branding stylesheet * Modify InstallLink component * Apply system-ui font * Update logo * Fix palette * Update custom blocks (Strapi & tip callouts, install links) * Update branding: body, headings, and code * Fix tip background color * Set up font weight for all links * Simplify syntax * Update all callout colors * Clean up branding.styl * Reduce page width * Update border-radius for inline code * Update sidebar and navbar links * Fix sidebar link color * Update table style * Update :::details style * Update code styles * Update tabs styles * Add hover effect on install links' arrows * Remove underline on header anchors * Fix border color on active toggle items in TOC * Prettify CSS tables section * Update API calls style * Fix code group active tab border color * Update QSG tabs * Clean up TODOs * Fix active toggle TOC item color * Fix nav (missing bold on some items) * Fix more link colors in nav Co-authored-by: Aurélien Georget <[email protected]> * Flatten APIs structure in TOC * Update version number * Fix custom fields conflict * Update pre-release tip * Fix callout type * fix: typo in code sample (#1084) * Fix usage of "allow" Co-authored-by: Shaun Brown <[email protected]> * fix file path * update API token screenshot * Remove outdated content + update button name * Add regenerate API token section * update text for new user interface * update text to match UI * reword for clarity and specificity * update screenshots * updated text * fix caps and move screenshot * Update node support to 18 * add manual installation sqlite * chore: fix typos * Update Azure db connection to v4 (#1119) * Revert "Merge pull request #1068 from strapi/user/api-tokens-v2-updates" This reverts commit 6523d60. * Rework entire history on API Tokens v2 PR (#1122) * Fix variable name In the code, the variable name is `APP_URL` while in the table is just `URL`. * Deployment guides cleanup (#1116) * cleanup * Update Deployment page * Feedback updates * Feedback re: file paths * Remove path from .env * Change @custom-fields to @beta (#1135) * Update amazon-aws.md Remove erroneous text from code block instruction. * update db config for v4 * Revert "update db config for v4" This reverts commit 6d20cc4. * update db config for v4 * Update docs/developer-docs/latest/setup-deployment-guides/configurations/databases/sqlite.md Co-authored-by: Shaun Brown <[email protected]> * Update docs/developer-docs/latest/setup-deployment-guides/configurations/databases/sqlite.md Co-authored-by: Shaun Brown <[email protected]> * change bracket alignment * add callout for thumbnail loading * change tableName to collectionName (#1141) Fixes #1139 * Fix kind and collectionName docs (#1140) * Clarify steps for plugin creation (#1114) * clarify steps for plugin creation * add develop plugin section * Add hot reloading call out * update text * update plugin directory build explanation * Edit callout text * fix text * Add documentation for the request context feature (#1134) * Add documentation for the request context feature * Update docs/developer-docs/latest/development/backend-customization/requests-responses.md Co-authored-by: Pierre Wizla <[email protected]> Co-authored-by: Pierre Wizla <[email protected]> * Mention node 16 as most recommended * add graphql plugin config to ts example similar to js * Bump version number to 4.3.9 * Sqlite update (#1147) * create branch for sqlite update * add manual installation sqlite * Update docs/developer-docs/latest/setup-deployment-guides/configurations/databases/sqlite.md Co-authored-by: Shaun Brown <[email protected]> * Update docs/developer-docs/latest/setup-deployment-guides/configurations/databases/sqlite.md Co-authored-by: Shaun Brown <[email protected]> * add typescript and small improvements * change H2 heading Co-authored-by: quiloos39 <[email protected]> Co-authored-by: Necdet Efe <[email protected]> Co-authored-by: Pierre Wizla <[email protected]> * Bump dependencies version sqlite3 version is correct? * Remove callout re: unstable (#1153) * Rebranding: Moved search bar (#1154) * Add branding palette * Add branding stylesheet * Modify InstallLink component * Apply system-ui font * Update logo * Position the search bar * Add new search icon * Apply branding in the results * Adjust positioning * Add TODO to fix sidebar behavior * Fix tablet display * Fix Algolia search and positioning * Improve search bar UX * Add code & links in the search dataset * Increase importance of h2 titles * Fix docsearch.config.json * Fix search bar and nav-links positioning on mobile Tested on desktop and "mobile" (a.k.a. Dev Tools simulation tools) on Firefox, Chrome and Safari Co-authored-by: Aurélien Georget <[email protected]> * add migration guide * add guide * update naming convention * update procedure and code examples * fix punctuation * update for TypeScript only * Revert "Rebranding: Moved search bar (#1154)" This reverts commit 534f77e. * Updated Heroku deployment documentation (#991) * Updated Heroku deployment documentation Added a line to recommend WSL for windows users on step 5 of the postgres setup, as that was something that would have saved me some time while following the guide. Also fixed a numbering error * Update docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/heroku.md Co-authored-by: Pierre Wizla <[email protected]> * Added multiple options for windows users on step 5 * Remove WSL suggestion and format as a tip Co-authored-by: Pierre Wizla <[email protected]> * Update admin-customization.md for plugin translation (#1100) * Update admin-customization.md for plugin translation Add instructions to admin-customization.md for extending a plugin's translations, which requires prefixing the key/value pair (declared in the plugin's translation file) with the plugin's name, for example `"content-type-builder.plugin.name": "Constructeur de Type-Contenu"` in order to translate the `plugin.name` key declared in `content-type-builder` plugin. This wasn't made clear by the documentation previously, since even for default plugins (such as content-type-builder) some fields are not translatable with the default method because they are declared independently in the plugin's files. I couldn't find any reference in the docs to the fact the plugin's name needed to be added as a prefix in order to extend a plugin's key. * Update docs/developer-docs/latest/development/admin-customization.md Co-authored-by: Pierre Wizla <[email protected]> Co-authored-by: Pierre Wizla <[email protected]> * Installing hotjar (#1061) * Support HTML in SidebarGroup title * Add hotjar * Delete SidebarGroup.vue * cleanup language * add regenerate and sync the labels with the UI * Add callout for read-only API tokens * Windows Desktop Recommended Version Correction Latest Windows OS version is Windows 11 * Update docs/developer-docs/latest/update-migration-guides/update-version.md Co-authored-by: Shaun Brown <[email protected]> * Update docs/developer-docs/latest/update-migration-guides/update-version.md Co-authored-by: Shaun Brown <[email protected]> * Update docs/developer-docs/latest/update-migration-guides/update-version.md Co-authored-by: Shaun Brown <[email protected]> * fix: typos fixed * fixed typos * update the video demo link for v4 * Update introduction.md * Missing environmet variables added for pm2. (#1164) I follow the AWS guidelines for a fresh start. When I came to the pm2 step, I noticed some missing environment variables in ecosystem.config.js. * Update link to ColorPicker input * Revert "Merge branch 'production'" This reverts commit 9a9dffd, reversing changes made to 318b284. * update guide name * fix header meta content * Fix logo * Clean up custom fields page * Fix code-blocks (empty blank lines) in TypeScript documentation * Fix pre-release doc. link (docs-next) in top nav bar * Clean up branding.styl * Clean up comments in REST API population * Clean up comments from "Installing plugins via Marketplace" * Revert unwanted wording change in "Installing plugins via Marketplace" * Remove outdated TODO in "Installing plugins via Marketplace" * Fix link to Roadmap (#1168) * Temporarily revert back to old logo Co-authored-by: Shaun Brown <[email protected]> Co-authored-by: Shaun Brown <[email protected]> Co-authored-by: Maeva Lienard <[email protected]> Co-authored-by: meganelacheny <[email protected]> Co-authored-by: Gabriel <[email protected]> Co-authored-by: Jean-Sébastien Herbaux <[email protected]> Co-authored-by: markkaylor <[email protected]> Co-authored-by: Aurélien Georget <[email protected]> Co-authored-by: Igor Quirino <[email protected]> Co-authored-by: Alexandre Bodin <[email protected]> Co-authored-by: quiloos39 <[email protected]> Co-authored-by: Kuizuo <[email protected]> Co-authored-by: DMehaffy <[email protected]> Co-authored-by: Sabato Luca Guadagno <[email protected]> Co-authored-by: muzucode <[email protected]> Co-authored-by: Necdet Efe <[email protected]> Co-authored-by: Laurens Kling <[email protected]> Co-authored-by: Alexandre BODIN <[email protected]> Co-authored-by: Dima Pulkinen <[email protected]> Co-authored-by: Victor Perez Montel <[email protected]> Co-authored-by: Levi Pettersen <[email protected]> Co-authored-by: Quentin Le Caignec <[email protected]> Co-authored-by: Vivek Patel <[email protected]> Co-authored-by: Shubhdeep Chhabra <[email protected]> Co-authored-by: Jizu Sun <[email protected]> Co-authored-by: Habil BOZALİ <[email protected]> Co-authored-by: Michael Härtl <[email protected]>
1 parent ced31ad commit 51d8348

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

docs/.vuepress/config/theme-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const themeConfig = {
2-
logo: '/assets/logo.svg',
2+
logo: '/assets/logo.png',
33
nav: [
44
{
55
text: 'Resource Center',

0 commit comments

Comments
 (0)